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

fix: Deduct included taxes from unallocated amount

Browse Source
This commit is contained in:
Deepesh Garg 2021-07-12 22:11:57 +05:30
parent eae7c1891f
commit 855e9030f2
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@ -517,16 +517,19 @@ class PaymentEntry(AccountsController):
self.unallocated_amount = 0 self.unallocated_amount = 0
if self.party: if self.party:
total_deductions = sum(flt(d.amount) for d in self.get("deductions")) total_deductions = sum(flt(d.amount) for d in self.get("deductions"))
included_taxes = self.get_included_taxes()
if self.payment_type == "Receive" \ if self.payment_type == "Receive" \
and self.base_total_allocated_amount < self.base_received_amount + total_deductions \ and self.base_total_allocated_amount < self.base_received_amount + total_deductions \
and self.total_allocated_amount < self.paid_amount + (total_deductions / self.source_exchange_rate): and self.total_allocated_amount < self.paid_amount + (total_deductions / self.source_exchange_rate):
self.unallocated_amount = (self.received_amount + total_deductions - self.unallocated_amount = (self.received_amount + total_deductions -
self.base_total_allocated_amount) / self.source_exchange_rate self.base_total_allocated_amount) / self.source_exchange_rate
self.unallocated_amount -= included_taxes
elif self.payment_type == "Pay" \ elif self.payment_type == "Pay" \
and self.base_total_allocated_amount < (self.base_paid_amount - total_deductions) \ and self.base_total_allocated_amount < (self.base_paid_amount - total_deductions) \
and self.total_allocated_amount < self.received_amount + (total_deductions / self.target_exchange_rate): and self.total_allocated_amount < self.received_amount + (total_deductions / self.target_exchange_rate):
self.unallocated_amount = (self.base_paid_amount - (total_deductions + self.unallocated_amount = (self.base_paid_amount - (total_deductions +
self.base_total_allocated_amount)) / self.target_exchange_rate self.base_total_allocated_amount)) / self.target_exchange_rate
self.unallocated_amount -= included_taxes
def set_difference_amount(self): def set_difference_amount(self):
base_unallocated_amount = flt(self.unallocated_amount) * (flt(self.source_exchange_rate) base_unallocated_amount = flt(self.unallocated_amount) * (flt(self.source_exchange_rate)
@ -542,10 +545,22 @@ class PaymentEntry(AccountsController):
self.difference_amount = self.base_paid_amount - flt(self.base_received_amount) self.difference_amount = self.base_paid_amount - flt(self.base_received_amount)
total_deductions = sum(flt(d.amount) for d in self.get("deductions")) total_deductions = sum(flt(d.amount) for d in self.get("deductions"))
included_taxes = self.get_included_taxes()
self.difference_amount = flt(self.difference_amount - total_deductions, self.difference_amount = flt(self.difference_amount - total_deductions - included_taxes,
self.precision("difference_amount")) self.precision("difference_amount"))
def get_included_taxes(self):
included_taxes = 0
for tax in self.get('taxes'):
if tax.included_in_paid_amount:
if tax.add_deduct_tax == 'Add':
included_taxes += tax.base_tax_amount
else:
included_taxes -= tax.base_tax_amount
return included_taxes
# Paid amount is auto allocated in the reference document by default. # Paid amount is auto allocated in the reference document by default.
# Clear the reference document which doesn't have allocated amount on validate so that form can be loaded fast # Clear the reference document which doesn't have allocated amount on validate so that form can be loaded fast
def clear_unallocated_reference_document_rows(self): def clear_unallocated_reference_document_rows(self):
@ -719,6 +734,10 @@ class PaymentEntry(AccountsController):
against = self.party or self.paid_to against = self.party or self.paid_to
payment_or_advance_account = self.get_party_account_for_taxes() payment_or_advance_account = self.get_party_account_for_taxes()
tax_amount = d.tax_amount
if self.advance_tax_account:
tax_amount = -1* tax_amount
gl_entries.append( gl_entries.append(
self.get_gl_dict({ self.get_gl_dict({
@ -732,16 +751,17 @@ class PaymentEntry(AccountsController):
}, account_currency, item=d)) }, account_currency, item=d))
#Intentionally use -1 to get net values in party account #Intentionally use -1 to get net values in party account
gl_entries.append( if not d.included_in_paid_amount or self.advance_tax_account:
self.get_gl_dict({ gl_entries.append(
"account": payment_or_advance_account, self.get_gl_dict({
"against": against, "account": payment_or_advance_account,
dr_or_cr: -1 * d.base_tax_amount, "against": against,
dr_or_cr + "_in_account_currency": -1*d.base_tax_amount dr_or_cr: -1 * d.base_tax_amount,
if account_currency==self.company_currency dr_or_cr + "_in_account_currency": -1*d.base_tax_amount
else d.tax_amount, if account_currency==self.company_currency
"cost_center": self.cost_center, else d.tax_amount,
}, account_currency, item=d)) "cost_center": self.cost_center,
}, account_currency, item=d))
def add_deductions_gl_entries(self, gl_entries): def add_deductions_gl_entries(self, gl_entries):
for d in self.get("deductions"): for d in self.get("deductions"):