mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-21 05:59:18 +00:00
Merge pull request #48927 from pps190/backport/version-14-hotfix/48926
fix: provide missing company in report records that require reference to Company:company:default_currency (Backport #48926)
This commit is contained in:
@@ -46,6 +46,7 @@ class PaymentLedger:
|
|||||||
against_voucher_no=ple.against_voucher_no,
|
against_voucher_no=ple.against_voucher_no,
|
||||||
amount=ple.amount,
|
amount=ple.amount,
|
||||||
currency=ple.account_currency,
|
currency=ple.account_currency,
|
||||||
|
company=ple.company,
|
||||||
)
|
)
|
||||||
|
|
||||||
if self.filters.include_account_currency:
|
if self.filters.include_account_currency:
|
||||||
@@ -77,6 +78,7 @@ class PaymentLedger:
|
|||||||
against_voucher_no="Outstanding:",
|
against_voucher_no="Outstanding:",
|
||||||
amount=total,
|
amount=total,
|
||||||
currency=voucher_data[0].currency,
|
currency=voucher_data[0].currency,
|
||||||
|
company=voucher_data[0].company,
|
||||||
)
|
)
|
||||||
|
|
||||||
if self.filters.include_account_currency:
|
if self.filters.include_account_currency:
|
||||||
@@ -85,7 +87,12 @@ class PaymentLedger:
|
|||||||
voucher_data.append(entry)
|
voucher_data.append(entry)
|
||||||
|
|
||||||
# empty row
|
# empty row
|
||||||
voucher_data.append(frappe._dict())
|
voucher_data.append(
|
||||||
|
frappe._dict(
|
||||||
|
currency=voucher_data[0].currency,
|
||||||
|
company=voucher_data[0].company,
|
||||||
|
)
|
||||||
|
)
|
||||||
self.data.extend(voucher_data)
|
self.data.extend(voucher_data)
|
||||||
|
|
||||||
def build_conditions(self):
|
def build_conditions(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user