From 2b775b0136a4d06c5d55848ff397f4e83abc6975 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Mon, 4 Jul 2016 14:17:07 +0200
Subject: [PATCH] [FIX] Make hr_timesheet updatable, remove command 0 in
 one2many that will violate the unique key constraint and replace them by the
 creation of ir.actions.act_window.view

---
 addons/hr_timesheet/hr_timesheet_view.xml     | 17 +++++++++---
 .../report/hr_timesheet_report_view.xml       | 26 +++++++++++++++----
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index e65249e92b0..ac34291657d 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -66,10 +66,6 @@
         <record id="act_hr_timesheet_line" model="ir.actions.act_window">
             <field name="name">Activities</field>
             <field name="res_model">account.analytic.line</field>
-            <field name="view_ids" eval="[
-                (0, False, {'view_mode': 'tree', 'view_id': ref('hr_timesheet.hr_timesheet_line_tree')}),
-                (0, False, {'view_mode': 'form', 'view_id': ref('hr_timesheet.hr_timesheet_line_form')})
-            ]"/>
             <field name="domain">[('project_id', '!=', False)]</field>
             <field name="context">{"search_default_today":1}</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
@@ -83,6 +79,19 @@
               </p>
             </field>
         </record>
+
+        <record model="ir.actions.act_window.view" id="act_hr_timesheet_line_view_tree">
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
+            <field name="act_window_id" ref="act_hr_timesheet_line"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="act_hr_timesheet_line_view_form">
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="hr_timesheet.hr_timesheet_line_form"/>
+            <field name="act_window_id" ref="act_hr_timesheet_line"/>
+        </record>
+
         <menuitem id="menu_hr_working_hours" parent="menu_hr_time_tracking" action="act_hr_timesheet_line"
             name="Detailed Activities"/>
 
diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
index c4cf159f92b..66ed0f56d99 100644
--- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
@@ -4,11 +4,6 @@
         <record id="act_hr_timesheet_report" model="ir.actions.act_window">
             <field name="name">Activities</field>
             <field name="res_model">account.analytic.line</field>
-            <field name="view_ids" eval="[
-                (0, False, {'view_mode': 'pivot', 'view_id': ref('hr_timesheet.view_hr_timesheet_line_pivot') }),
-                (0, False, {'view_mode': 'tree', 'view_id': ref('hr_timesheet.hr_timesheet_line_tree')}),
-                (0, False, {'view_mode': 'form'})
-            ]"/>
             <field name="domain">[('project_id', '!=', False)]</field>
             <field name="context">{"search_default_today":1}</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
@@ -23,6 +18,27 @@
             </field>
         </record>
 
+        <record model="ir.actions.act_window.view" id="act_hr_timesheet_report_pivot">
+            <field name="sequence" eval="1" />
+            <field name="view_mode">pivot</field>
+            <field name="view_id" ref="hr_timesheet.view_hr_timesheet_line_pivot"/>
+            <field name="act_window_id" ref="act_hr_timesheet_report"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="act_hr_timesheet_report_tree">
+            <field name="sequence" eval="2" />
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
+            <field name="act_window_id" ref="act_hr_timesheet_report"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="act_hr_timesheet_report_form">
+            <field name="sequence" eval="3" />
+            <field name="view_mode">form</field>
+            <field name="act_window_id" ref="act_hr_timesheet_report"/>
+        </record>
+
+
         <menuitem id="menu_timesheets_reports" name="Reports"
             parent="timesheet_menu_root" sequence="99" groups="base.group_hr_manager"/>
         <menuitem id="menu_hr_activity_analysis" parent="menu_timesheets_reports" action="act_hr_timesheet_report"