fix: filter invalid invoice from excel

resilient-tech · Sep 27, 2024 · 2f728a2 · 2f728a2
1 parent 69a47cb
commit 2f728a2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_export.py b/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_export.py
@@ -202,7 +202,15 @@ def process_doc_issue_data(self, data):
         """
         Add draft count to cancelled count for DOC_ISSUE category
         """
-        for doc in data:
+        for doc in data.copy():
+            if doc.get(GSTR1_DataField.DOC_TYPE.value) in [
+                "Invalid Invoice Number (length greater than 16)",
+                "Excluded from Report (Same GSTIN Billing)",
+                "Excluded from Report (Is Opening Entry)",
+            ]:
+                data.remove(doc)
+                continue
+
             doc[GSTR1_DataField.CANCELLED_COUNT.value] += doc.get(
                 GSTR1_DataField.DRAFT_COUNT.value, 0
             )

diff --git a/india_compliance/gst_india/report/gstr_1/gstr_1.py b/india_compliance/gst_india/report/gstr_1/gstr_1.py
@@ -1593,7 +1593,7 @@ def is_same_naming_series(self, name_1, name_2):
 
     def seperate_data_by_nature_of_document(self, data, doctype):
         nature_of_document = {
-            "Non GST Invoices": [],
+            "Invalid Invoice Number (length greater than 16)": [],
             "Excluded from Report (Same GSTIN Billing)": [],
             "Excluded from Report (Is Opening Entry)": [],
             "Invoices for outward supply": [],
@@ -1605,7 +1605,9 @@ def seperate_data_by_nature_of_document(self, data, doctype):
 
         for doc in data:
             if len(doc.name) > 16 or not GST_INVOICE_NUMBER_FORMAT.match(doc.name):
-                nature_of_document["Non GST Invoices"].append(doc)
+                nature_of_document[
+                    "Invalid Invoice Number (length greater than 16)"
+                ].append(doc)
             elif doc.is_opening == "Yes":
                 nature_of_document["Excluded from Report (Is Opening Entry)"].append(
                     doc