schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Validation for receivingfrom customer against negative outstanding

Browse Source
This commit is contained in:
Deepesh Garg
2021-08-10 14:04:31 +05:30
parent 8da3a5cdd4
commit c26f95e3b2
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,7 @@ class PaymentEntry(AccountsController):
self.set_title() self.set_title()
self.set_remarks() self.set_remarks()
self.validate_duplicate_entry() self.validate_duplicate_entry()
self.validate_payment_type_with_outstanding()
if not on_reference_unlink: if not on_reference_unlink:
self.validate_allocated_amount() self.validate_allocated_amount()
self.validate_paid_invoices() self.validate_paid_invoices()
@@ -120,6 +121,11 @@ class PaymentEntry(AccountsController):
if not self.get(field): if not self.get(field):
self.set(field, bank_data.account) self.set(field, bank_data.account)
def validate_payment_type_with_outstanding(self):
total_outstanding = sum(d.allocated_amount for d in self.get('references'))
if total_outstanding < 0 and self.party_type == 'Customer' and self.payment_type == 'Receive':
frappe.throw(_("Cannot receive from customer against negative outstanding"), title=_("Incorrect Payment Type"))
def validate_allocated_amount(self): def validate_allocated_amount(self):
for d in self.get("references"): for d in self.get("references"):
if (flt(d.allocated_amount))> 0: if (flt(d.allocated_amount))> 0:
@@ -530,10 +536,8 @@ class PaymentEntry(AccountsController):
base_total_allocated_amount += flt(flt(d.allocated_amount) * flt(d.exchange_rate), base_total_allocated_amount += flt(flt(d.allocated_amount) * flt(d.exchange_rate),
self.precision("base_paid_amount")) self.precision("base_paid_amount"))
# Do not use absolute values as only credit notes could be allocated self.total_allocated_amount = abs(total_allocated_amount)
# and total allocated should be negative in that scenario self.base_total_allocated_amount = abs(base_total_allocated_amount)
self.total_allocated_amount = total_allocated_amount
self.base_total_allocated_amount = base_total_allocated_amount
def set_unallocated_amount(self): def set_unallocated_amount(self):
self.unallocated_amount = 0 self.unallocated_amount = 0

2
erpnext/accounts/utils.py
View File

@@ -559,7 +559,7 @@ def remove_ref_doc_link_from_pe(ref_type, ref_no):
except Exception as e: except Exception as e:
msg = _("There were issues unlinking payment entry {0}.").format(pe_doc.name) msg = _("There were issues unlinking payment entry {0}.").format(pe_doc.name)
msg += '<br>' msg += '<br>'
msg += _("Please cancel payment entry manually first and then resubmit") msg += _("Please cancel payment entry manually first")
frappe.throw(msg, title=_("Payment Unlink Error")) frappe.throw(msg, title=_("Payment Unlink Error"))
frappe.db.sql("""update `tabPayment Entry` set total_allocated_amount=%s, frappe.db.sql("""update `tabPayment Entry` set total_allocated_amount=%s,