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

fix: Error on submitting sales invoice (#24243)

Browse Source 
* fix: Error on submitting sales invoice

* fix: remove return_taxes
This commit is contained in:
Deepesh Garg
2020-12-30 17:44:23 +05:30
committed by GitHub
parent 61298c3489
commit 11f2da72b1
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,7 +169,7 @@ def get_regional_address_details(party_details, doctype, company):
if is_internal_transfer(party_details, doctype): if is_internal_transfer(party_details, doctype):
party_details.taxes_and_charges = '' party_details.taxes_and_charges = ''
party_details.taxes = '' party_details.taxes = ''
return return party_details
if doctype in ("Sales Invoice", "Delivery Note", "Sales Order"): if doctype in ("Sales Invoice", "Delivery Note", "Sales Order"):
master_doctype = "Sales Taxes and Charges Template" master_doctype = "Sales Taxes and Charges Template"
@@ -177,11 +177,11 @@ def get_regional_address_details(party_details, doctype, company):
get_tax_template_for_sez(party_details, master_doctype, company, 'Customer') get_tax_template_for_sez(party_details, master_doctype, company, 'Customer')
get_tax_template_based_on_category(master_doctype, company, party_details) get_tax_template_based_on_category(master_doctype, company, party_details)
if party_details.get('taxes_and_charges') and return_taxes: if party_details.get('taxes_and_charges'):
return party_details return party_details
if not party_details.company_gstin: if not party_details.company_gstin:
return return party_details
elif doctype in ("Purchase Invoice", "Purchase Order", "Purchase Receipt"): elif doctype in ("Purchase Invoice", "Purchase Order", "Purchase Receipt"):
master_doctype = "Purchase Taxes and Charges Template" master_doctype = "Purchase Taxes and Charges Template"
@@ -189,15 +189,15 @@ def get_regional_address_details(party_details, doctype, company):
get_tax_template_for_sez(party_details, master_doctype, company, 'Supplier') get_tax_template_for_sez(party_details, master_doctype, company, 'Supplier')
get_tax_template_based_on_category(master_doctype, company, party_details) get_tax_template_based_on_category(master_doctype, company, party_details)
if party_details.get('taxes_and_charges') and return_taxes: if party_details.get('taxes_and_charges'):
return party_details return party_details
if not party_details.supplier_gstin: if not party_details.supplier_gstin:
return return party_details
if not party_details.place_of_supply: return if not party_details.place_of_supply: return party_details
if not party_details.company_gstin: return if not party_details.company_gstin: return party_details
if ((doctype in ("Sales Invoice", "Delivery Note", "Sales Order") and party_details.company_gstin if ((doctype in ("Sales Invoice", "Delivery Note", "Sales Order") and party_details.company_gstin
and party_details.company_gstin[:2] != party_details.place_of_supply[:2]) or (doctype in ("Purchase Invoice", and party_details.company_gstin[:2] != party_details.place_of_supply[:2]) or (doctype in ("Purchase Invoice",
@@ -207,12 +207,11 @@ def get_regional_address_details(party_details, doctype, company):
default_tax = get_tax_template(master_doctype, company, 0, party_details.company_gstin[:2]) default_tax = get_tax_template(master_doctype, company, 0, party_details.company_gstin[:2])
if not default_tax: if not default_tax:
return return party_details
party_details["taxes_and_charges"] = default_tax party_details["taxes_and_charges"] = default_tax
party_details.taxes = get_taxes_and_charges(master_doctype, default_tax) party_details.taxes = get_taxes_and_charges(master_doctype, default_tax)
if return_taxes: return party_details
return party_details
def update_party_details(party_details, doctype): def update_party_details(party_details, doctype):
for address_field in ['shipping_address', 'company_address', 'supplier_address', 'shipping_address_name', 'customer_address']: for address_field in ['shipping_address', 'company_address', 'supplier_address', 'shipping_address_name', 'customer_address']: