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

[fix] CDNR negative value

Browse Source
This commit is contained in:
vishdha 2018-01-30 12:19:56 +05:30
parent 109b408d11
commit 1910530e41
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/regional/report/gstr_2/gstr_2.py
View File

@ -37,7 +37,9 @@ class Gstr2Report(object):
# for is_igst, items in account.items(): # for is_igst, items in account.items():
row = [] row = []
for fieldname in invoice_fields: 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) row.append(invoice_details.base_rounded_total or invoice_details.base_grand_total)
else: else:
row.append(invoice_details.get(fieldname)) row.append(invoice_details.get(fieldname))
@ -46,11 +48,11 @@ class Gstr2Report(object):
row += [rate, 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()]]), 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()], [abs(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()], [abs(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 == False else 0.00 for k, v in items.items()],
self.invoice_cess.get(inv), self.invoice_cess.get(inv),
invoice_details.get('eligibility_for_itc'), invoice_details.get('eligibility_for_itc'),
invoice_details.get('itc_integrated_tax'), invoice_details.get('itc_integrated_tax'),