From d8479a41e5f70e8fd39b0d680fbd1e083eab595e Mon Sep 17 00:00:00 2001 From: Dany Robert Date: Sun, 26 Sep 2021 18:31:27 +0530 Subject: [PATCH 1/2] fix: tax rate being overridden in case of 0.00 Tax rate could be different for different expenses. Therefore, rate is kept as 0.00 and tax amount entered manually. But fetching used to override the rate(upon saving) and mess up the amount. (cherry picked from commit 5ce6a4c1075f3551608de4d9b70616aaae53d9b4) --- .../expense_taxes_and_charges/expense_taxes_and_charges.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json b/erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json index 020457d4ec6..4a1064b66b7 100644 --- a/erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json +++ b/erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json @@ -56,8 +56,6 @@ }, { "columns": 2, - "fetch_from": "account_head.tax_rate", - "fetch_if_empty": 1, "fieldname": "rate", "fieldtype": "Float", "in_list_view": 1, @@ -111,4 +109,4 @@ "sort_field": "modified", "sort_order": "ASC", "track_changes": 1 -} \ No newline at end of file +} From a17fed9cd93bf01eadae18ad165bb9efdcb55f16 Mon Sep 17 00:00:00 2001 From: Dany Robert Date: Wed, 29 Sep 2021 13:01:40 +0530 Subject: [PATCH 2/2] fix: return tax rate since fetch is removed (cherry picked from commit 2b4959fb3be1507e86e86bd0d7c29cae74d3cded) --- erpnext/hr/doctype/expense_claim/test_expense_claim.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/expense_claim/test_expense_claim.py b/erpnext/hr/doctype/expense_claim/test_expense_claim.py index e54c1457244..86a8b877e4b 100644 --- a/erpnext/hr/doctype/expense_claim/test_expense_claim.py +++ b/erpnext/hr/doctype/expense_claim/test_expense_claim.py @@ -176,7 +176,7 @@ def generate_taxes(): account = create_account(company=company_name, account_name="Output Tax CGST", account_type="Tax", parent_account=parent_account) return {'taxes':[{ "account_head": account, - "rate": 0, + "rate": 9, "description": "CGST", "tax_amount": 10, "total": 210