form toolbar lables and support ticket fix
diff --git a/erpnext/support/doctype/support_ticket/support_ticket.js b/erpnext/support/doctype/support_ticket/support_ticket.js
index 65c5fd9..48c80b5 100644
--- a/erpnext/support/doctype/support_ticket/support_ticket.js
+++ b/erpnext/support/doctype/support_ticket/support_ticket.js
@@ -48,6 +48,7 @@
},
refresh: function(doc) {
+ erpnext.hide_naming_series();
cur_frm.cscript.make_listing(doc);
if(!doc.__islocal) {
if(in_list(user_roles,'System Manager')) {
diff --git a/erpnext/support/doctype/support_ticket/support_ticket.txt b/erpnext/support/doctype/support_ticket/support_ticket.txt
index 67e60c2..c1622ab 100644
--- a/erpnext/support/doctype/support_ticket/support_ticket.txt
+++ b/erpnext/support/doctype/support_ticket/support_ticket.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-03-27 14:36:43',
+ 'creation': '2012-04-02 16:02:42',
'docstatus': 0,
- 'modified': '2012-03-27 14:36:43',
+ 'modified': '2012-05-02 11:33:24',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -26,7 +26,7 @@
'show_in_menu': 0,
'subject': u'%(subject)s',
'tag_fields': u'status,allocated_to',
- 'version': 153
+ 'version': 1
},
# These values are common for all DocField
@@ -41,6 +41,7 @@
# These values are common for all DocPerm
{
'amend': 0,
+ 'cancel': 0,
'doctype': u'DocPerm',
'name': '__common__',
'parent': u'Support Ticket',
@@ -58,7 +59,6 @@
# DocPerm
{
- 'cancel': 0,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
@@ -68,7 +68,6 @@
# DocPerm
{
- 'cancel': 0,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
@@ -78,7 +77,6 @@
# DocPerm
{
- 'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
@@ -88,7 +86,6 @@
# DocPerm
{
- 'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
@@ -98,7 +95,6 @@
# DocPerm
{
- 'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 2,
@@ -108,6 +104,21 @@
# DocField
{
+ 'doctype': u'DocField',
+ 'fieldname': u'naming_series',
+ 'fieldtype': u'Select',
+ 'hidden': 0,
+ 'label': u'Naming Series',
+ 'no_copy': 1,
+ 'options': u'SUP',
+ 'permlevel': 0,
+ 'print_hide': 1,
+ 'reqd': 0,
+ 'search_index': 0
+ },
+
+ # DocField
+ {
'colour': u'White:FFF',
'default': u'Open',
'doctype': u'DocField',
@@ -396,20 +407,5 @@
'no_copy': 1,
'permlevel': 0,
'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'naming_series',
- 'fieldtype': u'Select',
- 'hidden': 1,
- 'label': u'Series',
- 'no_copy': 1,
- 'options': u'SUP',
- 'permlevel': 0,
- 'print_hide': 1,
- 'reqd': 0,
- 'search_index': 0
}
]
\ No newline at end of file
diff --git a/js/all-app.js b/js/all-app.js
index 61afbdb..bafe125 100644
--- a/js/all-app.js
+++ b/js/all-app.js
@@ -1685,7 +1685,8 @@
*/
_f.FrmHeader=Class.extend({init:function(parent,frm){this.appframe=new wn.ui.AppFrame(parent)
this.appframe.$titlebar.append('<span class="label-area"></span>\
- <span class="breadcrumb-area"></span>');this.$w=this.appframe.$w;},refresh:function(){wn.views.breadcrumbs($(this.$w.find('.breadcrumb-area')),cur_frm.meta.module,cur_frm.meta.name,cur_frm.docname);this.refresh_labels();this.refresh_toolbar();},refresh_labels:function(){var labinfo={0:['Draft',''],1:['Submitted','label-info'],2:['Cancelled','label-important']}[cint(cur_frm.doc.docstatus)];if(cur_frm.doc.__unsaved){labinfo[1]='label-warning'}
+ <span class="breadcrumb-area"></span>');this.$w=this.appframe.$w;},refresh:function(){wn.views.breadcrumbs($(this.$w.find('.breadcrumb-area')),cur_frm.meta.module,cur_frm.meta.name,cur_frm.docname);this.refresh_labels();this.refresh_toolbar();},refresh_labels:function(){var labinfo={0:['Saved','label-success'],1:['Submitted','label-info'],2:['Cancelled','label-important']}[cint(cur_frm.doc.docstatus)];if(labinfo[0]=='Saved'&&cur_frm.meta.is_submittable){labinfo[0]='Saved, to Submit';}
+if(cur_frm.doc.__unsaved){labinfo[0]='Not Saved';labinfo[1]='label-warning'}
this.set_label(labinfo);},set_label:function(labinfo){this.$w.find('.label-area').html(repl('<span class="label %(lab_class)s">\
%(lab_status)s</span>',{lab_status:labinfo[0],lab_class:labinfo[1]}));},refresh_toolbar:function(){this.appframe.clear_buttons();var p=cur_frm.get_doc_perms();if(cur_frm.meta.read_only_onload&&!cur_frm.doc.__islocal){if(!cur_frm.editable)
this.appframe.add_button('Edit',function(){cur_frm.edit_doc();},'icon-pencil');else