From 55daa9cd24376c0ccd04b38b4b845c50ff7c05b0 Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Fri, 4 May 2018 18:01:23 +0530 Subject: [PATCH] fix taxable amount for same items (#13927) --- erpnext/regional/report/gstr_1/gstr_1.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py index 79d6e12bfb..a14500acaf 100644 --- a/erpnext/regional/report/gstr_1/gstr_1.py +++ b/erpnext/regional/report/gstr_1/gstr_1.py @@ -144,7 +144,17 @@ class Gstr1Report(object): """ % (self.doctype, ', '.join(['%s']*len(self.invoices))), tuple(self.invoices), as_dict=1) for d in items: - self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, d.base_net_amount) + item_details = {} + item_details[d.item_code] = d.base_net_amount + + if d.parent in self.invoice_items: + parent_dict = self.invoice_items[d.parent] + if d.item_code in parent_dict: + item_details[d.item_code] += parent_dict[d.item_code] + else: + item_details.update(parent_dict) + + self.invoice_items[d.parent] = item_details def get_items_based_on_tax_rate(self): self.tax_details = frappe.db.sql("""