From 7b48218b6f75bf59b1980d32bea75165e00d4346 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 5 Jun 2013 18:17:28 +0530 Subject: [PATCH 1/4] [Reports][Reorder Level] and [No Sales Order from Customer] --- selling/page/selling_home/selling_home.js | 6 ++ .../__init__.py | 0 ...s_order_from_customers_(since_2_months).py | 69 +++++++++++++ ..._order_from_customers_(since_2_months).txt | 21 ++++ stock/page/stock_home/stock_home.js | 5 + stock/report/item_reorder_level/__init__.py | 0 .../item_reorder_level/item_reorder_level.js | 16 +++ .../item_reorder_level/item_reorder_level.py | 97 +++++++++++++++++++ .../item_reorder_level/item_reorder_level.txt | 21 ++++ 9 files changed, 235 insertions(+) create mode 100644 selling/report/no_sales_order_from_customers_(since_2_months)/__init__.py create mode 100644 selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).py create mode 100644 selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).txt create mode 100644 stock/report/item_reorder_level/__init__.py create mode 100644 stock/report/item_reorder_level/item_reorder_level.js create mode 100644 stock/report/item_reorder_level/item_reorder_level.py create mode 100644 stock/report/item_reorder_level/item_reorder_level.txt diff --git a/selling/page/selling_home/selling_home.js b/selling/page/selling_home/selling_home.js index 682978bd17c..1f119e2917c 100644 --- a/selling/page/selling_home/selling_home.js +++ b/selling/page/selling_home/selling_home.js @@ -149,6 +149,11 @@ wn.module_page["Selling"] = [ right: true, icon: "icon-list", items: [ + { + "label":wn._("No Sales Order from Customers (Since 2 months)"), + route: "query-report/No Sales Order from Customers (Since 2 months)", + doctype: "Sales Order" + }, { "label":wn._("Customer Addresses And Contacts"), route: "query-report/Customer Addresses And Contacts" @@ -165,6 +170,7 @@ wn.module_page["Selling"] = [ "label":wn._("Item-wise Sales History"), route: "query-report/Item-wise Sales History", }, + ] } ] diff --git a/selling/report/no_sales_order_from_customers_(since_2_months)/__init__.py b/selling/report/no_sales_order_from_customers_(since_2_months)/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).py b/selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).py new file mode 100644 index 00000000000..43efb98d06b --- /dev/null +++ b/selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).py @@ -0,0 +1,69 @@ +# 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 . +import webnotes + +def execute(filters=None): + + columns = get_columns() + customers = get_so_details() + + data = [] + for cust in customers: + if cust[8] >= 60: # days_since_last_order + cust.insert(7,get_last_so_amt(cust[0])) + data.append(cust) + + return columns, data + +def get_so_details(): + return webnotes.conn.sql("""select + cust.name, + cust.customer_name, + cust.territory, + cust.customer_group, + count(distinct(so.name)) as 'num_of_order', + sum(net_total) as 'total_order_value', + sum(if(so.status = "Stopped", + so.net_total * so.per_delivered/100, + so.net_total)) as 'total_order_considered', + max(so.transaction_date) as 'last_sales_order_date', + DATEDIFF(CURDATE(),max(so.transaction_date)) as 'days_since_last_order' + from `tabCustomer` cust, `tabSales Order` so + where cust.name = so.customer and so.docstatus = 1 + group by cust.name + order by 'days_since_last_order' desc """,as_list=1) + +def get_last_so_amt(customer): + return webnotes.conn.sql("""select net_total from `tabSales Order` + where customer ='%(customer)s' and docstatus = 1 and + transaction_date = (select max(transaction_date) + from `tabSales Order` + where customer = '%(customer)s') + """%{'customer':customer}) + +def get_columns(): + return [ + "Customer:Link/Customer:120", + "Customer Name:Data:120", + "Territory::120", + "Customer Group::120", + "Number of Order::120", + "Total Order Value:Currency:120", + "Total Order Considered:Currency:160", + "Last Order Amount:Currency:160", + "Last Sales Order Date:Date:160", + "Days Since Last Order::160" + ] \ No newline at end of file diff --git a/selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).txt b/selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).txt new file mode 100644 index 00000000000..cd7b2b7ff93 --- /dev/null +++ b/selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).txt @@ -0,0 +1,21 @@ +[ + { + "creation": "2013-06-05 11:40:49", + "docstatus": 0, + "modified": "2013-06-05 11:40:49", + "modified_by": "Administrator", + "owner": "Administrator" + }, + { + "doctype": "Report", + "is_standard": "Yes", + "name": "__common__", + "ref_doctype": "Sales Order", + "report_name": "No Sales Order from Customers (Since 2 months)", + "report_type": "Script Report" + }, + { + "doctype": "Report", + "name": "No Sales Order from Customers (Since 2 months)" + } +] \ No newline at end of file diff --git a/stock/page/stock_home/stock_home.js b/stock/page/stock_home/stock_home.js index 75e4ee15b02..ac3a096c508 100644 --- a/stock/page/stock_home/stock_home.js +++ b/stock/page/stock_home/stock_home.js @@ -128,6 +128,11 @@ wn.module_page["Stock"] = [ right: true, icon: "icon-table", items: [ + { + "label":wn._("Item Reorder Level"), + route: "query-report/Item Reorder Level", + doctype: "Item" + }, { "label":wn._("Stock Ledger"), page: "stock-ledger" diff --git a/stock/report/item_reorder_level/__init__.py b/stock/report/item_reorder_level/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/stock/report/item_reorder_level/item_reorder_level.js b/stock/report/item_reorder_level/item_reorder_level.js new file mode 100644 index 00000000000..30240e587d6 --- /dev/null +++ b/stock/report/item_reorder_level/item_reorder_level.js @@ -0,0 +1,16 @@ +wn.query_reports["Item Reorder Level"] = { + "filters": [ + { + "fieldname":"from_date", + "label": "From Date", + "fieldtype": "Date", + "default": sys_defaults.year_start_date + }, + { + "fieldname":"to_date", + "label": "To Date", + "fieldtype": "Date", + "default": get_today() + } + ] +} \ No newline at end of file diff --git a/stock/report/item_reorder_level/item_reorder_level.py b/stock/report/item_reorder_level/item_reorder_level.py new file mode 100644 index 00000000000..d59696138c8 --- /dev/null +++ b/stock/report/item_reorder_level/item_reorder_level.py @@ -0,0 +1,97 @@ +# 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 . + +import webnotes +from webnotes.utils import getdate, flt, cint + +def execute(filters=None): + if not filters: filters = {} + + columns = get_columns() + items = get_item_info() + consumed_item_map = get_consumed_items(filters) + delivered_item_map = get_delivered_items(filters) + + avg_daily_outgoing = 0 + diff = (getdate(filters.get("to_date")) - getdate(filters.get("from_date"))).days + if diff <= 0: + webnotes.msgprint("To Date should not be less than eual to From Date",raise_exception=1) + + data = [] + for item in items: + + total_outgoing = consumed_item_map.get(item.name, 0)+delivered_item_map.get(item.name,0) + avg_daily_outgoing = cint(total_outgoing/diff) + reorder_level = (avg_daily_outgoing * item.lead_time_days) + item.min_order_qty + + data.append([item.name, item.item_name, item.description, item.min_order_qty, item.lead_time_days, + consumed_item_map.get(item.name, 0), delivered_item_map.get(item.name,0), total_outgoing, + avg_daily_outgoing, reorder_level]) + + return columns , data + +def get_columns(): + return["Item:Link/Item:120", "Item name:Data:120", "description::160", "minimum inventory level::120", + "lead time days::120", "consumed::120", "delivered::120", "total outgoing::120", + "avg daily outgoing::120", "reorder level::120"] + +def get_item_info(): + return webnotes.conn.sql("""select name, item_name, description, min_order_qty, lead_time_days + from tabItem""",as_dict=1) + +def get_consumed_items(filters): + condition = get_condition(filters) + + cn_items = webnotes.conn.sql("""select se_item.item_code, sum(se_item.actual_qty) as 'consume_qty' + from `tabStock Entry` se, `tabStock Entry Detail` se_item + where se.name = se_item.parent and se.docstatus = 1 and ifnull(se_item.t_warehouse, '') = '' %s + group by se_item.item_code""" % (condition), as_dict=1) + + cn_items_map = {} + for item in cn_items: + cn_items_map.setdefault(item.item_code, item.consume_qty) + + return cn_items_map + +def get_delivered_items(filters): + condition = get_condition(filters) + + dn_items = webnotes.conn.sql("""select dn_item.item_code, sum(dn_item.qty) as dn_qty + from `tabDelivery Note` dn, `tabDelivery Note Item` dn_item + where dn.name = dn_item.parent and dn.docstatus = 1 %s group by dn_item.item_code""" % (condition) + , as_dict=1) + + si_items = webnotes.conn.sql("""select si_item.item_name, sum(si_item.qty) as si_qty + from `tabSales Invoice` si, `tabSales Invoice Item` si_item + where si.name = si_item.parent and si.docstatus = 1 and ifnull(si.update_stock, 0) = 1 + and ifnull(si.is_pos, 0) = 1 %s group by si_item.item_name""" % (condition), as_dict=1) + + dn_item_map = {} + for item in dn_items: + dn_item_map.setdefault(item.item_code, item.dn_qty) + + for item in si_items: + dn_item_map.setdefault(item.item_code, item.si_qty) + + return dn_item_map + +def get_condition(filters): + conditions = "" + if filters.get("from_date") and filters.get("to_date"): + conditions += " and posting_date between '%s' and '%s'" % (filters["from_date"],filters["to_date"]) + else: + webnotes.msgprint("Please set date in from date field",raise_exception=1) + return conditions \ No newline at end of file diff --git a/stock/report/item_reorder_level/item_reorder_level.txt b/stock/report/item_reorder_level/item_reorder_level.txt new file mode 100644 index 00000000000..93c6dfb1854 --- /dev/null +++ b/stock/report/item_reorder_level/item_reorder_level.txt @@ -0,0 +1,21 @@ +[ + { + "creation": "2013-06-05 15:34:51", + "docstatus": 0, + "modified": "2013-06-05 15:50:30", + "modified_by": "Administrator", + "owner": "Administrator" + }, + { + "doctype": "Report", + "is_standard": "Yes", + "name": "__common__", + "ref_doctype": "Item", + "report_name": "Item Reorder Level", + "report_type": "Script Report" + }, + { + "doctype": "Report", + "name": "Item Reorder Level" + } +] \ No newline at end of file From 1efc8b373446edc0ff2a04a7d328a34ff2ad3f3c Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 6 Jun 2013 19:31:14 +0530 Subject: [PATCH 2/4] [Reprots][No Sales Order From Customer] and [Item Reorder Level] --- selling/page/selling_home/selling_home.js | 10 ++-- .../__init__.py | 0 .../no_sales_order_from_customers.py} | 15 ++--- .../no_sales_order_from_customers.txt} | 8 +-- stock/page/stock_home/stock_home.js | 10 ++-- .../item_reorder_level/item_reorder_level.py | 57 +++++++++++-------- 6 files changed, 52 insertions(+), 48 deletions(-) rename selling/report/{no_sales_order_from_customers_(since_2_months) => no_sales_order_from_customers}/__init__.py (100%) rename selling/report/{no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).py => no_sales_order_from_customers/no_sales_order_from_customers.py} (84%) rename selling/report/{no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).txt => no_sales_order_from_customers/no_sales_order_from_customers.txt} (57%) diff --git a/selling/page/selling_home/selling_home.js b/selling/page/selling_home/selling_home.js index 1f119e2917c..603bd3a48fe 100644 --- a/selling/page/selling_home/selling_home.js +++ b/selling/page/selling_home/selling_home.js @@ -149,11 +149,6 @@ wn.module_page["Selling"] = [ right: true, icon: "icon-list", items: [ - { - "label":wn._("No Sales Order from Customers (Since 2 months)"), - route: "query-report/No Sales Order from Customers (Since 2 months)", - doctype: "Sales Order" - }, { "label":wn._("Customer Addresses And Contacts"), route: "query-report/Customer Addresses And Contacts" @@ -170,6 +165,11 @@ wn.module_page["Selling"] = [ "label":wn._("Item-wise Sales History"), route: "query-report/Item-wise Sales History", }, + { + "label":wn._("No Sales Order from Customers (Since 2 months)"), + route: "query-report/No Sales Order from Customers", + doctype: "Sales Order" + }, ] } diff --git a/selling/report/no_sales_order_from_customers_(since_2_months)/__init__.py b/selling/report/no_sales_order_from_customers/__init__.py similarity index 100% rename from selling/report/no_sales_order_from_customers_(since_2_months)/__init__.py rename to selling/report/no_sales_order_from_customers/__init__.py diff --git a/selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).py b/selling/report/no_sales_order_from_customers/no_sales_order_from_customers.py similarity index 84% rename from selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).py rename to selling/report/no_sales_order_from_customers/no_sales_order_from_customers.py index 43efb98d06b..789e1684e91 100644 --- a/selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).py +++ b/selling/report/no_sales_order_from_customers/no_sales_order_from_customers.py @@ -16,7 +16,6 @@ import webnotes def execute(filters=None): - columns = get_columns() customers = get_so_details() @@ -25,7 +24,6 @@ def execute(filters=None): if cust[8] >= 60: # days_since_last_order cust.insert(7,get_last_so_amt(cust[0])) data.append(cust) - return columns, data def get_so_details(): @@ -40,19 +38,18 @@ def get_so_details(): so.net_total * so.per_delivered/100, so.net_total)) as 'total_order_considered', max(so.transaction_date) as 'last_sales_order_date', - DATEDIFF(CURDATE(),max(so.transaction_date)) as 'days_since_last_order' + DATEDIFF(CURDATE(), max(so.transaction_date)) as 'days_since_last_order' from `tabCustomer` cust, `tabSales Order` so where cust.name = so.customer and so.docstatus = 1 group by cust.name order by 'days_since_last_order' desc """,as_list=1) def get_last_so_amt(customer): - return webnotes.conn.sql("""select net_total from `tabSales Order` - where customer ='%(customer)s' and docstatus = 1 and - transaction_date = (select max(transaction_date) - from `tabSales Order` - where customer = '%(customer)s') - """%{'customer':customer}) + res = webnotes.conn.sql("""select net_total from `tabSales Order` + where customer ='%(customer)s' and docstatus = 1 order by transaction_date desc + limit 1""" % {'customer':customer}) + + return res and res[0][0] or 0 def get_columns(): return [ diff --git a/selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).txt b/selling/report/no_sales_order_from_customers/no_sales_order_from_customers.txt similarity index 57% rename from selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).txt rename to selling/report/no_sales_order_from_customers/no_sales_order_from_customers.txt index cd7b2b7ff93..32b38ae8156 100644 --- a/selling/report/no_sales_order_from_customers_(since_2_months)/no_sales_order_from_customers_(since_2_months).txt +++ b/selling/report/no_sales_order_from_customers/no_sales_order_from_customers.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-06-05 11:40:49", + "creation": "2013-06-06 19:15:50", "docstatus": 0, - "modified": "2013-06-05 11:40:49", + "modified": "2013-06-06 19:15:51", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,11 +11,11 @@ "is_standard": "Yes", "name": "__common__", "ref_doctype": "Sales Order", - "report_name": "No Sales Order from Customers (Since 2 months)", + "report_name": "No Sales Order from Customers", "report_type": "Script Report" }, { "doctype": "Report", - "name": "No Sales Order from Customers (Since 2 months)" + "name": "No Sales Order from Customers" } ] \ No newline at end of file diff --git a/stock/page/stock_home/stock_home.js b/stock/page/stock_home/stock_home.js index ac3a096c508..ab3d3253bbe 100644 --- a/stock/page/stock_home/stock_home.js +++ b/stock/page/stock_home/stock_home.js @@ -128,11 +128,6 @@ wn.module_page["Stock"] = [ right: true, icon: "icon-table", items: [ - { - "label":wn._("Item Reorder Level"), - route: "query-report/Item Reorder Level", - doctype: "Item" - }, { "label":wn._("Stock Ledger"), page: "stock-ledger" @@ -210,6 +205,11 @@ wn.module_page["Stock"] = [ "label":wn._("Requested Items To Be Transferred"), route: "query-report/Requested Items To Be Transferred", }, + { + "label":wn._("Item Reorder Level"), + route: "query-report/Item Reorder Level", + doctype: "Item" + }, ] } ] diff --git a/stock/report/item_reorder_level/item_reorder_level.py b/stock/report/item_reorder_level/item_reorder_level.py index d59696138c8..10ee1827013 100644 --- a/stock/report/item_reorder_level/item_reorder_level.py +++ b/stock/report/item_reorder_level/item_reorder_level.py @@ -15,27 +15,30 @@ # along with this program. If not, see . import webnotes -from webnotes.utils import getdate, flt, cint +from webnotes.utils import getdate, flt def execute(filters=None): if not filters: filters = {} + float_preceision = webnotes.conn.get_default("float_preceision") + + condition =get_condition(filters) + + avg_daily_outgoing = 0 + diff = ((getdate(filters.get("to_date")) - getdate(filters.get("from_date"))).days)+1 + if diff <= 0: + webnotes.msgprint("To Date should not be less than eual to From Date",raise_exception=1) columns = get_columns() items = get_item_info() - consumed_item_map = get_consumed_items(filters) - delivered_item_map = get_delivered_items(filters) - - avg_daily_outgoing = 0 - diff = (getdate(filters.get("to_date")) - getdate(filters.get("from_date"))).days - if diff <= 0: - webnotes.msgprint("To Date should not be less than eual to From Date",raise_exception=1) + consumed_item_map = get_consumed_items(condition) + delivered_item_map = get_delivered_items(condition) data = [] for item in items: total_outgoing = consumed_item_map.get(item.name, 0)+delivered_item_map.get(item.name,0) - avg_daily_outgoing = cint(total_outgoing/diff) - reorder_level = (avg_daily_outgoing * item.lead_time_days) + item.min_order_qty + avg_daily_outgoing = flt(total_outgoing/diff, float_preceision) + reorder_level = (avg_daily_outgoing * flt(item.lead_time_days)) + flt(item.min_order_qty) data.append([item.name, item.item_name, item.description, item.min_order_qty, item.lead_time_days, consumed_item_map.get(item.name, 0), delivered_item_map.get(item.name,0), total_outgoing, @@ -44,20 +47,24 @@ def execute(filters=None): return columns , data def get_columns(): - return["Item:Link/Item:120", "Item name:Data:120", "description::160", "minimum inventory level::120", - "lead time days::120", "consumed::120", "delivered::120", "total outgoing::120", - "avg daily outgoing::120", "reorder level::120"] + return[ + "Item:Link/Item:120", "Item name:Data:120", "Description::160", + "Minimum Inventory Level:Float:160", "Lead Time Days:Float:120", "Consumed:Float:120", + "Delivered:Float:120", "Total Outgoing:Float:120", "Avg Daily Outgoing:Float:160", + "Reorder Level:Float:120" + ] def get_item_info(): - return webnotes.conn.sql("""select name, item_name, description, min_order_qty, lead_time_days - from tabItem""",as_dict=1) + return webnotes.conn.sql("""select name, item_name, description, min_order_qty, + lead_time_days from tabItem""", as_dict=1) -def get_consumed_items(filters): - condition = get_condition(filters) +def get_consumed_items(condition): - cn_items = webnotes.conn.sql("""select se_item.item_code, sum(se_item.actual_qty) as 'consume_qty' + cn_items = webnotes.conn.sql("""select se_item.item_code, + sum(se_item.actual_qty) as 'consume_qty' from `tabStock Entry` se, `tabStock Entry Detail` se_item - where se.name = se_item.parent and se.docstatus = 1 and ifnull(se_item.t_warehouse, '') = '' %s + where se.name = se_item.parent and se.docstatus = 1 + and ifnull(se_item.t_warehouse, '') = '' %s group by se_item.item_code""" % (condition), as_dict=1) cn_items_map = {} @@ -66,18 +73,18 @@ def get_consumed_items(filters): return cn_items_map -def get_delivered_items(filters): - condition = get_condition(filters) +def get_delivered_items(condition): dn_items = webnotes.conn.sql("""select dn_item.item_code, sum(dn_item.qty) as dn_qty from `tabDelivery Note` dn, `tabDelivery Note Item` dn_item - where dn.name = dn_item.parent and dn.docstatus = 1 %s group by dn_item.item_code""" % (condition) - , as_dict=1) + where dn.name = dn_item.parent and dn.docstatus = 1 %s + group by dn_item.item_code""" % (condition), as_dict=1) si_items = webnotes.conn.sql("""select si_item.item_name, sum(si_item.qty) as si_qty from `tabSales Invoice` si, `tabSales Invoice Item` si_item - where si.name = si_item.parent and si.docstatus = 1 and ifnull(si.update_stock, 0) = 1 - and ifnull(si.is_pos, 0) = 1 %s group by si_item.item_name""" % (condition), as_dict=1) + where si.name = si_item.parent and si.docstatus = 1 and + ifnull(si.update_stock, 0) = 1 and ifnull(si.is_pos, 0) = 1 %s + group by si_item.item_name""" % (condition), as_dict=1) dn_item_map = {} for item in dn_items: From 5b1e899250637b0813c9f0822b24a62249b7fb08 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 7 Jun 2013 13:34:16 +0530 Subject: [PATCH 3/4] [Reports] [Customers Not Buying Sinse Long Time] and [Itemwise Recommended Reorder level] --- selling/page/selling_home/selling_home.js | 4 ++-- .../__init__.py | 0 .../customers_not_buying_since_long_time.js | 10 ++++++++++ .../customers_not_buying_since_long_time.py} | 11 ++++++++++- .../customers_not_buying_since_long_time.txt} | 8 ++++---- stock/page/stock_home/stock_home.js | 4 ++-- .../__init__.py | 0 .../itemwise_recommended_reorder_level.js} | 2 +- .../itemwise_recommended_reorder_level.py} | 2 +- .../itemwise_recommended_reorder_level.txt} | 8 ++++---- 10 files changed, 34 insertions(+), 15 deletions(-) rename selling/report/{no_sales_order_from_customers => customers_not_buying_since_long_time}/__init__.py (100%) create mode 100644 selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js rename selling/report/{no_sales_order_from_customers/no_sales_order_from_customers.py => customers_not_buying_since_long_time/customers_not_buying_since_long_time.py} (85%) rename selling/report/{no_sales_order_from_customers/no_sales_order_from_customers.txt => customers_not_buying_since_long_time/customers_not_buying_since_long_time.txt} (59%) rename stock/report/{item_reorder_level => itemwise_recommended_reorder_level}/__init__.py (100%) rename stock/report/{item_reorder_level/item_reorder_level.js => itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js} (81%) rename stock/report/{item_reorder_level/item_reorder_level.py => itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py} (98%) rename stock/report/{item_reorder_level/item_reorder_level.txt => itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.txt} (59%) diff --git a/selling/page/selling_home/selling_home.js b/selling/page/selling_home/selling_home.js index 603bd3a48fe..9c18fda6818 100644 --- a/selling/page/selling_home/selling_home.js +++ b/selling/page/selling_home/selling_home.js @@ -166,8 +166,8 @@ wn.module_page["Selling"] = [ route: "query-report/Item-wise Sales History", }, { - "label":wn._("No Sales Order from Customers (Since 2 months)"), - route: "query-report/No Sales Order from Customers", + "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/no_sales_order_from_customers/__init__.py b/selling/report/customers_not_buying_since_long_time/__init__.py similarity index 100% rename from selling/report/no_sales_order_from_customers/__init__.py rename to selling/report/customers_not_buying_since_long_time/__init__.py diff --git a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js new file mode 100644 index 00000000000..65d63484a5e --- /dev/null +++ b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js @@ -0,0 +1,10 @@ +wn.query_reports["Customers Not Buying Since Long Time"] = { + "filters": [ + { + "fieldname":"days_since_last_order", + "label": "Days Since Last Order", + "fieldtype": "Int", + "default": 60 + } + ] +} \ No newline at end of file diff --git a/selling/report/no_sales_order_from_customers/no_sales_order_from_customers.py b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py similarity index 85% rename from selling/report/no_sales_order_from_customers/no_sales_order_from_customers.py rename to selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py index 789e1684e91..d13315c1519 100644 --- a/selling/report/no_sales_order_from_customers/no_sales_order_from_customers.py +++ b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py @@ -13,15 +13,24 @@ # # 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 getdate, cint def execute(filters=None): + if not filters: filters ={} + + days_since_last_order = filters.get("days_since_last_order") + if not days_since_last_order or days_since_last_order <= 0: + webnotes.msgprint("Please mention legal value in days since last order field",raise_exception=1) + columns = get_columns() customers = get_so_details() data = [] for cust in customers: - if cust[8] >= 60: # days_since_last_order + if cust[8] >= days_since_last_order: cust.insert(7,get_last_so_amt(cust[0])) data.append(cust) return columns, data diff --git a/selling/report/no_sales_order_from_customers/no_sales_order_from_customers.txt b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.txt similarity index 59% rename from selling/report/no_sales_order_from_customers/no_sales_order_from_customers.txt rename to selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.txt index 32b38ae8156..4d94377aa97 100644 --- a/selling/report/no_sales_order_from_customers/no_sales_order_from_customers.txt +++ b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-06-06 19:15:50", + "creation": "2013-06-07 12:27:07", "docstatus": 0, - "modified": "2013-06-06 19:15:51", + "modified": "2013-06-07 12:27:07", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,11 +11,11 @@ "is_standard": "Yes", "name": "__common__", "ref_doctype": "Sales Order", - "report_name": "No Sales Order from Customers", + "report_name": "Customers Not Buying Since Long Time ", "report_type": "Script Report" }, { "doctype": "Report", - "name": "No Sales Order from Customers" + "name": "Customers Not Buying Since Long Time" } ] \ No newline at end of file diff --git a/stock/page/stock_home/stock_home.js b/stock/page/stock_home/stock_home.js index ab3d3253bbe..7e67cab3dae 100644 --- a/stock/page/stock_home/stock_home.js +++ b/stock/page/stock_home/stock_home.js @@ -206,8 +206,8 @@ wn.module_page["Stock"] = [ route: "query-report/Requested Items To Be Transferred", }, { - "label":wn._("Item Reorder Level"), - route: "query-report/Item Reorder Level", + "label":wn._("Itemwise Recommended Reorder Level"), + route: "query-report/Itemwise Recommended Reorder Level", doctype: "Item" }, ] diff --git a/stock/report/item_reorder_level/__init__.py b/stock/report/itemwise_recommended_reorder_level/__init__.py similarity index 100% rename from stock/report/item_reorder_level/__init__.py rename to stock/report/itemwise_recommended_reorder_level/__init__.py diff --git a/stock/report/item_reorder_level/item_reorder_level.js b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js similarity index 81% rename from stock/report/item_reorder_level/item_reorder_level.js rename to stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js index 30240e587d6..b8aa378828f 100644 --- a/stock/report/item_reorder_level/item_reorder_level.js +++ b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js @@ -1,4 +1,4 @@ -wn.query_reports["Item Reorder Level"] = { +wn.query_reports["Itemwise Recommended Reorder Level"] = { "filters": [ { "fieldname":"from_date", diff --git a/stock/report/item_reorder_level/item_reorder_level.py b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py similarity index 98% rename from stock/report/item_reorder_level/item_reorder_level.py rename to stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py index 10ee1827013..588132f9616 100644 --- a/stock/report/item_reorder_level/item_reorder_level.py +++ b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py @@ -61,7 +61,7 @@ def get_item_info(): def get_consumed_items(condition): cn_items = webnotes.conn.sql("""select se_item.item_code, - sum(se_item.actual_qty) as 'consume_qty' + sum(se_item.actual_qty) as 'consume_qty' from `tabStock Entry` se, `tabStock Entry Detail` se_item where se.name = se_item.parent and se.docstatus = 1 and ifnull(se_item.t_warehouse, '') = '' %s diff --git a/stock/report/item_reorder_level/item_reorder_level.txt b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.txt similarity index 59% rename from stock/report/item_reorder_level/item_reorder_level.txt rename to stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.txt index 93c6dfb1854..2763f21dfea 100644 --- a/stock/report/item_reorder_level/item_reorder_level.txt +++ b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-06-05 15:34:51", + "creation": "2013-06-07 12:47:22", "docstatus": 0, - "modified": "2013-06-05 15:50:30", + "modified": "2013-06-07 13:03:54", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,11 +11,11 @@ "is_standard": "Yes", "name": "__common__", "ref_doctype": "Item", - "report_name": "Item Reorder Level", + "report_name": "Itemwise Recommended Reorder Level", "report_type": "Script Report" }, { "doctype": "Report", - "name": "Item Reorder Level" + "name": "Itemwise Recommended Reorder Level" } ] \ No newline at end of file From d9bf6424470b542439c7eef443ef9694cf3f89a6 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 7 Jun 2013 15:28:43 +0530 Subject: [PATCH 4/4] [Report][Changes made in Customers Not Buying Since Long Time.py] --- .../customers_not_buying_since_long_time.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py index d13315c1519..08809a7619a 100644 --- a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +++ b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py @@ -22,8 +22,8 @@ def execute(filters=None): if not filters: filters ={} days_since_last_order = filters.get("days_since_last_order") - if not days_since_last_order or days_since_last_order <= 0: - webnotes.msgprint("Please mention legal value in days since last order field",raise_exception=1) + if cint(days_since_last_order) <= 0: + webnotes.msgprint("Please mention positive value in 'Days Since Last Order' field",raise_exception=1) columns = get_columns() customers = get_so_details()