diff --git a/core/page/data_import_tool/data_import_tool.html b/core/page/data_import_tool/data_import_tool.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/core/page/data_import_tool/data_import_tool.js b/core/page/data_import_tool/data_import_tool.js index 46a6c57e29..a8d4ecab27 100644 --- a/core/page/data_import_tool/data_import_tool.js +++ b/core/page/data_import_tool/data_import_tool.js @@ -10,7 +10,7 @@ wn.pages['data-import-tool'].onload = function(wrapper) {

\

\ - \ + \ Download with data\

\

\ @@ -141,12 +141,14 @@ wn.pages['data-import-tool'].onload = function(wrapper) { }); // add overwrite option - $(' Overwrite\ + $('\ + Overwrite\

If you are uploading a child table (for example Item Price), the all the entries of that table will be deleted (for that parent record) and new entries will be made.


') .insertBefore('#dit-upload-area form input[type="submit"]') // add ignore option - $(' Ignore Encoding Errors

') + $('\ + Ignore Encoding Errors

') .insertBefore('#dit-upload-area form input[type="submit"]') // rename button diff --git a/public/js/legacy/widgets/form/fields.js b/public/js/legacy/widgets/form/fields.js index 9023a71b6f..156ac7e3d8 100644 --- a/public/js/legacy/widgets/form/fields.js +++ b/public/js/legacy/widgets/form/fields.js @@ -128,7 +128,7 @@ Field.prototype.set_description = function(txt) { } } -Field.prototype.get_status = function() { +Field.prototype.get_status = function(explain) { // if used in filters if(this.in_filter) this.not_in_form = this.in_filter; @@ -150,16 +150,22 @@ Field.prototype.get_status = function() { else ret='None'; + if(explain) console.log("By Permission:" + ret) + // hidden if(cint(this.df.hidden)) { ret = 'None'; } + if(explain) console.log("By Hidden:" + ret) + // for submit if(ret=='Write' && cint(cur_frm.doc.docstatus) > 0) { ret = 'Read'; } + if(explain) console.log("By Submit:" + ret) + // allow on submit var a_o_s = cint(this.df.allow_on_submit); @@ -172,12 +178,16 @@ Field.prototype.get_status = function() { a_o_s = _f.cur_grid.field.df.allow_on_submit; } } + + if(explain) console.log("Allow on Submit:" + a_o_s) if(ret=="Read" && a_o_s && cint(cur_frm.doc.docstatus)==1 && cur_frm.perm[this.df.permlevel][WRITE]) { ret='Write'; } + if(explain) console.log("By Allow on Submt:" + ret) + // workflow state if(ret=="Write" && cur_frm && cur_frm.state_fieldname) { if(cint(cur_frm.read_only)) { @@ -189,13 +199,17 @@ Field.prototype.get_status = function() { ret = 'Read'; } } - + + if(explain) console.log("By Workflow:" + ret) + // make a field read_only if read_only // is checked (disregards write permission) if(ret=="Write" && cint(this.df.read_only)) { ret = "Read"; } + if(explain) console.log("By Read Only:" + ret) + return ret; } diff --git a/public/js/legacy/widgets/form/grid.js b/public/js/legacy/widgets/form/grid.js index 074628a8c3..c92a76ebb1 100644 --- a/public/js/legacy/widgets/form/grid.js +++ b/public/js/legacy/widgets/form/grid.js @@ -429,7 +429,8 @@ _f.Grid.prototype.notify_keypress = function(e, keycode) { } _f.Grid.prototype.make_template = function(hc) { - hc.template = make_field(wn.meta.get_docfield(hc.doctype, hc.fieldname), hc.doctype, '', this.field.frm, true); + hc.template = make_field(wn.meta.get_docfield(hc.doctype, hc.fieldname), hc.doctype, + '', this.field.frm, true); hc.template.grid = this; }