Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14044 from shreyashah115/fix-promotion-doc

Browse Source 
[Fix] Updation of new values in Employee Property History
This commit is contained in:
rohitwaghchaure 2018-05-15 15:27:16 +05:30 committed by GitHub
commit 66ece67d41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/hr/employee_property_update.js
View File

@ -57,7 +57,10 @@ var show_dialog = function(frm, table, field_labels) {
primary_action_label: __('Add to Details'), primary_action_label: __('Add to Details'),
primary_action: () => { primary_action: () => {
d.get_primary_btn().attr('disabled', true); d.get_primary_btn().attr('disabled', true);
if(d.data){ if(d.data) {
var input = $('[data-fieldname="field_html"] input');
d.data.new = input.val();
$(input).remove();
add_to_details(frm, d, table); add_to_details(frm, d, table);
} }
} }
@ -99,11 +102,6 @@ var render_dynamic_field = function(d, fieldtype, options, fieldname) {
}); });
dynamic_field.make_input(); dynamic_field.make_input();
$(dynamic_field.label_area).text(__("New")); $(dynamic_field.label_area).text(__("New"));
dynamic_field.$input.on("change", function(e) {
d.data.new = e.target.value;
}).on("awesomplete-close", function(e) {
d.data.new = e.target.value;
});
}; };
var add_to_details = function(frm, d, table) { var add_to_details = function(frm, d, table) {