From 1910530e41e1718eca50b16a304f2d68244f95f9 Mon Sep 17 00:00:00 2001 From: vishdha Date: Tue, 30 Jan 2018 12:19:56 +0530 Subject: [PATCH] [fix] CDNR negative value --- erpnext/regional/report/gstr_2/gstr_2.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/erpnext/regional/report/gstr_2/gstr_2.py b/erpnext/regional/report/gstr_2/gstr_2.py index 0715c8a478..2aa0386b4e 100644 --- a/erpnext/regional/report/gstr_2/gstr_2.py +++ b/erpnext/regional/report/gstr_2/gstr_2.py @@ -37,7 +37,9 @@ class Gstr2Report(object): # for is_igst, items in account.items(): row = [] for fieldname in invoice_fields: - if fieldname == "invoice_value": + if self.filters.get("type_of_business") == "CDNR" and fieldname == "invoice_value": + row.append(abs(invoice_details.base_rounded_total) or abs(invoice_details.base_grand_total)) + elif fieldname == "invoice_value": row.append(invoice_details.base_rounded_total or invoice_details.base_grand_total) else: row.append(invoice_details.get(fieldname)) @@ -46,11 +48,11 @@ class Gstr2Report(object): row += [rate, - sum([net_amount for item_code, net_amount in self.invoice_items.get(inv).items() + sum([abs(net_amount) for item_code, net_amount in self.invoice_items.get(inv).items() if item_code in [v[0] for k, v in items.items()]]), - [v[1] if k == True else 0.00 for k, v in items.items()], - [v[1] if k == False else 0.00 for k, v in items.items()], - [v[1] if k == False else 0.00 for k, v in items.items()], + [abs(v[1]) if k == True else 0.00 for k, v in items.items()], + [abs(v[1]) if k == False else 0.00 for k, v in items.items()], + [abs(v[1]) if k == False else 0.00 for k, v in items.items()], self.invoice_cess.get(inv), invoice_details.get('eligibility_for_itc'), invoice_details.get('itc_integrated_tax'),