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

fix: fix the purchase receipt trends and delivery note trends report

Browse Source
This commit is contained in:
Vishv-silveroak
2024-10-09 10:51:01 +05:30
committed by GitHub
parent 22a0da929f
commit 2e9dda1588
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",
]:
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
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"]:
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
else:
trans_date = "transaction_date"