From c23b7bdf6b4de3aa1b6aa1697b3eb35d1a1431bc Mon Sep 17 00:00:00 2001
From: Sergi Almacellas Abellana <sergi@koolpi.com>
Date: Fri, 9 Aug 2019 16:37:32 +0200
Subject: [PATCH] Use grouped attribute on message.xml and include records
 inside data

issue8556
review272001002
---
 message.xml   |  2 +-
 timesheet.xml | 38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/message.xml b/message.xml
index f1ffaed84a..a783da828d 100644
--- a/message.xml
+++ b/message.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tryton>
-    <data group="1">
+    <data grouped="1">
         <record model="ir.message" id="msg_modify_invoiced_line">
             <field name="text">You cannot modify an invoiced line.</field>
         </record>
diff --git a/timesheet.xml b/timesheet.xml
index 9f54e071bc..04c4c00e98 100644
--- a/timesheet.xml
+++ b/timesheet.xml
@@ -14,24 +14,24 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rule_group" ref="rule_group_line_project_invoice"/>
             <field name="group" ref="group_project_invoice"/>
         </record>
-    </data>
 
-    <record model="ir.action.act_window" id="act_timesheet_line_form_invoice">
-        <field name="name">Timesheet Lines</field>
-        <field name="res_model">timesheet.line</field>
-        <field name="domain"
-            eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('invoice_line.invoice', '=', Eval('active_id')), ('invoice_line.invoice', 'in', Eval('active_ids')))]"
-            pyson="1"/>
-    </record>
-    <record model="ir.action.keyword"
-        id="act_timesheet_line_form_invoice_keyword1">
-        <field name="keyword">form_relate</field>
-        <field name="model">account.invoice,-1</field>
-        <field name="action" ref="act_timesheet_line_form_invoice"/>
-    </record>
-    <record model="ir.action-res.group"
-        id="act_timesheet_line_form_invoice-group_timesheet_admin">
-        <field name="action" ref="act_timesheet_line_form_invoice"/>
-        <field name="group" ref="timesheet.group_timesheet_admin"/>
-    </record>
+        <record model="ir.action.act_window" id="act_timesheet_line_form_invoice">
+            <field name="name">Timesheet Lines</field>
+            <field name="res_model">timesheet.line</field>
+            <field name="domain"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('invoice_line.invoice', '=', Eval('active_id')), ('invoice_line.invoice', 'in', Eval('active_ids')))]"
+                pyson="1"/>
+        </record>
+        <record model="ir.action.keyword"
+            id="act_timesheet_line_form_invoice_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">account.invoice,-1</field>
+            <field name="action" ref="act_timesheet_line_form_invoice"/>
+        </record>
+        <record model="ir.action-res.group"
+            id="act_timesheet_line_form_invoice-group_timesheet_admin">
+            <field name="action" ref="act_timesheet_line_form_invoice"/>
+            <field name="group" ref="timesheet.group_timesheet_admin"/>
+        </record>
+    </data>
 </tryton>