From 5b1e899250637b0813c9f0822b24a62249b7fb08 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 7 Jun 2013 13:34:16 +0530 Subject: [PATCH] [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} (80%) 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 80% 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