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

refactor: handle currency on advance payment ledger

Browse Source
This commit is contained in:
ruthra kumar
2024-10-30 10:16:47 +05:30
parent ad88bde448
commit ae6a81cd07
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/controllers/accounts_controller.py
View File

@@ -1944,7 +1944,7 @@ class AccountsController(TransactionBase):
adv = frappe.qb.DocType("Advance Payment Ledger Entry") adv = frappe.qb.DocType("Advance Payment Ledger Entry")
advance = ( advance = (
frappe.qb.from_(adv) frappe.qb.from_(adv)
.select(adv.currency, Abs(Sum(adv.amount)).as_("amount")) .select(adv.currency.as_("account_currency"), Abs(Sum(adv.amount)).as_("amount"))
.where( .where(
(adv.against_voucher_type == self.doctype) (adv.against_voucher_type == self.doctype)
& (adv.against_voucher_no == self.name) & (adv.against_voucher_no == self.name)
@@ -2618,6 +2618,11 @@ class AccountsController(TransactionBase):
advance_doctype_references = [ advance_doctype_references = [
x for x in self.references if x.reference_doctype in advance_payment_doctypes x for x in self.references if x.reference_doctype in advance_payment_doctypes
] ]
currency = (
self.paid_from_account_currency
if self.payment_type == "Receive"
else self.paid_to_account_currency
)
for x in advance_doctype_references: for x in advance_doctype_references:
doc = frappe.new_doc("Advance Payment Ledger Entry") doc = frappe.new_doc("Advance Payment Ledger Entry")
doc.company = self.company doc.company = self.company
@@ -2626,6 +2631,7 @@ class AccountsController(TransactionBase):
doc.against_voucher_type = x.reference_doctype doc.against_voucher_type = x.reference_doctype
doc.against_voucher_no = x.reference_name doc.against_voucher_no = x.reference_name
doc.amount = x.allocated_amount if self.docstatus == 1 else -1 * x.allocated_amount doc.amount = x.allocated_amount if self.docstatus == 1 else -1 * x.allocated_amount
doc.currency = currency
doc.event = "Submit" if self.docstatus == 1 else "Cancel" doc.event = "Submit" if self.docstatus == 1 else "Cancel"
doc.save() doc.save()