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

fix: Unequal debit and credit issue on RCM Invoice (#24838)

Browse Source 
* fix: Unequal debit and credit issue on RCM Invoice

* fix: Travis
This commit is contained in:
Deepesh Garg 2021-03-15 18:04:47 +05:30 committed by GitHub
parent e838d1c7f0
commit 7f2e45e0f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
erpnext/regional/india/utils.py
View File

@ -693,25 +693,12 @@ def update_grand_total_for_rcm(doc, method):
if country != 'India': if country != 'India':
return return
if not doc.total_taxes_and_charges: gst_tax, base_gst_tax = get_gst_tax_amount(doc)
if not base_gst_tax:
return return
if doc.reverse_charge == 'Y': if doc.reverse_charge == 'Y':
gst_accounts = get_gst_accounts(doc.company)
gst_account_list = gst_accounts.get('cgst_account') + gst_accounts.get('sgst_account') \
+ gst_accounts.get('igst_account')
base_gst_tax = 0
gst_tax = 0
for tax in doc.get('taxes'):
if tax.category not in ("Total", "Valuation and Total"):
continue
if flt(tax.base_tax_amount_after_discount_amount) and tax.account_head in gst_account_list:
base_gst_tax += tax.base_tax_amount_after_discount_amount
gst_tax += tax.tax_amount_after_discount_amount
doc.taxes_and_charges_added -= gst_tax doc.taxes_and_charges_added -= gst_tax
doc.total_taxes_and_charges -= gst_tax doc.total_taxes_and_charges -= gst_tax
doc.base_taxes_and_charges_added -= base_gst_tax doc.base_taxes_and_charges_added -= base_gst_tax
@ -745,7 +732,9 @@ def make_regional_gl_entries(gl_entries, doc):
if country != 'India': if country != 'India':
return gl_entries return gl_entries
if not doc.total_taxes_and_charges: gst_tax, base_gst_tax = get_gst_tax_amount(doc)
if not base_gst_tax:
return gl_entries return gl_entries
if doc.reverse_charge == 'Y': if doc.reverse_charge == 'Y':
@ -775,3 +764,21 @@ def make_regional_gl_entries(gl_entries, doc):
) )
return gl_entries return gl_entries
def get_gst_tax_amount(doc):
gst_accounts = get_gst_accounts(doc.company)
gst_account_list = gst_accounts.get('cgst_account', []) + gst_accounts.get('sgst_account', []) \
+ gst_accounts.get('igst_account', [])
base_gst_tax = 0
gst_tax = 0
for tax in doc.get('taxes'):
if tax.category not in ("Total", "Valuation and Total"):
continue
if flt(tax.base_tax_amount_after_discount_amount) and tax.account_head in gst_account_list:
base_gst_tax += tax.base_tax_amount_after_discount_amount
gst_tax += tax.tax_amount_after_discount_amount
return gst_tax, base_gst_tax