Fixed conflict merge

selling/report/quotation_trends/quotation_trends.js

@@ -0,0 +1,5 @@
+wn.require("app/js/sales_trends_filters.js");
+
+wn.query_reports["Quotation Trends"] = {
+	filters: get_filters()
+ }

selling/report/quotation_trends/quotation_trends.py

@@ -0,0 +1,34 @@
+# ERPNext - web based ERP (http://erpnext.com)
+# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+import webnotes
+from controllers.trends	import get_columns,get_data
+
+def execute(filters=None):
+	if not filters: filters ={}
+	data = []
+
+	trans = "Quotation"
+	tab = ["tabQuotation","tabQuotation Item"]
+
+	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 

selling/report/quotation_trends/quotation_trends.txt

@@ -0,0 +1,22 @@
+[
+ {
+  "creation": "2013-06-07 16:01:16", 
+  "docstatus": 0, 
+  "modified": "2013-06-12 16:31:23", 
+  "modified_by": "Administrator", 
+  "owner": "Administrator"
+ }, 
+ {
+  "add_total_row": 0, 
+  "doctype": "Report", 
+  "is_standard": "Yes", 
+  "name": "__common__", 
+  "ref_doctype": "Quotation", 
+  "report_name": "Quotation Trends", 
+  "report_type": "Script Report"
+ }, 
+ {
+  "doctype": "Report", 
+  "name": "Quotation Trends"
+ }
+]

selling/report/sales_order_trends/sales_order_trends.js

@@ -0,0 +1,5 @@
+wn.require("app/js/sales_trends_filters.js");
+
+wn.query_reports["Sales Order Trends"] = {
+	filters: get_filters()
+ }

selling/report/sales_order_trends/sales_order_trends.py

@@ -0,0 +1,34 @@
+# ERPNext - web based ERP (http://erpnext.com)
+# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+import webnotes
+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"]
+	
+	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 

selling/report/sales_order_trends/sales_order_trends.txt

@@ -0,0 +1,21 @@
+[
+ {
+  "creation": "2013-06-13 18:43:30", 
+  "docstatus": 0, 
+  "modified": "2013-06-13 18:43:30", 
+  "modified_by": "Administrator", 
+  "owner": "Administrator"
+ }, 
+ {
+  "doctype": "Report", 
+  "is_standard": "Yes", 
+  "name": "__common__", 
+  "ref_doctype": "Sales Order", 
+  "report_name": "Sales Order Trends", 
+  "report_type": "Script Report"
+ }, 
+ {
+  "doctype": "Report", 
+  "name": "Sales Order Trends"
+ }
+]