Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14408 from rohitwaghchaure/purchase_invoice_supplier_gstin_issue

Browse Source 
[Fix] Code cleanup, if supplier gstin is none
This commit is contained in:
Faris Ansari 2018-06-07 13:48:51 +05:30 committed by GitHub
commit 25625f4092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,6 @@ def get_place_of_supply(out, doctype):
return cstr(address.gst_state_number) + "-" + cstr(address.gst_state) return cstr(address.gst_state_number) + "-" + cstr(address.gst_state)
def get_regional_address_details(out, doctype, company): def get_regional_address_details(out, doctype, company):
out.place_of_supply = get_place_of_supply(out, doctype) out.place_of_supply = get_place_of_supply(out, doctype)
if not out.place_of_supply: return if not out.place_of_supply: return
@ -97,8 +96,9 @@ def get_regional_address_details(out, doctype, company):
if not (out.supplier_gstin or out.place_of_supply): if not (out.supplier_gstin or out.place_of_supply):
return return
if doctype in ("Sales Invoice", "Delivery Note") and out.company_gstin[:2] != out.place_of_supply[:2]\ if ((doctype in ("Sales Invoice", "Delivery Note") and out.company_gstin
or (doctype == "Purchase Invoice" and out.supplier_gstin[:2] != out.place_of_supply[:2]): and out.company_gstin[:2] != out.place_of_supply[:2]) or (doctype == "Purchase Invoice"
and out.supplier_gstin and out.supplier_gstin[:2] != out.place_of_supply[:2])):
default_tax = frappe.db.get_value(master_doctype, {"company": company, "is_inter_state":1, "disabled":0}) default_tax = frappe.db.get_value(master_doctype, {"company": company, "is_inter_state":1, "disabled":0})
else: else:
default_tax = frappe.db.get_value(master_doctype, {"company": company, "disabled":0, "is_default": 1}) default_tax = frappe.db.get_value(master_doctype, {"company": company, "disabled":0, "is_default": 1})