Skip to content

Revert "fix: set taxes and totals before validating subcontracting transaction" #3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
karm1000 wants to merge 1 commit into from
Closed

Revert "fix: set taxes and totals before validating subcontracting transaction" #3783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions india_compliance/gst_india/overrides/subcontracting_transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,6 @@ 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

Expand All @@ -194,6 +187,13 @@ 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)

Expand Down
4 changes: 2 additions & 2 deletions india_compliance/gst_india/overrides/test_subcontracting_transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def test_for_unregistered_company(self):
)

sco = create_subcontracting_order(po_name=po.name)
self.assertEqual(sco.total_taxes, 0.0)
self.assertEqual(sco.total_taxes, None)

rm_items = get_rm_items(sco.supplied_items)
args = {
Expand All @@ -271,7 +271,7 @@ def test_stock_entry_for_material_receipt(self):
se = make_stock_entry()
se.save()

self.assertEqual(se.total_taxes, 0.0)
self.assertEqual(se.total_taxes, None)

def test_subcontracting_validations(self):
po = create_purchase_order(
Expand Down
2 changes: 1 addition & 1 deletion india_compliance/gst_india/utils/itc_04/test_itc_04_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"uqc": "NOS",
"qty": 10.0,
"desc": "Subcontracted SRM Item 1",
"txval": 200.0,
"txval": 0.0,
"goods_ty": "8b",
"tx_i": 0.0,
"tx_c": 0.0,
Expand Down
Loading
⚡