CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-12 14:58:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: other charges calculation

Browse Source
This commit is contained in:
Saqib Ansari
2020-11-02 14:10:38 +05:30
parent 6c064a1f95
commit b77375c72b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/regional/india/e_invoice/utils.py
View File

@@ -373,8 +373,6 @@ def get_item_list(invoice):
elif t.account_head in gst_accounts.cgst_account:
item.tax_rate += item_tax_detail[0]
item.cgst_amount += abs(item_tax_detail[1])
else:
item.other_charges += abs(item_tax_detail[1])
item.total_value = abs(item.base_amount + item.igst_amount + item.sgst_amount + item.cgst_amount + item.cess_amount + item.other_charges)
einv_item = item_schema.format(item=item)
@@ -388,8 +386,8 @@ def get_value_details(invoice):
value_details = frappe._dict(dict())
value_details.base_net_total = abs(invoice.base_net_total)
value_details.invoice_discount_amt = abs(invoice.discount_amount)
value_details.round_off = invoice.rounding_adjustment if invoice.rounding_adjustment > 0 else 0
value_details.invoice_discount_amt = invoice.discount_amount if invoice.discount_amount > 0 else 0
value_details.round_off = invoice.rounding_adjustment - (invoice.discount_amount if invoice.discount_amount < 0 else 0)
value_details.base_grand_total = abs(invoice.base_rounded_total)
value_details.grand_total = abs(invoice.rounded_total)
value_details.total_cgst_amt = 0