CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-03 18:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Tax Breakup table headers fix (#27596)

Browse Source 
(cherry picked from commit 0ff7367f39)

# Conflicts:
#	erpnext/regional/india/utils.py
This commit is contained in:
Subin Tom
2021-09-20 16:13:36 +05:30
committed by Mergify
parent f5160dc83d
commit e3cecec056
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/regional/india/utils.py
View File

@@ -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):