nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] [minor] fixed conflict while merging with master

Browse Source
This commit is contained in:
Nabin Hait
2013-08-19 11:06:06 +05:30
parent 4af2dbf84d c46d044efe
commit 44da6f2efe
206 changed files with 5830 additions and 1272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/account_tree_grid.js
View File

@@ -138,7 +138,7 @@ erpnext.AccountTreeGrid = wn.views.TreeGridReport.extend({
$.each(gl, function(i, v) {
var posting_date = dateutil.str_to_obj(v.posting_date);
var account = me.item_by_name[v.account];
me.update_balances(account, posting_date, v)
me.update_balances(account, posting_date, v);
});
this.update_groups();

4
public/js/conf.js
View File

@@ -3,10 +3,10 @@
wn.provide('erpnext');
wn.modules_path = 'erpnext';
// add toolbar icon
$(document).bind('toolbar_setup', function() {
wn.app.name = "ERPNext";
var brand = ($("<div></div>").append(wn.boot.website_settings.brand_html).text() || 'erpnext');
$('.navbar-brand').html('<div style="display: inline-block;">\
<object type="image/svg+xml" data="app/images/splash.svg" class="toolbar-splash"></object>\

9
public/js/startup.css
View File

@@ -19,15 +19,6 @@ span, div, td, input, textarea, button, select {
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;

36
public/js/startup.js
View File

@@ -26,26 +26,30 @@ erpnext.startup.start = function() {
"</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();

2
public/js/stock_analytics.js
View File

@@ -149,8 +149,6 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
} else {
break;
}
me.round_item_values(item);
}
}
},

11
public/js/transaction.js
View File

@@ -42,6 +42,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
callback: function(r) {
// remove this call when using client side mapper
me.set_default_values();
me.set_dynamic_labels();
}
});
}
@@ -113,13 +114,14 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
this.calculate_taxes_and_totals();
},
price_list_name: function(buying_or_selling) {
get_price_list_currency: function(buying_or_selling) {
var me = this;
if(this.frm.doc.price_list_name) {
var fieldname = buying_or_selling.toLowerCase() + "_price_list";
if(this.frm.doc[fieldname]) {
return this.frm.call({
method: "setup.utils.get_price_list_currency",
args: {
price_list_name: this.frm.doc.price_list_name,
price_list: this.frm.doc[fieldname],
},
callback: function(r) {
if(!r.exc) {
@@ -310,7 +312,8 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
if(!item_tax[item_code]) item_tax[item_code] = {};
if($.isArray(tax_data)) {
var tax_rate = tax_data[0] == null ? "" : (flt(tax_data[0], tax_rate_precision) + "%"),
tax_amount = format_currency(flt(tax_data[1], tax_amount_precision), company_currency);
tax_amount = format_currency(flt(tax_data[1], tax_amount_precision), company_currency,
tax_amount_precision);
item_tax[item_code][tax.name] = [tax_rate, tax_amount];
} else {