From e3cecec0563d3bae49bfec011d69002c65432f8e Mon Sep 17 00:00:00 2001 From: Subin Tom <36098155+nemesis189@users.noreply.github.com> Date: Mon, 20 Sep 2021 16:13:36 +0530 Subject: [PATCH] fix: Tax Breakup table headers fix (#27596) (cherry picked from commit 0ff7367f390682587346ebd54dbddf1e8eb5bb9e) # Conflicts: # erpnext/regional/india/utils.py --- erpnext/regional/india/utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py index 107c700b521..7199aab76f8 100644 --- a/erpnext/regional/india/utils.py +++ b/erpnext/regional/india/utils.py @@ -156,11 +156,15 @@ def validate_gstin_check_digit(gstin, label="GSTIN"): def get_itemised_tax_breakup_header(item_doctype, tax_accounts): +<<<<<<< HEAD hsn_wise_in_gst_settings = frappe.db.get_single_value("GST Settings", "hsn_wise_tax_breakup") if frappe.get_meta(item_doctype).has_field("gst_hsn_code") and hsn_wise_in_gst_settings: return [_("HSN/SAC"), _("Taxable Amount")] + tax_accounts else: return [_("Item"), _("Taxable Amount")] + tax_accounts +======= + return [_("Item"), _("Taxable Amount")] + tax_accounts +>>>>>>> 0ff7367f39 (fix: Tax Breakup table headers fix (#27596)) def get_itemised_tax_breakup_data(doc, account_wise=False, hsn_wise=False):