Merge branch 'master' of github.com:webnotes/erpnext into cleanup
diff --git a/patches/october_2013/p05_server_custom_script_to_file.py b/patches/october_2013/p05_server_custom_script_to_file.py
index 3a7e770..b1d4f21 100644
--- a/patches/october_2013/p05_server_custom_script_to_file.py
+++ b/patches/october_2013/p05_server_custom_script_to_file.py
@@ -21,8 +21,12 @@
for name, dt, script in webnotes.conn.sql("""select name, dt, script from `tabCustom Script`
where script_type='Server'"""):
if script.strip():
- script = indent_using_tabs(script)
- make_custom_server_script_file(dt, script)
+ try:
+ script = indent_using_tabs(script)
+ make_custom_server_script_file(dt, script)
+ except IOError, e:
+ if "already exists" not in repr(e):
+ raise
def indent_using_tabs(script):
for line in script.split("\n"):
diff --git a/selling/page/sales_funnel/sales_funnel.js b/selling/page/sales_funnel/sales_funnel.js
index e2c3a98..5ad61f7 100644
--- a/selling/page/sales_funnel/sales_funnel.js
+++ b/selling/page/sales_funnel/sales_funnel.js
@@ -8,14 +8,14 @@
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 @@
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 be0aebe..dfcf5e8 100644
--- a/selling/page/sales_funnel/sales_funnel.py
+++ b/selling/page/sales_funnel/sales_funnel.py
@@ -7,23 +7,23 @@
@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" },
diff --git a/startup/__init__.py b/startup/__init__.py
index 802daac..1d96323 100644
--- a/startup/__init__.py
+++ b/startup/__init__.py
@@ -29,7 +29,7 @@
# add startup propertes
mail_footer = """<div style="padding: 7px; text-align: right; color: #888"><small>Sent via
- <a style="color: #888" href="https://erpnext.com">ERPNext</a></div>"""
+ <a style="color: #888" href="http://erpnext.org">ERPNext</a></div>"""
def get_monthly_bulk_mail_limit():
import webnotes