diff --git a/accounts/report/purchase_invoice_trends/__init__.py b/accounts/report/purchase_invoice_trends/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js b/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
new file mode 100644
index 0000000000..bb18ce4cbe
--- /dev/null
+++ b/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
@@ -0,0 +1,5 @@
+wn.require("app/js/purchase_trends_filters.js");
+
+wn.query_reports["Purchase Invoice Trends"] = {
+ filters: get_filters()
+ }
\ No newline at end of file
diff --git a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py b/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py
new file mode 100644
index 0000000000..e74ad2129b
--- /dev/null
+++ b/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py
@@ -0,0 +1,37 @@
+# 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 .
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import cint, add_days, add_months, cstr
+from controllers.trends import get_columns,get_data
+
+def execute(filters=None):
+ if not filters: filters ={}
+ data = []
+
+ trans = "Purchase Invoice"
+ tab = ["tabPurchase Invoice","tabPurchase Invoice Item"]
+ ysd = webnotes.conn.sql("select year_start_date from `tabFiscal Year` where name = '%s'"%filters.get("fiscal_year"))[0][0]
+ year_start_date = ysd.strftime('%Y-%m-%d')
+ start_month = cint(year_start_date.split('-')[1])
+
+ columns, query_bon, query_pwc, basedon, grbc, sup_tab = get_columns(filters, year_start_date, start_month, trans)
+ data = get_data(columns,filters, tab, query_bon, query_pwc, basedon, grbc ,sup_tab)
+
+ if data == '':
+ webnotes.msgprint("Data Not Available")
+ return columns, data
\ No newline at end of file
diff --git a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.txt b/accounts/report/purchase_invoice_trends/purchase_invoice_trends.txt
new file mode 100644
index 0000000000..1d5c2d5f45
--- /dev/null
+++ b/accounts/report/purchase_invoice_trends/purchase_invoice_trends.txt
@@ -0,0 +1,21 @@
+[
+ {
+ "creation": "2013-06-13 18:46:55",
+ "docstatus": 0,
+ "modified": "2013-06-13 18:46:55",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "doctype": "Report",
+ "is_standard": "Yes",
+ "name": "__common__",
+ "ref_doctype": "Purchase Invoice",
+ "report_name": "Purchase Invoice Trends",
+ "report_type": "Script Report"
+ },
+ {
+ "doctype": "Report",
+ "name": "Purchase Invoice Trends"
+ }
+]
\ No newline at end of file
diff --git a/accounts/report/sales_invoice_trends/__init__.py b/accounts/report/sales_invoice_trends/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/accounts/report/sales_invoice_trends/sales_invoice_trends.js b/accounts/report/sales_invoice_trends/sales_invoice_trends.js
new file mode 100644
index 0000000000..6f20015d21
--- /dev/null
+++ b/accounts/report/sales_invoice_trends/sales_invoice_trends.js
@@ -0,0 +1,5 @@
+wn.require("app/js/sales_trends_filters.js");
+
+wn.query_reports["Sales Invoice Trends"] = {
+ filters: get_filters()
+ }
\ No newline at end of file
diff --git a/accounts/report/sales_invoice_trends/sales_invoice_trends.py b/accounts/report/sales_invoice_trends/sales_invoice_trends.py
new file mode 100644
index 0000000000..48606f04ed
--- /dev/null
+++ b/accounts/report/sales_invoice_trends/sales_invoice_trends.py
@@ -0,0 +1,37 @@
+# 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 .
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import cint, add_days, add_months, cstr
+from controllers.trends import get_columns,get_data
+
+def execute(filters=None):
+ if not filters: filters ={}
+ data = []
+
+ trans = "Sales Invoice"
+ tab = ["tabSales Invoice","tabSales Invoice Item"]
+ ysd = webnotes.conn.sql("select year_start_date from `tabFiscal Year` where name = '%s'"%filters.get("fiscal_year"))[0][0]
+ year_start_date = ysd.strftime('%Y-%m-%d')
+ start_month = cint(year_start_date.split('-')[1])
+
+ columns, query_bon, query_pwc, basedon, grbc, sup_tab = get_columns(filters, year_start_date, start_month, trans)
+ data = get_data(columns,filters, tab, query_bon, query_pwc, basedon, grbc ,sup_tab)
+
+ if data == '':
+ webnotes.msgprint("Data Not Available")
+ return columns, data
\ No newline at end of file
diff --git a/accounts/report/sales_invoice_trends/sales_invoice_trends.txt b/accounts/report/sales_invoice_trends/sales_invoice_trends.txt
new file mode 100644
index 0000000000..279ac1269f
--- /dev/null
+++ b/accounts/report/sales_invoice_trends/sales_invoice_trends.txt
@@ -0,0 +1,21 @@
+[
+ {
+ "creation": "2013-06-13 18:44:21",
+ "docstatus": 0,
+ "modified": "2013-06-13 18:44:21",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "doctype": "Report",
+ "is_standard": "Yes",
+ "name": "__common__",
+ "ref_doctype": "Sales Invoice",
+ "report_name": "Sales Invoice Trends",
+ "report_type": "Script Report"
+ },
+ {
+ "doctype": "Report",
+ "name": "Sales Invoice Trends"
+ }
+]
\ No newline at end of file
diff --git a/buying/report/purchase_order_trends/__init__.py b/buying/report/purchase_order_trends/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/buying/report/purchase_order_trends/purchase_order_trends.js b/buying/report/purchase_order_trends/purchase_order_trends.js
new file mode 100644
index 0000000000..c6373db6c2
--- /dev/null
+++ b/buying/report/purchase_order_trends/purchase_order_trends.js
@@ -0,0 +1,5 @@
+wn.require("app/js/purchase_trends_filters.js");
+
+wn.query_reports["Purchase Order Trends"] = {
+ filters: get_filters()
+ }
\ No newline at end of file
diff --git a/buying/report/purchase_order_trends/purchase_order_trends.py b/buying/report/purchase_order_trends/purchase_order_trends.py
new file mode 100644
index 0000000000..cdf79b2fad
--- /dev/null
+++ b/buying/report/purchase_order_trends/purchase_order_trends.py
@@ -0,0 +1,37 @@
+# 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 .
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import cint, add_days, add_months, cstr
+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"]
+ ysd = webnotes.conn.sql("select year_start_date from `tabFiscal Year` where name = '%s'"%filters.get("fiscal_year"))[0][0]
+ year_start_date = ysd.strftime('%Y-%m-%d')
+ start_month = cint(year_start_date.split('-')[1])
+
+ columns, query_bon, query_pwc, basedon, grbc, sup_tab = get_columns(filters, year_start_date, start_month, trans)
+ data = get_data(columns,filters, tab, query_bon, query_pwc, basedon, grbc ,sup_tab)
+
+ if data == '':
+ webnotes.msgprint("Data Not Available")
+ return columns, data
\ No newline at end of file
diff --git a/buying/report/purchase_order_trends/purchase_order_trends.txt b/buying/report/purchase_order_trends/purchase_order_trends.txt
new file mode 100644
index 0000000000..658dd4aab1
--- /dev/null
+++ b/buying/report/purchase_order_trends/purchase_order_trends.txt
@@ -0,0 +1,21 @@
+[
+ {
+ "creation": "2013-06-13 18:45:01",
+ "docstatus": 0,
+ "modified": "2013-06-13 18:45:01",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "doctype": "Report",
+ "is_standard": "Yes",
+ "name": "__common__",
+ "ref_doctype": "Purchase Order",
+ "report_name": "Purchase Order Trends",
+ "report_type": "Script Report"
+ },
+ {
+ "doctype": "Report",
+ "name": "Purchase Order Trends"
+ }
+]
\ No newline at end of file
diff --git a/controllers/trends.py b/controllers/trends.py
new file mode 100644
index 0000000000..6c33235b9f
--- /dev/null
+++ b/controllers/trends.py
@@ -0,0 +1,245 @@
+# 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 .
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import cint, add_days, add_months, cstr
+
+def get_columns(filters, year_start_date, start_month, trans):
+ columns, pwc, bon, grbc = [], [], [], []
+ query_bon, query_pwc = '', ''
+
+ period = filters.get("period")
+ based_on = filters.get("based_on")
+ grby = filters.get("group_by")
+
+ if not (period and based_on):
+ webnotes.msgprint("Value missing in 'Period' or 'Based On'", raise_exception=1)
+
+ elif based_on == grby:
+ webnotes.msgprint("Plese select different values in 'Based On' and 'Group By'", raise_exception=1)
+
+ else:
+ bon, query_bon, basedon, sup_tab = bon_columns_qdata(based_on, bon, trans)
+ pwc, query_pwc = pw_column_qdata(filters, period, pwc, year_start_date,start_month, trans)
+ grbc = grp_column(grby)
+
+ if grbc:
+ columns = bon + grbc + pwc +["TOTAL(Qty):Float:120", "TOTAL(Amt):Currency:120"]
+ else:
+ columns = bon + pwc + ["TOTAL(Qty):Float:120", "TOTAL(Amt):Currency:120"]
+
+ return columns, query_bon, query_pwc, basedon, grbc, sup_tab
+
+def get_data(columns, filters, tab, query_bon, query_pwc, basedon, grbc, sup_tab):
+
+ query_details = query_bon + query_pwc + 'SUM(t2.qty), SUM(t1.grand_total) '
+ query_pwc = query_pwc + 'SUM(t2.qty), SUM(t1.grand_total)'
+ data = []
+ inc, cond= '',''
+
+ if query_bon in ["t1.project_name,", "t2.project_name,"]:
+ cond = 'and '+ query_bon[:-1] +' IS Not NULL'
+
+ if filters.get("group_by"):
+ sel_col = ''
+
+ if filters.get("group_by") == 'Item':
+ sel_col = 't2.item_code'
+
+ elif filters.get("group_by") == 'Customer':
+ sel_col = 't1.customer'
+
+ elif filters.get("group_by") == 'Supplier':
+ sel_col = 't1.supplier'
+
+ if filters.get('based_on') in ['Item','Customer','Supplier']:
+ inc = 2
+ else :
+ inc = 1
+
+ ind = columns.index(grbc[0])
+
+ data1 = webnotes.conn.sql(""" select %s %s from `%s` t1, `%s` t2 %s
+ where t2.parent = t1.name and t1.company = '%s' and t1.fiscal_year = '%s'
+ and t1.docstatus = 1 %s group by %s
+ """%(query_bon, query_pwc, tab[0], tab[1], sup_tab,filters.get("company"), filters.get("fiscal_year"),
+ cond, basedon), as_list=1)
+
+ for d in range(len(data1)):
+ #to add blanck column
+ dt = data1[d]
+ dt.insert(ind,'')
+ data.append(dt)
+
+ #to get distinct value of col specified by group_by in filter
+ row = webnotes.conn.sql("""select DISTINCT(%s) from `%s` t1, `%s` t2
+ where t2.parent = t1.name and t1.company = '%s' and t1.fiscal_year = '%s'
+ and t1.docstatus = 1 and %s = '%s'
+ """%(sel_col, tab[0], tab[1], filters.get("company"), filters.get("fiscal_year"),
+ basedon, data1[d][0]),as_list=1)
+
+ for i in range(len(row)):
+ des = ['' for q in range(len(columns))]
+
+ #get data for each group_by filter
+ row1 = webnotes.conn.sql(""" select %s , %s from `%s` t1, `%s` t2
+ where t2.parent = t1.name and t1.company = '%s' and t1.fiscal_year = '%s'
+ and t1.docstatus = 1 and %s = '%s' and %s ='%s'
+ """%(sel_col, query_pwc, tab[0], tab[1], filters.get("company"), filters.get("fiscal_year"),
+ sel_col, row[i][0], basedon, data1[d][0]),as_list=1)
+
+ des[ind] = row[i]
+ for j in range(1,len(columns)-inc):
+ des[j+inc] = row1[0][j]
+ data.append(des)
+ else:
+
+ data = webnotes.conn.sql(""" select %s from `%s` t1, `%s` t2 %s
+ where t2.parent = t1.name and t1.company = '%s' and t1.fiscal_year = '%s'
+ and t1.docstatus = 1 %s group by %s
+ """%(query_details, tab[0], tab[1], sup_tab, filters.get("company"),
+ filters.get("fiscal_year"), cond,basedon), as_list=1)
+
+ return data
+
+def pw_column_qdata(filters, period, pwc, year_start_date, start_month, trans):
+ query_details = ''
+ if trans in ['Purchase Receipt', 'Delivery Note', 'Purchase Invoice', 'Sales Invoice']:
+ trans_date = 'posting_date'
+ else:
+ trans_date = 'transaction_date'
+
+ if period == "Monthly":
+ month_name = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']
+
+ for month in range(start_month-1,len(month_name)):
+ pwc.append(month_name[month]+' (Qty):Float:120')
+ pwc.append(month_name[month]+' (Amt):Currency:120')
+
+ query_details += """
+ Sum(CASE WHEN MONTH(t1.%(trans)s)= %(mon_num)s THEN t2.qty ELSE NULL END),
+ SUM(CASE WHEN MONTH(t1.%(trans)s)= %(mon_num)s THEN t1.grand_total ELSE NULL END),
+ """%{"trans": trans_date,"mon_num": cstr(month+1)}
+
+ for month in range(0, start_month-1):
+ pwc.append(month_name[month]+' (Qty):Float:120')
+ pwc.append(month_name[month]+' (Amt):Currency:120')
+
+ query_details += """
+ Sum(CASE WHEN MONTH(t1.%(trans)s)= %(mon_num)s THEN t2.qty ELSE NULL END),
+ SUM(CASE WHEN MONTH(t1.%(trans)s)= %(mon_num)s THEN t1.grand_total ELSE NULL END),
+ """%{"trans": trans_date, "mon_num": cstr(month+1)}
+
+ elif period == "Quarterly":
+ pwc = ["Q1(qty):Float:120", "Q1(amt):Currency:120", "Q2(qty):Float:120", "Q2(amt):Currency:120",
+ "Q3(qty):Float:120", "Q3(amt):Currency:120", "Q4(qty):Float:120", "Q4(amt):Currency:120"]
+
+ first_qsd, second_qsd, third_qsd, fourth_qsd = year_start_date, add_months(year_start_date,3), add_months(year_start_date,6), add_months(year_start_date,9)
+ first_qed, second_qed, third_qed, fourth_qed = add_days(add_months(first_qsd,3),-1), add_days(add_months(second_qsd,3),-1), add_days(add_months(third_qsd,3),-1), add_days(add_months(fourth_qsd,3),-1)
+
+ bet_dates = [[first_qsd,first_qed],[second_qsd,second_qed],[third_qsd,third_qed],[fourth_qsd,fourth_qed]]
+ for d in bet_dates:
+ query_details += """
+ SUM(CASE WHEN t1.%(trans)s BETWEEN '%(sd)s' AND '%(ed)s' THEN t2.qty ELSE NULL END),
+ SUM(CASE WHEN t1.%(trans)s BETWEEN '%(sd)s' AND '%(ed)s' THEN t1.grand_total ELSE NULL END),
+ """%{"trans": trans_date, "sd": d[0],"ed": d[1]}
+
+ elif period == "Half-yearly":
+ pwc = ["Fisrt Half(qty):Float:120", "Fisrt Half(amt):Currency:120", "Second Half(qty):Float:120",
+ "Second Half(amt):Currency:120"]
+
+ first_half_start = year_start_date
+ first_half_end = add_days(add_months(first_half_start,6),-1)
+ second_half_start = add_days(first_half_end,1)
+ second_half_end = add_days(add_months(second_half_start,6),-1)
+
+ query_details = """
+ SUM(CASE WHEN t1.%(trans)s BETWEEN '%(fhs)s' AND '%(fhe)s' THEN t2.qty ELSE NULL END),
+ SUM(CASE WHEN t1.%(trans)s BETWEEN '%(fhs)s' AND '%(fhe)s' THEN t1.grand_total ELSE NULL END),
+ SUM(CASE WHEN t1.%(trans)s BETWEEN '%(shs)s' AND '%(she)s' THEN t2.qty ELSE NULL END),
+ SUM(CASE WHEN t1.%(trans)s BETWEEN '%(shs)s' AND '%(she)s' THEN t1.grand_total ELSE NULL END),
+ """%{"trans": trans_date, "fhs": first_half_start, "fhe": first_half_end,"shs": second_half_start,
+ "she": second_half_end}
+
+ else:
+ pwc = [filters.get("fiscal_year")+"(qty):Float:120", filters.get("fiscal_year")+"(amt):Currency:120"]
+ query_details = " SUM(t2.qty), SUM(t1.grand_total),"
+
+ return pwc, query_details
+
+def bon_columns_qdata(based_on, bon, trans):
+ sup_tab = ''
+
+ if based_on == "Item":
+ bon = ["Item:Link/Item:120", "Item Name:Data:120"]
+ query_details = "t2.item_code, t2.item_name,"
+ basedon = 't2.item_code'
+
+ elif based_on == "Item Group":
+ bon = ["Item Group:Link/Item Group:120"]
+ query_details = "t2.item_group,"
+ basedon = 't2.item_group'
+
+ elif based_on == "Customer":
+ bon = ["Customer:Link/Customer:120", "Territory:Link/Territory:120"]
+ query_details = "t1.customer_name, t1.territory, "
+ basedon = 't1.customer_name'
+
+ elif based_on == "Customer Group":
+ bon = ["Customer Group:Link/Customer Group"]
+ query_details = "t1.customer_group,"
+ basedon = 't1.customer_group'
+
+ elif based_on == 'Supplier':
+ bon = ["Supplier:Link/Supplier:120", "Supplier Type:Link/Supplier Type:120"]
+ query_details = "t1.supplier, t3.supplier_type,"
+ basedon = 't1.supplier'
+ sup_tab = ',`tabSupplier` t3'
+
+ elif based_on == 'Supplier Type':
+ bon = ["Supplier Type:Link/Supplier Type:120"]
+ query_details = "t3.supplier_type,"
+ basedon = 't3.supplier_type'
+ sup_tab = ',`tabSupplier` t3'
+
+ elif based_on == "Territory":
+ bon = ["Territory:Link/Territory:120"]
+ query_details = "t1.territory,"
+ basedon = 't1.territory'
+
+ elif based_on == "Project":
+
+ if trans in ['Sales Invoice', 'Delivery Note', 'Sales Order']:
+ bon = ["Project:Link/Project:120"]
+ query_details = "t1.project_name,"
+ basedon = 't1.project_name'
+
+ elif trans in ['Purchase Order', 'Purchase Invoice', 'Purchase Receipt']:
+ bon = ["Project:Link/Project:120"]
+ query_details = "t2.project_name,"
+ basedon = 't2.project_name'
+
+ else:
+ webnotes.msgprint("No Information Available", raise_exception=1)
+
+ return bon, query_details, basedon, sup_tab
+
+def grp_column(group_by):
+ if group_by:
+ return [group_by+":Link/"+group_by+":120"]
+ else:
+ return []
\ No newline at end of file
diff --git a/public/js/purchase_trends_filters.js b/public/js/purchase_trends_filters.js
new file mode 100644
index 0000000000..05f67c92a4
--- /dev/null
+++ b/public/js/purchase_trends_filters.js
@@ -0,0 +1,39 @@
+var get_filter = function(){
+ return [
+ {
+ "fieldname":"period",
+ "label": "Period",
+ "fieldtype": "Select",
+ "options": ["Monthly", "Quarterly", "Half-yearly", "Yearly"].join("\n"),
+ "default": "Monthly"
+ },
+ {
+ "fieldname":"based_on",
+ "label": "Based On",
+ "fieldtype": "Select",
+ "options": ["Item", "Item Group", "Supplier", "Supplier Type", "Project"].join("\n"),
+ "default": "Item"
+ },
+ {
+ "fieldname":"group_by",
+ "label": "Group By",
+ "fieldtype": "Select",
+ "options": ["Item", "Supplier"].join("\n"),
+ "default": ""
+ },
+ {
+ "fieldname":"fiscal_year",
+ "label": "Fiscal Year",
+ "fieldtype": "Link",
+ "options":'Fiscal Year',
+ "default": sys_defaults.fiscal_year
+ },
+ {
+ "fieldname":"company",
+ "label": "Company",
+ "fieldtype": "Link",
+ "options": "Company",
+ "default": sys_defaults.company
+ },
+ ];
+}
\ No newline at end of file
diff --git a/public/js/sales_trends_filters.js b/public/js/sales_trends_filters.js
new file mode 100644
index 0000000000..14dcbe3cf6
--- /dev/null
+++ b/public/js/sales_trends_filters.js
@@ -0,0 +1,39 @@
+var get_filters = function(){
+ return[
+ {
+ "fieldname":"period",
+ "label": "Period",
+ "fieldtype": "Select",
+ "options": ["Monthly", "Quarterly", "Half-yearly", "Yearly"].join("\n"),
+ "default": "Monthly"
+ },
+ {
+ "fieldname":"based_on",
+ "label": "Based On",
+ "fieldtype": "Select",
+ "options": ["Item", "Item Group", "Customer", "Customer Group", "Territory", "Project"].join("\n"),
+ "default": "Item"
+ },
+ {
+ "fieldname":"group_by",
+ "label": "Group By",
+ "fieldtype": "Select",
+ "options": ["Item", "Customer"].join("\n"),
+ "default": ""
+ },
+ {
+ "fieldname":"fiscal_year",
+ "label": "Fiscal Year",
+ "fieldtype": "Link",
+ "options":'Fiscal Year',
+ "default": sys_defaults.fiscal_year
+ },
+ {
+ "fieldname":"company",
+ "label": "Company",
+ "fieldtype": "Link",
+ "options": "Company",
+ "default": sys_defaults.company
+ },
+ ];
+}
\ No newline at end of file
diff --git a/selling/report/quotation_trends/quotation_trends.js b/selling/report/quotation_trends/quotation_trends.js
index e166fa66ce..2f9f23666c 100644
--- a/selling/report/quotation_trends/quotation_trends.js
+++ b/selling/report/quotation_trends/quotation_trends.js
@@ -1,40 +1,5 @@
+wn.require("app/js/sales_trends_filters.js");
+
wn.query_reports["Quotation Trends"] = {
- "filters": [
- {
- "fieldname":"period",
- "label": "Period",
- "fieldtype": "Select",
- "options": "Monthly"+NEWLINE+"Quarterly"+NEWLINE+"Half-yearly"+NEWLINE+"Yearly",
- "default": "Monthly"
- },
- {
- "fieldname":"based_on",
- "label": "Based On",
- "fieldtype": "Select",
- "options": "Item"+NEWLINE+"Item Group"+NEWLINE+"Customer"+NEWLINE+"Customer Group"+NEWLINE+"Territory"+NEWLINE+"Project",
- "default": "Item"
- },
- {
- "fieldname":"group_by",
- "label": "Group By",
- "fieldtype": "Select",
- "options": "Item"+NEWLINE+"Customer",
- "default": ""
- },
- {
- "fieldname":"fiscal_year",
- "label": "Fiscal Year",
- "fieldtype": "Link",
- "options":'Fiscal Year',
- "default": sys_defaults.fiscal_year
- },
- {
- "fieldname":"company",
- "label": "Company",
- "fieldtype": "Link",
- "options": "Company",
- "default": sys_defaults.company
- },
-
- ]
-}
\ No newline at end of file
+ filters: get_filters()
+ }
\ No newline at end of file
diff --git a/selling/report/quotation_trends/quotation_trends.py b/selling/report/quotation_trends/quotation_trends.py
index 7f944e0f23..527e0addc5 100644
--- a/selling/report/quotation_trends/quotation_trends.py
+++ b/selling/report/quotation_trends/quotation_trends.py
@@ -17,204 +17,21 @@
from __future__ import unicode_literals
import webnotes
from webnotes.utils import cint, add_days, add_months, cstr
+from controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
+ data = []
- # Global data
trans = "Quotation"
tab = ["tabQuotation","tabQuotation Item"]
ysd = webnotes.conn.sql("select year_start_date from `tabFiscal Year` where name = '%s'"%filters.get("fiscal_year"))[0][0]
year_start_date = ysd.strftime('%Y-%m-%d')
start_month = cint(year_start_date.split('-')[1])
- columns, query_bon, query_pwc, group_by, gby = get_columns(filters, year_start_date, start_month, trans)
- data = get_data(columns,filters, tab, query_bon, query_pwc, group_by, gby)
+ columns, query_bon, query_pwc, basedon, grbc, sup_tab = get_columns(filters, year_start_date, start_month, trans)
+ data = get_data(columns,filters, tab, query_bon, query_pwc, basedon, grbc ,sup_tab)
- return columns, data
-
-def get_columns(filters, year_start_date, start_month, trans):
- columns, pwc, bon, gby = [], [], [], []
- query_bon, query_pwc = '', ''
-
- period = filters.get("period")
- based_on = filters.get("based_on")
- grby = filters.get("group_by")
-
- if not (period and based_on):
- webnotes.msgprint("Value missing in 'Period' or 'Based On'", raise_exception=1)
-
- elif based_on == grby:
- webnotes.msgprint("Plese select different values in 'Based On' and 'Group By'", raise_exception=1)
-
- else:
- bon,query_bon,group_by = base_wise_column(based_on, bon)
- pwc,query_pwc = period_wise_column_and_query(filters, period, pwc, year_start_date,start_month, trans)
- gby = gruoup_wise_column(grby)
-
- if gby:
- columns = bon + gby + pwc +["TOTAL(Qty):Float:120", "TOTAL(Amt):Currency:120"]
- else:
- columns = bon + pwc + ["TOTAL(Qty):Float:120", "TOTAL(Amt):Currency:120"]
-
- return columns, query_bon, query_pwc, group_by,gby
-
-def get_data(columns, filters, tab, query_bon, query_pwc, group_by,gby):
-
- query_details = query_bon + query_pwc + 'SUM(t2.qty), SUM(t1.grand_total) '
- query_pwc = query_pwc + 'SUM(t2.qty), SUM(t1.grand_total)'
- data = []
- inc = ''
-
- if filters.get("group_by"):
- sel_col = ''
- if filters.get("group_by") == 'Item':
- sel_col = 't2.item_code'
-
- elif filters.get("group_by") == 'Customer':
- sel_col = 't1.customer'
-
- if filters.get('based_on') in ['Item','Customer']:
- inc = 2
- else :
- inc = 1
-
- ind = columns.index(gby[0])
-
- data1 = webnotes.conn.sql(""" select %s %s from `%s` t1, `%s` t2
- where t2.parent = t1.name and t1.company = '%s' and t1.fiscal_year = '%s'
- and t1.docstatus = 1 group by %s """%(query_bon, query_pwc, tab[0], tab[1],
- filters.get("company"), filters.get("fiscal_year"), group_by), as_list=1)
-
- for d in range(len(data1)):
-
- dt = data1[d]
- dt.insert(ind,'')
- data.append(dt)
-
- row = webnotes.conn.sql("""select DISTINCT(%s) from `%s` t1, `%s` t2
- where t2.parent = t1.name and t1.company = '%s' and t1.fiscal_year = '%s'
- and t1.docstatus = 1 and %s = '%s' """%(sel_col, tab[0], tab[1], filters.get("company"),
- filters.get("fiscal_year"), group_by, data1[d][0]),as_list=1)
-
- for i in range(len(row)):
- des = ['' for q in range(len(columns))]
-
- row1 = webnotes.conn.sql(""" select %s , %s from `%s` t1, `%s` t2
- where t2.parent = t1.name and t1.company = '%s' and t1.fiscal_year = '%s'
- and t1.docstatus = 1 and %s = '%s' and %s ='%s' """%(sel_col, query_pwc, tab[0], tab[1],
- filters.get("company"), filters.get("fiscal_year"), sel_col, row[i][0], group_by,
- data1[d][0]),as_list=1)
-
- des[ind] = row[i]
- for j in range(1,len(columns)-inc):
- des[j+inc] = row1[0][j]
- data.append(des)
- else:
-
- data = webnotes.conn.sql(""" select %s from `%s` t1, `%s` t2
- where t2.parent = t1.name and t1.company = '%s' and t1.fiscal_year = '%s'
- and t1.docstatus = 1 group by %s
- """%(query_details, tab[0], tab[1], filters.get("company"), filters.get("fiscal_year"), group_by), as_list=1)
-
- return data
-
-def period_wise_column_and_query(filters, period, pwc, year_start_date, start_month, trans):
- query_details = ''
- if trans in ['Purchase Receipt', 'Delivery Note', 'Purchase Invoice', 'Sales Invoice']:
- trans_date = 'posting_date'
- else:
- trans_date = 'transaction_date'
-
- if period == "Monthly":
- month_name = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']
-
- for month in range(start_month-1,len(month_name)):
- pwc.append(month_name[month]+' (Qty):Float:120')
- pwc.append(month_name[month]+' (Amt):Currency:120')
-
- query_details += """
- Sum(CASE WHEN MONTH(t1.%(trans)s)= %(mon_num)s THEN t2.qty ELSE NULL END),
- SUM(CASE WHEN MONTH(t1.%(trans)s)= %(mon_num)s THEN t1.grand_total ELSE NULL END),
- """%{"trans": trans_date,"mon_num": cstr(month+1)}
-
- for month in range(0, start_month-1):
- pwc.append(month_name[month]+' (Qty):Float:120')
- pwc.append(month_name[month]+' (Amt):Currency:120')
-
- query_details += """
- Sum(CASE WHEN MONTH(t1.%(trans)s)= %(mon_num)s THEN t2.qty ELSE NULL END),
- SUM(CASE WHEN MONTH(t1.%(trans)s)= %(mon_num)s THEN t1.grand_total ELSE NULL END),
- """%{"trans": trans_date, "mon_num": cstr(month+1)}
-
- elif period == "Quarterly":
- pwc = ["Q1(qty):Float:120", "Q1(amt):Currency:120", "Q2(qty):Float:120", "Q2(amt):Currency:120",
- "Q3(qty):Float:120", "Q3(amt):Currency:120", "Q4(qty):Float:120", "Q4(amt):Currency:120"]
-
- first_qsd, second_qsd, third_qsd, fourth_qsd = year_start_date, add_months(year_start_date,3), add_months(year_start_date,6), add_months(year_start_date,9)
- first_qed, second_qed, third_qed, fourth_qed = add_days(add_months(first_qsd,3),-1), add_days(add_months(second_qsd,3),-1), add_days(add_months(third_qsd,3),-1), add_days(add_months(fourth_qsd,3),-1)
-
- bet_dates = [[first_qsd,first_qed],[second_qsd,second_qed],[third_qsd,third_qed],[fourth_qsd,fourth_qed]]
- for d in bet_dates:
- query_details += """
- SUM(CASE WHEN t1.%(trans)s BETWEEN '%(sd)s' AND '%(ed)s' THEN t2.qty ELSE NULL END),
- SUM(CASE WHEN t1.%(trans)s BETWEEN '%(sd)s' AND '%(ed)s' THEN t1.grand_total ELSE NULL END),
- """%{"trans": trans_date, "sd": d[0],"ed": d[1]}
-
- elif period == "Half-yearly":
- pwc = ["Fisrt Half(qty):Float:120", "Fisrt Half(amt):Currency:120", "Second Half(qty):Float:120",
- "Second Half(amt):Currency:120"]
-
- first_half_start = year_start_date
- first_half_end = add_days(add_months(first_half_start,6),-1)
- second_half_start = add_days(first_half_end,1)
- second_half_end = add_days(add_months(second_half_start,6),-1)
-
- query_details = """
- SUM(CASE WHEN t1.%(trans)s BETWEEN '%(fhs)s' AND '%(fhe)s' THEN t2.qty ELSE NULL END),
- SUM(CASE WHEN t1.%(trans)s BETWEEN '%(fhs)s' AND '%(fhe)s' THEN t1.grand_total ELSE NULL END),
- SUM(CASE WHEN t1.%(trans)s BETWEEN '%(shs)s' AND '%(she)s' THEN t2.qty ELSE NULL END),
- SUM(CASE WHEN t1.%(trans)s BETWEEN '%(shs)s' AND '%(she)s' THEN t1.grand_total ELSE NULL END),
- """%{"trans": trans_date, "fhs": first_half_start, "fhe": first_half_end,"shs": second_half_start, "she": second_half_end}
-
- else:
- pwc = [filters.get("fiscal_year")+"(qty):Float:120", filters.get("fiscal_year")+"(amt):Currency:120"]
- query_details = " SUM(t2.qty), SUM(t1.grand_total),"
-
- return pwc, query_details
-
-def base_wise_column(based_on, bon):
- if based_on == "Item":
- bon = ["Item:Link/Item:120", "Item Name:Data:120"]
- query_details = "t2.item_code, t2.item_name,"
- group_by = 't2.item_code'
-
- elif based_on == "Item Group":
- bon = ["Item Group:Link/Item Group:120"]
- query_details = "t2.item_group,"
- group_by = 't2.item_group'
-
- elif based_on == "Customer":
- bon = ["Customer:Link/Customer:120", "Territory:Link/Territory:120"]
- query_details = "t1.customer_name, t1.territory, "
- group_by = 't1.customer_name'
-
- elif based_on == "Customer Group":
- bon = ["Customer Group:Link/Customer Group"]
- query_details = "t1.customer_group, "
- group_by = 't1.customer_group'
-
- elif based_on == "Territory":
- bon = ["Territory:Link/Territory:120"]
- query_details = "t1.territory, "
- group_by = 't1.territory'
-
- else:
- bon = ["Project:Link/Project:120"]
- return bon, query_details, group_by
-
-def gruoup_wise_column(group_by):
- if group_by:
- return [group_by+":Link/"+group_by+":120"]
- else:
- return []
\ No newline at end of file
+ if data == '':
+ webnotes.msgprint("Data Not Available")
+ return columns, data
\ No newline at end of file
diff --git a/selling/report/sales_order_trends/__init__.py b/selling/report/sales_order_trends/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/selling/report/sales_order_trends/sales_order_trends.js b/selling/report/sales_order_trends/sales_order_trends.js
new file mode 100644
index 0000000000..29c124403f
--- /dev/null
+++ b/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"] = {
+ filters: get_filters()
+ }
\ No newline at end of file
diff --git a/selling/report/sales_order_trends/sales_order_trends.py b/selling/report/sales_order_trends/sales_order_trends.py
new file mode 100644
index 0000000000..047a8a9e9f
--- /dev/null
+++ b/selling/report/sales_order_trends/sales_order_trends.py
@@ -0,0 +1,37 @@
+# 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 .
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import cint, add_days, add_months, cstr
+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"]
+ ysd = webnotes.conn.sql("select year_start_date from `tabFiscal Year` where name = '%s'"%filters.get("fiscal_year"))[0][0]
+ year_start_date = ysd.strftime('%Y-%m-%d')
+ start_month = cint(year_start_date.split('-')[1])
+
+ columns, query_bon, query_pwc, basedon, grbc, sup_tab = get_columns(filters, year_start_date, start_month, trans)
+ data = get_data(columns,filters, tab, query_bon, query_pwc, basedon, grbc ,sup_tab)
+
+ if data == '':
+ webnotes.msgprint("Data Not Available")
+ return columns, data
\ No newline at end of file
diff --git a/selling/report/sales_order_trends/sales_order_trends.txt b/selling/report/sales_order_trends/sales_order_trends.txt
new file mode 100644
index 0000000000..16ee9ca46b
--- /dev/null
+++ b/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"
+ }
+]
\ No newline at end of file
diff --git a/stock/report/delivery_note_trends/__init__.py b/stock/report/delivery_note_trends/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/stock/report/delivery_note_trends/delivery_note_trends.js b/stock/report/delivery_note_trends/delivery_note_trends.js
new file mode 100644
index 0000000000..3ec5e594d7
--- /dev/null
+++ b/stock/report/delivery_note_trends/delivery_note_trends.js
@@ -0,0 +1,5 @@
+wn.require("app/js/sales_trends_filters.js");
+
+wn.query_reports["Delivery Note Trends"] = {
+ filters: get_filters()
+ }
\ No newline at end of file
diff --git a/stock/report/delivery_note_trends/delivery_note_trends.py b/stock/report/delivery_note_trends/delivery_note_trends.py
new file mode 100644
index 0000000000..685cede509
--- /dev/null
+++ b/stock/report/delivery_note_trends/delivery_note_trends.py
@@ -0,0 +1,37 @@
+# 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 .
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import cint, add_days, add_months, cstr
+from controllers.trends import get_columns,get_data
+
+def execute(filters=None):
+ if not filters: filters ={}
+ data = []
+
+ trans = "Delivery Note"
+ tab = ["tabDelivery Note","tabDelivery Note Item"]
+ ysd = webnotes.conn.sql("select year_start_date from `tabFiscal Year` where name = '%s'"%filters.get("fiscal_year"))[0][0]
+ year_start_date = ysd.strftime('%Y-%m-%d')
+ start_month = cint(year_start_date.split('-')[1])
+
+ columns, query_bon, query_pwc, basedon, grbc, sup_tab = get_columns(filters, year_start_date, start_month, trans)
+ data = get_data(columns,filters, tab, query_bon, query_pwc, basedon, grbc ,sup_tab)
+
+ if data == '':
+ webnotes.msgprint("Data Not Available")
+ return columns, data
\ No newline at end of file
diff --git a/stock/report/delivery_note_trends/delivery_note_trends.txt b/stock/report/delivery_note_trends/delivery_note_trends.txt
new file mode 100644
index 0000000000..bb8720074a
--- /dev/null
+++ b/stock/report/delivery_note_trends/delivery_note_trends.txt
@@ -0,0 +1,21 @@
+[
+ {
+ "creation": "2013-06-13 18:42:11",
+ "docstatus": 0,
+ "modified": "2013-06-13 18:42:11",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "doctype": "Report",
+ "is_standard": "Yes",
+ "name": "__common__",
+ "ref_doctype": "Delivery Note",
+ "report_name": "Delivery Note Trends",
+ "report_type": "Script Report"
+ },
+ {
+ "doctype": "Report",
+ "name": "Delivery Note Trends"
+ }
+]
\ No newline at end of file
diff --git a/stock/report/purchase_receipt_trends/__init__.py b/stock/report/purchase_receipt_trends/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/stock/report/purchase_receipt_trends/purchase_receipt_trends.js b/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
new file mode 100644
index 0000000000..ecfa5a473e
--- /dev/null
+++ b/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
@@ -0,0 +1,5 @@
+wn.require("app/js/purchase_trends_filters.js");
+
+wn.query_reports["Purchase Receipt Trends"] = {
+ filters: get_filters()
+ }
\ No newline at end of file
diff --git a/stock/report/purchase_receipt_trends/purchase_receipt_trends.py b/stock/report/purchase_receipt_trends/purchase_receipt_trends.py
new file mode 100644
index 0000000000..aaa18a0a0d
--- /dev/null
+++ b/stock/report/purchase_receipt_trends/purchase_receipt_trends.py
@@ -0,0 +1,37 @@
+# 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 .
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import cint, add_days, add_months, cstr
+from controllers.trends import get_columns,get_data
+
+def execute(filters=None):
+ if not filters: filters ={}
+ data = []
+
+ trans = "Purchase Receipt"
+ tab = ["tabPurchase Receipt","tabPurchase Receipt Item"]
+ ysd = webnotes.conn.sql("select year_start_date from `tabFiscal Year` where name = '%s'"%filters.get("fiscal_year"))[0][0]
+ year_start_date = ysd.strftime('%Y-%m-%d')
+ start_month = cint(year_start_date.split('-')[1])
+
+ columns, query_bon, query_pwc, basedon, grbc, sup_tab = get_columns(filters, year_start_date, start_month, trans)
+ data = get_data(columns,filters, tab, query_bon, query_pwc, basedon, grbc ,sup_tab)
+
+ if data == '':
+ webnotes.msgprint("Data Not Available")
+ return columns, data
\ No newline at end of file
diff --git a/stock/report/purchase_receipt_trends/purchase_receipt_trends.txt b/stock/report/purchase_receipt_trends/purchase_receipt_trends.txt
new file mode 100644
index 0000000000..179c524f96
--- /dev/null
+++ b/stock/report/purchase_receipt_trends/purchase_receipt_trends.txt
@@ -0,0 +1,21 @@
+[
+ {
+ "creation": "2013-06-13 18:45:44",
+ "docstatus": 0,
+ "modified": "2013-06-13 18:45:44",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "doctype": "Report",
+ "is_standard": "Yes",
+ "name": "__common__",
+ "ref_doctype": "Purchase Receipt",
+ "report_name": "Purchase Receipt Trends",
+ "report_type": "Script Report"
+ },
+ {
+ "doctype": "Report",
+ "name": "Purchase Receipt Trends"
+ }
+]
\ No newline at end of file