[merge]

selling/doctype/sales_order/sales_order.js

@@ -112,7 +112,7 @@ cur_frm.cscript.pull_quotation_details = function(doc,dt,dn) {
 					'contact_person', 'territory', 'customer_group']);
 				if(doc.customer) get_server_fields('get_shipping_address', doc.customer, '', doc, dt, dn, 0);
 			}			
-			cur_frm.refresh();
+			cur_frm.refresh_fields();
 		}
 	} 
 

selling/page/selling_home/selling_home.js

@@ -137,11 +137,6 @@ wn.module_page["Selling"] = [
 				"label":wn._("Sales Analytics"),
 				page: "sales-analytics"
 			},
-			{
-				"label":wn._("Trend Analyzer"),
-				route: "Report/Profile/Trend Analyzer",
-				doctype: "Sales Order"
-			},
 		]
 	},
 	{
@@ -190,6 +185,10 @@ wn.module_page["Selling"] = [
 				route: "query-report/Sales Order Trends",
 				doctype: "Sales Order"
 			},
+			{
+				"label":wn._("Pending SO Items For Purchase Request"),
+				route: "query-report/Pending SO Items For Purchase Request"
+			},
 		]
 	}
 ]

selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.txt

@@ -0,0 +1,22 @@
+[
+ {
+  "creation": "2013-06-21 16:46:45", 
+  "docstatus": 0, 
+  "modified": "2013-06-21 16:55:54", 
+  "modified_by": "Administrator", 
+  "owner": "Administrator"
+ }, 
+ {
+  "doctype": "Report", 
+  "is_standard": "Yes", 
+  "name": "__common__", 
+  "query": "select \n so_item.item_code as \"Item Code:Link/Item:120\",\n so_item.item_name as \"Item Name::120\",\n so_item.description as \"Description::120\",\n so.`name` as \"S.O. No.:Link/Sales Order:120\",\n so.`transaction_date` as \"Date:Date:120\",\n mr.name as \"Material Request:Link/Material Request:120\",\n so.customer as \"Customer:Link/Customer:120\",\n so.territory as \"Terretory:Link/Territory:120\",\n sum(so_item.qty) as \"SO Qty:Float:100 \",\n sum(mr_item.qty) as \"Requested Qty:Float:100\"\nfrom\n `tabSales Order` so, `tabSales Order Item` so_item, \n `tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere\n so_item.`parent` = so.`name` and mr_item.sales_order_no = so.name\n and mr_item.parent = mr.name \n and so.docstatus = 1 and so.status != \"Stopped\" \n and mr.docstatus = 1 and mr.status != \"Stopped\"\ngroup by so.name, so_item.item_code\norder by so.name desc, so_item.item_code asc", 
+  "ref_doctype": "Sales Order", 
+  "report_name": "Pending SO Items For Purchase Request", 
+  "report_type": "Query Report"
+ }, 
+ {
+  "doctype": "Report", 
+  "name": "Pending SO Items For Purchase Request"
+ }
+]

selling/report/quotation_trends/quotation_trends.py

@@ -21,11 +21,8 @@ from controllers.trends	import get_columns, get_data
 def execute(filters=None):
 	if not filters: filters ={}
 	data = []
-
 	trans = "Quotation"
-	tab = ["tabQuotation","tabQuotation Item"]
+	conditions = get_columns(filters, trans)
+	data = get_data(filters, conditions)
 
-	details = get_columns(filters, trans)
-	data = get_data(filters, tab, details)
-
-	return details["columns"], data 
+	return conditions["columns"], data 

selling/report/sales_order_trends/sales_order_trends.py

@@ -21,14 +21,8 @@ from controllers.trends	import get_columns,get_data
 def execute(filters=None):
 	if not filters: filters ={}
 	data = []
-
 	trans = "Sales Order"
-	tab = ["tabSales Order","tabSales 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