[MERGE]:merge with main project branch

bzr revid: mma@tinyerp.com-20120601123737-fh6412cdyke7bqdd
bzr revid: mma@tinyerp.com-20120601124150-2grs2hqdkye6ww2n

1 files changed, 30 insertions, 39 deletions

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 148d2f79b97..082ce6afd78 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -52,14 +52,26 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object"/>
-                    <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-                    <button name="case_pending" string="Pending" states="draft,open" type="object"/>
-                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
+                    <button name="case_open" string="Open" type="object"
+                            states="draft,pending"/>
+                    <button name="case_close" string="Done" type="object"
+                            states="draft,open,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"/>
                     <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                        <field name="stage_id" nolabel="1" widget="statusbar"/>
                     </div>
                     <div class="oe_clear"/>
                 </div>
@@ -75,11 +87,7 @@
                         </group>
                         <field name="user_id"/>
                         <field name="version_id" colspan="2" widget="selection"/>
-                        <group colspan="2" col="4">
-                            <field name="type_id" string="Stages" />
-                            <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
-                            <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
-                        </group>
+                        <field name="state" groups="base.group_no_one"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -138,19 +146,11 @@
                     <field name="partner_id"/>
                     <field name="project_id" />
                     <field name="priority" string="Priority"/>
-                    <field name="type_id" widget="selection" readonly="1" string="Stages" />
-                    <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
-                    <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id" widget="selection"/>
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
-                    <field name="state"/>
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" help="To Do"/>
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
+                    <field name="stage_id" widget="selection" readonly="1"/>
+                    <field name="state" groups="base.group_no_one"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
@@ -192,7 +192,7 @@
                         <filter string="Priority" icon="terp-rating-rated" domain="[]"
                             context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]"
-                            context="{'group_by':'type_id'}" />
+                            context="{'group_by':'stage_id'}" />
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
                             context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
@@ -224,9 +224,9 @@
         <field name="model">project.issue</field>
         <field name="type">kanban</field>
         <field name="arch" type="xml">
-            <kanban default_group_by="type_id">
+            <kanban default_group_by="stage_id">
                 <field name="color"/>
-                <field name="state"/>
+                <field name="state" groups="base.group_no_one"/>
                 <field name="priority"/>
                 <field name="user_email"/>
                 <field name="user_id"/>
@@ -270,8 +270,7 @@
                                         <a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/>
                                     </div>
                                     <div class="oe_kanban_right">
-                                        <a name="case_open" string="Open" states="draft,pending" type="object" icon="kanban-apply" />
-                                        <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause"/>
+                                        <a name="case_open" string="Open" states="draft,pending" type="object" icon="kanban-apply"/>
                                         <a name="case_close" string="Close" states="open,draft,pending" type="object" icon="kanban-stop"/>
                                     </div>
                                     <div class="oe_kanban_clear"/>
@@ -304,18 +303,10 @@
                     <field name="name" string="Feature description"/>
                     <field name="partner_id"/>
                     <field name="priority" string="Priority"/>
-                    <field name="type_id" widget="selection" readonly="1"/>
-                    <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
-                    <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id"/>
                     <field name="user_id"/>
-                    <field name="state"/>
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
+                    <field name="stage_id" widget="selection" readonly="1"/>
+                    <field name="state" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
@@ -326,13 +317,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
-                    <filter icon="terp-go-today" string="Today" 
+                    <filter icon="terp-go-today" string="Today"
                         domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's features"/>
                     <separator orientation="vertical"/>
                     <group>
                         <field name="name" string="Feature description"/>
                         <field name="user_id"/>
-                        <field name="state">
+                        <field name="state" groups="base.group_no_one">
                         <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                         <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                         </field>