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

Merge pull request #28334 from deepeshgarg007/gstr_1_duplicate_items

Browse Source 
fix(India): Sales Invoice with duplicate items not showing correct taxable value
This commit is contained in:
Deepesh Garg 2021-11-11 11:38:58 +05:30 committed by GitHub
commit fdb8e1855d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/regional/report/gstr_1/gstr_1.py
View File

@ -248,18 +248,17 @@ class Gstr1Report(object):
""" % (self.doctype, ', '.join(['%s']*len(self.invoices))), tuple(self.invoices), as_dict=1) """ % (self.doctype, ', '.join(['%s']*len(self.invoices))), tuple(self.invoices), as_dict=1)
for d in items: for d in items:
if d.item_code not in self.invoice_items.get(d.parent, {}): self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, 0.0)
self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, 0.0) self.invoice_items[d.parent][d.item_code] += d.get('taxable_value', 0) or d.get('base_net_amount', 0)
self.invoice_items[d.parent][d.item_code] += d.get('taxable_value', 0) or d.get('base_net_amount', 0)
item_tax_rate = {} item_tax_rate = {}
if d.item_tax_rate: if d.item_tax_rate:
item_tax_rate = json.loads(d.item_tax_rate) item_tax_rate = json.loads(d.item_tax_rate)
for account, rate in item_tax_rate.items(): for account, rate in item_tax_rate.items():
tax_rate_dict = self.item_tax_rate.setdefault(d.parent, {}).setdefault(d.item_code, []) tax_rate_dict = self.item_tax_rate.setdefault(d.parent, {}).setdefault(d.item_code, [])
tax_rate_dict.append(rate) tax_rate_dict.append(rate)
def get_items_based_on_tax_rate(self): def get_items_based_on_tax_rate(self):
self.tax_details = frappe.db.sql(""" self.tax_details = frappe.db.sql("""