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

Merge pull request #27545 from nextchamp-saqib/pay-received-amt-fix

Browse Source 
fix: cannot add deductions in internal transfer payment entry
This commit is contained in:
Deepesh Garg 2021-10-12 23:04:04 +05:30 committed by GitHub
commit b990d5b112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,12 +505,13 @@ class PaymentEntry(AccountsController):
def validate_received_amount(self): def validate_received_amount(self):
if self.paid_from_account_currency == self.paid_to_account_currency: if self.paid_from_account_currency == self.paid_to_account_currency:
if self.paid_amount != self.received_amount: if self.paid_amount < self.received_amount:
frappe.throw(_("Received Amount cannot be greater than Paid Amount")) frappe.throw(_("Received Amount cannot be greater than Paid Amount"))
def set_received_amount(self): def set_received_amount(self):
self.base_received_amount = self.base_paid_amount self.base_received_amount = self.base_paid_amount
if self.paid_from_account_currency == self.paid_to_account_currency: if self.paid_from_account_currency == self.paid_to_account_currency \
and not self.payment_type == 'Internal Transfer':
self.received_amount = self.paid_amount self.received_amount = self.paid_amount
def set_amounts_after_tax(self): def set_amounts_after_tax(self):