diff --git a/selling/page/sales_funnel/sales_funnel.js b/selling/page/sales_funnel/sales_funnel.js index e2c3a98bf59..5ad61f7ad4b 100644 --- a/selling/page/sales_funnel/sales_funnel.js +++ b/selling/page/sales_funnel/sales_funnel.js @@ -8,14 +8,14 @@ wn.pages['sales-funnel'].onload = function(wrapper) { single_column: true }); - wrapper.crm_funnel = new erpnext.CRMFunnel(wrapper); + wrapper.sales_funnel = new erpnext.SalesFunnel(wrapper); wrapper.appframe.add_module_icon("Selling", "sales-funnel", function() { wn.set_route("selling-home"); }); } -erpnext.CRMFunnel = Class.extend({ +erpnext.SalesFunnel = Class.extend({ init: function(wrapper) { var me = this; // 0 setTimeout hack - this gives time for canvas to get width and height @@ -72,7 +72,7 @@ erpnext.CRMFunnel = Class.extend({ var me = this; wn.call({ module: "selling", - page: "crm_funnel", + page: "sales_funnel", method: "get_funnel_data", args: { from_date: this.options.from_date, diff --git a/selling/page/sales_funnel/sales_funnel.py b/selling/page/sales_funnel/sales_funnel.py index be0aebe7bb8..dfcf5e8a9b0 100644 --- a/selling/page/sales_funnel/sales_funnel.py +++ b/selling/page/sales_funnel/sales_funnel.py @@ -7,23 +7,23 @@ import webnotes @webnotes.whitelist() def get_funnel_data(from_date, to_date): active_leads = webnotes.conn.sql("""select count(*) from `tabLead` - where (`modified` between %s and %s) + where (date(`modified`) between %s and %s) and status != "Do Not Contact" """, (from_date, to_date))[0][0] active_leads += webnotes.conn.sql("""select count(distinct customer) from `tabContact` - where (`modified` between %s and %s) + where (date(`modified`) between %s and %s) and status != "Passive" """, (from_date, to_date))[0][0] opportunities = webnotes.conn.sql("""select count(*) from `tabOpportunity` - where docstatus = 1 and (`modified` between %s and %s) + where docstatus = 1 and (date(`creation`) between %s and %s) and status != "Lost" """, (from_date, to_date))[0][0] quotations = webnotes.conn.sql("""select count(*) from `tabQuotation` - where docstatus = 1 and (`modified` between %s and %s) + where docstatus = 1 and (date(`creation`) between %s and %s) and status != "Lost" """, (from_date, to_date))[0][0] sales_orders = webnotes.conn.sql("""select count(*) from `tabQuotation` - where docstatus = 1 and (`modified` between %s and %s)""", (from_date, to_date))[0][0] + where docstatus = 1 and (date(`creation`) between %s and %s)""", (from_date, to_date))[0][0] return [ { "title": "Active Leads / Customers", "value": active_leads, "color": "#B03B46" },