merge from trunk

bzr revid: goran.kliska@slobodni-programi.hr-20121210111404-jcwlv3nsa16bu8zq

1 files changed, 149 insertions, 128 deletions

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9800c209dd5..18e471ddd40 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,16 +2,12 @@
 <openerp>
     <data>
 
-    <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/>
-
-    # ------------------------------------------------------
-    # Project User Allocation
-    # ------------------------------------------------------
+        <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/>
 
+        <!-- Project User Allocation -->
         <record id="view_project_user_allocation_gantt" model="ir.ui.view">
             <field name="name">project.user.allocation.gantt</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">gantt</field>
             <field name="arch" type="xml">
               <gantt date_start="date_start" date_stop="date_end" default_group_by="user_id">
               </gantt>
@@ -21,7 +17,6 @@
         <record id="view_project_user_allocation_calendar" model="ir.ui.view">
             <field name="name">project.user.allocation.calendar</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_start" date_stop="date_end" day_length="12" string="Users">
@@ -35,10 +30,9 @@
         <record id="view_project_user_allocation_form" model="ir.ui.view">
             <field name="name">project.user.allocation.form</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project User Allocation">
-                    <group colspan="4" col="6">
+                <form string="Project User Allocation" version="7.0">
+                    <group col="4">
                         <field name="user_id"/>
                         <field name="phase_id"/>
                         <field name="project_id"/>
@@ -52,7 +46,6 @@
         <record id="view_project_user_allocation_list" model="ir.ui.view">
             <field name="name">project.user.allocation.list</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Project User Allocation">
@@ -66,86 +59,142 @@
        <record id="view_project_user_allocation_search" model="ir.ui.view">
             <field name="name">project.user.allocation.search</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Planning of Users">
-                    <group>
-                        <field name="user_id"/>
-                        <field name="phase_id"/>
-                        <field name="project_id"/>
-                    </group>
-                    <newline/>
+                    <field name="user_id"/>
+                    <field name="phase_id"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By...">
                         <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
             </field>
         </record>
-       <record id="act_resouce_allocation" model="ir.actions.act_window">
+        <record id="act_resouce_allocation" model="ir.actions.act_window">
             <field name="name">Planning of Users</field>
             <field name="res_model">project.user.allocation</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
-             <field name="context">{}</field>
+            <field name="context">{}</field>
             <field name="search_view_id" ref="view_project_user_allocation_search"/>
         </record>
 
 
-    # ------------------------------------------------------
-    # Project Phase
-    # ------------------------------------------------------
+        <!-- Project Phase -->
+
+        <record id="act_project_phases" model="ir.actions.act_window">
+            <field name="res_model">project.phase</field>
+            <field name="view_type">form</field>
+            <field name="name">Phases</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+        </record>
+
+        <record id="project_phase_form" model="ir.ui.view">
+            <field name="name">Inherit project form : Phase</field>
+            <field name="model">project.project</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='options_active']" position='inside'>
+                       <field name="use_phases" class="oe_inline"/>
+                       <label for="use_phases"/>
+                </xpath>
+                <xpath expr="//div[@name='buttons']" position='inside'>
+                        <button name="%(act_project_phases)d"
+                                string="Phases" type="action"
+                                attrs="{'invisible':[('use_phases','=', 0)]}"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_project_kanban_phase" model="ir.ui.view">
+            <field name="name">project.project.kanban.inherited</field>
+            <field name="model">project.project</field>
+            <field name="inherit_id" ref="project.view_project_kanban"/>
+            <field name="arch" type="xml">
+                <field name="use_tasks" position="after">
+                    <field name="use_phases"/>
+                    <field name="phase_count"/>
+                </field>
+                <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
+                    <a t-if="record.use_phases.raw_value"
+                        name="%(act_project_phases)d" type="action">
+                        <span t-if="record.phase_count.raw_value gt 1"><field name="phase_count"/> Phases</span>
+                        <span t-if="record.phase_count.raw_value lt 2"><field name="phase_count"/> Phase</span>
+                    </a>
+                </xpath>
+            </field>
+        </record>
+        
+        <record id="project_phase_task_list" model="ir.actions.act_window">
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="name">Tasks</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}</field>
+        </record>
 
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project Phase">
-                    <group colspan="6" col="6">
-                        <group colspan="6" col="7" >
-                            <field name="name" colspan="4"/>
-                            <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
-                            <field name="date_start"/>
-                            <field name="date_end"/>
-                            <field name="duration"/>
-                            <field name="product_uom" nolabel="1"/>
+                <form string="Project Phase" version="7.0">
+                <header>
+                    <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
+                    <button string="Done" name="set_done" states="pending,open"/>
+                    <button string="Pending" name="set_pending" states="open"/>
+                    <button string="Draft" name="set_draft" states="open"/>
+                    <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                </header>
+                <sheet>
+                    <button name="%(project_phase_task_list)d" string="Related Tasks" type="action" class="oe_right"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                    </div>
+                    <group>
+                        <group>
+                            <label for="date_start" string="Duration"/>
+                            <div>
+                                <div>
+                                    <field name="duration" class="oe_inline"/>
+                                    <field name="product_uom" class="oe_inline"/>
+                                </div>
+                                <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group>
+                            <field name="project_id" on_change="onchange_project(project_id)"/>
                         </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Planning of Users">
