nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-depr-after-sale

Browse Source
This commit is contained in:
Ganga Manoj
2021-09-21 06:29:41 +05:30
committed by GitHub
parent 3c8879e777 6d8e869a92
commit eb8122baba
7 changed files with 89 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,10 +112,7 @@ def validate_gstin_check_digit(gstin, label='GSTIN'):
frappe.throw(_("""Invalid {0}! The check digit validation has failed. Please ensure you've typed the {0} correctly.""").format(label))
def get_itemised_tax_breakup_header(item_doctype, tax_accounts):
if frappe.get_meta(item_doctype).has_field('gst_hsn_code'):
return [_("HSN/SAC"), _("Taxable Amount")] + tax_accounts
else:
return [_("Item"), _("Taxable Amount")] + tax_accounts
return [_("Item"), _("Taxable Amount")] + tax_accounts
def get_itemised_tax_breakup_data(doc, account_wise=False, hsn_wise=False):
itemised_tax = get_itemised_tax(doc.taxes, with_tax_account=account_wise)