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 (#24836)

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

* fix: Travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
This commit is contained in:
Deepesh Garg 2021-03-15 18:04:42 +05:30 committed by GitHub
parent 4f6f224544
commit 93f925fb98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -719,25 +719,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
@ -771,6 +758,11 @@ def make_regional_gl_entries(gl_entries, doc):
if country != 'India': if country != 'India':
return gl_entries return gl_entries
gst_tax, base_gst_tax = get_gst_tax_amount(doc)
if not base_gst_tax:
return gl_entries
if doc.reverse_charge == 'Y': if doc.reverse_charge == 'Y':
gst_accounts = get_gst_accounts(doc.company) gst_accounts = get_gst_accounts(doc.company)
gst_account_list = gst_accounts.get('cgst_account') + gst_accounts.get('sgst_account') \ gst_account_list = gst_accounts.get('cgst_account') + gst_accounts.get('sgst_account') \
@ -799,23 +791,20 @@ def make_regional_gl_entries(gl_entries, doc):
return gl_entries return gl_entries
@frappe.whitelist() def get_gst_tax_amount(doc):
def get_regional_round_off_accounts(company, account_list): gst_accounts = get_gst_accounts(doc.company)
country = frappe.get_cached_value('Company', company, 'country') gst_account_list = gst_accounts.get('cgst_account', []) + gst_accounts.get('sgst_account', []) \
+ gst_accounts.get('igst_account', [])
if country != 'India': base_gst_tax = 0
return gst_tax = 0
if isinstance(account_list, string_types): for tax in doc.get('taxes'):
account_list = json.loads(account_list) if tax.category not in ("Total", "Valuation and Total"):
continue
if not frappe.db.get_single_value('GST Settings', 'round_off_gst_values'): if flt(tax.base_tax_amount_after_discount_amount) and tax.account_head in gst_account_list:
return base_gst_tax += tax.base_tax_amount_after_discount_amount
gst_tax += tax.tax_amount_after_discount_amount
gst_accounts = get_gst_accounts(company) return gst_tax, base_gst_tax
gst_account_list = gst_accounts.get('cgst_account') + gst_accounts.get('sgst_account') \
+ gst_accounts.get('igst_account')
account_list.extend(gst_account_list)
return account_list