schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: set taxes before calculating taxes and totals

Browse Source 
(cherry picked from commit 0fd0695bbb)
This commit is contained in:
Ninad1306
2025-02-18 12:52:33 +05:30
committed by Mergify
parent 9082ff6aa9
commit 90dea426d8
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/controllers/accounts_controller.py
View File

@@ -194,6 +194,14 @@ class AccountsController(TransactionBase):
self.set_incoming_rate() self.set_incoming_rate()
self.init_internal_values() self.init_internal_values()
# Need to set taxes based on taxes_and_charges template
# before calculating taxes and totals
if self.meta.get_field("taxes_and_charges"):
self.validate_enabled_taxes_and_charges()
self.validate_tax_account_company()
self.set_taxes_and_charges()
if self.meta.get_field("currency"): if self.meta.get_field("currency"):
self.calculate_taxes_and_totals() self.calculate_taxes_and_totals()
@@ -204,10 +212,6 @@ class AccountsController(TransactionBase):
self.validate_all_documents_schedule() self.validate_all_documents_schedule()
if self.meta.get_field("taxes_and_charges"):
self.validate_enabled_taxes_and_charges()
self.validate_tax_account_company()
self.validate_party() self.validate_party()
self.validate_currency() self.validate_currency()
self.validate_party_account_currency() self.validate_party_account_currency()
@@ -252,8 +256,6 @@ class AccountsController(TransactionBase):
self.validate_deferred_income_expense_account() self.validate_deferred_income_expense_account()
self.set_inter_company_account() self.set_inter_company_account()
self.set_taxes_and_charges()
if self.doctype == "Purchase Invoice": if self.doctype == "Purchase Invoice":
self.calculate_paid_amount() self.calculate_paid_amount()
# apply tax withholding only if checked and applicable # apply tax withholding only if checked and applicable