-                            <field colspan="4" name="user_ids" nolabel="1">
+                            <field name="user_ids">
                                  <tree editable="bottom" string="Project Users">
-                                    <field name="user_id"/>
-                                    <field name="date_start"/>
-                                    <field name="date_end"/>
+                                      <field name="user_id"/>
+                                      <field name="date_start"/>
+                                      <field name="date_end"/>
                                   </tree>
-                                  <form string="Project Users">
-                                    <field name="user_id"/>
-                                    <field name="date_start" />
-                                    <field name="date_end"/>
+                                  <form string="Project Users" version="7.0">
+                                      <group col="4">
+                                          <field name="user_id"/>
+                                          <field name="date_start"/>
+                                          <field name="date_end"/>
+                                      </group>
                                   </form>
                              </field>
-                            <separator string="" colspan="4"/>
-                            <group col="12" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
-                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
-                                <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                                <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
-                                <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
-                                <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                            </group>
                         </page>
                         <page string="Tasks Details">
-                            <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
+                            <field name="task_ids" readonly="1" context="{'default_project_id' :project_id}">
                                  <tree string="Project's Tasks">
                                     <field name="sequence"/>
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="date_start"/>
-                                    <field name="date_end" />
+                                    <field name="date_end"/>
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
@@ -155,24 +204,23 @@
                              </field>
                         </page>
                         <page string="Constraints">
-                           <group colspan="2" col="2">
-                                <separator string="Constraints" colspan="2"/>
-                                <field name="constraint_date_start"/>
-                                <field name="constraint_date_end"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Displaying settings" colspan="2"/>
-                                <field name="sequence"/>
+                           <group>
+                               <group>
+                                    <field name="constraint_date_start"/>
+                                    <field name="constraint_date_end"/>
+                                </group>
+                                <group>
+                                    <field name="sequence"/>
+                                     <field name="user_force_ids" widget="many2many_tags"/>
+                                </group>
                             </group>
-                           <separator colspan="4" string="Force Assigned Users"/>
-                           <field colspan="4" name="user_force_ids" nolabel="1"/>
-                           <separator colspan="4" string="Previous Phases"/>
-                           <field colspan="4" name="previous_phase_ids" nolabel="1"/>
-                           <separator colspan="4" string="Next Phases"/>
-                           <field colspan="4" name="next_phase_ids" nolabel="1"/>
+                           <separator string="Previous Phases"/>
+                           <field name="previous_phase_ids"/>
+                           <separator string="Next Phases"/>
+                           <field name="next_phase_ids"/>
                         </page>
                     </notebook>
-                    <newline/>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -180,7 +228,6 @@
         <record id="view_project_phase_list" model="ir.ui.view">
             <field name="name">project.phase.list</field>
             <field name="model">project.phase</field>
