Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/hr/doctype/appraisal/appraisal.js b/hr/doctype/appraisal/appraisal.js
index 11fa328..f098b80 100644
--- a/hr/doctype/appraisal/appraisal.js
+++ b/hr/doctype/appraisal/appraisal.js
@@ -20,8 +20,9 @@
cur_frm.cscript.onload = function(doc,cdt,cdn){
if(!doc.status)
set_multiple(cdt,cdn,{status:'Draft'});
- if(doc.amended_from && doc.__islocal)
- cur_frm.cscript.refresh_appraisal_details(doc, cdt, cdn);
+ if(doc.amended_from && doc.__islocal) {
+ doc.status = "Draft";
+ }
}
cur_frm.cscript.onload_post_render = function(doc,cdt,cdn){
@@ -42,17 +43,6 @@
});
}
-
-cur_frm.cscript.refresh_appraisal_details = function(doc, cdt, cdn){
- var val = getchildren('Appraisal Goal', doc.name, 'appraisal_details', doc.doctype);
- for(var i = 0; i<val.length; i++){
- set_multiple('Appraisal Goal', val[i].name, {'target_achieved':'', 'score':'', 'scored_earned':''}, 'appraisal_details');
- }
- doc.total_score = '';
- refresh_field('appraisal_details');
- refresh_field('total_score');
-}
-
cur_frm.cscript.calculate_total_score = function(doc,cdt,cdn){
//get_server_fields('calculate_total','','',doc,cdt,cdn,1);
var val = getchildren('Appraisal Goal', doc.name, 'appraisal_details', doc.doctype);
@@ -77,7 +67,7 @@
refresh_field('score_earned', d.name, 'appraisal_details');
}
else{
- d.score_earned = '';
+ d.score_earned = 0;
refresh_field('score_earned', d.name, 'appraisal_details');
}
cur_frm.cscript.calculate_total(doc,cdt,cdn);