Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fix in itemised sales register

Browse Source
This commit is contained in:
Nabin Hait 2017-08-23 09:44:33 +05:30
parent 8f4e1712ba
commit fcb2462902
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@ -125,14 +125,15 @@ def get_purchase_receipts_against_purchase_order(item_list):
po_pr_map = frappe._dict() po_pr_map = frappe._dict()
po_item_rows = list(set([d.po_detail for d in item_list])) po_item_rows = list(set([d.po_detail for d in item_list]))
purchase_receipts = frappe.db.sql(""" if po_item_rows:
select parent, purchase_order_item purchase_receipts = frappe.db.sql("""
from `tabPurchase Receipt Item` select parent, purchase_order_item
where docstatus=1 and purchase_order_item in (%s) from `tabPurchase Receipt Item`
group by purchase_order_item, parent where docstatus=1 and purchase_order_item in (%s)
""" % (', '.join(['%s']*len(po_item_rows))), tuple(po_item_rows), as_dict=1) group by purchase_order_item, parent
""" % (', '.join(['%s']*len(po_item_rows))), tuple(po_item_rows), as_dict=1)
for pr in purchase_receipts: for pr in purchase_receipts:
po_pr_map.setdefault(pr.po_detail, []).append(pr.parent) po_pr_map.setdefault(pr.po_detail, []).append(pr.parent)
return po_pr_map return po_pr_map

17
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@ -127,15 +127,16 @@ def get_delivery_notes_against_sales_order(item_list):
so_dn_map = frappe._dict() so_dn_map = frappe._dict()
so_item_rows = list(set([d.so_detail for d in item_list])) so_item_rows = list(set([d.so_detail for d in item_list]))
delivery_notes = frappe.db.sql(""" if so_item_rows:
select parent, so_detail delivery_notes = frappe.db.sql("""
from `tabDelivery Note Item` select parent, so_detail
where docstatus=1 and so_detail in (%s) from `tabDelivery Note Item`
group by so_detail, parent where docstatus=1 and so_detail in (%s)
""" % (', '.join(['%s']*len(so_item_rows))), tuple(so_item_rows), as_dict=1) group by so_detail, parent
""" % (', '.join(['%s']*len(so_item_rows))), tuple(so_item_rows), as_dict=1)
for dn in delivery_notes: for dn in delivery_notes:
so_dn_map.setdefault(dn.so_detail, []).append(dn.parent) so_dn_map.setdefault(dn.so_detail, []).append(dn.parent)
return so_dn_map return so_dn_map