-            <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancelled','done');blue:state == 'pending'" string="Project Phases">
@@ -197,7 +244,6 @@
         <record id="view_project_phase_calendar" model="ir.ui.view">
             <field name="name">project.phase.calendar</field>
             <field name="model">project.phase</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="project_id" date_start="date_start" date_stop="date_end" day_length="12">
@@ -209,7 +255,6 @@
         <record id="view_project_phase_gantt" model="ir.ui.view">
             <field name="name">project.phase.gantt</field>
             <field name="model">project.phase</field>
-            <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <gantt date_stop="date_end" date_start="date_start" default_group_by="project_id">
@@ -220,27 +265,20 @@
         <record id="view_project_phase_search" model="ir.ui.view">
             <field name="name">project.phase.search</field>
             <field name="model">project.phase</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Project Phases">
-                    <group>
-                        <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
-                        <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="project_id">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
-                        </field>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Group By..." groups="base.group_extended">
+                    <field name="name" string="Project Phases"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                    <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
+                    <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
+                    <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
+                    <separator/>
+                    <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
+                    <field name="project_id"/>
+                    <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
                     </group>
                 </search>
@@ -267,29 +305,24 @@
         </record>
 
 
-    # ------------------------------------------------------
-    # Project Task
-    # ------------------------------------------------------
-
+        <!-- Project Task -->
         <record id="view_phase_task_form2" model="ir.ui.view">
             <field name="name">phase.task.form2</field>
             <field name="model">project.task</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='effective_hours']" position="after">
-                    <field name="phase_id"/>
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="phase_id" context="{'default_project_id' : project_id}"/>
                 </xpath>
             </field>
         </record>
         <record id="view_phase_task_search_form" model="ir.ui.view">
             <field name="name">phase.task.search.form</field>
             <field name="model">project.task</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
-                <field name="project_id" position="after">
-                    <field name="phase_id" select="1"/>
+                <field name="user_id" position="before">
+                    <field name="phase_id"/>
                 </field>
             </field>
         </record>
@@ -297,11 +330,10 @@
          <record id="view_phase_task_search_form_group" model="ir.ui.view">
             <field name="name">phase.task.search.form.group</field>
             <field name="model">project.task</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
             <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" position="after">
-                <filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}" groups="base.group_extended"/>
+                <filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}"/>
             </filter>
             </field>
         </record>
@@ -309,38 +341,28 @@
          <record id="view_phase_task_search_form_tree" model="ir.ui.view">
             <field name="name">phase.task.search.form.tree</field>
             <field name="model">project.task</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="project.view_task_tree2"/>
             <field name="arch" type="xml">
                 <field name="project_id" position="after">
-                    <field name="phase_id" invisible="1" groups="base.group_extended"/>
+                    <field name="phase_id" invisible="1"/>
                 </field>
             </field>
         </record>
 
-    <act_window
-        context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
-        id="project_phase_task_list"
-        name="Related Tasks"
-        res_model="project.task"
-        src_model="project.phase"
-        view_mode="tree,form"
-        />
-
-    <act_window
-        context="{'search_default_project_id': active_id, 'default_project_id': active_id}"
-        id="act_project_phases"
-        name="Phases"
-        res_model="project.phase"
-        src_model="project.project"
-        view_mode="tree,form"
-        view_type="form"
-        />
-
-    # ------------------------------------------------------
-    # Menu Items
-    # ------------------------------------------------------
+        <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.phase.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//div[@name="project"]' position='inside'>
+                    <field name="use_phases"/>
+                    <label for="use_phases"/>
+                </xpath>
+            </field>
+        </record>
 
+        <!-- Menu Items -->
         <menuitem action="act_project_phase_list"
             id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
 
@@ -353,8 +375,7 @@
             parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_users_project1"
-            groups="base.group_extended"
-            name="Resources" parent="project.menu_definitions" sequence="3"/>
+            name="Resources" parent="base.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/>