nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 03:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: validations

Browse Source
This commit is contained in:
Saqib Ansari
2020-10-26 13:18:33 +05:30
parent e1e3dbcae2
commit 9363725342
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/regional/india/e_invoice/e_invoice_utils.py
View File

@@ -396,13 +396,13 @@ def get_value_details(invoice):
for t in invoice.taxes: for t in invoice.taxes:
if t.account_head in gst_accounts_list: if t.account_head in gst_accounts_list:
if t.account_head in gst_accounts.cess_account: if t.account_head in gst_accounts.cess_account:
value_details.total_cess_amt += abs(t.base_tax_amount) value_details.total_cess_amt += abs(t.base_tax_amount_after_discount_amount)
elif t.account_head in gst_accounts.igst_account: elif t.account_head in gst_accounts.igst_account:
value_details.total_igst_amt += abs(t.base_tax_amount) value_details.total_igst_amt += abs(t.base_tax_amount_after_discount_amount)
elif t.account_head in gst_accounts.sgst_account: elif t.account_head in gst_accounts.sgst_account:
value_details.total_sgst_amt += abs(t.base_tax_amount) value_details.total_sgst_amt += abs(t.base_tax_amount_after_discount_amount)
elif t.account_head in gst_accounts.cgst_account: elif t.account_head in gst_accounts.cgst_account:
value_details.total_cgst_amt += abs(t.base_tax_amount) value_details.total_cgst_amt += abs(t.base_tax_amount_after_discount_amount)
return value_details return value_details
@@ -499,7 +499,7 @@ def make_einvoice(doctype, name):
def validate_einvoice(validations, einvoice, errors=[]): def validate_einvoice(validations, einvoice, errors=[]):
for fieldname, field_validation in validations.items(): for fieldname, field_validation in validations.items():
value = einvoice.get(fieldname, None) value = einvoice.get(fieldname, None)
if value in (None, "None", {}, []): if not value or value == "None":
# remove keys with empty values # remove keys with empty values
einvoice.pop(fieldname, None) einvoice.pop(fieldname, None)
continue continue
@@ -511,6 +511,9 @@ def validate_einvoice(validations, einvoice, errors=[]):
if isinstance(value, list): if isinstance(value, list):
for d in value: for d in value:
validate_einvoice(child_validations, d, errors) validate_einvoice(child_validations, d, errors)
if not d:
# remove empty dicts
einvoice.pop(fieldname, None)
else: else:
validate_einvoice(child_validations, value, errors) validate_einvoice(child_validations, value, errors)
if not value: if not value: