Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/patches/patch.py b/patches/patch.py
index 9783de5..6b3f0af 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 @@
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'")
diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js
index 584f412..2c1e77f 100644
--- a/support/doctype/support_ticket/support_ticket.js
+++ b/support/doctype/support_ticket/support_ticket.js
@@ -33,12 +33,14 @@
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);