From 1ded5c618ee73166dfcba4671cd9b041baa1cd4f Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Fri, 21 Jun 2013 12:47:51 +0530 Subject: [PATCH 01/11] [Report]Cleanup of territory target variance, sales person target variance & budget variance reports --- .../budget_variance_report.py | 59 +++------------ selling/page/selling_home/selling_home.js | 4 +- .../__init__.py | 0 ...person_target_variance_item_group_wise.js} | 2 +- ...person_target_variance_item_group_wise.py} | 74 ++++--------------- ...erson_target_variance_item_group_wise.txt} | 8 +- .../__init__.py | 0 ...ritory_target_variance_item_group_wise.js} | 2 +- ...ritory_target_variance_item_group_wise.py} | 74 ++++--------------- ...itory_target_variance_item_group_wise.txt} | 8 +- stock/report/item_prices/item_prices.py | 62 +++++++++++++--- 11 files changed, 106 insertions(+), 187 deletions(-) rename selling/report/{sales_person_target_variance_(item_group_wise) => sales_person_target_variance_item_group_wise}/__init__.py (100%) rename selling/report/{sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).js => sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js} (86%) rename selling/report/{sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).py => sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py} (67%) rename selling/report/{sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).txt => sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.txt} (56%) rename selling/report/{territory_target_variance_(item_group_wise) => territory_target_variance_item_group_wise}/__init__.py (100%) rename selling/report/{territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).js => territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js} (86%) rename selling/report/{territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).py => territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py} (66%) rename selling/report/{territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).txt => territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.txt} (57%) diff --git a/accounts/report/budget_variance_report/budget_variance_report.py b/accounts/report/budget_variance_report/budget_variance_report.py index 99e303bd204..b4959aa6679 100644 --- a/accounts/report/budget_variance_report/budget_variance_report.py +++ b/accounts/report/budget_variance_report/budget_variance_report.py @@ -16,18 +16,21 @@ from __future__ import unicode_literals import webnotes -import calendar from webnotes import _, msgprint from webnotes.utils import flt import time +from accounts.utils import get_fiscal_year +from controllers.trends import get_period_date_ranges, get_period_month_ranges def execute(filters=None): if not filters: filters = {} columns = get_columns(filters) - period_month_ranges = get_period_month_ranges(filters) + period_month_ranges = get_period_month_ranges(filters["period"], filters["fiscal_year"]) cam_map = get_costcenter_account_month_map(filters) + precision = webnotes.conn.get_value("Global Defaults", None, "float_precision") or 2 + data = [] for cost_center, cost_center_items in cam_map.items(): @@ -39,7 +42,7 @@ def execute(filters=None): for month in relevant_months: month_data = monthwise_data.get(month, {}) for i, fieldname in enumerate(["target", "actual", "variance"]): - value = flt(month_data.get(fieldname)) + value = flt(month_data.get(fieldname), precision) period_data[i] += value totals[i] += value period_data[2] = period_data[0] - period_data[1] @@ -61,7 +64,7 @@ def get_columns(filters): group_months = False if filters["period"] == "Monthly" else True - for from_date, to_date in get_period_date_ranges(filters): + for from_date, to_date in get_period_date_ranges(filters["period"], filters["fiscal_year"]): for label in ["Target (%s)", "Actual (%s)", "Variance (%s)"]: if group_months: columns.append(label % (from_date.strftime("%b") + " - " + to_date.strftime("%b"))) @@ -70,41 +73,6 @@ def get_columns(filters): return columns + ["Total Target::80", "Total Actual::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 cost center & target details def get_costcenter_target_details(filters): return webnotes.conn.sql("""select cc.name, cc.distribution_id, @@ -122,7 +90,7 @@ def get_target_distribution_details(filters): for d in webnotes.conn.sql("""select bdd.month, bdd.percentage_allocation \ from `tabBudget Distribution Detail` bdd, `tabBudget Distribution` bd, \ `tabCost Center` cc where bdd.parent=bd.name and cc.distribution_id=bd.name and \ - bd.fiscal_year=%s""" % ('%s'), (filters.get("fiscal_year")), as_dict=1): + bd.fiscal_year=%s""", (filters["fiscal_year"]), as_dict=1): target_details.setdefault(d.month, d) return target_details @@ -151,18 +119,11 @@ def get_costcenter_account_month_map(filters): })) tav_dict = cam_map[ccd.name][ccd.account][month] - tav_dict.target = ccd.budget_allocated*(tdd[month]["percentage_allocation"]/100) + tav_dict.target = flt(ccd.budget_allocated)*(tdd[month]["percentage_allocation"]/100) for ad in actual_details: if ad.month_name == month and ad.account == ccd.account \ and ad.cost_center == ccd.name: tav_dict.actual += ad.debit - ad.credit - return cam_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] \ No newline at end of file + return cam_map \ No newline at end of file diff --git a/selling/page/selling_home/selling_home.js b/selling/page/selling_home/selling_home.js index 87e12db904a..7a0848e9317 100644 --- a/selling/page/selling_home/selling_home.js +++ b/selling/page/selling_home/selling_home.js @@ -167,12 +167,12 @@ wn.module_page["Selling"] = [ }, { "label":wn._("Territory Target Variance (Item Group-Wise)"), - route: "query-report/Territory Target Variance (Item Group-Wise)", + route: "query-report/Territory Target Variance Item Group-Wise", doctype: "Sales Order" }, { "label":wn._("Sales Person Target Variance (Item Group-Wise)"), - route: "query-report/Sales Person Target Variance (Item Group-Wise)", + route: "query-report/Sales Person Target Variance Item Group-Wise", doctype: "Sales Order" }, { diff --git a/selling/report/sales_person_target_variance_(item_group_wise)/__init__.py b/selling/report/sales_person_target_variance_item_group_wise/__init__.py similarity index 100% rename from selling/report/sales_person_target_variance_(item_group_wise)/__init__.py rename to selling/report/sales_person_target_variance_item_group_wise/__init__.py diff --git a/selling/report/sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).js b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js similarity index 86% rename from selling/report/sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).js rename to selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js index 09f0d55aedc..c7a5d668c48 100644 --- a/selling/report/sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).js +++ b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js @@ -1,4 +1,4 @@ -wn.query_reports["Sales Person Target Variance (Item Group-Wise)"] = { +wn.query_reports["Sales Person Target Variance Item Group-Wise"] = { "filters": [ { fieldname: "fiscal_year", diff --git a/selling/report/sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).py b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py similarity index 67% rename from selling/report/sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).py rename to selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py index 8f5931d826b..6e39143f2ed 100644 --- a/selling/report/sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).py +++ b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py @@ -16,18 +16,21 @@ from __future__ import unicode_literals import webnotes -import calendar from webnotes import _, msgprint from webnotes.utils import flt import time +from accounts.utils import get_fiscal_year +from controllers.trends import get_period_date_ranges, get_period_month_ranges def execute(filters=None): if not filters: filters = {} columns = get_columns(filters) - period_month_ranges = get_period_month_ranges(filters) + period_month_ranges = get_period_month_ranges(filters["period"], filters["fiscal_year"]) sim_map = get_salesperson_item_month_map(filters) + precision = webnotes.conn.get_value("Global Defaults", None, "float_precision") or 2 + data = [] for salesperson, salesperson_items in sim_map.items(): @@ -39,7 +42,7 @@ def execute(filters=None): 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)) + value = flt(month_data.get(fieldname), precision) period_data[i] += value totals[i] += value period_data[2] = period_data[0] - period_data[1] @@ -61,7 +64,7 @@ def get_columns(filters): group_months = False if filters["period"] == "Monthly" else True - for from_date, to_date in get_period_date_ranges(filters): + for from_date, to_date in get_period_date_ranges(filters["period"], filters["fiscal_year"]): for label in ["Target (%s)", "Achieved (%s)", "Variance (%s)"]: if group_months: columns.append(label % (from_date.strftime("%b") + " - " + to_date.strftime("%b"))) @@ -70,49 +73,14 @@ def get_columns(filters): 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 sales person & item group details def get_salesperson_details(filters): return webnotes.conn.sql("""select sp.name, td.item_group, td.target_qty, td.target_amount, sp.distribution_id from `tabSales Person` sp, `tabTarget Detail` td where td.parent=sp.name and td.fiscal_year=%s and - ifnull(sp.distribution_id, '')!='' order by sp.name""" % - ('%s'), (filters.get("fiscal_year")), as_dict=1) + ifnull(sp.distribution_id, '')!='' order by sp.name""", + (filters["fiscal_year"]), as_dict=1) #Get target distribution details of item group def get_target_distribution_details(filters): @@ -121,14 +89,14 @@ def get_target_distribution_details(filters): 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): + bd.fiscal_year=%s""", (filters["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) + start_date, end_date = get_fiscal_year(filters)[1:] return webnotes.conn.sql("""select soi.item_code, soi.qty, soi.amount, so.transaction_date, st.sales_person, MONTHNAME(so.transaction_date) as month_name @@ -156,28 +124,18 @@ def get_salesperson_item_month_map(filters): for ad in achieved_details: if (filters["target_on"] == "Quantity"): - tav_dict.target = sd.target_qty*(tdd[month]["percentage_allocation"]/100) - if ad.month_name == month and ''.join(get_item_group(ad.item_code)) == sd.item_group \ + tav_dict.target = flt(sd.target_qty)*(tdd[month]["percentage_allocation"]/100) + if ad.month_name == month and get_item_group(ad.item_code) == sd.item_group \ and ad.sales_person == sd.name: tav_dict.achieved += ad.qty if (filters["target_on"] == "Amount"): - tav_dict.target = sd.target_amount*(tdd[month]["percentage_allocation"]/100) - if ad.month_name == month and ''.join(get_item_group(ad.item_code)) == sd.item_group \ + tav_dict.target = flt(sd.target_amount)*(tdd[month]["percentage_allocation"]/100) + if ad.month_name == month and get_item_group(ad.item_code) == sd.item_group \ and ad.sales_person == sd.name: tav_dict.achieved += ad.amount return sim_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 + return webnotes.conn.get_value("Item", item_name, item_group) \ No newline at end of file diff --git a/selling/report/sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).txt b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.txt similarity index 56% rename from selling/report/sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).txt rename to selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.txt index 955cdec4775..e587c2c0840 100644 --- a/selling/report/sales_person_target_variance_(item_group_wise)/sales_person_target_variance_(item_group_wise).txt +++ b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-06-18 12:09:40", + "creation": "2013-06-21 12:14:15", "docstatus": 0, - "modified": "2013-06-18 12:09:40", + "modified": "2013-06-21 12:14:15", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,11 +11,11 @@ "is_standard": "Yes", "name": "__common__", "ref_doctype": "Sales Order", - "report_name": "Sales Person Target Variance (Item Group-Wise)", + "report_name": "Sales Person Target Variance Item Group-Wise", "report_type": "Script Report" }, { "doctype": "Report", - "name": "Sales Person Target Variance (Item Group-Wise)" + "name": "Sales Person Target Variance Item Group-Wise" } ] \ No newline at end of file diff --git a/selling/report/territory_target_variance_(item_group_wise)/__init__.py b/selling/report/territory_target_variance_item_group_wise/__init__.py similarity index 100% rename from selling/report/territory_target_variance_(item_group_wise)/__init__.py rename to selling/report/territory_target_variance_item_group_wise/__init__.py diff --git a/selling/report/territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).js b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js similarity index 86% rename from selling/report/territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).js rename to selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js index 58718a4e0b2..146b17d02b8 100644 --- a/selling/report/territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).js +++ b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js @@ -1,4 +1,4 @@ -wn.query_reports["Territory Target Variance (Item Group-Wise)"] = { +wn.query_reports["Territory Target Variance Item Group-Wise"] = { "filters": [ { fieldname: "fiscal_year", diff --git a/selling/report/territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).py b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py similarity index 66% rename from selling/report/territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).py rename to selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py index 079f8e82a2a..e7ddc6e6f9e 100644 --- a/selling/report/territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).py +++ b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py @@ -16,18 +16,21 @@ from __future__ import unicode_literals import webnotes -import calendar from webnotes import _, msgprint from webnotes.utils import flt import time +from accounts.utils import get_fiscal_year +from controllers.trends import get_period_date_ranges, get_period_month_ranges def execute(filters=None): if not filters: filters = {} columns = get_columns(filters) - period_month_ranges = get_period_month_ranges(filters) + period_month_ranges = get_period_month_ranges(filters["period"], filters["fiscal_year"]) tim_map = get_territory_item_month_map(filters) + precision = webnotes.conn.get_value("Global Defaults", None, "float_precision") or 2 + data = [] for territory, territory_items in tim_map.items(): @@ -39,7 +42,7 @@ def execute(filters=None): 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)) + value = flt(month_data.get(fieldname), precision) period_data[i] += value totals[i] += value period_data[2] = period_data[0] - period_data[1] @@ -61,7 +64,7 @@ def get_columns(filters): group_months = False if filters["period"] == "Monthly" else True - for from_date, to_date in get_period_date_ranges(filters): + for from_date, to_date in get_period_date_ranges(filters["period"], filters["fiscal_year"]): for label in ["Target (%s)", "Achieved (%s)", "Variance (%s)"]: if group_months: columns.append(label % (from_date.strftime("%b") + " - " + to_date.strftime("%b"))) @@ -70,49 +73,14 @@ def get_columns(filters): 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) + ifnull(t.distribution_id, '')!='' order by t.name""", + (filters["fiscal_year"]), as_dict=1) #Get target distribution details of item group def get_target_distribution_details(filters): @@ -121,14 +89,14 @@ def get_target_distribution_details(filters): 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): + bd.fiscal_year=%s""", (filters["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) + start_date, end_date = get_fiscal_year(filters)[1:] return webnotes.conn.sql("""select soi.item_code, soi.qty, soi.amount, so.transaction_date, so.territory, MONTHNAME(so.transaction_date) as month_name @@ -155,28 +123,18 @@ def get_territory_item_month_map(filters): for ad in achieved_details: if (filters["target_on"] == "Quantity"): - tav_dict.target = td.target_qty*(tdd[month]["percentage_allocation"]/100) - if ad.month_name == month and ''.join(get_item_group(ad.item_code)) == td.item_group \ + tav_dict.target = flt(td.target_qty)*(tdd[month]["percentage_allocation"]/100) + if ad.month_name == month and get_item_group(ad.item_code) == td.item_group \ and ad.territory == td.name: tav_dict.achieved += ad.qty if (filters["target_on"] == "Amount"): - tav_dict.target = td.target_amount*(tdd[month]["percentage_allocation"]/100) - if ad.month_name == month and ''.join(get_item_group(ad.item_code)) == td.item_group \ + tav_dict.target = flt(td.target_amount)*(tdd[month]["percentage_allocation"]/100) + if ad.month_name == month and get_item_group(ad.item_code) == td.item_group \ and ad.territory == td.name: tav_dict.achieved += ad.amount return tim_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 + return webnotes.conn.get_value("Item", item_name, item_group) \ No newline at end of file diff --git a/selling/report/territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).txt b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.txt similarity index 57% rename from selling/report/territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).txt rename to selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.txt index 7fff64a861f..6e16b64d4e2 100644 --- a/selling/report/territory_target_variance_(item_group_wise)/territory_target_variance_(item_group_wise).txt +++ b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-06-07 15:13:13", + "creation": "2013-06-21 12:15:00", "docstatus": 0, - "modified": "2013-06-07 15:13:13", + "modified": "2013-06-21 12:15:00", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,11 +11,11 @@ "is_standard": "Yes", "name": "__common__", "ref_doctype": "Sales Order", - "report_name": "Territory Target Variance (Item Group-Wise)", + "report_name": "Territory Target Variance Item Group-Wise", "report_type": "Script Report" }, { "doctype": "Report", - "name": "Territory Target Variance (Item Group-Wise)" + "name": "Territory Target Variance Item Group-Wise" } ] \ No newline at end of file diff --git a/stock/report/item_prices/item_prices.py b/stock/report/item_prices/item_prices.py index 86ae085ce70..7a3877bccaf 100644 --- a/stock/report/item_prices/item_prices.py +++ b/stock/report/item_prices/item_prices.py @@ -24,16 +24,22 @@ def execute(filters=None): columns = get_columns(filters) item_map = get_item_details() pl = get_price_list() + last_purchase_rate = get_last_purchase_rate() bom_rate = get_item_bom_rate() val_rate_map = get_valuation_rate() + + precision = webnotes.conn.get_value("Global Defaults", None, "float_precision") or 2 data = [] for item in sorted(item_map): data.append([item, item_map[item]["item_name"], item_map[item]["description"], item_map[item]["stock_uom"], - flt(item_map[item]["last_purchase_rate"]), val_rate_map.get(item, 0), - pl.get(item, {}).get("selling"), pl.get(item, {}).get("buying"), - bom_rate.get(item, 0), flt(item_map[item]["standard_rate"]) + flt(last_purchase_rate.get(item, 0), precision), + flt(val_rate_map.get(item, 0), precision), + pl.get(item, {}).get("selling"), + pl.get(item, {}).get("buying"), + flt(bom_rate.get(item, 0), precision), + flt(item_map[item]["standard_rate"]) ]) return columns, data @@ -53,7 +59,7 @@ def get_item_details(): item_map = {} for i in webnotes.conn.sql("select name, item_name, description, \ - stock_uom, standard_rate, last_purchase_rate from tabItem \ + stock_uom, standard_rate from tabItem \ order by item_code", as_dict=1): item_map.setdefault(i.name, i) @@ -84,24 +90,60 @@ def get_price_list(): return item_rate_map +def get_last_purchase_rate(): + + item_last_purchase_rate_map = {} + + query = """select * from (select + result.item_code, + result.purchase_rate + from ( + (select + po_item.item_code, + po_item.item_name, + po.transaction_date as posting_date, + po_item.purchase_ref_rate, + po_item.discount_rate, + po_item.purchase_rate + from `tabPurchase Order` po, `tabPurchase Order Item` po_item + where po.name = po_item.parent and po.docstatus = 1) + union + (select + pr_item.item_code, + pr_item.item_name, + pr.posting_date, + pr_item.purchase_ref_rate, + pr_item.discount_rate, + pr_item.purchase_rate + from `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pr_item + where pr.name = pr_item.parent and pr.docstatus = 1) + ) result + order by result.item_code asc, result.posting_date desc) result_wrapper + group by item_code""" + + for d in webnotes.conn.sql(query, as_dict=1): + item_last_purchase_rate_map.setdefault(d.item_code, d.purchase_rate) + + return item_last_purchase_rate_map + def get_item_bom_rate(): """Get BOM rate of an item from BOM""" - bom_map = {} + item_bom_map = {} for b in webnotes.conn.sql("""select item, (total_cost/quantity) as bom_rate from `tabBOM` where is_active=1 and is_default=1""", as_dict=1): - bom_map.setdefault(b.item, flt(b.bom_rate)) + item_bom_map.setdefault(b.item, flt(b.bom_rate)) - return bom_map + return item_bom_map def get_valuation_rate(): """Get an average valuation rate of an item from all warehouses""" - val_rate_map = {} + item_val_rate_map = {} for d in webnotes.conn.sql("""select item_code, avg(valuation_rate) as val_rate from tabBin group by item_code""", as_dict=1): - val_rate_map.setdefault(d.item_code, d.val_rate) + item_val_rate_map.setdefault(d.item_code, flt(d.val_rate)) - return val_rate_map \ No newline at end of file + return item_val_rate_map \ No newline at end of file From 3e8eca35a259021e982c1003ddac50fa6d47d016 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 24 Jun 2013 17:18:24 +0530 Subject: [PATCH 02/11] [report][fix] stock balance --- accounts/page/general_ledger/general_ledger.js | 2 +- startup/report_data_map.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index ffab56831ae..e612bd8a418 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -326,7 +326,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ if(voucher_dict.totals.debit || voucher_dict.totals.credit) { voucher_dict.row.debit = voucher_dict.totals.debit; voucher_dict.row.credit = voucher_dict.totals.credit; - voucher_dict.row.id = "entry" + voucher + voucher_dict.row.id = "entry_grouped_by_" + voucher out = out.concat(voucher_dict.row); } }); diff --git a/startup/report_data_map.py b/startup/report_data_map.py index 068e4700450..c3a5dd2cce9 100644 --- a/startup/report_data_map.py +++ b/startup/report_data_map.py @@ -72,7 +72,7 @@ data_map = { }, "Item Group": { "columns": ["name", "parent_item_group"], - "conditions": ["docstatus < 2"], + # "conditions": ["docstatus < 2"], "order_by": "lft" }, "Brand": { From a19014a8469938ea38169fba9280aadb998e6760 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Mon, 24 Jun 2013 19:05:16 +0530 Subject: [PATCH 03/11] Moved Sales BOM & Sales BOM Item to Selling module, completed 'Available Stock for packing Items' report --- .../doctype/sales_bom/__init__.py | 0 .../sales_bom/locale/_messages_doc.json | 0 .../doctype/sales_bom/locale/ar-doc.json | 0 .../doctype/sales_bom/locale/de-doc.json | 0 .../doctype/sales_bom/locale/es-doc.json | 0 .../doctype/sales_bom/locale/fr-doc.json | 0 .../doctype/sales_bom/locale/hi-doc.json | 0 .../doctype/sales_bom/locale/hr-doc.json | 0 .../doctype/sales_bom/locale/nl-doc.json | 0 .../doctype/sales_bom/locale/pt-BR-doc.json | 0 .../doctype/sales_bom/locale/pt-doc.json | 0 .../doctype/sales_bom/locale/sr-doc.json | 0 .../doctype/sales_bom/locale/ta-doc.json | 0 .../doctype/sales_bom/locale/th-doc.json | 0 .../doctype/sales_bom/sales_bom.js | 0 .../doctype/sales_bom/sales_bom.py | 0 .../doctype/sales_bom/sales_bom.txt | 0 .../doctype/sales_bom/test_sales_bom.py | 0 .../doctype/sales_bom_item/__init__.py | 0 .../sales_bom_item/locale/_messages_doc.json | 0 .../doctype/sales_bom_item/locale/ar-doc.json | 0 .../doctype/sales_bom_item/locale/de-doc.json | 0 .../doctype/sales_bom_item/locale/es-doc.json | 0 .../doctype/sales_bom_item/locale/fr-doc.json | 0 .../doctype/sales_bom_item/locale/hi-doc.json | 0 .../doctype/sales_bom_item/locale/hr-doc.json | 0 .../doctype/sales_bom_item/locale/nl-doc.json | 0 .../sales_bom_item/locale/pt-BR-doc.json | 0 .../doctype/sales_bom_item/locale/pt-doc.json | 0 .../doctype/sales_bom_item/locale/sr-doc.json | 0 .../doctype/sales_bom_item/locale/ta-doc.json | 0 .../doctype/sales_bom_item/locale/th-doc.json | 0 .../doctype/sales_bom_item/sales_bom_item.py | 0 .../doctype/sales_bom_item/sales_bom_item.txt | 0 selling/locale/_messages_js.json | 1 + selling/locale/_messages_py.json | 7 ++ selling/locale/ar-py.json | 7 ++ selling/locale/de-py.json | 7 ++ selling/locale/es-py.json | 7 ++ selling/locale/fr-py.json | 7 ++ selling/locale/hi-py.json | 7 ++ selling/locale/hr-py.json | 7 ++ selling/locale/nl-py.json | 7 ++ selling/locale/pt-BR-py.json | 7 ++ selling/locale/pt-py.json | 7 ++ selling/locale/sr-py.json | 7 ++ selling/locale/ta-py.json | 7 ++ selling/locale/th-py.json | 7 ++ selling/page/selling_home/selling_home.js | 11 ++- .../__init__.py | 0 .../available_stock_for_packing_items.py | 89 +++++++++++++++++++ .../available_stock_for_packing_items.txt | 21 +++++ 52 files changed, 209 insertions(+), 4 deletions(-) rename {stock => selling}/doctype/sales_bom/__init__.py (100%) rename {stock => selling}/doctype/sales_bom/locale/_messages_doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/ar-doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/de-doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/es-doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/fr-doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/hi-doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/hr-doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/nl-doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/pt-BR-doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/pt-doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/sr-doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/ta-doc.json (100%) rename {stock => selling}/doctype/sales_bom/locale/th-doc.json (100%) rename {stock => selling}/doctype/sales_bom/sales_bom.js (100%) rename {stock => selling}/doctype/sales_bom/sales_bom.py (100%) rename {stock => selling}/doctype/sales_bom/sales_bom.txt (100%) rename {stock => selling}/doctype/sales_bom/test_sales_bom.py (100%) rename {stock => selling}/doctype/sales_bom_item/__init__.py (100%) rename {stock => selling}/doctype/sales_bom_item/locale/_messages_doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/ar-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/de-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/es-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/fr-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/hi-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/hr-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/nl-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/pt-BR-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/pt-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/sr-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/ta-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/locale/th-doc.json (100%) rename {stock => selling}/doctype/sales_bom_item/sales_bom_item.py (100%) rename {stock => selling}/doctype/sales_bom_item/sales_bom_item.txt (100%) create mode 100644 selling/locale/_messages_js.json create mode 100644 selling/locale/_messages_py.json create mode 100644 selling/locale/ar-py.json create mode 100644 selling/locale/de-py.json create mode 100644 selling/locale/es-py.json create mode 100644 selling/locale/fr-py.json create mode 100644 selling/locale/hi-py.json create mode 100644 selling/locale/hr-py.json create mode 100644 selling/locale/nl-py.json create mode 100644 selling/locale/pt-BR-py.json create mode 100644 selling/locale/pt-py.json create mode 100644 selling/locale/sr-py.json create mode 100644 selling/locale/ta-py.json create mode 100644 selling/locale/th-py.json create mode 100644 selling/report/available_stock_for_packing_items/__init__.py create mode 100644 selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py create mode 100644 selling/report/available_stock_for_packing_items/available_stock_for_packing_items.txt diff --git a/stock/doctype/sales_bom/__init__.py b/selling/doctype/sales_bom/__init__.py similarity index 100% rename from stock/doctype/sales_bom/__init__.py rename to selling/doctype/sales_bom/__init__.py diff --git a/stock/doctype/sales_bom/locale/_messages_doc.json b/selling/doctype/sales_bom/locale/_messages_doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/_messages_doc.json rename to selling/doctype/sales_bom/locale/_messages_doc.json diff --git a/stock/doctype/sales_bom/locale/ar-doc.json b/selling/doctype/sales_bom/locale/ar-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/ar-doc.json rename to selling/doctype/sales_bom/locale/ar-doc.json diff --git a/stock/doctype/sales_bom/locale/de-doc.json b/selling/doctype/sales_bom/locale/de-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/de-doc.json rename to selling/doctype/sales_bom/locale/de-doc.json diff --git a/stock/doctype/sales_bom/locale/es-doc.json b/selling/doctype/sales_bom/locale/es-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/es-doc.json rename to selling/doctype/sales_bom/locale/es-doc.json diff --git a/stock/doctype/sales_bom/locale/fr-doc.json b/selling/doctype/sales_bom/locale/fr-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/fr-doc.json rename to selling/doctype/sales_bom/locale/fr-doc.json diff --git a/stock/doctype/sales_bom/locale/hi-doc.json b/selling/doctype/sales_bom/locale/hi-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/hi-doc.json rename to selling/doctype/sales_bom/locale/hi-doc.json diff --git a/stock/doctype/sales_bom/locale/hr-doc.json b/selling/doctype/sales_bom/locale/hr-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/hr-doc.json rename to selling/doctype/sales_bom/locale/hr-doc.json diff --git a/stock/doctype/sales_bom/locale/nl-doc.json b/selling/doctype/sales_bom/locale/nl-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/nl-doc.json rename to selling/doctype/sales_bom/locale/nl-doc.json diff --git a/stock/doctype/sales_bom/locale/pt-BR-doc.json b/selling/doctype/sales_bom/locale/pt-BR-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/pt-BR-doc.json rename to selling/doctype/sales_bom/locale/pt-BR-doc.json diff --git a/stock/doctype/sales_bom/locale/pt-doc.json b/selling/doctype/sales_bom/locale/pt-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/pt-doc.json rename to selling/doctype/sales_bom/locale/pt-doc.json diff --git a/stock/doctype/sales_bom/locale/sr-doc.json b/selling/doctype/sales_bom/locale/sr-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/sr-doc.json rename to selling/doctype/sales_bom/locale/sr-doc.json diff --git a/stock/doctype/sales_bom/locale/ta-doc.json b/selling/doctype/sales_bom/locale/ta-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/ta-doc.json rename to selling/doctype/sales_bom/locale/ta-doc.json diff --git a/stock/doctype/sales_bom/locale/th-doc.json b/selling/doctype/sales_bom/locale/th-doc.json similarity index 100% rename from stock/doctype/sales_bom/locale/th-doc.json rename to selling/doctype/sales_bom/locale/th-doc.json diff --git a/stock/doctype/sales_bom/sales_bom.js b/selling/doctype/sales_bom/sales_bom.js similarity index 100% rename from stock/doctype/sales_bom/sales_bom.js rename to selling/doctype/sales_bom/sales_bom.js diff --git a/stock/doctype/sales_bom/sales_bom.py b/selling/doctype/sales_bom/sales_bom.py similarity index 100% rename from stock/doctype/sales_bom/sales_bom.py rename to selling/doctype/sales_bom/sales_bom.py diff --git a/stock/doctype/sales_bom/sales_bom.txt b/selling/doctype/sales_bom/sales_bom.txt similarity index 100% rename from stock/doctype/sales_bom/sales_bom.txt rename to selling/doctype/sales_bom/sales_bom.txt diff --git a/stock/doctype/sales_bom/test_sales_bom.py b/selling/doctype/sales_bom/test_sales_bom.py similarity index 100% rename from stock/doctype/sales_bom/test_sales_bom.py rename to selling/doctype/sales_bom/test_sales_bom.py diff --git a/stock/doctype/sales_bom_item/__init__.py b/selling/doctype/sales_bom_item/__init__.py similarity index 100% rename from stock/doctype/sales_bom_item/__init__.py rename to selling/doctype/sales_bom_item/__init__.py diff --git a/stock/doctype/sales_bom_item/locale/_messages_doc.json b/selling/doctype/sales_bom_item/locale/_messages_doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/_messages_doc.json rename to selling/doctype/sales_bom_item/locale/_messages_doc.json diff --git a/stock/doctype/sales_bom_item/locale/ar-doc.json b/selling/doctype/sales_bom_item/locale/ar-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/ar-doc.json rename to selling/doctype/sales_bom_item/locale/ar-doc.json diff --git a/stock/doctype/sales_bom_item/locale/de-doc.json b/selling/doctype/sales_bom_item/locale/de-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/de-doc.json rename to selling/doctype/sales_bom_item/locale/de-doc.json diff --git a/stock/doctype/sales_bom_item/locale/es-doc.json b/selling/doctype/sales_bom_item/locale/es-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/es-doc.json rename to selling/doctype/sales_bom_item/locale/es-doc.json diff --git a/stock/doctype/sales_bom_item/locale/fr-doc.json b/selling/doctype/sales_bom_item/locale/fr-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/fr-doc.json rename to selling/doctype/sales_bom_item/locale/fr-doc.json diff --git a/stock/doctype/sales_bom_item/locale/hi-doc.json b/selling/doctype/sales_bom_item/locale/hi-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/hi-doc.json rename to selling/doctype/sales_bom_item/locale/hi-doc.json diff --git a/stock/doctype/sales_bom_item/locale/hr-doc.json b/selling/doctype/sales_bom_item/locale/hr-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/hr-doc.json rename to selling/doctype/sales_bom_item/locale/hr-doc.json diff --git a/stock/doctype/sales_bom_item/locale/nl-doc.json b/selling/doctype/sales_bom_item/locale/nl-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/nl-doc.json rename to selling/doctype/sales_bom_item/locale/nl-doc.json diff --git a/stock/doctype/sales_bom_item/locale/pt-BR-doc.json b/selling/doctype/sales_bom_item/locale/pt-BR-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/pt-BR-doc.json rename to selling/doctype/sales_bom_item/locale/pt-BR-doc.json diff --git a/stock/doctype/sales_bom_item/locale/pt-doc.json b/selling/doctype/sales_bom_item/locale/pt-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/pt-doc.json rename to selling/doctype/sales_bom_item/locale/pt-doc.json diff --git a/stock/doctype/sales_bom_item/locale/sr-doc.json b/selling/doctype/sales_bom_item/locale/sr-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/sr-doc.json rename to selling/doctype/sales_bom_item/locale/sr-doc.json diff --git a/stock/doctype/sales_bom_item/locale/ta-doc.json b/selling/doctype/sales_bom_item/locale/ta-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/ta-doc.json rename to selling/doctype/sales_bom_item/locale/ta-doc.json diff --git a/stock/doctype/sales_bom_item/locale/th-doc.json b/selling/doctype/sales_bom_item/locale/th-doc.json similarity index 100% rename from stock/doctype/sales_bom_item/locale/th-doc.json rename to selling/doctype/sales_bom_item/locale/th-doc.json diff --git a/stock/doctype/sales_bom_item/sales_bom_item.py b/selling/doctype/sales_bom_item/sales_bom_item.py similarity index 100% rename from stock/doctype/sales_bom_item/sales_bom_item.py rename to selling/doctype/sales_bom_item/sales_bom_item.py diff --git a/stock/doctype/sales_bom_item/sales_bom_item.txt b/selling/doctype/sales_bom_item/sales_bom_item.txt similarity index 100% rename from stock/doctype/sales_bom_item/sales_bom_item.txt rename to selling/doctype/sales_bom_item/sales_bom_item.txt diff --git a/selling/locale/_messages_js.json b/selling/locale/_messages_js.json new file mode 100644 index 00000000000..0637a088a01 --- /dev/null +++ b/selling/locale/_messages_js.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/selling/locale/_messages_py.json b/selling/locale/_messages_py.json new file mode 100644 index 00000000000..f5b4a010f5f --- /dev/null +++ b/selling/locale/_messages_py.json @@ -0,0 +1,7 @@ +[ + "is not a Stock Item", + "Item", + "Please check", + "reached its end of life on", + "is a cancelled Item" +] \ No newline at end of file diff --git a/selling/locale/ar-py.json b/selling/locale/ar-py.json new file mode 100644 index 00000000000..b8dd151cf97 --- /dev/null +++ b/selling/locale/ar-py.json @@ -0,0 +1,7 @@ +{ + "Item": "\u0628\u0646\u062f", + "Please check": "\u064a\u0631\u062c\u0649 \u0645\u0631\u0627\u062c\u0639\u0629", + "is a cancelled Item": "\u0647\u0648 \u0628\u0646\u062f \u0625\u0644\u063a\u0627\u0621", + "is not a Stock Item": "\u0644\u064a\u0633 \u0627\u0644\u0625\u063a\u0644\u0627\u0642 \u0644\u0644\u0633\u0647\u0645", + "reached its end of life on": "\u0648\u0635\u0644 \u0625\u0644\u0649 \u0646\u0647\u0627\u064a\u062a\u0647 \u0645\u0646 \u0627\u0644\u062d\u064a\u0627\u0629 \u0639\u0644\u0649" +} \ No newline at end of file diff --git a/selling/locale/de-py.json b/selling/locale/de-py.json new file mode 100644 index 00000000000..68b58d7a4b2 --- /dev/null +++ b/selling/locale/de-py.json @@ -0,0 +1,7 @@ +{ + "Item": "Artikel", + "Please check": "Bitte \u00fcberpr\u00fcfen Sie", + "is a cancelled Item": "ist ein gestempeltes", + "is not a Stock Item": "ist kein Lagerartikel", + "reached its end of life on": "erreichte Ende des Lebens auf" +} \ No newline at end of file diff --git a/selling/locale/es-py.json b/selling/locale/es-py.json new file mode 100644 index 00000000000..7d145d1e4ce --- /dev/null +++ b/selling/locale/es-py.json @@ -0,0 +1,7 @@ +{ + "Item": "Art\u00edculo", + "Please check": "Por favor, compruebe", + "is a cancelled Item": "Es un Tema cancelado", + "is not a Stock Item": "no es un elemento de serie", + "reached its end of life on": "llegado al final de su vida en la" +} \ No newline at end of file diff --git a/selling/locale/fr-py.json b/selling/locale/fr-py.json new file mode 100644 index 00000000000..c466df4c7f9 --- /dev/null +++ b/selling/locale/fr-py.json @@ -0,0 +1,7 @@ +{ + "Item": "Article", + "Please check": "S'il vous pla\u00eet v\u00e9rifier", + "is a cancelled Item": "est un \u00e9l\u00e9ment annul\u00e9e", + "is not a Stock Item": "n'est pas un \u00e9l\u00e9ment de Stock", + "reached its end of life on": "atteint la fin de sa vie sur" +} \ No newline at end of file diff --git a/selling/locale/hi-py.json b/selling/locale/hi-py.json new file mode 100644 index 00000000000..58d4e654111 --- /dev/null +++ b/selling/locale/hi-py.json @@ -0,0 +1,7 @@ +{ + "Item": "\u092e\u0926", + "Please check": "\u0915\u0943\u092a\u092f\u093e \u091c\u093e\u0901\u091a \u0915\u0930\u0947\u0902", + "is a cancelled Item": "\u0930\u0926\u094d\u0926 \u0906\u0907\u091f\u092e", + "is not a Stock Item": "\u0938\u094d\u091f\u0949\u0915 \u0906\u0907\u091f\u092e \u0928\u0939\u0940\u0902 \u0939\u0948", + "reached its end of life on": "\u092a\u0930 \u0905\u092a\u0928\u0947 \u091c\u0940\u0935\u0928 \u0915\u0947 \u0905\u0902\u0924 \u0924\u0915 \u092a\u0939\u0941\u0901\u091a" +} \ No newline at end of file diff --git a/selling/locale/hr-py.json b/selling/locale/hr-py.json new file mode 100644 index 00000000000..24f60bb1c48 --- /dev/null +++ b/selling/locale/hr-py.json @@ -0,0 +1,7 @@ +{ + "Item": "Stavka", + "Please check": "Molimo provjerite", + "is a cancelled Item": "je otkazan artikla", + "is not a Stock Item": "nije katalo\u0161ki artikla", + "reached its end of life on": "dosegla svoj kraj \u017eivota na" +} \ No newline at end of file diff --git a/selling/locale/nl-py.json b/selling/locale/nl-py.json new file mode 100644 index 00000000000..7964d37f6e2 --- /dev/null +++ b/selling/locale/nl-py.json @@ -0,0 +1,7 @@ +{ + "Item": "Item", + "Please check": "Controleer", + "is a cancelled Item": "is een geannuleerde artikel", + "is not a Stock Item": "is niet een Stock Item", + "reached its end of life on": "het einde van zijn leven op" +} \ No newline at end of file diff --git a/selling/locale/pt-BR-py.json b/selling/locale/pt-BR-py.json new file mode 100644 index 00000000000..0bf350cad03 --- /dev/null +++ b/selling/locale/pt-BR-py.json @@ -0,0 +1,7 @@ +{ + "Item": "Item", + "Please check": "Por favor, verifique", + "is a cancelled Item": "\u00e9 um Item cancelado", + "is not a Stock Item": "n\u00e3o \u00e9 um Item de Estoque", + "reached its end of life on": "chegou ao fim de vida em" +} \ No newline at end of file diff --git a/selling/locale/pt-py.json b/selling/locale/pt-py.json new file mode 100644 index 00000000000..cfcbcec8dfa --- /dev/null +++ b/selling/locale/pt-py.json @@ -0,0 +1,7 @@ +{ + "Item": "Item", + "Please check": "Por favor, verifique", + "is a cancelled Item": "\u00e9 um item cancelado", + "is not a Stock Item": "n\u00e3o \u00e9 um item de estoque", + "reached its end of life on": "chegou ao fim da vida na" +} \ No newline at end of file diff --git a/selling/locale/sr-py.json b/selling/locale/sr-py.json new file mode 100644 index 00000000000..ed1672fc6c3 --- /dev/null +++ b/selling/locale/sr-py.json @@ -0,0 +1,7 @@ +{ + "Item": "\u0421\u0442\u0430\u0432\u043a\u0430", + "Please check": "\u041c\u043e\u043b\u0438\u043c\u043e \u0432\u0430\u0441 \u0434\u0430 \u043f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u0435", + "is a cancelled Item": "\u0458\u0435 \u043e\u0442\u043a\u0430\u0437\u0430\u043d\u0430 \u0448\u0438\u0444\u0440\u0430", + "is not a Stock Item": "\u043d\u0438\u0458\u0435 \u0431\u0435\u0440\u0437\u0430 \u0448\u0438\u0444\u0440\u0430", + "reached its end of life on": "\u0434\u043e\u0441\u0442\u0438\u0433\u0430\u043e \u0441\u0432\u043e\u0458 \u043a\u0440\u0430\u0458 \u0436\u0438\u0432\u043e\u0442\u0430 \u043d\u0430" +} \ No newline at end of file diff --git a/selling/locale/ta-py.json b/selling/locale/ta-py.json new file mode 100644 index 00000000000..355cc0e7ced --- /dev/null +++ b/selling/locale/ta-py.json @@ -0,0 +1,7 @@ +{ + "Item": "\u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf", + "Please check": "\u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0b95\u0bcd\u0b95\u0bb5\u0bc1\u0bae\u0bcd", + "is a cancelled Item": "\u0b92\u0bb0\u0bc1 \u0bb0\u0ba4\u0bcd\u0ba4\u0bc1 \u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf \u0b89\u0bb3\u0bcd\u0bb3\u0ba4\u0bc1", + "is not a Stock Item": "\u0b92\u0bb0\u0bc1 \u0baa\u0b99\u0bcd\u0b95\u0bc1 \u0baa\u0bc6\u0bbe\u0bb0\u0bc1\u0bb3\u0bcd \u0b85\u0bb2\u0bcd\u0bb2", + "reached its end of life on": "\u0bb5\u0bbe\u0bb4\u0bcd\u0b95\u0bcd\u0b95\u0bc8 \u0b85\u0ba4\u0ba9\u0bcd \u0b87\u0bb1\u0bc1\u0ba4\u0bbf\u0baf\u0bbf\u0bb2\u0bcd \u0b85\u0b9f\u0bc8\u0ba8\u0bcd\u0ba4\u0ba4\u0bc1" +} \ No newline at end of file diff --git a/selling/locale/th-py.json b/selling/locale/th-py.json new file mode 100644 index 00000000000..5f31a593737 --- /dev/null +++ b/selling/locale/th-py.json @@ -0,0 +1,7 @@ +{ + "Item": "\u0e0a\u0e34\u0e49\u0e19", + "Please check": "\u0e01\u0e23\u0e38\u0e13\u0e32\u0e15\u0e23\u0e27\u0e08\u0e2a\u0e2d\u0e1a", + "is a cancelled Item": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e22\u0e01\u0e40\u0e25\u0e34\u0e01\u0e40\u0e1b\u0e47\u0e19", + "is not a Stock Item": "\u0e44\u0e21\u0e48\u0e44\u0e14\u0e49\u0e40\u0e1b\u0e47\u0e19\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e2a\u0e15\u0e47\u0e2d\u0e01", + "reached its end of life on": "\u0e16\u0e36\u0e07\u0e08\u0e38\u0e14\u0e2a\u0e34\u0e49\u0e19\u0e2a\u0e38\u0e14\u0e02\u0e2d\u0e07\u0e0a\u0e35\u0e27\u0e34\u0e15\u0e40\u0e21\u0e37\u0e48\u0e2d" +} \ No newline at end of file diff --git a/selling/page/selling_home/selling_home.js b/selling/page/selling_home/selling_home.js index 7a0848e9317..4157bbb809c 100644 --- a/selling/page/selling_home/selling_home.js +++ b/selling/page/selling_home/selling_home.js @@ -167,13 +167,11 @@ wn.module_page["Selling"] = [ }, { "label":wn._("Territory Target Variance (Item Group-Wise)"), - route: "query-report/Territory Target Variance Item Group-Wise", - doctype: "Sales Order" + route: "query-report/Territory Target Variance Item Group-Wise" }, { "label":wn._("Sales Person Target Variance (Item Group-Wise)"), - route: "query-report/Sales Person Target Variance Item Group-Wise", - doctype: "Sales Order" + route: "query-report/Sales Person Target Variance Item Group-Wise" }, { "label":wn._("Customers Not Buying Since Long Time"), @@ -190,6 +188,11 @@ wn.module_page["Selling"] = [ route: "query-report/Sales Order Trends", doctype: "Sales Order" }, + { + "label":wn._("Available Stock for Packing Items"), + route: "query-report/Available Stock for Packing Items", + + }, ] } ] diff --git a/selling/report/available_stock_for_packing_items/__init__.py b/selling/report/available_stock_for_packing_items/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py b/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py new file mode 100644 index 00000000000..d766c4487d8 --- /dev/null +++ b/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py @@ -0,0 +1,89 @@ +# 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 + +def execute(filters=None): + if not filters: filters = {} + + columns = get_columns() + item_warehouse_quantity_map = get_item_warehouse_quantity_map() + + data = [] + for item, warehouse in item_warehouse_quantity_map.items(): + item_details = get_item_details(item)[0] + total = 0 + total_qty = 0 + for wh, item_qty in warehouse.items(): + total += 1 + row = [item, item_details.item_name, item_details.description, \ + item_details.stock_uom, wh] + for quantity in item_qty.items(): + max_qty = [] + max_qty.append(quantity[1]) + max_qty = min(max_qty) + total_qty += cint(max_qty.qty) + row += [max_qty.qty] + data.append(row) + if (total == len(warehouse)): + row = ["", "", "Total", "", "", total_qty] + data.append(row) + + return columns, data + +def get_columns(): + columns = ["Item Code:Link/Item:100", "Item Name::100", "Description::120", \ + "UOM:Link/UOM:80", "Warehouse:Link/Warehouse:100", "Quantity::100"] + + return columns + +def get_sales_bom(): + return webnotes.conn.sql("""select name from `tabSales BOM`""", as_dict=1) + +def get_sales_bom_items(item): + return webnotes.conn.sql("""select parent, item_code, qty from `tabSales BOM Item` + where parent=%s""", (item), as_dict=1) + +def get_item_details(item): + return webnotes.conn.sql("""select name, item_name, description, stock_uom + from `tabItem` where name=%s""", (item), as_dict=1) + +def get_item_warehouse_quantity(item): + return webnotes.conn.sql("""select item_code, warehouse, actual_qty from `tabBin` + where item_code=%s""", (item), as_dict=1) + +def get_item_warehouse_quantity_map(): + iwq_map = {} + + sales_bom = get_sales_bom() + + for item in sales_bom: + child_item = get_sales_bom_items(item.name) + for child in child_item: + item_warehouse_quantity = get_item_warehouse_quantity(child.item_code) + for iwq in item_warehouse_quantity: + iwq_map.setdefault(item.name, {}).setdefault(iwq.warehouse, {}).\ + setdefault(child.item_code, webnotes._dict({ + "qty" : 0 + })) + + q_dict = iwq_map[item.name][iwq.warehouse][child.item_code] + + q_dict.qty = cint(iwq.actual_qty / child.qty) + + return iwq_map \ No newline at end of file diff --git a/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.txt b/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.txt new file mode 100644 index 00000000000..5cf413393f4 --- /dev/null +++ b/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.txt @@ -0,0 +1,21 @@ +[ + { + "creation": "2013-06-21 13:40:05", + "docstatus": 0, + "modified": "2013-06-21 15:06:40", + "modified_by": "Administrator", + "owner": "Administrator" + }, + { + "doctype": "Report", + "is_standard": "Yes", + "name": "__common__", + "ref_doctype": "Sales BOM", + "report_name": "Available Stock for Packing Items", + "report_type": "Script Report" + }, + { + "doctype": "Report", + "name": "Available Stock for Packing Items" + } +] \ No newline at end of file From ec1f69ddb96955b7d10b55e2523472eca67ea910 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 25 Jun 2013 12:17:43 +0530 Subject: [PATCH 04/11] [reports][fix] removed old reports --- patches/august_2012/remove_cash_flow_statement.py | 4 ---- patches/december_2012/deprecate_tds.py | 1 - .../reload_debtors_creditors_ledger.py | 5 ----- patches/february_2013/p03_material_request.py | 2 -- .../remove_sales_order_pending_items.py | 3 --- .../deprecate_stock_search_criteria.py | 9 --------- .../january_2013/remove_support_search_criteria.py | 4 ---- patches/july_2012/sync_trial_balance.py | 5 ----- patches/june_2012/reports_list_permission.py | 1 - .../may_2012/reload_customer_address_contact.py | 5 ----- patches/may_2012/reload_reports.py | 7 ------- patches/may_2012/reload_so_pending_items.py | 9 --------- patches/patch_list.py | 14 -------------- 13 files changed, 69 deletions(-) delete mode 100644 patches/august_2012/remove_cash_flow_statement.py delete mode 100644 patches/december_2012/reload_debtors_creditors_ledger.py delete mode 100644 patches/february_2013/remove_sales_order_pending_items.py delete mode 100644 patches/january_2013/deprecate_stock_search_criteria.py delete mode 100644 patches/january_2013/remove_support_search_criteria.py delete mode 100644 patches/july_2012/sync_trial_balance.py delete mode 100644 patches/may_2012/reload_customer_address_contact.py delete mode 100644 patches/may_2012/reload_reports.py delete mode 100644 patches/may_2012/reload_so_pending_items.py diff --git a/patches/august_2012/remove_cash_flow_statement.py b/patches/august_2012/remove_cash_flow_statement.py deleted file mode 100644 index 739a4f2709e..00000000000 --- a/patches/august_2012/remove_cash_flow_statement.py +++ /dev/null @@ -1,4 +0,0 @@ -from __future__ import unicode_literals -def execute(): - import webnotes - webnotes.conn.sql("delete from `tabSearch Criteria` where name = 'cash_flow_statement'") \ No newline at end of file diff --git a/patches/december_2012/deprecate_tds.py b/patches/december_2012/deprecate_tds.py index e351fd9f754..f3daeb0db77 100644 --- a/patches/december_2012/deprecate_tds.py +++ b/patches/december_2012/deprecate_tds.py @@ -15,7 +15,6 @@ def execute(): webnotes.conn.sql("drop table if exists `tab%s`" % dt) webnotes.conn.begin() - delete_doc("Search Criteria", "tds_return") # Add tds entry in tax table for purchase invoice pi_list = webnotes.conn.sql("""select name from `tabPurchase Invoice` diff --git a/patches/december_2012/reload_debtors_creditors_ledger.py b/patches/december_2012/reload_debtors_creditors_ledger.py deleted file mode 100644 index 7f88a6f47d2..00000000000 --- a/patches/december_2012/reload_debtors_creditors_ledger.py +++ /dev/null @@ -1,5 +0,0 @@ -def execute(): - import webnotes - from webnotes.modules import reload_doc - reload_doc("accounts", "search_criteria", "debtors_ledger") - reload_doc("accounts", "search_criteria", "creditors_ledger") \ No newline at end of file diff --git a/patches/february_2013/p03_material_request.py b/patches/february_2013/p03_material_request.py index f0373bdffb7..d85710d2a89 100644 --- a/patches/february_2013/p03_material_request.py +++ b/patches/february_2013/p03_material_request.py @@ -8,8 +8,6 @@ def execute(): webnotes.rename_doc("DocType", "Purchase Request Item", "Material Request Item", force=True) if not "tabMaterial Request" in tables: webnotes.rename_doc("DocType", "Purchase Request", "Material Request", force=True) - webnotes.reload_doc("buying", "search_criteria", "pending_po_items_to_bill") - webnotes.reload_doc("buying", "search_criteria", "pending_po_items_to_receive") webnotes.reload_doc("stock", "doctype", "material_request") webnotes.reload_doc("stock", "doctype", "material_request_item") diff --git a/patches/february_2013/remove_sales_order_pending_items.py b/patches/february_2013/remove_sales_order_pending_items.py deleted file mode 100644 index bde6a7b2409..00000000000 --- a/patches/february_2013/remove_sales_order_pending_items.py +++ /dev/null @@ -1,3 +0,0 @@ -def execute(): - import webnotes - webnotes.delete_doc("Search Criteria", "sales_order_pending_items") \ No newline at end of file diff --git a/patches/january_2013/deprecate_stock_search_criteria.py b/patches/january_2013/deprecate_stock_search_criteria.py deleted file mode 100644 index d51aadb5cf4..00000000000 --- a/patches/january_2013/deprecate_stock_search_criteria.py +++ /dev/null @@ -1,9 +0,0 @@ -import webnotes - -def execute(): - for sc in ["itemwise_price_list", "itemwise_receipt_details", - "shortage_to_purchase_request", "stock_aging_report", - "stock_ledger", "stock_level", "stock_report", - "custom_test2", "custom_test3", "custom_test4", - "test_so2", "test_so3"]: - webnotes.delete_doc("Search Criteria", sc) \ No newline at end of file diff --git a/patches/january_2013/remove_support_search_criteria.py b/patches/january_2013/remove_support_search_criteria.py deleted file mode 100644 index 0443afeeda1..00000000000 --- a/patches/january_2013/remove_support_search_criteria.py +++ /dev/null @@ -1,4 +0,0 @@ -import webnotes -def execute(): - for sc in ["warranty-amc_expiry_details", "warranty-amc_summary"]: - webnotes.delete_doc("Search Criteria", sc) \ No newline at end of file diff --git a/patches/july_2012/sync_trial_balance.py b/patches/july_2012/sync_trial_balance.py deleted file mode 100644 index 3755ed442bd..00000000000 --- a/patches/july_2012/sync_trial_balance.py +++ /dev/null @@ -1,5 +0,0 @@ -from __future__ import unicode_literals -def execute(): - import webnotes - from webnotes.modules import reload_doc - reload_doc('accounts', 'search_criteria', 'trial_balance') \ No newline at end of file diff --git a/patches/june_2012/reports_list_permission.py b/patches/june_2012/reports_list_permission.py index e34eb5ae467..e88e8fbc607 100644 --- a/patches/june_2012/reports_list_permission.py +++ b/patches/june_2012/reports_list_permission.py @@ -8,7 +8,6 @@ def execute(): webnotes.conn.commit() - webnotes.reload_doc('core', 'doctype', 'search_criteria') webnotes.reload_doc('core', 'doctype', 'report') webnotes.conn.begin() \ No newline at end of file diff --git a/patches/may_2012/reload_customer_address_contact.py b/patches/may_2012/reload_customer_address_contact.py deleted file mode 100644 index 4aec19d02d6..00000000000 --- a/patches/may_2012/reload_customer_address_contact.py +++ /dev/null @@ -1,5 +0,0 @@ -from __future__ import unicode_literals -def execute(): - import webnotes - import webnotes.modules - webnotes.modules.reload_doc('selling', 'search_criteria', 'customer_address_contact') \ No newline at end of file diff --git a/patches/may_2012/reload_reports.py b/patches/may_2012/reload_reports.py deleted file mode 100644 index 1cee3a0061c..00000000000 --- a/patches/may_2012/reload_reports.py +++ /dev/null @@ -1,7 +0,0 @@ -from __future__ import unicode_literals -def execute(): - import webnotes - from webnotes.modules import reload_doc - reload_doc('selling', 'search_criteria', 'itemwise_sales_details') - reload_doc('selling', 'search_criteria', 'itemwise_delivery_details') - diff --git a/patches/may_2012/reload_so_pending_items.py b/patches/may_2012/reload_so_pending_items.py deleted file mode 100644 index 999004e1fe9..00000000000 --- a/patches/may_2012/reload_so_pending_items.py +++ /dev/null @@ -1,9 +0,0 @@ -from __future__ import unicode_literals -def execute(): - import webnotes - from webnotes.model import delete_doc - delete_doc("Search Criteria", "sales_order_pending_items1") - - webnotes.conn.sql("update `tabSearch Criteria` set module = 'Selling' where module = 'CRM'") - from webnotes.modules import reload_doc - reload_doc('selling', 'search_criteria', 'sales_order_pending_items') \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index 0353c74b1e8..efd4d51cceb 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -38,19 +38,15 @@ patch_list = [ "patches.may_2012.cleanup_property_setter", "patches.may_2012.rename_prev_doctype", "patches.may_2012.cleanup_notification_control", - "patches.may_2012.renamedt_in_custom_search_criteria", "patches.may_2012.stock_reco_patch", - "patches.may_2012.reload_reports", "patches.may_2012.page_role_series_fix", "patches.may_2012.reload_sales_invoice_pf", "patches.may_2012.std_pf_readonly", - "patches.may_2012.reload_so_pending_items", "patches.may_2012.customize_form_cleanup", "patches.may_2012.cs_server_readonly", "patches.may_2012.clear_session_cache", "patches.may_2012.same_purchase_rate_patch", "patches.may_2012.create_report_manager_role", - "patches.may_2012.reload_customer_address_contact", "patches.may_2012.profile_perm_patch", "patches.may_2012.remove_euro_currency", "patches.may_2012.remove_communication_log", @@ -81,7 +77,6 @@ patch_list = [ "patches.august_2012.task_allocated_to_assigned", "patches.august_2012.change_profile_permission", "patches.august_2012.repost_billed_amt", - "patches.august_2012.remove_cash_flow_statement", "patches.september_2012.stock_report_permissions_for_accounts", "patches.september_2012.communication_delete_permission", "patches.september_2012.all_permissions_patch", @@ -123,7 +118,6 @@ patch_list = [ "patches.december_2012.expense_leave_reload", "patches.december_2012.repost_ordered_qty", "patches.december_2012.repost_projected_qty", - "patches.december_2012.reload_debtors_creditors_ledger", "patches.december_2012.website_cache_refactor", "patches.december_2012.production_cleanup", "patches.december_2012.fix_default_print_format", @@ -138,8 +132,6 @@ patch_list = [ "patches.december_2012.remove_project_mapper", "patches.december_2012.update_print_width", "patches.january_2013.remove_bad_permissions", - "patches.january_2013.deprecate_stock_search_criteria", - "patches.january_2013.remove_support_search_criteria", "patches.january_2013.holiday_list_patch", "patches.january_2013.stock_reconciliation_patch", "patches.january_2013.report_permission", @@ -163,7 +155,6 @@ patch_list = [ "patches.february_2013.remove_gl_mapper", "patches.february_2013.reload_bom_replace_tool_permission", "patches.february_2013.payment_reconciliation_reset_values", - "patches.february_2013.remove_sales_order_pending_items", "patches.february_2013.account_negative_balance", "patches.february_2013.remove_account_utils_folder", "patches.february_2013.update_company_in_leave_application", @@ -187,14 +178,11 @@ patch_list = [ "execute:webnotes.delete_doc('DocType', 'Service Quotation Detail')", "patches.february_2013.p06_material_request_mappers", "execute:webnotes.delete_doc('Page', 'Query Report')", - "execute:webnotes.delete_doc('Search Criteria', 'employeewise_balance_leave_report')", - "execute:webnotes.delete_doc('Search Criteria', 'employee_leave_balance_report')", "patches.february_2013.repost_reserved_qty", "execute:webnotes.reload_doc('core', 'doctype', 'report') # 2013-02-25", "execute:webnotes.conn.sql(\"update `tabReport` set report_type=if(ifnull(query, '')='', 'Report Builder', 'Query Report') where is_standard='No'\")", "execute:webnotes.conn.sql(\"update `tabReport` set report_name=name where ifnull(report_name,'')='' and is_standard='No'\")", "patches.february_2013.p08_todo_query_report", - "execute:webnotes.delete_doc('Search Criteria', 'gross_profit') # 2013-02-26", 'execute:webnotes.reload_doc("accounts", "Print Format", "Sales Invoice Classic") # 2013-02-26', 'execute:webnotes.reload_doc("accounts", "Print Format", "Sales Invoice Modern") # 2013-02-26', 'execute:webnotes.reload_doc("accounts", "Print Format", "Sales Invoice Spartan") # 2013-02-26', @@ -208,7 +196,6 @@ patch_list = [ "execute:webnotes.delete_doc('DocType', 'Attendance Control Panel')", "patches.march_2013.p02_get_global_default", "patches.march_2013.p03_rename_blog_to_blog_post", - "execute:webnotes.reload_doc('hr', 'search_criteria', 'monthly_attendance_details')", "patches.march_2013.p04_pos_update_stock_check", "patches.march_2013.p05_payment_reconciliation", "patches.march_2013.p06_remove_sales_purchase_return_tool", @@ -234,7 +221,6 @@ patch_list = [ 'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Modern") # 2013-04-02', 'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Spartan") # 2013-04-02', "patches.april_2013.p04_reverse_modules_list", - "execute:webnotes.delete_doc('Search Criteria', 'time_log_summary')", "patches.april_2013.p04_update_role_in_pages", "patches.april_2013.p05_update_file_data", "patches.april_2013.p06_update_file_size", From 909e8b120f62507ec65afd14592248cf6cc4c619 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 25 Jun 2013 14:08:18 +0530 Subject: [PATCH 05/11] [fix][report] general ledger --- accounts/page/general_ledger/general_ledger.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index e612bd8a418..d30772acfd9 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -232,7 +232,6 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ grouped_ledgers[item.account].totals.debit += item.debit; grouped_ledgers[item.account].totals.credit += item.credit; - grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no] .totals.debit += item.debit; grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no] @@ -248,8 +247,8 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ grouped_ledgers[item.account].entries.push(item); if(grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no].row){ - grouped_ledgers[item.account]. - entries_group_by_voucher[item.voucher_no].row = item; + grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no] + .row = jQuery.extend({}, item); } } } @@ -321,7 +320,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ $.each(Object.keys(grouped_ledgers).sort(), function(i, account) { if(grouped_ledgers[account].entries.length) { $.each(Object.keys(grouped_ledgers[account].entries_group_by_voucher).sort(), - function(j, voucher) { + function(j, voucher) { voucher_dict = grouped_ledgers[account].entries_group_by_voucher[voucher]; if(voucher_dict.totals.debit || voucher_dict.totals.credit) { voucher_dict.row.debit = voucher_dict.totals.debit; From cca41a172cf397747f5300cf49e3ad3ca6331002 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 25 Jun 2013 14:14:32 +0530 Subject: [PATCH 06/11] [fix][report] general ledger --- accounts/page/general_ledger/general_ledger.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index d30772acfd9..269ed5e3f23 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -319,10 +319,11 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ var out = [] $.each(Object.keys(grouped_ledgers).sort(), function(i, account) { if(grouped_ledgers[account].entries.length) { - $.each(Object.keys(grouped_ledgers[account].entries_group_by_voucher).sort(), + $.each(Object.keys(grouped_ledgers[account].entries_group_by_voucher), function(j, voucher) { voucher_dict = grouped_ledgers[account].entries_group_by_voucher[voucher]; - if(voucher_dict.totals.debit || voucher_dict.totals.credit) { + if(voucher_dict && + (voucher_dict.totals.debit || voucher_dict.totals.credit)) { voucher_dict.row.debit = voucher_dict.totals.debit; voucher_dict.row.credit = voucher_dict.totals.credit; voucher_dict.row.id = "entry_grouped_by_" + voucher From 50899d2bd4c53826356d76cb24c6ed13ebc0a28c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 25 Jun 2013 15:17:38 +0530 Subject: [PATCH 07/11] [fix][patch] bom exploded items --- patches/june_2013/p01_update_bom_exploded_items.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/june_2013/p01_update_bom_exploded_items.py b/patches/june_2013/p01_update_bom_exploded_items.py index eff0931e4d9..f53eb5bc68b 100644 --- a/patches/june_2013/p01_update_bom_exploded_items.py +++ b/patches/june_2013/p01_update_bom_exploded_items.py @@ -23,7 +23,7 @@ def execute(): if bom[0] not in updated_bom: try: bom_obj = webnotes.get_obj("BOM", bom[0], with_children=1) - updated_bom = bom_obj.update_cost_and_exploded_items(updated_bom) + updated_bom += bom_obj.update_cost_and_exploded_items(bom[0]) webnotes.conn.commit() except: pass \ No newline at end of file From e05e6a114eab33efb5e1acb03e1ba2662b803bd9 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Tue, 25 Jun 2013 18:00:30 +0530 Subject: [PATCH 08/11] [Fix]SMS Center Cell Number --- selling/doctype/sms_center/sms_center.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/selling/doctype/sms_center/sms_center.py b/selling/doctype/sms_center/sms_center.py index c5db7383f72..7d50e712326 100644 --- a/selling/doctype/sms_center/sms_center.py +++ b/selling/doctype/sms_center/sms_center.py @@ -24,7 +24,7 @@ from webnotes.model.code import get_obj from webnotes import msgprint sql = webnotes.conn.sql - + # ---------- class DocType: @@ -45,17 +45,16 @@ class DocType: elif self.doc.send_to == 'All Lead (Open)': rec = sql("select lead_name, mobile_no from tabLead where ifnull(mobile_no,'')!='' and docstatus != 2 and status = 'Open'") elif self.doc.send_to == 'All Employee (Active)': - where_clause = self.doc.department and " and t1.department = '%s'" % self.doc.department or "" - where_clause += self.doc.branch and " and t1.branch = '%s'" % self.doc.branch or "" - rec = sql("select t1.employee_name, t2.cell_number from `tabEmployee` t1, `tabEmployee Profile` t2 where t2.employee = t1.name and t1.status = 'Active' and t1.docstatus != 2 and ifnull(t2.cell_number,'')!='' %s" % where_clause) + where_clause = self.doc.department and " and department = '%s'" % self.doc.department or "" + where_clause += self.doc.branch and " and branch = '%s'" % self.doc.branch or "" + rec = sql("select employee_name, cell_number from `tabEmployee` where status = 'Active' and docstatus < 2 and ifnull(cell_number,'')!='' %s" % where_clause) elif self.doc.send_to == 'All Sales Person': rec = sql("select sales_person_name, mobile_no from `tabSales Person` where docstatus != 2 and ifnull(mobile_no,'')!=''") - rec_list = '' for d in rec: rec_list += d[0] + ' - ' + d[1] + '\n' self.doc.receiver_list = rec_list - + webnotes.errprint(rec_list) def get_receiver_nos(self): receiver_nos = [] for d in self.doc.receiver_list.split('\n'): From 4c819edf24207c522b3289155f6be92afc54b909 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Wed, 26 Jun 2013 11:28:53 +0530 Subject: [PATCH 09/11] [Report] Added rounded_total & outstanding_amount to Sales & Purchase Register --- .../purchase_register/purchase_register.py | 23 +++++++++++-------- .../report/sales_register/sales_register.py | 16 +++++++------ 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/accounts/report/purchase_register/purchase_register.py b/accounts/report/purchase_register/purchase_register.py index 548b5613440..d6233a41e0d 100644 --- a/accounts/report/purchase_register/purchase_register.py +++ b/accounts/report/purchase_register/purchase_register.py @@ -38,11 +38,12 @@ def execute(filters=None): data = [] for inv in invoice_list: # invoice details - purchase_order = ", ".join(invoice_po_pr_map.get(inv.name, {}).get("purchase_order", [])) - purchase_receipt = ", ".join(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", [])) + purchase_order = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_order", []))) + purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", []))) + row = [inv.name, inv.posting_date, inv.supplier, inv.credit_to, account_map.get(inv.credit_to), inv.project_name, inv.bill_no, inv.bill_date, - inv.remarks, purchase_order, purchase_receipt] + inv.remarks, ", ".join(purchase_order), ", ".join(purchase_receipt)] # map expense values for expense_acc in expense_accounts: @@ -55,8 +56,9 @@ def execute(filters=None): for tax_acc in tax_accounts: row.append(invoice_tax_map.get(inv.name, {}).get(tax_acc)) - # total tax, grand total - row += [inv.total_tax, inv.grand_total] + # total tax, grand total, outstanding amount & rounded total + row += [inv.other_charges_total, inv.grand_total, flt(inv.grand_total, 2), \ + inv.outstanding_amount] data.append(row) return columns, data @@ -85,7 +87,8 @@ def get_columns(invoice_list): columns = columns + [(account + ":Currency:120") for account in expense_accounts] + \ ["Net Total:Currency:120"] + [(account + ":Currency:120") for account in tax_accounts] + \ - ["Total Tax:Currency:120"] + ["Grand Total:Currency:120"] + ["Total Tax:Currency:120"] + ["Grand Total:Currency:120"] + \ + ["Rounded Total:Currency:120"] + ["Outstanding Amount:Currency:120"] return columns, expense_accounts, tax_accounts @@ -102,9 +105,11 @@ def get_conditions(filters): def get_invoices(filters): conditions = get_conditions(filters) - return webnotes.conn.sql("""select name, posting_date, credit_to, project_name, supplier, - bill_no, bill_date, remarks, net_total, total_tax, grand_total - from `tabPurchase Invoice` where docstatus = 1 %s + return webnotes.conn.sql("""select pi.name, pi.posting_date, pi.credit_to, + pii.project_name, pi.supplier, pi.bill_no, pi.bill_date, pi.remarks, pi.net_total, + pi.total_tax, pi.grand_total, pi.outstanding_amount + from `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pii + where pii.parent = pi.name and pi.docstatus = 1 %s order by posting_date desc, name desc""" % conditions, filters, as_dict=1) diff --git a/accounts/report/sales_register/sales_register.py b/accounts/report/sales_register/sales_register.py index 99057f9a2eb..3eebc33e9ca 100644 --- a/accounts/report/sales_register/sales_register.py +++ b/accounts/report/sales_register/sales_register.py @@ -39,12 +39,12 @@ def execute(filters=None): data = [] for inv in invoice_list: # invoice details - sales_order = ", ".join(invoice_so_dn_map.get(inv.name, {}).get("sales_order", [])) - delivery_note = ", ".join(invoice_so_dn_map.get(inv.name, {}).get("delivery_note", [])) + sales_order = list(set(invoice_so_dn_map.get(inv.name, {}).get("sales_order", []))) + delivery_note = list(set(invoice_so_dn_map.get(inv.name, {}).get("delivery_note", []))) row = [inv.name, inv.posting_date, inv.customer, inv.debit_to, account_map.get(inv.debit_to), customer_map.get(inv.customer), inv.project_name, - inv.remarks, sales_order, delivery_note] + inv.remarks, ", ".join(sales_order), ", ".join(delivery_note)] # map income values for income_acc in income_accounts: @@ -57,8 +57,8 @@ def execute(filters=None): for tax_acc in tax_accounts: row.append(invoice_tax_map.get(inv.name, {}).get(tax_acc)) - # total tax, grand total - row += [inv.other_charges_total, inv.grand_total] + # total tax, grand total, outstanding amount & rounded total + row += [inv.other_charges_total, inv.grand_total, inv.rounded_total, inv.outstanding_amount] data.append(row) @@ -88,7 +88,8 @@ def get_columns(invoice_list): columns = columns + [(account + ":Currency:120") for account in income_accounts] + \ ["Net Total:Currency:120"] + [(account + ":Currency:120") for account in tax_accounts] + \ - ["Total Tax:Currency:120"] + ["Grand Total:Currency:120"] + ["Total Tax:Currency:120"] + ["Grand Total:Currency:120"] + \ + ["Rounded Total:Currency:120"] + ["Outstanding Amount:Currency:120"] return columns, income_accounts, tax_accounts @@ -106,7 +107,8 @@ def get_conditions(filters): def get_invoices(filters): conditions = get_conditions(filters) return webnotes.conn.sql("""select name, posting_date, debit_to, project_name, customer, - remarks, net_total, other_charges_total, grand_total from `tabSales Invoice` + remarks, net_total, other_charges_total, grand_total, rounded_total, + outstanding_amount from `tabSales Invoice` where docstatus = 1 %s order by posting_date desc, name desc""" % conditions, filters, as_dict=1) From b802050cd4935ff1722234556595737223ce2afc Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 26 Jun 2013 12:05:37 +0530 Subject: [PATCH 10/11] [grid report] round currency values --- public/js/stock_analytics.js | 2 ++ stock/page/stock_balance/stock_balance.js | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/js/stock_analytics.js b/public/js/stock_analytics.js index c3ed1cb232f..91384f61ed9 100644 --- a/public/js/stock_analytics.js +++ b/public/js/stock_analytics.js @@ -162,6 +162,8 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({ } else { break; } + + me.round_item_values(item); } } }, diff --git a/stock/page/stock_balance/stock_balance.js b/stock/page/stock_balance/stock_balance.js index 163b74f6291..f4deb4fcd48 100644 --- a/stock/page/stock_balance/stock_balance.js +++ b/stock/page/stock_balance/stock_balance.js @@ -119,7 +119,7 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({ var qty_diff = sl.qty; var value_diff = me.get_value_diff(wh, sl, is_fifo); - + if(sl_posting_date < from_date) { item.opening_qty += qty_diff; item.opening_value += value_diff; @@ -146,6 +146,8 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({ } else { break; } + + me.round_item_values(item); } } From e26acffcfe593d6a4c688536d40aa83903e69fe1 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 26 Jun 2013 13:47:11 +0530 Subject: [PATCH 11/11] [report] available qty for packing items --- selling/doctype/sales_bom/sales_bom.txt | 10 +- .../doctype/sales_bom_item/sales_bom_item.txt | 6 +- .../available_stock_for_packing_items.py | 95 ++++++++++--------- 3 files changed, 58 insertions(+), 53 deletions(-) diff --git a/selling/doctype/sales_bom/sales_bom.txt b/selling/doctype/sales_bom/sales_bom.txt index 031f2559196..bf8fa479c22 100644 --- a/selling/doctype/sales_bom/sales_bom.txt +++ b/selling/doctype/sales_bom/sales_bom.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-10 16:34:29", + "creation": "2013-06-20 11:53:21", "docstatus": 0, - "modified": "2013-01-22 14:57:23", + "modified": "2013-06-25 16:43:18", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,7 +11,7 @@ "doctype": "DocType", "document_type": "Master", "is_submittable": 0, - "module": "Stock", + "module": "Selling", "name": "__common__" }, { @@ -23,7 +23,6 @@ "permlevel": 0 }, { - "amend": 0, "doctype": "DocPerm", "name": "__common__", "parent": "Sales BOM", @@ -74,6 +73,7 @@ "reqd": 1 }, { + "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", @@ -81,6 +81,7 @@ "write": 1 }, { + "amend": 0, "cancel": 0, "create": 0, "doctype": "DocPerm", @@ -88,6 +89,7 @@ "write": 0 }, { + "amend": 0, "cancel": 1, "create": 1, "doctype": "DocPerm", diff --git a/selling/doctype/sales_bom_item/sales_bom_item.txt b/selling/doctype/sales_bom_item/sales_bom_item.txt index 98285af1048..f7906b72d8b 100644 --- a/selling/doctype/sales_bom_item/sales_bom_item.txt +++ b/selling/doctype/sales_bom_item/sales_bom_item.txt @@ -1,15 +1,15 @@ [ { - "creation": "2013-02-22 01:28:03", + "creation": "2013-05-23 16:55:51", "docstatus": 0, - "modified": "2013-03-07 07:03:30", + "modified": "2013-06-26 13:45:41", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", "istable": 1, - "module": "Stock", + "module": "Selling", "name": "__common__" }, { diff --git a/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py b/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py index d766c4487d8..171c3bb8d9a 100644 --- a/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py +++ b/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py @@ -16,33 +16,33 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import cint +from webnotes.utils import flt def execute(filters=None): if not filters: filters = {} columns = get_columns() - item_warehouse_quantity_map = get_item_warehouse_quantity_map() + iwq_map = get_item_warehouse_quantity_map() + item_map = get_item_details() - data = [] - for item, warehouse in item_warehouse_quantity_map.items(): - item_details = get_item_details(item)[0] + data = [] + for sbom, warehouse in iwq_map.items(): total = 0 total_qty = 0 + for wh, item_qty in warehouse.items(): total += 1 - row = [item, item_details.item_name, item_details.description, \ - item_details.stock_uom, wh] - for quantity in item_qty.items(): - max_qty = [] - max_qty.append(quantity[1]) - max_qty = min(max_qty) - total_qty += cint(max_qty.qty) - row += [max_qty.qty] - data.append(row) - if (total == len(warehouse)): - row = ["", "", "Total", "", "", total_qty] + row = [sbom, item_map.get(sbom).item_name, item_map.get(sbom).description, + item_map.get(sbom).stock_uom, wh] + available_qty = min(item_qty.values()) + total_qty += flt(available_qty) + row += [available_qty] + + if available_qty: data.append(row) + if (total == len(warehouse)): + row = ["", "", "Total", "", "", total_qty] + data.append(row) return columns, data @@ -52,38 +52,41 @@ def get_columns(): return columns -def get_sales_bom(): - return webnotes.conn.sql("""select name from `tabSales BOM`""", as_dict=1) +def get_sales_bom_items(): + sbom_item_map = {} + for sbom in webnotes.conn.sql("""select parent, item_code, qty from `tabSales BOM Item` + where docstatus < 2""", as_dict=1): + sbom_item_map.setdefault(sbom.parent, {}).setdefault(sbom.item_code, sbom.qty) + + return sbom_item_map -def get_sales_bom_items(item): - return webnotes.conn.sql("""select parent, item_code, qty from `tabSales BOM Item` - where parent=%s""", (item), as_dict=1) +def get_item_details(): + item_map = {} + for item in webnotes.conn.sql("""select name, item_name, description, stock_uom + from `tabItem`""", as_dict=1): + item_map.setdefault(item.name, item) + + return item_map -def get_item_details(item): - return webnotes.conn.sql("""select name, item_name, description, stock_uom - from `tabItem` where name=%s""", (item), as_dict=1) - -def get_item_warehouse_quantity(item): - return webnotes.conn.sql("""select item_code, warehouse, actual_qty from `tabBin` - where item_code=%s""", (item), as_dict=1) +def get_item_warehouse_quantity(): + iwq_map = {} + bin = webnotes.conn.sql("""select item_code, warehouse, actual_qty from `tabBin` + where actual_qty > 0""") + for item, wh, qty in bin: + iwq_map.setdefault(item, {}).setdefault(wh, qty) + + return iwq_map def get_item_warehouse_quantity_map(): - iwq_map = {} + sbom_map = {} + iwq_map = get_item_warehouse_quantity() + sbom_item_map = get_sales_bom_items() + + for sbom, sbom_items in sbom_item_map.items(): + for item, child_qty in sbom_items.items(): + for wh, qty in iwq_map.get(item, {}).items(): + avail_qty = flt(qty) / flt(child_qty) + sbom_map.setdefault(sbom, {}).setdefault(wh, {}) \ + .setdefault(item, avail_qty) - sales_bom = get_sales_bom() - - for item in sales_bom: - child_item = get_sales_bom_items(item.name) - for child in child_item: - item_warehouse_quantity = get_item_warehouse_quantity(child.item_code) - for iwq in item_warehouse_quantity: - iwq_map.setdefault(item.name, {}).setdefault(iwq.warehouse, {}).\ - setdefault(child.item_code, webnotes._dict({ - "qty" : 0 - })) - - q_dict = iwq_map[item.name][iwq.warehouse][child.item_code] - - q_dict.qty = cint(iwq.actual_qty / child.qty) - - return iwq_map \ No newline at end of file + return sbom_map \ No newline at end of file