fix: filter out completed purchase receipt
diff --git a/erpnext/buying/report/procurement_tracker/procurement_tracker.py b/erpnext/buying/report/procurement_tracker/procurement_tracker.py
index 7889d95..2654cd4 100644
--- a/erpnext/buying/report/procurement_tracker/procurement_tracker.py
+++ b/erpnext/buying/report/procurement_tracker/procurement_tracker.py
@@ -150,11 +150,10 @@
"""% (filters.get('cost_center'), filters.get('project'))
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"):
- conditions.append("transaction_date<=%s", filters.get('to_date')
-
+ conditions.append("AND transaction_date<=%s", filters.get('to_date')
return conditions
def get_data(filters):
@@ -227,12 +226,12 @@
def get_mapped_pi_records():
return frappe._dict(frappe.db.sql("""
SELECT
- po_detail,
- base_amount
- FROM `tabPurchase Invoice Item`
+ pi_item.po_detail,
+ pi_item.base_amount
+ FROM `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pi_item
WHERE
- docstatus=1
- AND po_detail IS NOT NULL
+ pi.docstatus=1
+ AND pi_item.po_detail IS NOT NULL
"""))
def get_mapped_pr_records():
@@ -245,6 +244,7 @@
pr.docstatus=1
AND pr.name=pr_item.parent
AND pr_item.purchase_order_item IS NOT NULL
+ AND pr.status not in ("Closed","Completed","Cancelled")
"""))
def get_po_entries(conditions):