Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/controllers/accounts_controller.py b/controllers/accounts_controller.py
index 4ee7e53..eb71f21 100644
--- a/controllers/accounts_controller.py
+++ b/controllers/accounts_controller.py
@@ -56,23 +56,23 @@
def set_price_list_currency(self, buying_or_selling):
company_currency = get_company_currency(self.doc.company)
fieldname = buying_or_selling.lower() + "_price_list"
+
# TODO - change this, since price list now has only one currency allowed
- if self.meta.get_field(fieldname) and self.doc.fields.get(fieldname) and \
- not self.doc.price_list_currency:
+ if self.meta.get_field(fieldname) and self.doc.fields.get(fieldname):
+ if not self.doc.price_list_currency:
self.doc.fields.update(get_price_list_currency(self.doc.fields.get(fieldname)))
- if self.doc.price_list_currency:
- if not self.doc.plc_conversion_rate:
- if self.doc.price_list_currency == company_currency:
- self.doc.plc_conversion_rate = 1.0
- else:
- exchange = self.doc.price_list_currency + "-" + company_currency
- self.doc.plc_conversion_rate = flt(webnotes.conn.get_value("Currency Exchange",
- exchange, "exchange_rate"))
-
- if not self.doc.currency:
- self.doc.currency = self.doc.price_list_currency
- self.doc.conversion_rate = self.doc.plc_conversion_rate
+ if self.doc.price_list_currency:
+ if self.doc.price_list_currency == company_currency:
+ self.doc.plc_conversion_rate = 1.0
+ elif not self.doc.plc_conversion_rate:
+ exchange = self.doc.price_list_currency + "-" + company_currency
+ self.doc.plc_conversion_rate = flt(webnotes.conn.get_value("Currency Exchange",
+ exchange, "exchange_rate"))
+
+ if not self.doc.currency:
+ self.doc.currency = self.doc.price_list_currency
+ self.doc.conversion_rate = self.doc.plc_conversion_rate
if self.meta.get_field("currency"):
if self.doc.currency and self.doc.currency != company_currency:
@@ -82,7 +82,7 @@
exchange, "exchange_rate"))
else:
self.doc.conversion_rate = 1
-
+
def set_missing_item_details(self, get_item_details):
"""set missing item values"""
for item in self.doclist.get({"parentfield": self.fname}):
diff --git a/public/js/toolbar.js b/public/js/toolbar.js
index 2566fcb..3f910ff 100644
--- a/public/js/toolbar.js
+++ b/public/js/toolbar.js
@@ -15,8 +15,9 @@
$user.append('<li><a href="http://groups.google.com/group/erpnext-user-forum" target="_blank">\
<i class="icon-fixed-width icon-quote-left"></i> '+wn._('Forum')+'</a></li>');
- if(wn.boot.expires_on) {
- $user.append('<li><a href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">\
+ if(wn.boot.expires_on || wn.boot.commercial_support) {
+ $user.append('<li>\
+ <a href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">\
<i class="icon-fixed-width icon-comments"></i> '+wn._('Live Chat')+'</a></li>');
}
diff --git a/startup/boot.py b/startup/boot.py
index ce446e9..48bdeec 100644
--- a/startup/boot.py
+++ b/startup/boot.py
@@ -33,8 +33,9 @@
# load subscription info
import conf
- for key in ['max_users', 'expires_on', 'max_space', 'status', 'developer_mode']:
- if hasattr(conf, key): bootinfo[key] = getattr(conf, key)
+ for key in ['max_users', 'expires_on', 'max_space', 'status', 'developer_mode',
+ 'commercial_support']:
+ if hasattr(conf, key): bootinfo[key] = getattr(conf, key)
bootinfo['docs'] += webnotes.conn.sql("""select name, default_currency, cost_center
from `tabCompany`""", as_dict=1, update={"doctype":":Company"})