From 63371271d24115e14ca03022eb4a3f4e5de54767 Mon Sep 17 00:00:00 2001 From: Ravi Dey Date: Wed, 13 Jul 2011 15:07:42 +0530 Subject: [PATCH 1/2] System Manager can close ticket --- support/doctype/support_ticket/support_ticket.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js index 584f41278a1..2c1e77faed5 100644 --- a/support/doctype/support_ticket/support_ticket.js +++ b/support/doctype/support_ticket/support_ticket.js @@ -33,12 +33,14 @@ $.extend(cur_frm.cscript, { refresh: function(doc) { cs.make_listing(doc); - if(!doc.__islocal) { - - if(doc.allocated_to) + if(!doc.__islocal) { + 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('Re-Open Ticket', cs['Re-Open Ticket']); + }else if(doc.allocated_to) { set_field_permlevel('status',2); if(user==doc.allocated_to && doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cs['Close Ticket']); - if(doc.status=='Closed') cur_frm.add_custom_button('Re-Open Ticket', cs['Re-Open Ticket']); + } // can't change the main message & subject once set set_field_permlevel('subject',2); From 54b0e7d8f7c46438f785217fc4a1446846bf6fd6 Mon Sep 17 00:00:00 2001 From: nabinhait Date: Wed, 13 Jul 2011 16:40:03 +0530 Subject: [PATCH 2/2] test_field will be deleted from customer --- patches/patch.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/patches/patch.py b/patches/patch.py index 9783de5a3ee..6b3f0af4363 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1,7 +1,7 @@ # REMEMBER to update this # ======================== -last_patch = 323 +last_patch = 324 #------------------------------------------- @@ -1289,3 +1289,5 @@ def execute(patch_no): reload_doc('stock', 'doctype', 'stock_entry') sql("update `tabDocField` set options = 'get_stock_and_rate' where parent = 'Stock Entry' and label = 'Get Stock and Rate'") sql("delete from `tabDocField` where label = 'Get Current Stock' and parent = 'Stock Entry'") + elif patch_no == 324: + sql("delete from `tabDocField` where fieldname = 'test_field' and parent = 'Customer'")