From fcb246290241fdfb3e5218c785aa24caa9c726c0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 23 Aug 2017 09:44:33 +0530 Subject: [PATCH] Minor fix in itemised sales register --- .../item_wise_purchase_register.py | 17 +++++++++-------- .../item_wise_sales_register.py | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py index 8f9948e41c5..ef7b4d5161e 100644 --- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py +++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py @@ -125,14 +125,15 @@ def get_purchase_receipts_against_purchase_order(item_list): po_pr_map = frappe._dict() po_item_rows = list(set([d.po_detail for d in item_list])) - purchase_receipts = frappe.db.sql(""" - select parent, purchase_order_item - from `tabPurchase Receipt Item` - where docstatus=1 and purchase_order_item in (%s) - group by purchase_order_item, parent - """ % (', '.join(['%s']*len(po_item_rows))), tuple(po_item_rows), as_dict=1) + if po_item_rows: + purchase_receipts = frappe.db.sql(""" + select parent, purchase_order_item + from `tabPurchase Receipt Item` + where docstatus=1 and purchase_order_item in (%s) + group by purchase_order_item, parent + """ % (', '.join(['%s']*len(po_item_rows))), tuple(po_item_rows), as_dict=1) - for pr in purchase_receipts: - po_pr_map.setdefault(pr.po_detail, []).append(pr.parent) + for pr in purchase_receipts: + po_pr_map.setdefault(pr.po_detail, []).append(pr.parent) return po_pr_map \ No newline at end of file diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py index 30c545f58c0..48ea313dbe1 100644 --- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py @@ -127,15 +127,16 @@ def get_delivery_notes_against_sales_order(item_list): so_dn_map = frappe._dict() so_item_rows = list(set([d.so_detail for d in item_list])) - delivery_notes = frappe.db.sql(""" - select parent, so_detail - from `tabDelivery Note Item` - where docstatus=1 and so_detail in (%s) - group by so_detail, parent - """ % (', '.join(['%s']*len(so_item_rows))), tuple(so_item_rows), as_dict=1) + if so_item_rows: + delivery_notes = frappe.db.sql(""" + select parent, so_detail + from `tabDelivery Note Item` + where docstatus=1 and so_detail in (%s) + group by so_detail, parent + """ % (', '.join(['%s']*len(so_item_rows))), tuple(so_item_rows), as_dict=1) - for dn in delivery_notes: - so_dn_map.setdefault(dn.so_detail, []).append(dn.parent) + for dn in delivery_notes: + so_dn_map.setdefault(dn.so_detail, []).append(dn.parent) return so_dn_map