nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-29 22:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove irrelavent conditions

Browse Source 
(cherry picked from commit 9610a33d23)

# Conflicts:
#	erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
This commit is contained in:
Sugesh393
2024-12-05 18:51:29 +05:30
committed by Mergify
parent b07fc8080a
commit 6c77fc7953
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
View File

@@ -32,6 +32,7 @@ class PartyLedgerSummaryReport:
self.filters.from_date = getdate(self.filters.from_date or nowdate())
self.filters.to_date = getdate(self.filters.to_date or nowdate())
<<<<<<< HEAD
<<<<<<< HEAD
=======
if self.filters.get("cost_center"):
@@ -40,6 +41,8 @@ class PartyLedgerSummaryReport:
if self.filters.get("project"):
self.filters.project = frappe.parse_json(self.filters.get("project"))
=======
>>>>>>> 9610a33d23 (fix: remove irrelavent conditions)
if not self.filters.get("company"):
self.filters["company"] = frappe.db.get_single_value("Global Defaults", "default_company")
@@ -374,7 +377,7 @@ class PartyLedgerSummaryReport:
f"""
select
gle.posting_date, gle.party, gle.voucher_type, gle.voucher_no, gle.against_voucher_type,
gle.against_voucher, gle.cost_center, gle.project, gle.debit, gle.credit, gle.is_opening {join_field}
gle.against_voucher, gle.debit, gle.credit, gle.is_opening {join_field}
from `tabGL Entry` gle
{join}
where
@@ -462,25 +465,26 @@ class PartyLedgerSummaryReport:
)
if self.filters.get("cost_center"):
self.filters.cost_center = frappe.parse_json(self.filters.get("cost_center"))
self.filters.cost_center = get_cost_centers_with_children(self.filters.cost_center)
conditions.append("gle.cost_center in %(cost_center)s")
if self.filters.get("project"):
self.filters.project = frappe.parse_json(self.filters.get("project"))
conditions.append("gle.project in %(project)s")
accounting_dimensions = get_accounting_dimensions(as_list=False)
if accounting_dimensions:
for dimension in accounting_dimensions:
if not dimension.disabled and dimension.document_type != "Finance Book":
if self.filters.get(dimension.fieldname):
if frappe.get_cached_value("DocType", dimension.document_type, "is_tree"):
self.filters[dimension.fieldname] = get_dimension_with_children(
dimension.document_type, self.filters.get(dimension.fieldname)
)
conditions.append(f"{dimension.fieldname} in %({dimension.fieldname})s")
else:
conditions.append(f"{dimension.fieldname} in %({dimension.fieldname})s")
if self.filters.get(dimension.fieldname):
if frappe.get_cached_value("DocType", dimension.document_type, "is_tree"):
self.filters[dimension.fieldname] = get_dimension_with_children(
dimension.document_type, self.filters.get(dimension.fieldname)
)
conditions.append(f"{dimension.fieldname} in %({dimension.fieldname})s")
else:
conditions.append(f"{dimension.fieldname} in %({dimension.fieldname})s")
return " and ".join(conditions)
>>>>>>> 901bcd5c43 (feat: add accounting dimensions in ledger summary reports)