nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 06:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: the purchase receipt trends and delivery note trends report (backport #43585) (#43587)

Browse Source 
* fix: fix the purchase receipt trends and delivery note trends report

(cherry picked from commit 2e9dda1588)

* fix: trends date filter issue --formatter

(cherry picked from commit b3e4463a4f)

---------

Co-authored-by: Vishv-silveroak <108357657+Vishv-024@users.noreply.github.com>
Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2024-10-09 13:38:43 +05:30
committed by GitHub
parent 83ce3dd915
commit 355ba2f632
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/trends.py
View File

@@ -69,7 +69,7 @@ def get_data(filters, conditions):
"Delivery Note", "Delivery Note",
]: ]:
posting_date = "t1.posting_date" posting_date = "t1.posting_date"
if filters.period_based_on: if filters.period_based_on and conditions.get("trans") in ["Sales Invoice", "Purchase Invoice"]:
posting_date = "t1." + filters.period_based_on posting_date = "t1." + filters.period_based_on
if conditions["based_on_select"] in ["t1.project,", "t2.project,"]: if conditions["based_on_select"] in ["t1.project,", "t2.project,"]:
@@ -224,7 +224,7 @@ def period_wise_columns_query(filters, trans):
if trans in ["Purchase Receipt", "Delivery Note", "Purchase Invoice", "Sales Invoice"]: if trans in ["Purchase Receipt", "Delivery Note", "Purchase Invoice", "Sales Invoice"]:
trans_date = "posting_date" trans_date = "posting_date"
if filters.period_based_on: if filters.period_based_on and trans in ["Purchase Invoice", "Sales Invoice"]:
trans_date = filters.period_based_on trans_date = filters.period_based_on
else: else:
trans_date = "transaction_date" trans_date = "transaction_date"