chore: release v14

india_compliance/gst_india/api_classes/base.py

@@ -226,7 +226,6 @@ def is_ignored_error(self, response_json):
         pass
 
     def handle_http_code(self, status_code, response_json):
-
         # GSP connectivity issues
         if status_code == 401 or (
             status_code == 403
@@ -265,22 +264,23 @@ def mask_sensitive_info(self, log):
         output = log.output
         data = log.data
         request_body = data and data.get("body")
+        placeholder = "*****"
 
         for key in self.SENSITIVE_INFO:
             if key in request_headers:
-                request_headers[key] = "*****"
+                request_headers[key] = placeholder
 
             if output and key in output:
-                output[key] = "*****"
+                output[key] = placeholder
 
             if not data:
                 continue
 
             if key in data:
-                data[key] = "*****"
+                data[key] = placeholder
 
             if request_body and key in request_body:
-                request_body[key] = "*****"
+                request_body[key] = placeholder
 
 
 def get_public_ip():

india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py

@@ -349,6 +349,7 @@ def __init__(self, **kwargs):
 
     def get_all(self, additional_fields=None, names=None, only_names=False):
         query = self.get_query(additional_fields)
+        match_found = ("Reconciled", "Match Found")
 
         if only_names and not names:
             return
@@ -360,15 +361,15 @@ def get_all(self, additional_fields=None, names=None, only_names=False):
             query = query.where(
                 (
                     (self.PI.posting_date[self.from_date : self.to_date])
-                    & (IfNull(self.PI.reconciliation_status, "") != "Reconciled")
+                    & (IfNull(self.PI.reconciliation_status, "").notin(match_found))
                 )
                 | (self.PI.name.isin(names))
             )
 
         else:
             query = query.where(
                 (self.PI.posting_date[self.from_date : self.to_date])
-                & (IfNull(self.PI.reconciliation_status, "") != "Reconciled")
+                & (IfNull(self.PI.reconciliation_status, "").notin(match_found))
             )
 
         return query.run(as_dict=True)
@@ -502,6 +503,7 @@ def __init__(self, **kwargs):
 
     def get_all(self, additional_fields=None, names=None, only_names=False):
         query = self.get_query(additional_fields)
+        match_found = ("Reconciled", "Match Found")
 
         if only_names and not names:
             return
@@ -513,15 +515,15 @@ def get_all(self, additional_fields=None, names=None, only_names=False):
             query = query.where(
                 (
                     (self.BOE.posting_date[self.from_date : self.to_date])
-                    & (IfNull(self.BOE.reconciliation_status, "") != "Reconciled")
+                    & (IfNull(self.BOE.reconciliation_status, "").notin(match_found))
                 )
                 | (self.BOE.name.isin(names))
             )
 
         else:
             query = query.where(
                 (self.BOE.posting_date[self.from_date : self.to_date])
-                & (IfNull(self.BOE.reconciliation_status, "") != "Reconciled")
+                & (IfNull(self.BOE.reconciliation_status, "").notin(match_found))
             )
 
         return query.run(as_dict=True)
@@ -745,6 +747,8 @@ def reconcile(self, category, amended_category):
         """
         Reconcile purchases and inward supplies for given category.
         """
+        self.category = category
+
         # GSTIN Level matching
         purchases = self.get_unmatched_purchase_or_bill_of_entry(category)
         inward_supplies = self.get_unmatched_inward_supply(category, amended_category)
@@ -789,12 +793,13 @@ def reconcile_for_rule(self, purchases, inward_supplies, match_status, rules):
                 for inward_supply_name, inward_supply in (
                     inward_supplies[supplier_gstin].copy().items()
                 ):
-                    if match_status == "Residual Match":
-                        if (
-                            abs((purchase.bill_date - inward_supply.bill_date).days)
-                            > 10
-                        ):
-                            continue
+                    if (
+                        match_status == "Residual Match"
+                        and self.category != "CDNR"
+                        and abs((purchase.bill_date - inward_supply.bill_date).days)
+                        > 10
+                    ):
+                        continue
 
                     if not self.is_doc_matching(purchase, inward_supply, rules):
                         continue

india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_detail_comparision.html

@@ -4,7 +4,7 @@
 			<tr class="text-center">
 				<th></th>
 				<th>2A / 2B</th>
-				<th>Purchase</th>
+				<th>{{ purchase.doctype }}</th>
 			</tr>
 		</thead>
 		<tbody data-label="detail-view-content">

india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.js

@@ -16,12 +16,13 @@ const ALERT_HTML = `
         <div>
             You have missing GSTR-2B downloads
         </div>
-        ${api_enabled
-        ? `<a id="download-gstr2b-button" href="#" class="alert-link">
+        ${
+            api_enabled
+                ? `<a id="download-gstr2b-button" href="#" class="alert-link">
                     Download 2B
                 </a>`
-        : ""
-    }
+                : ""
+        }
     </div>
 `;
 
@@ -96,30 +97,31 @@ frappe.ui.form.on("Purchase Reconciliation Tool", {
             frm.save();
         });
 
+        const action_group = __("Actions");
+
         // add custom buttons
         api_enabled
             ? frm.add_custom_button(__("Download 2A/2B"), () => new ImportDialog(frm))
             : frm.add_custom_button(
-                __("Upload 2A/2B"),
-                () => new ImportDialog(frm, false)
-            );
+                  __("Upload 2A/2B"),
+                  () => new ImportDialog(frm, false)
+              );
 
         if (!frm.purchase_reconciliation_tool?.data?.length) return;
         if (frm.get_active_tab()?.df.fieldname == "invoice_tab") {
             frm.add_custom_button(
                 __("Unlink"),
                 () => unlink_documents(frm),
-                __("Actions")
+                action_group
             );
-            frm.add_custom_button(__("dropdown-divider"), () => { }, __("Actions"));
+            frm.add_custom_button(__("dropdown-divider"), () => {}, action_group);
         }
-        ["Accept", "Pending", "Ignore"].forEach(
-            action =>
-                frm.add_custom_button(
-                    __(action),
-                    () => apply_action(frm, action),
-                    __("Actions")
-                )
+        ["Accept", "Pending", "Ignore"].forEach(action =>
+            frm.add_custom_button(
+                __(action),
+                () => apply_action(frm, action),
+                action_group
+            )
         );
         frm.$wrapper
             .find("[data-label='dropdown-divider']")
@@ -131,10 +133,16 @@ frappe.ui.form.on("Purchase Reconciliation Tool", {
         );
 
         // move actions button next to filters
-        for (let button of $(".custom-actions .inner-group-button")) {
-            if (button.innerText?.trim() != "Actions") continue;
+        for (const group_div of $(".custom-actions .inner-group-button")) {
+            const btn_label = group_div.querySelector("button").innerText?.trim();
+            if (btn_label != action_group) continue;
+
             $(".custom-button-group .inner-group-button").remove();
-            $(button).appendTo($(".custom-button-group"));
+
+            // to hide `Actions` button group on smaller screens
+            $(group_div).addClass("hidden-md");
+
+            $(group_div).appendTo($(".custom-button-group"));
         }
     },
 
@@ -191,8 +199,8 @@ frappe.ui.form.on("Purchase Reconciliation Tool", {
                 method == "update_api_progress"
                     ? __("Fetching data from GSTN")
                     : __("Updating Inward Supply for Return Period {0}", [
-                        data.return_period,
-                    ]);
+                          data.return_period,
+                      ]);
 
             frm.dashboard.show_progress(
                 "Import GSTR Progress",
@@ -377,6 +385,12 @@ class PurchaseReconciliationTool {
                 fieldname: "is_reverse_charge",
                 fieldtype: "Check",
             },
+            {
+                label: "DocType",
+                fieldname: "purchase_doctype",
+                fieldtype: "Select",
+                options: ["Purchase Invoice", "Bill of Entry"],
+            },
         ];
 
         fields.forEach(field => (field.parent = "Purchase Reconciliation Tool"));
@@ -453,47 +467,39 @@ class PurchaseReconciliationTool {
             me.dm = new EmailDialog(me.frm, row);
         });
 
-        this.tabs.summary_tab.$datatable.on(
-            "click",
-            ".match-status",
-            async function (e) {
-                e.preventDefault();
-
-                const match_status = $(this).text();
-                await me.filter_group.push_new_filter([
-                    "Purchase Reconciliation Tool",
-                    "match_status",
-                    "=",
-                    match_status,
-                ]);
-                me.filter_group.apply();
-            }
-        );
-
-        this.tabs.supplier_tab.$datatable.on(
-            "click",
-            ".supplier-gstin",
-            add_supplier_gstin_filter
-        );
-
-        this.tabs.invoice_tab.$datatable.on(
-            "click",
-            ".supplier-gstin",
-            add_supplier_gstin_filter
-        );
-
-        async function add_supplier_gstin_filter(e) {
-            e.preventDefault();
+        const filter_map = {
+            // TAB: { SELECTOR: FIELDNAME }
+            summary: { ".match-status": "match_status" },
+            supplier: { ".supplier-gstin": "supplier_gstin" },
+            invoice: {
+                ".match-status": "match_status",
+                ".action-performed": "action",
+                ".supplier-gstin": "supplier_gstin",
+            },
+        };
 
-            const supplier_gstin = $(this).text().trim();
-            await me.filter_group.push_new_filter([
-                "Purchase Reconciliation Tool",
-                "supplier_gstin",
-                "=",
-                supplier_gstin,
-            ]);
-            me.filter_group.apply();
-        }
+        Object.keys(filter_map).forEach(tab => {
+            Object.keys(filter_map[tab]).forEach(selector => {
+                this.tabs[`${tab}_tab`].$datatable.on(
+                    "click",
+                    selector,
+                    async function (e) {
+                        e.preventDefault();
+                        const value = $(this).text().trim();
+                        const field = filter_map[tab][selector];
+
+                        await me.filter_group.push_new_filter([
+                            "Purchase Reconciliation Tool",
+                            field,
+                            "=",
+                            value,
+                        ]);
+
+                        me.filter_group.apply();
+                    }
+                );
+            });
+        });
     }
 
     export_data(selected_row) {
@@ -743,12 +749,15 @@ class PurchaseReconciliationTool {
                 label: "Match Status",
                 fieldname: "match_status",
                 width: 120,
+                _value: (...args) => {
+                    return `<a href="#" class='match-status'>${args[0]}</a>`;
+                },
             },
             {
                 label: "GST Inward <br>Supply",
                 fieldname: "inward_supply_name",
                 fieldtype: "Link",
-                doctype: "GST Inward Supply",
+                options: "GST Inward Supply",
                 align: "center",
                 width: 120,
             },
@@ -787,6 +796,9 @@ class PurchaseReconciliationTool {
             {
                 label: "Action",
                 fieldname: "action",
+                _value: (...args) => {
+                    return `<a href="#" class='action-performed'>${args[0]}</a>`;
+                },
             },
         ];
     }
@@ -921,8 +933,9 @@ class DetailViewDialog {
                         ? ["GST Inward Supply"]
                         : ["Purchase Invoice", "Bill of Entry"],
 
-                read_only_depends_on: `eval: ${this.missing_doctype == "GST Inward Supply"
-                    }`,
+                read_only_depends_on: `eval: ${
+                    this.missing_doctype == "GST Inward Supply"
+                }`,
 
                 onchange: () => {
                     const doctype = this.dialog.get_value("doctype");
@@ -1243,8 +1256,7 @@ class ImportDialog {
     download_gstr_by_period(only_missing) {
         if (only_missing && this.has_no_pending_download) {
             frappe.msgprint({
-                message:
-                    "There are no pending downloads for the selected period.",
+                message: "There are no pending downloads for the selected period.",
                 title: "No Pending Downloads",
                 indicator: "orange",
             });
@@ -1830,6 +1842,7 @@ async function create_new_purchase_invoice(row, company, company_gstin) {
             bill_no: doc.bill_no,
             bill_date: doc.bill_date,
             is_reverse_charge: ["Yes", 1].includes(doc.is_reverse_charge) ? 1 : 0,
+            is_return: ["CDNR", "CDNRA"].includes(doc.classification) ? 1 : 0,
         };
 
         _set_value({