From 1f8a6dd0a57d6fd484d7b94abe52c1d0750a2cf5 Mon Sep 17 00:00:00 2001
From: Benjamin <benjamin@le-filament.com>
Date: Mon, 23 Dec 2019 11:22:01 +0100
Subject: [PATCH] [MIG] Make module installable in v12
---
views/assets.xml | 3 +--
views/training_course_view.xml | 2 +-
views/training_session_view.xml | 6 +++---
views/training_training_view.xml | 20 ++++++++++----------
4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/views/assets.xml b/views/assets.xml
index 40c2275..a89252c 100644
--- a/views/assets.xml
+++ b/views/assets.xml
@@ -3,9 +3,8 @@
<odoo>
<data>
- <template id="training_assets_common" name="training_assets" inherit_id="report.assets_common">
+ <template id="training_assets_common" name="training_assets" inherit_id="web.report_assets_common">
<xpath expr="." position="inside">
- <!-- <link href="https://fonts.googleapis.com/css?family=Lato:300,400|Lekton:400,700" rel="stylesheet"/> -->
<link rel="stylesheet" href="/lefilament_training/static/src/less/style.less"/>
</xpath>
</template>
diff --git a/views/training_course_view.xml b/views/training_course_view.xml
index 17f4354..0ad09cc 100644
--- a/views/training_course_view.xml
+++ b/views/training_course_view.xml
@@ -69,7 +69,7 @@
<field name="name"/>
<!-- Groupes -->
<group expand="0" name="group_by" string="Group By">
- <filter string="Nombre de sessions" domain="[]" context="{'group_by' : 'duration_total'}" />
+ <filter string="Nombre de sessions" name ="group_duration_total" domain="[]" context="{'group_by' : 'duration_total'}" />
</group>
</search>
</field>
diff --git a/views/training_session_view.xml b/views/training_session_view.xml
index ce723e7..96aa1f1 100644
--- a/views/training_session_view.xml
+++ b/views/training_session_view.xml
@@ -50,9 +50,9 @@
<!-- Groupes -->
<group expand="0" name="group_by" string="Group By">
- <filter string="Formateur" domain="[]" context="{'group_by' : 'user_id'}" />
- <filter string="Formation" domain="[]" context="{'group_by' : 'training_id'}" />
- <filter string="Mois" domain="[]" context="{'group_by' : 'date'}" />
+ <filter string="Formateur" name="group_user" domain="[]" context="{'group_by' : 'user_id'}" />
+ <filter string="Formation" name="group_training" domain="[]" context="{'group_by' : 'training_id'}" />
+ <filter string="Mois" name="group_month" domain="[]" context="{'group_by' : 'date'}" />
</group>
</search>
</field>
diff --git a/views/training_training_view.xml b/views/training_training_view.xml
index 8880239..79a312c 100644
--- a/views/training_training_view.xml
+++ b/views/training_training_view.xml
@@ -127,20 +127,20 @@
<field name="opco_id"/>
<field name="course_id"/>
<!-- Filtres -->
- <filter string="Brouillon" domain="[('state','=','draft')]"/>
- <filter string="En cours" domain="[('state','=','current')]"/>
- <filter string="Réalisé" domain="[('state','=','done')]"/>
+ <filter string="Brouillon" name="filter_draft" domain="[('state','=','draft')]"/>
+ <filter string="En cours" name="filter_current" domain="[('state','=','current')]"/>
+ <filter string="Réalisé" name="filter_done" domain="[('state','=','done')]"/>
<separator></separator>
- <filter string="INTRA" domain="[('type','=','intra')]"/>
- <filter string="INTER" domain="[('type','=','inter')]"/>
+ <filter string="INTRA" name="filter_intra" domain="[('type','=','intra')]"/>
+ <filter string="INTER" name="filter_inter" domain="[('type','=','inter')]"/>
<!-- Groupes -->
<group expand="0" name="group_by" string="Group By">
- <filter string="Client" domain="[]" context="{'group_by' : 'customer_id'}" />
- <filter string="OPCO" domain="[]" context="{'group_by' : 'opco_id'}" />
- <filter string="Formation" domain="[]" context="{'group_by' : 'course_id'}" />
+ <filter string="Client" name="group_customer" domain="[]" context="{'group_by' : 'customer_id'}" />
+ <filter string="OPCO" name="group_opco" domain="[]" context="{'group_by' : 'opco_id'}" />
+ <filter string="Formation" name="group_course" domain="[]" context="{'group_by' : 'course_id'}" />
<separator></separator>
- <filter string="Date Début" domain="[]" context="{'group_by' : 'date_begin'}" />
- <filter string="Date Fin" domain="[]" context="{'group_by' : 'date_end'}" />
+ <filter string="Date Début" name="group_start" domain="[]" context="{'group_by' : 'date_begin'}" />
+ <filter string="Date Fin" name="group_end" domain="[]" context="{'group_by' : 'date_end'}" />
</group>
</search>
</field>
--
GitLab