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

fix: filter out completed purchase receipt

Browse Source
This commit is contained in:
Mangesh-Khairnar 2019-05-03 16:41:04 +05:30
parent 13d393247a
commit e003cc8812
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/buying/report/procurement_tracker/procurement_tracker.py
View File

@ -150,11 +150,10 @@ def get_conditions(filters):
"""% (filters.get('cost_center'), filters.get('project')) """% (filters.get('cost_center'), filters.get('project'))
if filters.get("from_date"): if filters.get("from_date"):
conditions.append("transaction_date>=%s", filters.get('from_date')) conditions.append("AND transaction_date>=%s", filters.get('from_date'))
if filters.get("to_date"): if filters.get("to_date"):
conditions.append("transaction_date<=%s", filters.get('to_date') conditions.append("AND transaction_date<=%s", filters.get('to_date')
return conditions return conditions
def get_data(filters): def get_data(filters):
@ -227,12 +226,12 @@ def get_mapped_mr_details(conditions):
def get_mapped_pi_records(): def get_mapped_pi_records():
return frappe._dict(frappe.db.sql(""" return frappe._dict(frappe.db.sql("""
SELECT SELECT
po_detail, pi_item.po_detail,
base_amount pi_item.base_amount
FROM `tabPurchase Invoice Item` FROM `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pi_item
WHERE WHERE
docstatus=1 pi.docstatus=1
AND po_detail IS NOT NULL AND pi_item.po_detail IS NOT NULL
""")) """))
def get_mapped_pr_records(): def get_mapped_pr_records():
@ -245,6 +244,7 @@ def get_mapped_pr_records():
pr.docstatus=1 pr.docstatus=1
AND pr.name=pr_item.parent AND pr.name=pr_item.parent
AND pr_item.purchase_order_item IS NOT NULL AND pr_item.purchase_order_item IS NOT NULL
AND pr.status not in ("Closed","Completed","Cancelled")
""")) """))
def get_po_entries(conditions): def get_po_entries(conditions):