mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-13 01:34:10 +00:00
fix: check the payment ledger entry has the dimension (#51823)
* fix: check the payment ledger entry has the dimension
* fix: add project in payment ledger entry
(cherry picked from commit efa3973b77)
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
This commit is contained in:
@@ -132,6 +132,12 @@
|
|||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Cost Center",
|
"label": "Cost Center",
|
||||||
"options": "Cost Center"
|
"options": "Cost Center"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "project",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Project",
|
||||||
|
"options": "Project"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "due_date",
|
"fieldname": "due_date",
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ class PaymentLedgerEntry(Document):
|
|||||||
amount_in_account_currency: DF.Currency
|
amount_in_account_currency: DF.Currency
|
||||||
company: DF.Link | None
|
company: DF.Link | None
|
||||||
cost_center: DF.Link | None
|
cost_center: DF.Link | None
|
||||||
|
project: DF.Link | None
|
||||||
delinked: DF.Check
|
delinked: DF.Check
|
||||||
due_date: DF.Date | None
|
due_date: DF.Date | None
|
||||||
finance_book: DF.Link | None
|
finance_book: DF.Link | None
|
||||||
|
|||||||
@@ -746,7 +746,7 @@ class PaymentReconciliation(Document):
|
|||||||
ple = qb.DocType("Payment Ledger Entry")
|
ple = qb.DocType("Payment Ledger Entry")
|
||||||
for x in self.dimensions:
|
for x in self.dimensions:
|
||||||
dimension = x.fieldname
|
dimension = x.fieldname
|
||||||
if self.get(dimension):
|
if self.get(dimension) and frappe.db.has_column("Payment Ledger Entry", dimension):
|
||||||
self.accounting_dimension_filter_conditions.append(ple[dimension] == self.get(dimension))
|
self.accounting_dimension_filter_conditions.append(ple[dimension] == self.get(dimension))
|
||||||
|
|
||||||
def build_qb_filter_conditions(self, get_invoices=False, get_return_invoices=False):
|
def build_qb_filter_conditions(self, get_invoices=False, get_return_invoices=False):
|
||||||
|
|||||||
@@ -1947,6 +1947,7 @@ def get_payment_ledger_entries(gl_entries, cancel=0):
|
|||||||
account=gle.account,
|
account=gle.account,
|
||||||
party_type=gle.party_type,
|
party_type=gle.party_type,
|
||||||
party=gle.party,
|
party=gle.party,
|
||||||
|
project=gle.project,
|
||||||
cost_center=gle.cost_center,
|
cost_center=gle.cost_center,
|
||||||
finance_book=gle.finance_book,
|
finance_book=gle.finance_book,
|
||||||
due_date=gle.due_date,
|
due_date=gle.due_date,
|
||||||
|
|||||||
Reference in New Issue
Block a user