nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ensure correct preview and set latest transaction date

Browse Source
This commit is contained in:
Smit Vora
2023-09-12 13:25:51 +05:30
parent 43061f4416
commit c09807845f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,6 @@ class PaymentEntry(AccountsController):
if self.difference_amount: if self.difference_amount:
frappe.throw(_("Difference Amount must be zero")) frappe.throw(_("Difference Amount must be zero"))
self.make_gl_entries() self.make_gl_entries()
self.make_advance_gl_entries()
self.update_outstanding_amounts() self.update_outstanding_amounts()
self.update_advance_paid() self.update_advance_paid()
self.update_payment_schedule() self.update_payment_schedule()
@@ -152,7 +151,6 @@ class PaymentEntry(AccountsController):
) )
super(PaymentEntry, self).on_cancel() super(PaymentEntry, self).on_cancel()
self.make_gl_entries(cancel=1) self.make_gl_entries(cancel=1)
self.make_advance_gl_entries(cancel=1)
self.update_outstanding_amounts() self.update_outstanding_amounts()
self.update_advance_paid() self.update_advance_paid()
self.delink_advance_entry_references() self.delink_advance_entry_references()
@@ -1055,6 +1053,8 @@ class PaymentEntry(AccountsController):
else: else:
self.make_exchange_gain_loss_journal() self.make_exchange_gain_loss_journal()
self.make_advance_gl_entries(cancel=cancel)
def add_party_gl_entries(self, gl_entries): def add_party_gl_entries(self, gl_entries):
if self.party_account: if self.party_account:
if self.payment_type == "Receive": if self.payment_type == "Receive":
@@ -1163,6 +1163,9 @@ class PaymentEntry(AccountsController):
invoice.reference_doctype, invoice.reference_name, "posting_date" invoice.reference_doctype, invoice.reference_name, "posting_date"
) )
if getdate(posting_date) < getdate(self.posting_date):
posting_date = self.posting_date
dr_or_cr = "credit" if invoice.reference_doctype == "Sales Invoice" else "debit" dr_or_cr = "credit" if invoice.reference_doctype == "Sales Invoice" else "debit"
args_dict["account"] = invoice.account args_dict["account"] = invoice.account
args_dict[dr_or_cr] = invoice.allocated_amount args_dict[dr_or_cr] = invoice.allocated_amount