[MERGE] sync with trunk (state -> stage removed some test)

bzr revid: mat@openerp.com-20130911110755-zf3ytf9m27im6x9k

1 files changed, 30 insertions, 48 deletions

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 33842a9a19c..6c00902a7c0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,30 +18,27 @@
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
                     <field name="categ_ids"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
+                    <filter string="New" name="draft" domain="[('stage_id.sequence', '=', 1)]"/>
                     <separator/>
-                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
-                    <separator/>
-                    <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
-                    <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
-                    <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                    <separator/>
-                    <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
+                    <filter string="My Tasks" domain="[('user_id','=',uid)]"/>
                     <separator/>
-                    <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal"/>
-                    <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
-                        help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                        help="Show only tasks having a deadline"/>
                     <field name="partner_id"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
+                    <field name="stage_id" domain="[]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Last Stage Update" icon="terp-go-month" domain="[]" context="{'group_by':'date_last_stage_update'}"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/>
-                        <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
+                        <filter string="Start Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="End Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
@@ -104,7 +101,7 @@
                         <group>
                             <field name="user_id" string="Project Manager" 
                                     attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
-                                    context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
+                                    context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_manager']}"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                             <span></span>
                             <p attrs="{'invisible': [('analytic_account_id','=',False)]}">
@@ -130,7 +127,7 @@
                     </group>
                     <notebook>
                         <page string="Team" name="team">
-                            <field colspan="4" name="members" widget="many2many_kanban">
+                            <field colspan="4" name="members" widget="many2many_kanban" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'group_project_user']}">
                                 <kanban quick_create="false" create="true">
                                     <field name="name"/>
                                     <templates>
@@ -138,6 +135,7 @@
                                             <div style="position: relative">
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
                                                 <div class="oe_module_vignette">
+                                                    <img t-att-src="kanban_image('res.users', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                     <div class="oe_module_desc">
                                                         <field name="name"/>
                                                     </div>
@@ -342,7 +340,7 @@
                         <field colspan="4" name="name"/>
                         <field name="hours" widget="float_time"/>
                         <field name="date"/>
-                        <field name="user_id" options='{"no_open": True}'/>
+                        <field name="user_id" options='{"no_open": True}' context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_partner_manager', 'project.group_project_user']}"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </form>
@@ -357,7 +355,7 @@
                     <field name="date"/>
                     <field name="name"/>
                     <field name="hours" widget="float_time"/>
-                    <field name="user_id"/>
+                    <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'project.group_project_user']}"/>
                 </tree>
             </field>
         </record>
@@ -371,18 +369,6 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                     <header>
-                        <!--
-                        <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending" class="oe_highlight"/>
-                        <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done"/>
-                        -->
-                        <button name="project_task_reevaluate" string="Reactivate" type="object"
-                                states="cancelled,done" context="{'button_reactivate':True}" groups="base.group_user"/>
-                        <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending" groups="base.group_user"/>
-                        <button name="do_cancel" string="Cancel Task" type="object"
-                                states="draft,open,pending" groups="base.group_user"/>
                         <field name="stage_id" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet string="Task">
@@ -396,30 +382,29 @@
                     <group>
                         <group>
                             <field name="project_id"  on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
-                            <field name="user_id" 
-                                attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" 
+                            <field name="user_id"
                                 options='{"no_open": True}'
-                                context="{'default_groups_ref': ['base.group_user', 'project.group_project_user']}"/>
+                                context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_user']}"/>
                             <field name="planned_hours" widget="float_time"
                                     groups="project.group_time_work_estimation_tasks"
                                     on_change="onchange_planned(planned_hours, effective_hours)"/>
                         </group>
                         <group>
-                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="date_deadline"/>
                             <field name="categ_ids" widget="many2many_tags"/>
                             <field name="progress" widget="progressbar"
-                                groups="project.group_time_work_estimation_tasks" attrs="{'invisible':[('state','=','cancelled')]}"/>
+                                groups="project.group_time_work_estimation_tasks"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..."/>
+                            <field name="description" placeholder="Add a Description..."/>
                             <field name="work_ids" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
                                     <field name="name"/>
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
                                     <field name="date"/>
-                                    <field name="user_id"/>
+                                    <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_user']}"/>
                                 </tree>
                             </field>
                             <group>
@@ -427,7 +412,7 @@
                                 <field name="effective_hours" widget="float_time"/>
                                 <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
                                 <div>
-                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','in',('done','cancelled'))]}" groups="project.group_time_work_estimation_tasks"/>
+                                    <field name="remaining_hours" widget="float_time" groups="project.group_time_work_estimation_tasks"/>
                                 </div>
                                 <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
                              </group>
@@ -436,7 +421,7 @@
                         </page>
                         <page string="Delegation" groups="project.group_delegate_task">
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                                    states="pending,open,draft" groups="project.group_delegate_task"/>
+                                    groups="project.group_delegate_task"/>
                             <separator string="Parent Tasks"/>
                             <field name="parent_ids"/>
                             <separator string="Delegated tasks"/>
@@ -445,7 +430,6 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="stage_id"/>
-                                    <field name="state" invisible="1"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="progress" widget="progressbar"/>
                                     <field name="remaining_hours" widget="float_time"/>
@@ -453,12 +437,11 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
+                        <page string="Extra Info">
                             <group col="4">
                                 <field name="priority" groups="base.group_user"/>
                                 <field name="sequence"/>
                                 <field name="partner_id"/>
-                                <field name="state" invisible="1"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
                             <group>
@@ -467,6 +450,7 @@
                                     <field name="date_end"/>
                                 </group>
                                 <group>
+                                    <field name="date_last_stage_update" groups="base.group_no_one"/>
                                 </group>
                             </group>
                         </page>
@@ -493,7 +477,6 @@
                     <field name="user_email"/>
                     <field name="description"/>
                     <field name="sequence"/>
-                    <field name="state" groups="base.group_no_one"/>
                     <field name="kanban_state"/>
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
@@ -513,7 +496,6 @@
                                         <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li>
                                         <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li>
                                         <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li>
-                                        <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li>
                                       </ul>
                                     </li>
                                     <br/>
@@ -562,7 +544,7 @@
             <field name="model">project.task</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree fonts="bold:message_unread==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                <tree fonts="bold:message_unread==True" colors="red:date_deadline and (date_deadline&lt;current_date)" string="Tasks">
                     <field name="message_unread" invisible="1"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
@@ -575,7 +557,6 @@
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="1"/>
                     <field name="date_start" groups="base.group_no_one"/>
                     <field name="date_end" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -661,7 +642,7 @@
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,kanban</field>
-            <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d')),('state','in',('draft','pending','open'))]</field>
+            <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d'))]</field>
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
@@ -706,7 +687,6 @@
                             <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="state"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
@@ -723,7 +703,7 @@
                 <tree string="Task Stage">
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
-                    <field name="state"/>
+                    <field name="fold"/>
                 </tree>
             </field>
         </record>
@@ -767,7 +747,9 @@
         </record>
 
         <!-- User Form -->
-        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}"
+                    id="act_res_users_2_project_task_opened" name="Assigned Tasks"
+                    res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
 
         <!-- Tags -->
         <record model="ir.ui.view" id="project_category_search_view">