Skip to content

Commit b6c561f

Browse files
authored
Merge pull request #3960 from resilient-tech/mergify/bp/version-15-hotfix/pr-3782
fix: set taxes and totals before validating subcontracting transaction (backport #3782)
2 parents 8ca7140 + f28b5b0 commit b6c561f

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

india_compliance/gst_india/overrides/subcontracting_transaction.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,13 @@ def onload(doc, method=None):
177177

178178

179179
def validate(doc, method=None):
180+
field_map = (
181+
STOCK_ENTRY_FIELD_MAP
182+
if doc.doctype == "Stock Entry"
183+
else SUBCONTRACTING_ORDER_RECEIPT_FIELD_MAP
184+
)
185+
CustomTaxController(doc, field_map).set_taxes_and_totals()
186+
180187
if ignore_gst_validations_for_subcontracting(doc):
181188
return
182189

@@ -186,13 +193,6 @@ def validate(doc, method=None):
186193
if doc.doctype in ("Stock Entry", "Subcontracting Receipt"):
187194
validate_transaction_name(doc)
188195

189-
field_map = (
190-
STOCK_ENTRY_FIELD_MAP
191-
if doc.doctype == "Stock Entry"
192-
else SUBCONTRACTING_ORDER_RECEIPT_FIELD_MAP
193-
)
194-
CustomTaxController(doc, field_map).set_taxes_and_totals()
195-
196196
set_gst_tax_type(doc)
197197
validate_taxes(doc)
198198

india_compliance/gst_india/overrides/test_subcontracting_transaction.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def test_for_unregistered_company(self):
251251
)
252252

253253
sco = create_subcontracting_order(po_name=po.name)
254-
self.assertEqual(sco.total_taxes, None)
254+
self.assertEqual(sco.total_taxes, 0.0)
255255

256256
rm_items = get_rm_items(sco.supplied_items)
257257
args = {
@@ -271,7 +271,7 @@ def test_stock_entry_for_material_receipt(self):
271271
se = make_stock_entry()
272272
se.save()
273273

274-
self.assertEqual(se.total_taxes, None)
274+
self.assertEqual(se.total_taxes, 0.0)
275275

276276
def test_subcontracting_validations(self):
277277
po = create_purchase_order(

india_compliance/gst_india/utils/itc_04/test_itc_04_export.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"uqc": "NOS",
5656
"qty": 10.0,
5757
"desc": "Subcontracted SRM Item 1",
58-
"txval": 0.0,
58+
"txval": 200.0,
5959
"goods_ty": "8b",
6060
"tx_i": 0.0,
6161
"tx_c": 0.0,

0 commit comments

Comments
 (0)