Merge branch 'master' of https://github.com/webnotes/erpnext
diff --git a/selling/page/selling_home/selling_home.js b/selling/page/selling_home/selling_home.js
index 9c18fda..e3663c9 100644
--- a/selling/page/selling_home/selling_home.js
+++ b/selling/page/selling_home/selling_home.js
@@ -159,18 +159,22 @@
},
{
"label":wn._("Sales Person-wise Transaction Summary"),
- route: "query-report/Sales Person-wise Transaction Summary",
+ route: "query-report/Sales Person-wise Transaction Summary"
},
{
"label":wn._("Item-wise Sales History"),
- route: "query-report/Item-wise Sales History",
+ route: "query-report/Item-wise Sales History"
+ },
+ {
+ "label":wn._("Territory Target Variance (Item Group-Wise)"),
+ route: "query-report/Territory Target Variance (Item Group-Wise)",
+ doctype: "Sales Order"
},
{
"label":wn._("Customers Not Buying Since Long Time"),
route: "query-report/Customers Not Buying Since Long Time",
doctype: "Sales Order"
},
-
]
}
]
diff --git "a/selling/report/territory_target_variance_\050item_group_wise\051/__init__.py" "b/selling/report/territory_target_variance_\050item_group_wise\051/__init__.py"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/selling/report/territory_target_variance_\050item_group_wise\051/__init__.py"
diff --git "a/selling/report/territory_target_variance_\050item_group_wise\051/territory_target_variance_\050item_group_wise\051.js" "b/selling/report/territory_target_variance_\050item_group_wise\051/territory_target_variance_\050item_group_wise\051.js"
new file mode 100644
index 0000000..58718a4
--- /dev/null
+++ "b/selling/report/territory_target_variance_\050item_group_wise\051/territory_target_variance_\050item_group_wise\051.js"
@@ -0,0 +1,25 @@
+wn.query_reports["Territory Target Variance (Item Group-Wise)"] = {
+ "filters": [
+ {
+ fieldname: "fiscal_year",
+ label: "Fiscal Year",
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: sys_defaults.fiscal_year
+ },
+ {
+ fieldname: "period",
+ label: "Period",
+ fieldtype: "Select",
+ options: "Monthly\nQuarterly\nHalf-Yearly\nYearly",
+ default: "Monthly"
+ },
+ {
+ fieldname: "target_on",
+ label: "Target On",
+ fieldtype: "Select",
+ options: "Quantity\nAmount",
+ default: "Quantity"
+ },
+ ]
+}
\ No newline at end of file
diff --git "a/selling/report/territory_target_variance_\050item_group_wise\051/territory_target_variance_\050item_group_wise\051.py" "b/selling/report/territory_target_variance_\050item_group_wise\051/territory_target_variance_\050item_group_wise\051.py"
new file mode 100644
index 0000000..844d4f3
--- /dev/null
+++ "b/selling/report/territory_target_variance_\050item_group_wise\051/territory_target_variance_\050item_group_wise\051.py"
@@ -0,0 +1,186 @@
+# 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
+import calendar
+from webnotes import _, msgprint
+from webnotes.utils import cint, cstr, add_months, flt
+import time
+import calendar
+
+def execute(filters=None):
+ if not filters: filters = {}
+
+ columns = get_columns(filters)
+ period_month_ranges = get_period_month_ranges(filters)
+
+ target_on = "Quantity" if (filters.get("target_on")=="Quantity") else "Amount"
+ tim_map = get_territory_item_month_map(filters, target_on)
+
+ data = []
+
+ for territory, territory_items in tim_map.items():
+ for item_group, monthwise_data in territory_items.items():
+ row = [territory, item_group]
+ totals = [0, 0, 0]
+ for relevant_months in period_month_ranges:
+ period_data = [0, 0, 0]
+ for month in relevant_months:
+ month_data = monthwise_data.get(month, {})
+ for i, fieldname in enumerate(["target", "achieved", "variance"]):
+ value = flt(month_data.get(fieldname))
+ period_data[i] += value
+ totals[i] += value
+ period_data[2] = period_data[0] - period_data[1]
+ row += period_data
+ totals[2] = totals[0] - totals[1]
+ row += totals
+ data.append(row)
+
+ return columns, sorted(data, key=lambda x: (x[0], x[1]))
+
+def get_columns(filters):
+ for fieldname in ["fiscal_year", "period", "target_on"]:
+ if not filters.get(fieldname):
+ label = (" ".join(fieldname.split("_"))).title()
+ msgprint(_("Please specify") + ": " + label,
+ raise_exception=True)
+
+ columns = ["Territory:Link/Territory:80", "Item Group:Link/Item Group:80"]
+
+ group_months = False if filters["period"] == "Monthly" else True
+
+ for from_date, to_date in get_period_date_ranges(filters):
+ for label in ["Target (%s)", "Achieved (%s)", "Variance (%s)"]:
+ if group_months:
+ columns.append(label % (from_date.strftime("%b") + " - " + to_date.strftime("%b")))
+ else:
+ columns.append(label % from_date.strftime("%b"))
+
+ return columns + ["Total Target::80", "Total Achieved::80", "Total Variance::80"]
+
+def get_period_date_ranges(filters):
+ from dateutil.relativedelta import relativedelta
+
+ year_start_date, year_end_date = get_year_start_end_date(filters)
+
+ increment = {
+ "Monthly": 1,
+ "Quarterly": 3,
+ "Half-Yearly": 6,
+ "Yearly": 12
+ }.get(filters["period"])
+
+ period_date_ranges = []
+ for i in xrange(1, 13, increment):
+ period_end_date = year_start_date + relativedelta(months=increment,
+ days=-1)
+ period_date_ranges.append([year_start_date, period_end_date])
+ year_start_date = period_end_date + relativedelta(days=1)
+
+ return period_date_ranges
+
+def get_period_month_ranges(filters):
+ from dateutil.relativedelta import relativedelta
+ period_month_ranges = []
+
+ for start_date, end_date in get_period_date_ranges(filters):
+ months_in_this_period = []
+ while start_date <= end_date:
+ months_in_this_period.append(start_date.strftime("%B"))
+ start_date += relativedelta(months=1)
+ period_month_ranges.append(months_in_this_period)
+
+ return period_month_ranges
+
+
+#Get territory & item group details
+def get_territory_details(filters):
+ return webnotes.conn.sql("""select t.name, td.item_group, td.target_qty, td.target_amount,
+ t.distribution_id from `tabTerritory` t, `tabTarget Detail` td
+ where td.parent=t.name and td.fiscal_year=%s and
+ ifnull(t.distribution_id, '')!='' order by t.name""" %
+ ('%s'), (filters.get("fiscal_year")), as_dict=1)
+
+#Get target distribution details of item group
+def get_target_distribution_details(filters):
+ target_details = {}
+ abc = []
+ for d in webnotes.conn.sql("""select bdd.month, bdd.percentage_allocation \
+ from `tabBudget Distribution Detail` bdd, `tabBudget Distribution` bd, \
+ `tabTerritory` t where bdd.parent=bd.name and t.distribution_id=bd.name and \
+ bd.fiscal_year=%s """ % ('%s'), (filters.get("fiscal_year")), as_dict=1):
+ target_details.setdefault(d.month, d)
+
+ return target_details
+
+#Get achieved details from sales order
+def get_achieved_details(filters):
+ start_date, end_date = get_year_start_end_date(filters)
+ achieved_details = {}
+
+ for d in webnotes.conn.sql("""select soi.item_code, soi.qty, soi.amount, so.transaction_date, \
+ MONTHNAME(so.transaction_date) as month_name \
+ from `tabSales Order Item` soi, `tabSales Order` so \
+ where soi.parent=so.name and so.docstatus=1 and so.transaction_date>=%s and \
+ so.transaction_date<=%s""" % ('%s', '%s'), \
+ (start_date, end_date), as_dict=1):
+ achieved_details.setdefault(d.month_name, d)
+
+ return achieved_details
+
+def get_territory_item_month_map(filters, target_on):
+ territory_details = get_territory_details(filters)
+ tdd = get_target_distribution_details(filters)
+ achieved_details = get_achieved_details(filters)
+
+ ti_map = {}
+
+ for td in territory_details:
+ for month in tdd:
+ ti_map.setdefault(td.name, {}).setdefault(td.item_group, {})\
+ .setdefault(month, webnotes._dict({
+ "target": 0.0, "achieved": 0.0, "variance": 0.0
+ }))
+
+ tav_dict = ti_map[td.name][td.item_group][month]
+
+ for ad in achieved_details:
+ if (target_on == "Quantity"):
+ tav_dict.target = td.target_qty*(tdd[month]["percentage_allocation"]/100)
+ if ad == month and ''.join(get_item_group(achieved_details[month]["item_code"])) == td.item_group:
+ tav_dict.achieved += achieved_details[month]["qty"]
+
+ if (target_on == "Amount"):
+ tav_dict.target = td.target_amount*(tdd[month]["percentage_allocation"]/100)
+ if ad == month and ''.join(get_item_group(achieved_details[month]["item_code"])) == td.item_group:
+ tav_dict.achieved += achieved_details[month]["amount"]
+
+ return ti_map
+
+def get_year_start_end_date(filters):
+ return webnotes.conn.sql("""select year_start_date,
+ subdate(adddate(year_start_date, interval 1 year), interval 1 day)
+ as year_end_date
+ from `tabFiscal Year`
+ where name=%s""", filters["fiscal_year"])[0]
+
+def get_item_group(item_name):
+ """Get Item Group of an item"""
+
+ return webnotes.conn.sql_list("select item_group from `tabItem` where name=%s""" %
+ ('%s'), (item_name))
\ No newline at end of file
diff --git "a/selling/report/territory_target_variance_\050item_group_wise\051/territory_target_variance_\050item_group_wise\051.txt" "b/selling/report/territory_target_variance_\050item_group_wise\051/territory_target_variance_\050item_group_wise\051.txt"
new file mode 100644
index 0000000..7fff64a
--- /dev/null
+++ "b/selling/report/territory_target_variance_\050item_group_wise\051/territory_target_variance_\050item_group_wise\051.txt"
@@ -0,0 +1,21 @@
+[
+ {
+ "creation": "2013-06-07 15:13:13",
+ "docstatus": 0,
+ "modified": "2013-06-07 15:13:13",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "doctype": "Report",
+ "is_standard": "Yes",
+ "name": "__common__",
+ "ref_doctype": "Sales Order",
+ "report_name": "Territory Target Variance (Item Group-Wise)",
+ "report_type": "Script Report"
+ },
+ {
+ "doctype": "Report",
+ "name": "Territory Target Variance (Item Group-Wise)"
+ }
+]
\ No newline at end of file