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

fixed conflict while merging with master branch

Browse Source
This commit is contained in:
Nabin Hait
2012-04-20 13:58:43 +05:30
parent 0788570ce7 e72ae2a19b
commit f7c506d69e
13 changed files with 53 additions and 31 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 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({