schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: do not clear promotion/transfer details if doc is amended (#32000)

Browse Source
This commit is contained in:
Rucha Mahabal
2022-08-29 12:10:15 +05:30
committed by GitHub
parent 8eded437d2
commit 074d484d3c
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/hr/employee_property_update.js
View File

@@ -8,11 +8,11 @@ frappe.ui.form.on(cur_frm.doctype, {
};
});
},
onload: function(frm){
if(frm.doc.__islocal){
if(frm.doctype == "Employee Promotion"){
onload: function(frm) {
if (frm.doc.__islocal && !frm.doc.amended_from) {
if (frm.doctype == "Employee Promotion") {
frm.doc.promotion_details = [];
}else if (frm.doctype == "Employee Transfer") {
} else if (frm.doctype == "Employee Transfer") {
frm.doc.transfer_details = [];
}
}
@@ -106,12 +106,12 @@ var render_dynamic_field = function(d, fieldtype, options, fieldname) {
var add_to_details = function(frm, d, table) {
let data = d.data;
if(data.fieldname){
if(validate_duplicate(frm, table, data.fieldname)){
if (data.fieldname) {
if (validate_duplicate(frm, table, data.fieldname)) {
frappe.show_alert({message:__("Property already added"), indicator:'orange'});
return false;
}
if(data.current == data.new){
if (data.current == data.new) {
frappe.show_alert({message:__("Nothing to change"), indicator:'orange'});
d.get_primary_btn().attr('disabled', false);
return false;
@@ -123,12 +123,14 @@ var add_to_details = function(frm, d, table) {
new: data.new
});
frm.refresh_field(table);
frm.fields_dict[table].grid.wrapper.find(".grid-add-row").hide();
d.fields_dict.field_html.$wrapper.html("");
d.set_value("property", "");
d.set_value('current', "");
frappe.show_alert({message:__("Added to details"),indicator:'green'});
d.data = {};
}else {
} else {
frappe.show_alert({message:__("Value missing"),indicator:'red'});
}
};