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

fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice

Browse Source
This commit is contained in:
GangaManoj 2021-07-17 19:49:16 +05:30
parent 99551e9b7f
commit 228499369c
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/controllers/accounts_controller.py
View File

@ -791,14 +791,22 @@ class AccountsController(TransactionBase):
if flt(tax.base_tax_amount_after_discount_amount) and flt(tax.base_tax_amount): if flt(tax.base_tax_amount_after_discount_amount) and flt(tax.base_tax_amount):
account_currency = get_account_currency(tax.account_head) account_currency = get_account_currency(tax.account_head)
additional_discount_applied_on_taxes = flt(tax.base_tax_amount) - flt(tax.base_tax_amount_after_discount_amount) additional_discount_applied_on_taxes = flt(tax.base_tax_amount) - flt(tax.base_tax_amount_after_discount_amount)
if self.doctype == 'Purchase Invoice':
against = self.supplier
dr_or_cr = "debit"
rev_dr_cr = "credit"
else:
against = self.customer
dr_or_cr = "credit"
rev_dr_cr = "debit"
gl_entries.append( gl_entries.append(
self.get_gl_dict({ self.get_gl_dict({
"account": tax.account_head, "account": tax.account_head,
"against": self.customer, "against": against,
"credit": flt(additional_discount_applied_on_taxes, dr_or_cr: flt(additional_discount_applied_on_taxes,
tax.precision("tax_amount_after_discount_amount")), tax.precision("tax_amount_after_discount_amount")),
"credit_in_account_currency": (flt(additional_discount_applied_on_taxes, dr_or_cr + "_in_account_currency": (flt(additional_discount_applied_on_taxes,
tax.precision("base_tax_amount_after_discount_amount")) if account_currency==self.company_currency else tax.precision("base_tax_amount_after_discount_amount")) if account_currency==self.company_currency else
flt(additional_discount_applied_on_taxes, tax.precision("tax_amount_after_discount_amount"))), flt(additional_discount_applied_on_taxes, tax.precision("tax_amount_after_discount_amount"))),
"cost_center": tax.cost_center "cost_center": tax.cost_center
@ -808,17 +816,16 @@ class AccountsController(TransactionBase):
gl_entries.append( gl_entries.append(
self.get_gl_dict({ self.get_gl_dict({
"account": self.additional_discount_account, "account": self.additional_discount_account,
"against": self.customer, "against": against,
"debit": flt(additional_discount_applied_on_taxes, rev_dr_cr: flt(additional_discount_applied_on_taxes,
tax.precision("tax_amount_after_discount_amount")), tax.precision("tax_amount_after_discount_amount")),
"debit_in_account_currency": (flt(additional_discount_applied_on_taxes, rev_dr_cr + "_in_account_currency": (flt(additional_discount_applied_on_taxes,
tax.precision("base_tax_amount_after_discount_amount")) if account_currency==self.company_currency else tax.precision("base_tax_amount_after_discount_amount")) if account_currency==self.company_currency else
flt(additional_discount_applied_on_taxes, tax.precision("tax_amount_after_discount_amount"))), flt(additional_discount_applied_on_taxes, tax.precision("tax_amount_after_discount_amount"))),
"cost_center": tax.cost_center "cost_center": tax.cost_center
}, account_currency, item=tax) }, account_currency, item=tax)
) )
def allocate_advance_taxes(self, gl_entries): def allocate_advance_taxes(self, gl_entries):
tax_map = self.get_tax_map() tax_map = self.get_tax_map()
for pe in self.get("advances"): for pe in self.get("advances"):