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

hotfix for desktop icon + updates to assign to and patch

Browse Source
This commit is contained in:
Rushabh Mehta 2012-11-15 16:36:42 +05:30
parent f281a0cf2f
commit 85df835db2
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hr/doctype/appraisal/appraisal.js
View File

@ -71,15 +71,6 @@ cur_frm.cscript.calculate_total_score = function(doc,cdt,cdn){
refresh_field('total_score') 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){ cur_frm.cscript.declare_completed = function(doc,cdt,cdn){
var declare_completed_dialog; var declare_completed_dialog;

15
hr/doctype/appraisal/appraisal.py
View File

@ -18,20 +18,13 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import webnotes 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.utils import add_days, cstr, flt, getdate, now, nowdate
from webnotes.model import db_exists from webnotes.model.doclist import getlist
from webnotes.model.doc import Document, addchild, getchildren, make_autoname from webnotes.model.code import get_obj
from webnotes.model.doclist import getlist, copy_doclist from webnotes import msgprint
from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
from webnotes import session, form, msgprint, errprint
set = webnotes.conn.set set = webnotes.conn.set
sql = webnotes.conn.sql 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: class DocType:

3
patches/august_2012/task_allocated_to_assigned.py
View File

@ -11,5 +11,6 @@ def execute():
'assign_to': t['allocated_to'], 'assign_to': t['allocated_to'],
'assigned_by': t['owner'], 'assigned_by': t['owner'],
'description': t['subject'], 'description': t['subject'],
'date': t['creation'] 'date': t['creation'],
"no_notification": True
}) })