diff --git a/india_compliance/gst_india/overrides/subcontracting_transaction.py b/india_compliance/gst_india/overrides/subcontracting_transaction.py index cbf5859aab..e20fee8bef 100644 --- a/india_compliance/gst_india/overrides/subcontracting_transaction.py +++ b/india_compliance/gst_india/overrides/subcontracting_transaction.py @@ -178,6 +178,13 @@ def onload(doc, method=None): def validate(doc, method=None): + field_map = ( + STOCK_ENTRY_FIELD_MAP + if doc.doctype == "Stock Entry" + else SUBCONTRACTING_ORDER_RECEIPT_FIELD_MAP + ) + CustomTaxController(doc, field_map).set_taxes_and_totals() + if ignore_gst_validations_for_subcontracting(doc): return @@ -187,13 +194,6 @@ def validate(doc, method=None): if doc.doctype in ("Stock Entry", "Subcontracting Receipt"): validate_transaction_name(doc) - field_map = ( - STOCK_ENTRY_FIELD_MAP - if doc.doctype == "Stock Entry" - else SUBCONTRACTING_ORDER_RECEIPT_FIELD_MAP - ) - CustomTaxController(doc, field_map).set_taxes_and_totals() - set_gst_tax_type(doc) validate_taxes(doc) diff --git a/india_compliance/gst_india/overrides/test_subcontracting_transaction.py b/india_compliance/gst_india/overrides/test_subcontracting_transaction.py index dde7bc7f85..b4ff5332ea 100644 --- a/india_compliance/gst_india/overrides/test_subcontracting_transaction.py +++ b/india_compliance/gst_india/overrides/test_subcontracting_transaction.py @@ -251,7 +251,7 @@ def test_for_unregistered_company(self): ) sco = create_subcontracting_order(po_name=po.name) - self.assertEqual(sco.total_taxes, None) + self.assertEqual(sco.total_taxes, 0.0) rm_items = get_rm_items(sco.supplied_items) args = { @@ -271,7 +271,7 @@ def test_stock_entry_for_material_receipt(self): se = make_stock_entry() se.save() - self.assertEqual(se.total_taxes, None) + self.assertEqual(se.total_taxes, 0.0) def test_subcontracting_validations(self): po = create_purchase_order( diff --git a/india_compliance/gst_india/utils/itc_04/test_itc_04_export.py b/india_compliance/gst_india/utils/itc_04/test_itc_04_export.py index 3b71db69d8..63d35f5f97 100644 --- a/india_compliance/gst_india/utils/itc_04/test_itc_04_export.py +++ b/india_compliance/gst_india/utils/itc_04/test_itc_04_export.py @@ -55,7 +55,7 @@ "uqc": "NOS", "qty": 10.0, "desc": "Subcontracted SRM Item 1", - "txval": 0.0, + "txval": 200.0, "goods_ty": "8b", "tx_i": 0.0, "tx_c": 0.0,