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 2012-12-17 10:28:37 +05:30
commit 60f47b3648
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -719,7 +719,7 @@ def get_next_date(dt, mcount, day=None):
if not day:
day = getdate(dt).day
if month > 12:
month, year = m-12, y+1
month, year = month-12, year+1
try:
next_month_date = datetime.date(year, month, day)
except:
@ -909,4 +909,4 @@ def get_bank_cash_account(mode_of_payment):
webnotes.msgprint("Default Bank / Cash Account not set in Mode of Payment: %s. Please add a Default Account in Mode of Payment master." % mode_of_payment)
return {
"cash_bank_account": val
}
}

11
public/js/startup.js
View File

@ -57,17 +57,18 @@ erpnext.startup.start = 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\">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). \
</div>', { expiry_string: expiry_string }));
(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>. \
</div>', { expiry_string: expiry_string }));
This ERPNext subscription <b>has expired</b>. %(payment_link)s\
</div>', { expiry_string: expiry_string, payment_link: payment_link }));
}
}
erpnext.set_about();
@ -162,4 +163,4 @@ erpnext.setup_mousetrap = function() {
// start
$(document).bind('startup', function() {
erpnext.startup.start();
});
});