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

fix: exclude cancelled salary slips

Browse Source
This commit is contained in:
pateljannat
2021-03-23 11:18:57 +05:30
parent a2068d9b98
commit 453e07e32a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/projects/report/profitability/profitability.py
View File

@@ -96,7 +96,7 @@ def get_data(filters):
`tabSalary Slip Timesheet` as sst join `tabTimesheet` on tabTimesheet.name = sst.time_sheet `tabSalary Slip Timesheet` as sst join `tabTimesheet` on tabTimesheet.name = sst.time_sheet
join `tabSales Invoice Timesheet` as sit on sit.time_sheet = tabTimesheet. name join `tabSales Invoice Timesheet` as sit on sit.time_sheet = tabTimesheet. name
join `tabSales Invoice` as si on si. name = sit.parent and si.status != "Cancelled" join `tabSales Invoice` as si on si. name = sit.parent and si.status != "Cancelled"
join `tabSalary Slip` as ss on ss.name = sst.parent """ join `tabSalary Slip` as ss on ss.name = sst.parent and ss.status != "Cancelled" """
if conditions: if conditions:
sql += """ sql += """
where where