From 85df835db2fab2b3f8366b371fe4390466eb6e57 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 15 Nov 2012 16:36:42 +0530 Subject: [PATCH] hotfix for desktop icon + updates to assign to and patch --- hr/doctype/appraisal/appraisal.js | 9 --------- hr/doctype/appraisal/appraisal.py | 15 ++++----------- patches/august_2012/task_allocated_to_assigned.py | 3 ++- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/hr/doctype/appraisal/appraisal.js b/hr/doctype/appraisal/appraisal.js index 1243dc48f3..4c7c5e5e95 100644 --- a/hr/doctype/appraisal/appraisal.js +++ b/hr/doctype/appraisal/appraisal.js @@ -71,15 +71,6 @@ cur_frm.cscript.calculate_total_score = function(doc,cdt,cdn){ refresh_field('total_score') } -/*cur_frm.cscript.declare_completed = function(doc,cdt,cdn){ - $c_obj(make_doclist(doc.doctype, doc.name),'declare_completed','', function(r,rt){ - if(r.message){ - refresh_field('Status'); - cur_frm.cscript.refresh(doc,cdt,cdn); - } - }); -}*/ - cur_frm.cscript.declare_completed = function(doc,cdt,cdn){ var declare_completed_dialog; diff --git a/hr/doctype/appraisal/appraisal.py b/hr/doctype/appraisal/appraisal.py index 2b206418f4..39bc3ffa6e 100644 --- a/hr/doctype/appraisal/appraisal.py +++ b/hr/doctype/appraisal/appraisal.py @@ -18,20 +18,13 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add -from webnotes.model import db_exists -from webnotes.model.doc import Document, addchild, getchildren, make_autoname -from webnotes.model.doclist import getlist, copy_doclist -from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax -from webnotes import session, form, msgprint, errprint +from webnotes.utils import add_days, cstr, flt, getdate, now, nowdate +from webnotes.model.doclist import getlist +from webnotes.model.code import get_obj +from webnotes import msgprint set = webnotes.conn.set sql = webnotes.conn.sql -get_value = webnotes.conn.get_value -in_transaction = webnotes.conn.in_transaction -convert_to_lists = webnotes.conn.convert_to_lists - -# ----------------------------------------------------------------------------------------- class DocType: diff --git a/patches/august_2012/task_allocated_to_assigned.py b/patches/august_2012/task_allocated_to_assigned.py index 1bbc447c76..8485939eec 100644 --- a/patches/august_2012/task_allocated_to_assigned.py +++ b/patches/august_2012/task_allocated_to_assigned.py @@ -11,5 +11,6 @@ def execute(): 'assign_to': t['allocated_to'], 'assigned_by': t['owner'], 'description': t['subject'], - 'date': t['creation'] + 'date': t['creation'], + "no_notification": True }) \ No newline at end of file