Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into cleanup

Browse Source
This commit is contained in:
Rushabh Mehta 2013-11-02 10:28:30 +05:30
commit 771f4a729e
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/october_2013/p05_server_custom_script_to_file.py
View File

@ -21,8 +21,12 @@ def execute():
for name, dt, script in webnotes.conn.sql("""select name, dt, script from `tabCustom Script` for name, dt, script in webnotes.conn.sql("""select name, dt, script from `tabCustom Script`
where script_type='Server'"""): where script_type='Server'"""):
if script.strip(): if script.strip():
try:
script = indent_using_tabs(script) script = indent_using_tabs(script)
make_custom_server_script_file(dt, script) make_custom_server_script_file(dt, script)
except IOError, e:
if "already exists" not in repr(e):
raise
def indent_using_tabs(script): def indent_using_tabs(script):
for line in script.split("\n"): for line in script.split("\n"):

6
selling/page/sales_funnel/sales_funnel.js
View File

@ -8,14 +8,14 @@ wn.pages['sales-funnel'].onload = function(wrapper) {
single_column: true 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() { wrapper.appframe.add_module_icon("Selling", "sales-funnel", function() {
wn.set_route("selling-home"); wn.set_route("selling-home");
}); });
} }
erpnext.CRMFunnel = Class.extend({ erpnext.SalesFunnel = Class.extend({
init: function(wrapper) { init: function(wrapper) {
var me = this; var me = this;
// 0 setTimeout hack - this gives time for canvas to get width and height // 0 setTimeout hack - this gives time for canvas to get width and height
@ -72,7 +72,7 @@ erpnext.CRMFunnel = Class.extend({
var me = this; var me = this;
wn.call({ wn.call({
module: "selling", module: "selling",
page: "crm_funnel", page: "sales_funnel",
method: "get_funnel_data", method: "get_funnel_data",
args: { args: {
from_date: this.options.from_date, from_date: this.options.from_date,

10
selling/page/sales_funnel/sales_funnel.py
View File

@ -7,23 +7,23 @@ import webnotes
@webnotes.whitelist() @webnotes.whitelist()
def get_funnel_data(from_date, to_date): def get_funnel_data(from_date, to_date):
active_leads = webnotes.conn.sql("""select count(*) from `tabLead` 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] and status != "Do Not Contact" """, (from_date, to_date))[0][0]
active_leads += webnotes.conn.sql("""select count(distinct customer) from `tabContact` 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] and status != "Passive" """, (from_date, to_date))[0][0]
opportunities = webnotes.conn.sql("""select count(*) from `tabOpportunity` 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] and status != "Lost" """, (from_date, to_date))[0][0]
quotations = webnotes.conn.sql("""select count(*) from `tabQuotation` 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] and status != "Lost" """, (from_date, to_date))[0][0]
sales_orders = webnotes.conn.sql("""select count(*) from `tabQuotation` 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 [ return [
{ "title": "Active Leads / Customers", "value": active_leads, "color": "#B03B46" }, { "title": "Active Leads / Customers", "value": active_leads, "color": "#B03B46" },

2
startup/__init__.py
View File

@ -29,7 +29,7 @@ profile_defaults = {
# add startup propertes # add startup propertes
mail_footer = """<div style="padding: 7px; text-align: right; color: #888"><small>Sent via 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(): def get_monthly_bulk_mail_limit():
import webnotes import webnotes