nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 06:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[merge]

Browse Source
This commit is contained in:
Rushabh Mehta
2013-06-24 15:47:02 +05:30
parent 847cfe2b07 82366d3bb8
commit 7925bd7079
28 changed files with 289 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
buying/page/buying_home/buying_home.js
View File

@@ -91,11 +91,6 @@ wn.module_page["Buying"] = [
"label":wn._("Purchase Analytics"),
page: "purchase-analytics"
},
{
"label":wn._("Trend Analyzer"),
route: "Report/Profile/Trend Analyzer",
doctype: "Purchase Order"
},
]
},
{

0
buying/report/item_wise_last_purchase_rate/__init__.py
View File

22
buying/report/item_wise_last_purchase_rate/item_wise_last_purchase_rate.txt
View File

@@ -1,22 +0,0 @@
[
{
"creation": "2013-06-18 11:24:36",
"docstatus": 0,
"modified": "2013-06-18 15:28:57",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"doctype": "Report",
"is_standard": "Yes",
"name": "__common__",
"query": "select * from (select \n result.item_code as \"Item Code:Link/Item:120\",\n result.item_name as \"Item Name::120\",\n result.description as \"Description::150\",\n result.posting_date as \"Date::150\",\n result.purchase_ref_rate as \"Price List Rate::180\", \n result.discount_rate as \"Discount::120\", \n result.purchase_rate as \"Rate::120\"\nfrom (\n (select \n po_item.item_code,\n po_item.item_name,\n po_item.description,\n po.transaction_date as posting_date,\n po_item.purchase_ref_rate, \n po_item.discount_rate, \n po_item.purchase_rate\n from `tabPurchase Order` po, `tabPurchase Order Item` po_item\n where po.name = po_item.parent and po.docstatus = 1)\n union\n (select \n pr_item.item_code,\n pr_item.item_name,\n pr_item.description,\n pr.posting_date,\n pr_item.purchase_ref_rate,\n pr_item.discount_rate,\n pr_item.purchase_rate\n from `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pr_item\n where pr.name = pr_item.parent and pr.docstatus = 1)\n) result\norder by result.item_code asc, result.posting_date desc) result_wrapper\ngroup by `Item Code:Link/Item:120`\n",
"ref_doctype": "Purchase Order",
"report_name": "Item-wise Last Purchase Rate",
"report_type": "Query Report"
},
{
"doctype": "Report",
"name": "Item-wise Last Purchase Rate"
}
]

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

@@ -21,14 +21,8 @@ from controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
data = []
trans = "Purchase Order"
tab = ["tabPurchase Order","tabPurchase Order Item"]
conditions = get_columns(filters, trans)
data = get_data(filters, conditions)
details = get_columns(filters, trans)
data = get_data(filters, tab, details)
if not data :
webnotes.msgprint("Data not found for selected criterias")
return details["columns"], data
return conditions["columns"], data