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

fix: filter pi item based on po completeion

Browse Source
This commit is contained in:
Mangesh-Khairnar 2019-05-06 12:53:52 +05:30
parent e003cc8812
commit 09d4933edb
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,10 +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("AND transaction_date>=%s", filters.get('from_date')) conditions += "AND transaction_date>=%s"% filters.get('from_date')
if filters.get("to_date"): if filters.get("to_date"):
conditions.append("AND transaction_date<=%s", filters.get('to_date') conditions += "AND transaction_date<=%s"% filters.get('to_date')
return conditions return conditions
def get_data(filters): def get_data(filters):
@ -162,6 +162,7 @@ def get_data(filters):
mr_records, procurement_record_against_mr = get_mapped_mr_details(conditions) mr_records, procurement_record_against_mr = get_mapped_mr_details(conditions)
pr_records = get_mapped_pr_records() pr_records = get_mapped_pr_records()
pi_records = get_mapped_pi_records() pi_records = get_mapped_pi_records()
print(pi_records)
procurement_record=[] procurement_record=[]
if procurement_record_against_mr: if procurement_record_against_mr:
@ -228,9 +229,12 @@ def get_mapped_pi_records():
SELECT SELECT
pi_item.po_detail, pi_item.po_detail,
pi_item.base_amount pi_item.base_amount
FROM `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pi_item FROM `tabPurchase Invoice Item` as pi_item
INNER JOIN `tabPurchase Order` as po
ON pi_item.`purchase_order` = po.`name`
WHERE WHERE
pi.docstatus=1 pi_item.docstatus = 1
AND po.status not in ("Closed","Completed","Cancelled")
AND pi_item.po_detail IS NOT NULL AND pi_item.po_detail IS NOT NULL
""")) """))