From 7c135ed2fc0c35ac2fca579a1abfff85f2e10b03 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 19 Apr 2012 17:58:56 +0530 Subject: [PATCH 1/2] projects date_format to be fetched from wn.boot.sysdefaults --- erpnext/projects/page/projects/projects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/projects/page/projects/projects.js b/erpnext/projects/page/projects/projects.js index 3778a34b61..1ffbe5af20 100644 --- a/erpnext/projects/page/projects/projects.js +++ b/erpnext/projects/page/projects/projects.js @@ -74,7 +74,7 @@ GanttChart.prototype.make_date = function(label,idx) { var w = this.make_filter(label,idx); var i = $a(w, 'input'); - var user_fmt = wn.control_panel.date_format; + var user_fmt = wn.boot.sysdefaults.date_format; if(!this.user_fmt)this.user_fmt = 'dd-mm-yy'; $(i).datepicker({ From b301251090f4daa372eef1a8d643cdd4dbd7b130 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 20 Apr 2012 11:51:27 +0530 Subject: [PATCH 2/2] Store base currency on client side --- erpnext/selling/doctype/sales_common/sales_common.js | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/selling/doctype/sales_common/sales_common.js b/erpnext/selling/doctype/sales_common/sales_common.js index b257d6da51..a4a6fe6c43 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.js +++ b/erpnext/selling/doctype/sales_common/sales_common.js @@ -140,6 +140,7 @@ var set_dynamic_label_child = function(doc, cdt, cdn, base_curr) { //------------------------------------------------------------------ cur_frm.cscript.dynamic_label = function(doc, cdt, cdn, base_curr, callback) { + cur_frm.cscript.base_currency = base_curr; set_dynamic_label_par(doc, cdt, cdn, base_curr); set_dynamic_label_child(doc, cdt, cdn, base_curr);