Launchpad automatic translations update.

[odoo/odoo.git] / addons / project_planning / project_planning_view.xml

diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 2152805..ef39b5d 100644 (file)
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -74,10 +74,9 @@
                                     <field name="task_ids" />
                                     <field name="note" />
                                     <field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
-
                                 </tree>
                                 <form string="Planning Lines">
-                                    <field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
+                                    <field name="user_id"/>
                                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="amount" />
                                     <field name="amount_unit" />
@@ -104,14 +103,13 @@
                                                     <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
                                                     <group col="11" colspan="4">
                                                         <field name="state" select="1"/>
+                                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                                                         <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                                                         <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
                                                         <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                                         <button name="%(project.action_project_task_close)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
-                                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-
                                                     </group>
                                                  </page>
                                                 <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
@@ -139,12 +137,12 @@
                     <group col="6" colspan="4">
                         <field name="state" select="1"
                             readonly="1" />
+                        <button name="action_cancel" states="draft,open"
+                            string="Cancel" type="object" icon="gtk-cancel" />
                         <button name="action_open" states="draft"
                             string="Open" type="object" icon="gtk-yes" />
                         <button name="action_done" states="open"
                             string="Done" type="object" icon="gtk-jump-to" />
-                        <button name="action_cancel" states="draft,open"
-                            string="Cancel" type="object" icon="gtk-cancel" />
                         <button name="action_draft" states="done,cancel"
                             string="Reset to Draft" type="object" icon="gtk-convert" />
                     </group>
@@ -213,14 +211,14 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="account_analytic_planning_view_search"/>
-            <field name="help">With its commun system for scheduling all resources of a company (people and materials), OpenERP allows you to encode then compute automatically tasks and phases scheduling, track resources allocation and availibility.</field>
+            <field name="help">With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability.</field>
         </record>
 <!--        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>-->
         <menuitem id="base.menu_project_long_term" name="Long Term Planning"
             parent="base.menu_main_pm" />
 
         <menuitem action="action_account_analytic_planning_form"
-            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
+            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager"/>
 
         <!--
             Planning statistics
@@ -277,8 +275,6 @@
             <field name="arch" type="xml">
                 <search string="Planning statistics">
                     <group col="10" colspan="4">
-                        <filter icon="gtk-execute" string="My" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="My Plannings Statistics"/>
-                        <separator orientation="vertical"/>
                         <field name="planning_id" select="1"/>
                         <field name="user_id" select="1"/>
                         <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
@@ -293,13 +289,17 @@
             <field name="res_model">report_account_analytic.planning.stat</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="context">{"search_default_user_id":uid}</field>
+            <!-- <field name="context">{"search_default_user_id":uid}</field> -->
             <field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
         </record>
         <menuitem id="next_id_85" name="Planning"
             parent="hr.menu_hr_reporting" />
         <menuitem action="action_account_analytic_planning_stat_form"
             id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
+            <menuitem  action="action_account_analytic_planning_stat_form"
+                       icon="terp-graph"
+                       id="menu_board_planning"
+                       parent="project.next_id_86"/>
 
 <!--        Analytic account Form -->