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

fix: SO analysis rpt will fetch SO's without Delivery note as well

Browse Source 
(cherry picked from commit e28e6726f1)

# Conflicts:
#	erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
This commit is contained in:
ruthra kumar
2022-04-14 18:34:47 +05:30
committed by mergify-bot
parent 8e30af84cd
commit f9d89c7ce6
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
View File

@@ -77,7 +77,15 @@ def get_data(conditions, filters):
`tabSales Order` so, `tabSales Order` so,
`tabSales Order Item` soi `tabSales Order Item` soi
LEFT JOIN `tabSales Invoice Item` sii LEFT JOIN `tabSales Invoice Item` sii
<<<<<<< HEAD
ON sii.so_detail = soi.name and sii.docstatus = 1 ON sii.so_detail = soi.name and sii.docstatus = 1
=======
ON sii.so_detail = soi.name and sii.docstatus = 1)
LEFT JOIN `tabDelivery Note Item` dni
on dni.so_detail = soi.name
LEFT JOIN `tabDelivery Note` dn
on dni.parent = dn.name and dn.docstatus = 1
>>>>>>> e28e6726f1 (fix: SO analysis rpt will fetch SO's without Delivery note as well)
WHERE WHERE
soi.parent = so.name soi.parent = so.name
and so.status not in ('Stopped', 'Closed', 'On Hold') and so.status not in ('Stopped', 'Closed', 'On Hold')