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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2012-11-15 12:29:06 +01:00
commit 035d8f4049
5 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
home/page/desktop/desktop.js
View File

@ -60,7 +60,7 @@ erpnext.desktop.render = function() {
// setup // setup
for(var i in wn.boot.modules_list) { for(var i in wn.boot.modules_list) {
var m = wn.boot.modules_list[i]; var m = wn.boot.modules_list[i];
if(!in_list(['Setup'], m) && wn.boot.profile.allow_modules.indexOf(m)!=-1) if(!in_list(['Setup', 'Core'], m) && wn.boot.profile.allow_modules.indexOf(m)!=-1)
add_icon(m); add_icon(m);
} }

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
}) })

8
patches/november_2012/customer_issue_allocated_to_assigned.py
View File

@ -3,13 +3,17 @@ import webnotes
def execute(): def execute():
from webnotes.widgets.form.assign_to import add from webnotes.widgets.form.assign_to import add
# clear old customer issue todos
webnotes.conn.sql("""delete from tabToDo where reference_type='Customer Issue'""")
webnotes.conn.sql("""delete from tabComment where comment like '%Form/Customer Issue%'""")
for t in webnotes.conn.sql("""select * from `tabCustomer Issue` for t in webnotes.conn.sql("""select * from `tabCustomer Issue`
where ifnull(allocated_to, '')!=''""", as_dict=1): where ifnull(allocated_to, '')!='' and ifnull(status, "")="Open" """, as_dict=1):
add({ add({
'doctype': "Customer Issue", 'doctype': "Customer Issue",
'name': t['name'], 'name': t['name'],
'assign_to': t['allocated_to'], 'assign_to': t['allocated_to'],
'assigned_by': t['owner'], 'assigned_by': t['owner'],
'description': t['complaint'], 'description': t['complaint'],
'date': t['creation'] 'date': t['creation'],
'no_notification': True
}) })