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

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

Browse Source
This commit is contained in:
Rushabh Mehta 2013-08-09 18:12:15 +05:30
commit 813b1cba65
5 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/js/startup.css
View File

@ -19,15 +19,6 @@ span, div, td, input, textarea, button, select {
text-align: center; 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 { .show-all-reports {
margin-top: 5px; margin-top: 5px;
font-size: 11px; font-size: 11px;

36
public/js/startup.js
View File

@ -26,26 +26,30 @@ erpnext.startup.start = function() {
"</p>", wn._("Welcome")); "</p>", wn._("Welcome"));
} }
} else if(wn.boot.expires_on && in_list(user_roles, 'System Manager')) { } else if(wn.boot.expires_on && in_list(user_roles, 'System Manager')) {
var today = dateutil.str_to_obj(wn.boot.server_date); erpnext.startup.show_expiry_banner();
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 = 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 // start
$(document).bind('startup', function() { $(document).bind('startup', function() {
erpnext.startup.start(); erpnext.startup.start();

3
setup/doctype/naming_series/naming_series.py
View File

@ -121,8 +121,7 @@ class DocType:
def get_current(self, arg=None): def get_current(self, arg=None):
"""get series current""" """get series current"""
self.doc.current_value = webnotes.conn.sql("""select current from tabSeries where name=%s""", self.doc.current_value = webnotes.conn.get_value("Series", self.doc.prefix, "current")
self.doc.prefix)[0][0]
def insert_series(self, series): def insert_series(self, series):
"""insert series if missing""" """insert series if missing"""

2
stock/doctype/stock_ledger/stock_ledger.py
View File

@ -118,7 +118,7 @@ class DocType:
elif purpose == 'Sales Return': elif purpose == 'Sales Return':
webnotes.conn.sql("update `tabSerial No` set status = 'Delivered', purchase_document_type = '', purchase_document_no = '' where name = '%s'" % serial_no) webnotes.conn.sql("update `tabSerial No` set status = 'Delivered', purchase_document_type = '', purchase_document_no = '' where name = '%s'" % serial_no)
else: 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): def check_serial_no_exists(self, serial_no, item_code):

2
utilities/transaction_base.py
View File

@ -77,7 +77,7 @@ class TransactionBase(StatusUpdater):
""" """
customer_defaults = self.get_customer_defaults() 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 \ webnotes.conn.get_value("Customer Group", self.doc.customer_group, "default_price_list") or \
self.doc.price_list self.doc.price_list