Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/public/js/startup.css b/public/js/startup.css
index d15b7a4..ab70ee4 100644
--- a/public/js/startup.css
+++ b/public/js/startup.css
@@ -19,15 +19,6 @@
text-align: center;
}
-.expiry-info {
- margin-top: -20px;
- margin-bottom: 20px;
- text-align: center;
- background-color: rgb(255, 255, 204);
- padding: 7px;
- z-index: 1;
-}
-
.show-all-reports {
margin-top: 5px;
font-size: 11px;
diff --git a/public/js/startup.js b/public/js/startup.js
index 6654ca7..eee8a05 100644
--- a/public/js/startup.js
+++ b/public/js/startup.js
@@ -26,26 +26,30 @@
"</p>", wn._("Welcome"));
}
} else if(wn.boot.expires_on && in_list(user_roles, 'System Manager')) {
- var today = dateutil.str_to_obj(wn.boot.server_date);
- var expires_on = dateutil.str_to_obj(wn.boot.expires_on);
- var diff = dateutil.get_diff(expires_on, today);
- var payment_link = "<a href=\"https://erpnext.com/modes-of-payment.html\" target=\"_blank\">See Payment Options.</a>";
- if (0 <= diff && diff <= 15) {
- var expiry_string = diff==0 ? "today" : repl("in %(diff)s day(s)", { diff: diff });
- $('header').append(repl('<div class="expiry-info"> \
- Your ERPNext subscription will <b>expire %(expiry_string)s</b>. \
- Please renew your subscription to continue using ERPNext \
- (and remove this annoying banner). %(payment_link)s\
- </div>', { expiry_string: expiry_string, payment_link: payment_link }));
- } else if (diff < 0) {
- $('header').append(repl('<div class="expiry-info"> \
- This ERPNext subscription <b>has expired</b>. %(payment_link)s\
- </div>', { expiry_string: expiry_string, payment_link: payment_link }));
- }
+ erpnext.startup.show_expiry_banner();
}
}
}
+erpnext.startup.show_expiry_banner = function() {
+ var today = dateutil.str_to_obj(wn.boot.server_date);
+ var expires_on = dateutil.str_to_obj(wn.boot.expires_on);
+ var diff = dateutil.get_diff(expires_on, today);
+ var payment_link = "<a href=\"https://erpnext.com/modes-of-payment.html\" target=\"_blank\">\
+ Click here to buy subscription.</a>";
+
+ var msg = "";
+ if (0 <= diff && diff <= 10) {
+ var expiry_string = diff==0 ? "today" : repl("in %(diff)s day(s)", { diff: diff });
+ msg = repl('Your ERPNext subscription will <b>expire %(expiry_string)s</b>. %(payment_link)s',
+ { expiry_string: expiry_string, payment_link: payment_link });
+ } else if (diff < 0) {
+ msg = repl('This ERPNext subscription <b>has expired</b>. %(payment_link)s', {payment_link: payment_link});
+ }
+
+ if(msg) wn.ui.toolbar.show_banner(msg);
+}
+
// start
$(document).bind('startup', function() {
erpnext.startup.start();
diff --git a/setup/doctype/naming_series/naming_series.py b/setup/doctype/naming_series/naming_series.py
index c9604fc..9cc4de2 100644
--- a/setup/doctype/naming_series/naming_series.py
+++ b/setup/doctype/naming_series/naming_series.py
@@ -121,8 +121,7 @@
def get_current(self, arg=None):
"""get series current"""
- self.doc.current_value = webnotes.conn.sql("""select current from tabSeries where name=%s""",
- self.doc.prefix)[0][0]
+ self.doc.current_value = webnotes.conn.get_value("Series", self.doc.prefix, "current")
def insert_series(self, series):
"""insert series if missing"""
diff --git a/stock/doctype/stock_ledger/stock_ledger.py b/stock/doctype/stock_ledger/stock_ledger.py
index ed8196a..0af18b9 100644
--- a/stock/doctype/stock_ledger/stock_ledger.py
+++ b/stock/doctype/stock_ledger/stock_ledger.py
@@ -118,7 +118,7 @@
elif purpose == 'Sales Return':
webnotes.conn.sql("update `tabSerial No` set status = 'Delivered', purchase_document_type = '', purchase_document_no = '' where name = '%s'" % serial_no)
else:
- webnotes.conn.sql("update `tabSerial No` set docstatus = 2, status = 'Not in Use', purchase_document_type = '', purchase_document_no = '', purchase_date = null, purchase_rate = 0, supplier = null, supplier_name = '', supplier_address = '', warehouse = '' where name = '%s'" % serial_no)
+ webnotes.conn.sql("update `tabSerial No` set docstatus = 2, status = 'Not in Use', purchase_document_type = '', purchase_document_no = '', purchase_date = null, purchase_rate = 0, supplier = null, supplier_name = '', address_display = '', warehouse = '' where name = '%s'" % serial_no)
def check_serial_no_exists(self, serial_no, item_code):
diff --git a/utilities/transaction_base.py b/utilities/transaction_base.py
index 20f270c..47e35f1 100644
--- a/utilities/transaction_base.py
+++ b/utilities/transaction_base.py
@@ -77,7 +77,7 @@
"""
customer_defaults = self.get_customer_defaults()
- customer_defaults["price_list"] = customer_defaults.get("price_list") or \
+ customer_defaults["price_list_name"] = customer_defaults.get("price_list") or \
webnotes.conn.get_value("Customer Group", self.doc.customer_group, "default_price_list") or \
self.doc.price_list