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

Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename

Browse Source
This commit is contained in:
Rushabh Mehta 2012-04-30 14:22:50 +05:30
commit 963c651f2c
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/setup/doctype/setup_control/setup_control.py
View File

@ -33,6 +33,7 @@ class DocType:
webnotes.conn.begin() webnotes.conn.begin()
curr_fiscal_year, fy_start_date, fy_abbr = self.get_fy_details(args.get('fy_start')) curr_fiscal_year, fy_start_date, fy_abbr = self.get_fy_details(args.get('fy_start'))
#webnotes.msgprint(self.get_fy_details(args.get('fy_start')))
args['name'] = webnotes.session.get('user') args['name'] = webnotes.session.get('user')

2
erpnext/startup/startup.js
View File

@ -94,7 +94,7 @@ erpnext.startup.start = function() {
erpnext.complete_setup.show(); erpnext.complete_setup.show();
} }
if(wn.boot.expires_on) { if(wn.boot.expires_on && in_list(user_roles, 'System Manager')) {
var today = dateutil.str_to_obj(dateutil.get_today()); var today = dateutil.str_to_obj(dateutil.get_today());
var expires_on = dateutil.str_to_obj(wn.boot.expires_on); var expires_on = dateutil.str_to_obj(wn.boot.expires_on);
var diff = dateutil.get_diff(expires_on, today); var diff = dateutil.get_diff(expires_on, today);

12
erpnext/support/doctype/support_ticket/support_ticket.js
View File

@ -48,14 +48,14 @@ $.extend(cur_frm.cscript, {
}, },
refresh: function(doc) { refresh: function(doc) {
cs.make_listing(doc); cur_frm.cscript.make_listing(doc);
if(!doc.__islocal) { if(!doc.__islocal) {
if(in_list(user_roles,'System Manager')) { if(in_list(user_roles,'System Manager')) {
if(doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cs['Close Ticket']); if(doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cur_frm.cscript['Close Ticket']);
if(doc.status=='Closed') cur_frm.add_custom_button('Re-Open Ticket', cs['Re-Open Ticket']); if(doc.status=='Closed') cur_frm.add_custom_button('Re-Open Ticket', cur_frm.cscript['Re-Open Ticket']);
}else if(doc.allocated_to) { }else if(doc.allocated_to) {
set_field_permlevel('status',2); set_field_permlevel('status',2);
if(user==doc.allocated_to && doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cs['Close Ticket']); if(user==doc.allocated_to && doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cur_frm.cscript['Close Ticket']);
} }
// can't change the main message & subject once set // can't change the main message & subject once set
@ -81,7 +81,7 @@ $.extend(cur_frm.cscript, {
}, null, -1) }, null, -1)
// render thread // render thread
cs.thread_list = new wn.ui.Listing({ cur_frm.cscript.thread_list = new wn.ui.Listing({
parent: $a(cur_frm.fields_dict['thread_html'].wrapper, 'div'), parent: $a(cur_frm.fields_dict['thread_html'].wrapper, 'div'),
no_result_message: 'No responses yet', no_result_message: 'No responses yet',
get_query: function() { get_query: function() {
@ -93,7 +93,7 @@ $.extend(cur_frm.cscript, {
new EmailMessage(parent, data, list, idx); new EmailMessage(parent, data, list, idx);
} }
}); });
cs.thread_list.run(); cur_frm.cscript.thread_list.run();
}, },