fixes in currency format, breadcrumbs

This commit is contained in:
Anand Doshi 2012-04-20 11:22:25 +05:30
parent 68bab20622
commit 17b32d4b60
2 changed files with 3 additions and 4 deletions

View file

@ -30,9 +30,8 @@ function fmt_money(v){
if(isNaN(v)) {
return ''; // not a number
} else {
var cp = wn.control_panel;
var val = 2; // variable used to differentiate other values from Millions
if(cp.currency_format == 'Millions') val = 3;
if(wn.boot.sysdefaults.currency_format == 'Millions') val = 3;
v = v.toFixed(2);
var delimiter = ","; // replace comma if desired
amount = v+'';

View file

@ -3,9 +3,9 @@ wn.views.breadcrumbs = function(parent, module, doctype, name) {
$(parent).empty();
var $bspan = $(repl('<span class="breadcrumbs">\
<a href="#%(home_page)s">Home</a></span>', {home_page: wn.boot.home_page}));
if(module) {
if(module && wn.modules[module]) {
$bspan.append(repl(' / <a href="#!%(module_page)s">%(module)s Home</a>',
{module: module, module_page: erpnext.modules[module] }))
{module: module, module_page: wn.modules[module] }))
}
if(doctype && (locals.DocType[doctype] && !locals.DocType[doctype].issingle)) {
$bspan.append(repl(' / <a href="#!List/%(doctype)s">%(doctype)s</a>',