Merge pull request #108 from 8848digital/16_oct_to_6_nov

16 oct to 6 nov

Author: nirali8848

india_compliance/__init__.py

@@ -1 +1 @@
-__version__ = "15.23.0"
+__version__ = "15.23.2"

india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js

@@ -2967,7 +2967,7 @@ class GSTR1Action extends FileGSTR1Dialog {
         // summary matched
         if (filing_status == "Ready to File") {
             // only show filed tab
-            ["books", "unfiled", "reconcile"].map(tab =>
+            ["books", "unfiled", "reconcile", "errors"].map(tab =>
                 this.frm.gstr1.tabs[`${tab}_tab`].hide()
             );
             this.frm.gstr1.tabs.filed_tab.set_active();

india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.py

@@ -350,35 +350,28 @@ def set_reclaim_of_itc_reversal(self):
             self.report_dict["itc_elg"]["itc_inelg"][0][tax_amount_key] += entry.amount
 
     def get_inward_nil_exempt(self, state):
-        PurchaseInvoice =  frappe.qb.DocType("Purchase Invoice")
-        PurchaseInvoiceItem =  frappe.qb.DocType("Purchase Invoice Item")
-
-        query = (
-            frappe.qb.from_(PurchaseInvoice)
-            .join(PurchaseInvoiceItem)
-            .on(PurchaseInvoice.name == PurchaseInvoiceItem.parent)
-            .select(
-                PurchaseInvoice.place_of_supply,
-                PurchaseInvoice.supplier_address,
-                PurchaseInvoiceItem.taxable_value,
-                PurchaseInvoiceItem.gst_treatment,
-            )
-            .where(
-                (PurchaseInvoice.docstatus == 1)
-                & (PurchaseInvoice.is_opening == "No")
-                & (PurchaseInvoice.company_gstin != IfNull(PurchaseInvoice.supplier_gstin, ""))
-                & (
-                    (PurchaseInvoiceItem.gst_treatment != "Taxable")
-                    | (PurchaseInvoice.gst_category == "Registered Composition")
-                )
-                & (PurchaseInvoice.posting_date.between(self.from_date, self.to_date))
-                & (PurchaseInvoice.company == self.company)
-                & (PurchaseInvoice.company_gstin == self.gst_details.get("gstin"))
-            )
+        inward_nil_exempt = frappe.db.sql(
+            """
+            SELECT p.place_of_supply, p.supplier_address,
+            i.taxable_value, i.gst_treatment
+            FROM `tabPurchase Invoice` p , `tabPurchase Invoice Item` i
+            WHERE p.docstatus = 1 and p.name = i.parent
+            and p.is_opening = 'No'
+            and p.company_gstin != IFNULL(p.supplier_gstin, "")
+            and (i.gst_treatment != 'Taxable' or p.gst_category = 'Registered Composition') and
+            p.posting_date between %s and %s
+            and p.company = %s and p.company_gstin = %s
+            and p.gst_category != "Overseas"
+            """,
+            (
+                self.from_date,
+                self.to_date,
+                self.company,
+                self.gst_details.get("gstin"),
+            ),
+            as_dict=1,
         )
 
-        inward_nil_exempt = query.run(as_dict=True)
-
         inward_nil_exempt_details = {
             "gst": {"intra": 0.0, "inter": 0.0},
             "non_gst": {"intra": 0.0, "inter": 0.0},
@@ -391,7 +384,9 @@ def get_inward_nil_exempt(self, state):
                 d.place_of_supply = "00-" + cstr(state)
 
             supplier_state = address_state_map.get(d.supplier_address) or state
-            is_intra_state = cstr(supplier_state) == cstr(d.place_of_supply.split("-")[1])
+            is_intra_state = cstr(supplier_state) == cstr(
+                d.place_of_supply.split("-")[1]
+            )
             amount = flt(d.taxable_value, 2)
 
             if d.gst_treatment != "Non-GST":

india_compliance/gst_india/report/gstr_3b_details/gstr_3b_details.py

@@ -431,6 +431,7 @@ def get_inward_nil_exempt(self):
                     purchase_invoice.company_gstin
                     != IfNull(purchase_invoice.supplier_gstin, "")
                 )
+                & (purchase_invoice.gst_category != "Overseas")
             )
             .groupby(
                 purchase_invoice.name,

india_compliance/gst_india/utils/__init__.py

@@ -1069,7 +1069,7 @@ def create_notification(
             "email_content": message_content.get("body"),
         }
     )
-    notification.insert()
+    notification.insert(ignore_permissions=True)
 
 
 def enable_autocommit(fn):

india_compliance/gst_india/utils/e_invoice.py

@@ -685,7 +685,7 @@ def update_item_details(self, item_details, item):
         )
 
         if self.doc.is_reverse_charge:
-            item_details["total_value"] = item.taxable_value
+            item_details["total_value"] = abs(self.rounded(item.taxable_value, 2))
 
         if batch_no := self.sanitize_value(
             item.batch_no, max_length=20, truncate=False

india_compliance/public/js/setup_wizard.js

@@ -30,8 +30,8 @@ function complete_setup_wizard() {
         method: "india_compliance.setup_wizard.enable_setup_wizard_complete",
         callback: function (r) {
             frappe.ui.toolbar.clear_cache();
-        }
-    })
+        },
+    });
 }
 
 function toggle_india_specific_fields(country) {
@@ -60,37 +60,44 @@ function update_erpnext_slides_settings() {
         erpnext.setup?.slides_settings && erpnext.setup.slides_settings.slice(-1)[0];
     if (!slide) return;
 
-    company_gstin_field = {
-        fieldname: "company_gstin",
-        fieldtype: "Data",
-        label: __("Company GSTIN"),
-    };
+    const gstin_section = [
+        {
+            fieldname: "company_gstin",
+            fieldtype: "Data",
+            label: __("Company GSTIN"),
+        },
+        {
+            fieldtype: "Column Break",
+        },
+        {
+            fieldname: "default_gst_rate",
+            fieldtype: "Select",
+            label: __("Default GST Rate"),
+            options: [
+                "0.0",
+                "0.1",
+                "0.25",
+                "1.0",
+                "1.5",
+                "3.0",
+                "5.0",
+                "6.0",
+                "7.5",
+                "12.0",
+                "18.0",
+                "28.0",
+                "40.0",
+            ],
+            default: "18.0",
+        },
+        {
+            fieldtype: "Section Break",
+        },
+    ];
 
-    const _index = can_fetch_gstin_info() ? 0 : 1;
-
-    slide.fields.splice(_index, 0, company_gstin_field);
-
-    slide.fields.splice(4, 0, {
-        fieldname: "default_gst_rate",
-        fieldtype: "Select",
-        label: __("Default GST Rate"),
-        options: [
-            "0.0",
-            "0.1",
-            "0.25",
-            "1.0",
-            "1.5",
-            "3.0",
-            "5.0",
-            "6.0",
-            "7.5",
-            "12.0",
-            "18.0",
-            "28.0",
-            "40.0",
-        ],
-        default: "18.0",
-    });
+    const _index = can_fetch_gstin_info() ? 0 : 4;
+
+    slide.fields.splice(_index, 0, ...gstin_section);
 
     slide.fields.push({
         fieldname: "enable_audit_trail",

india_compliance/public/js/taxes_controller.js

@@ -139,10 +139,11 @@ india_compliance.taxes_controller = class TaxesController {
         if (this.frm.doc.doctype === "Subcontracting Receipt") {
             amount = calculateAmount(row.qty, row.rate, "amount");
         } else if (this.frm.doc.doctype === "Stock Entry") {
-            amount = calculateAmount(row.qty, row.basic_rate, "basic_amount");
+            amount = calculateAmount(row.transfer_qty, row.basic_rate, "basic_amount");
         }
 
         row.taxable_value = amount;
+        this.frm.refresh_field("items");
     }
 
     async update_tax_amount() {

india_compliance/public/js/utils.js

@@ -268,20 +268,29 @@ Object.assign(india_compliance, {
     },
 
     validate_gstin(gstin, show_msg = true) {
+        const opts = { title: __("Error"), indicator: "red" };
+
         if (!gstin || gstin.length !== 15) {
-            if (show_msg) frappe.msgprint(__("GSTIN must be 15 characters long"));
+            if (show_msg) {
+                frappe.msgprint({
+                    message: __("GSTIN must be 15 characters long"),
+                    ...opts,
+                });
+            }
             return;
         }
 
         gstin = gstin.trim().toUpperCase();
 
         if (GSTIN_REGEX.test(gstin) && is_gstin_check_digit_valid(gstin)) {
             return gstin;
-        } else {
-            if (show_msg) frappe.msgprint(__("Invalid GSTIN"));
+        } else if (show_msg) {
+            frappe.msgprint({
+                message: __("Invalid GSTIN"),
+                ...opts,
+            });
         }
     },
-
     guess_gst_category(gstin, country) {
         if (!gstin) {
             if (country && country !== "India") return "Overseas";