[MERGE] from trunk

bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g

3 files changed, 39 insertions, 37 deletions

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 976a706ac54..2aa6d4e1bcd 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -241,7 +241,7 @@ class project_issue(base_stage, osv.osv):
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
-        'stage_id': fields.many2one ('project.task.type', 'Stages',
+        'stage_id': fields.many2one ('project.task.type', 'Stage',
                         domain="['|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index 8f0f097cb87..34fea22f9b9 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -8,13 +8,13 @@
         <record model="crm.case.categ" id="bug_categ">
             <field name="name">Maintenance</field>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+            <field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
         </record>    
 
         <record model="crm.case.categ" id="feature_request_categ">
             <field name="name">Feature Requests</field>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>        
+            <field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
         </record>
 
         <!-- Case type_id -->
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 5e37157d8f2..9f0c92b3e91 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -55,26 +55,28 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="case_open" string="Open" type="object"
-                            states="draft,pending" class="oe_highlight"/>
-                    <button name="case_close" string="Done" type="object"
-                            states="open"/>
-                     <button name="case_close" string="Done" type="object"
-                            states="draft,pending"/>
-                    <button name="case_pending" string="Pending" type="object"
-                            states="draft,open" />
-                    <button name="case_escalate" string="Escalate" type="object"
-                            states="draft,open,pending" />
-                    <button name="case_reset" string="Reset to New" type="object"
-                            states="cancelled,done" />
-                    <button name="stage_previous" string="Previous Stage" type="object"
-                            states="open,pending" icon="gtk-go-back"
-                            attrs="{'invisible': [('stage_id','=', False)]}"/>
-                    <button name="stage_next" string="Next Stage" type="object"
-                            states="open,pending" icon="gtk-go-forward"
-                            attrs="{'invisible': [('stage_id','=', False)]}"/>
-                    <button name="case_cancel" string="Cancel" type="object"
-                            states="draft,open,pending"/>
+                    <span groups="base.group_user">
+                        <button name="case_open" string="Open" type="object"
+                                states="draft,pending" class="oe_highlight"/>
+                        <button name="case_close" string="Done" type="object"
+                                states="open"/>
+                         <button name="case_close" string="Done" type="object"
+                                states="draft,pending"/>
+                        <button name="case_pending" string="Pending" type="object"
+                                states="draft,open" />
+                        <button name="case_escalate" string="Escalate" type="object"
+                                states="draft,open,pending" />
+                        <button name="case_reset" string="Reset to New" type="object"
+                                states="cancelled,done" />
+                        <button name="stage_previous" string="Previous Stage" type="object"
+                                states="open,pending" icon="gtk-go-back"
+                                attrs="{'invisible': [('stage_id','=', False)]}"/>
+                        <button name="stage_next" string="Next Stage" type="object"
+                                states="open,pending" icon="gtk-go-forward"
+                                attrs="{'invisible': [('stage_id','=', False)]}"/>
+                        <button name="case_cancel" string="Cancel" type="object"
+                                states="draft,open,pending"/>
+                    </span>
                     <field name="stage_id" widget="statusbar"/>
                 </header>
                 <sheet string="Issue">
@@ -88,7 +90,7 @@
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
                         </group><group>
-                            <field name="task_id" on_change="onchange_task_id(task_id)" />
+                            <field name="task_id" on_change="onchange_task_id(task_id)"/>
                             <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                             <field name="version_id" widget="selection"/>
                             <field name="priority"/>
@@ -96,7 +98,7 @@
                             <field name="state" groups="base.group_no_one"/>
                         </group>
                     </group>
-                    <field name="description" placeholder="Add a description..." />
+                    <field name="description" placeholder="Add a description..."/>
 
                     <notebook groups="base.group_no_one">
                         <page string="Extra Info">
@@ -135,8 +137,8 @@
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
                     <field name="partner_id"/>
-                    <field name="project_id" />
-                    <field name="priority" string="Priority"/>
+                    <field name="project_id"/>
+                    <field name="priority" string="Priority" groups="base.group_user"/>
                     <field name="version_id" widget="selection"/>
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
@@ -170,24 +172,24 @@
                     <newline/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
+                            domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]"
-                            context="{'group_by':'partner_id'}" />
+                            context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Project"  icon="terp-folder-violet" domain="[]"
-                            context="{'group_by':'project_id'}" />
+                            context="{'group_by':'project_id'}"/>
                         <filter string="Version" icon="terp-gtk-jump-to-rtl"
-                            domain="[]" context="{'group_by':'version_id'}" />
+                            domain="[]" context="{'group_by':'version_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"
-                            context="{'group_by':'categ_id'}" />
+                            context="{'group_by':'categ_id'}"/>
                         <filter string="Priority" icon="terp-rating-rated" domain="[]"
-                            context="{'group_by':'priority'}" />
+                            context="{'group_by':'priority'}"/>
                         <filter string="Stage" icon="terp-stage" domain="[]"
-                            context="{'group_by':'stage_id'}" />
+                            context="{'group_by':'stage_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
-                            context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
+                            context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
                     </group>
@@ -219,7 +221,7 @@
             <kanban default_group_by="stage_id">
                 <field name="color"/>
                 <field name="state" groups="base.group_no_one"/>
-                <field name="priority"/>
+                <field name="priority" groups="base.group_user"/>
                 <field name="user_email"/>
                 <field name="user_id"/>
                 <templates>