nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into responsive

Browse Source 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	buying/doctype/supplier_quotation/supplier_quotation.js
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-07-02 11:50:32 +05:30
parent 2023012b0e ac24d0fa98
commit 15db6c4659
16 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
buying/report/purchase_order_trends/purchase_order_trends.py
View File

@@ -21,8 +21,7 @@ from controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
data = []
trans = "Purchase Order"
conditions = get_columns(filters, trans)
conditions = get_columns(filters, "Purchase Order")
data = get_data(filters, conditions)
return conditions["columns"], data