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

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

Browse Source
This commit is contained in:
Nabin Hait
2012-04-23 14:03:22 +05:30
parent b743bb6c10 b301251090
commit 6dbfcdbe5c
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/projects/page/projects/projects.js
View File

@@ -74,7 +74,7 @@ GanttChart.prototype.make_date = function(label,idx) {
var w = this.make_filter(label,idx); var w = this.make_filter(label,idx);
var i = $a(w, 'input'); 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'; if(!this.user_fmt)this.user_fmt = 'dd-mm-yy';
$(i).datepicker({ $(i).datepicker({

1
erpnext/selling/doctype/sales_common/sales_common.js
View File

@@ -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.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_par(doc, cdt, cdn, base_curr);
set_dynamic_label_child(doc, cdt, cdn, base_curr); set_dynamic_label_child(doc, cdt, cdn, base_curr);