From e3be882a306891a81ca7afdf4b6ceb8897a8fd9b Mon Sep 17 00:00:00 2001
From: Yves Goldberg <admin@ygol.com>
Date: Wed, 29 May 2019 16:37:03 +0200
Subject: [PATCH 1/4] [UPD] update agreement demo data with compulsory fields

---
 agreement_legal/__manifest__.py |   1 +
 agreement_legal/data/demo.xml   | 148 ++++++++++++++++++++++++++++++++
 2 files changed, 149 insertions(+)
 create mode 100644 agreement_legal/data/demo.xml

diff --git a/agreement_legal/__manifest__.py b/agreement_legal/__manifest__.py
index aae585b4..627d71d2 100644
--- a/agreement_legal/__manifest__.py
+++ b/agreement_legal/__manifest__.py
@@ -18,6 +18,7 @@
         "data/module_category.xml",
         "data/agreement_stage.xml",
         "data/agreement_type.xml",
+        "data/demo.xml",
         "security/res_groups.xml",
         "security/ir.model.access.csv",
         "report/agreement.xml",
diff --git a/agreement_legal/data/demo.xml b/agreement_legal/data/demo.xml
new file mode 100644
index 00000000..eb1b8560
--- /dev/null
+++ b/agreement_legal/data/demo.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     © 2019 Ygol Internetwork (yves@ygol.com)
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+
+<odoo noupdate="1">
+
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market1')]"
+            />
+        </function>
+
+        <value eval="{'noupdate': False}" />
+    </function>
+
+    <record id="agreement.market1" model="agreement">
+        <field name="description">Hardware IT (C2C-IT0042)</field>
+        <field name="agreement_type_id">1</field>
+    </record>
+
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market1')]"
+            />
+        </function>
+        <value eval="{'noupdate': True}" />
+    </function>
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market2')]"
+            />
+        </function>
+
+        <value eval="{'noupdate': False}" />
+    </function>
+
+    <record id="agreement.market2" model="agreement">
+        <field name="description">Fiber access office Lausanne (C2C-IT0043)</field>
+        <field name="agreement_type_id">2</field>
+    </record>
+
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market2')]"
+            />
+        </function>
+        <value eval="{'noupdate': True}" />
+    </function>
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market3')]"
+            />
+        </function>
+
+        <value eval="{'noupdate': False}" />
+    </function>
+
+    <record id="agreement.market3" model="agreement">
+        <field name="description">Vétérinaire (AGR-VETO001)</field>
+        <field name="agreement_type_id">3</field>
+    </record>
+
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market3')]"
+            />
+        </function>
+        <value eval="{'noupdate': True}" />
+    </function>
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market4')]"
+            />
+        </function>
+
+        <value eval="{'noupdate': False}" />
+    </function>
+
+    <record id="agreement.market4" model="agreement">
+        <field name="description">Wazo IPBX deployment and maintenance (AGR-TEL001)</field>
+        <field name="agreement_type_id">3</field>
+    </record>
+
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market4')]"
+            />
+        </function>
+        <value eval="{'noupdate': True}" />
+    </function>
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market5')]"
+            />
+        </function>
+
+        <value eval="{'noupdate': False}" />
+    </function>
+
+    <record id="agreement.market5" model="agreement">
+        <field name="description">SIP Phones supply (BUY-VOIP012)</field>
+        <field name="agreement_type_id">1</field>
+    </record>
+
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market5')]"
+            />
+        </function>
+        <value eval="{'noupdate': True}" />
+    </function>
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market6')]"
+            />
+        </function>
+
+        <value eval="{'noupdate': False}" />
+    </function>
+
+    <record id="agreement.market6" model="agreement">
+        <field name="description">SIP-ISDN gateways (BUY-VOIP013)</field>
+        <field name="agreement_type_id">2</field>
+    </record>
+
+    <function name="write" model="ir.model.data">
+        <function name="search" model="ir.model.data">
+            <value
+                eval="[('module', '=', 'agreement'), ('name', '=', 'market6')]"
+            />
+        </function>
+        <value eval="{'noupdate': True}" />
+    </function>
+
+</odoo>

From 14efba8686fa363e4088248f615a3332571e1ed0 Mon Sep 17 00:00:00 2001
From: Yves Goldberg <admin@ygol.com>
Date: Wed, 29 May 2019 17:16:11 +0200
Subject: [PATCH 2/4] [UPD] move data to demo keyword

---
 agreement_legal/__manifest__.py         | 2 +-
 agreement_legal/{data => demo}/demo.xml | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename agreement_legal/{data => demo}/demo.xml (100%)

diff --git a/agreement_legal/__manifest__.py b/agreement_legal/__manifest__.py
index 627d71d2..62f4522e 100644
--- a/agreement_legal/__manifest__.py
+++ b/agreement_legal/__manifest__.py
@@ -18,7 +18,7 @@
         "data/module_category.xml",
         "data/agreement_stage.xml",
         "data/agreement_type.xml",
-        "data/demo.xml",
+        "demo/demo.xml",
         "security/res_groups.xml",
         "security/ir.model.access.csv",
         "report/agreement.xml",
diff --git a/agreement_legal/data/demo.xml b/agreement_legal/demo/demo.xml
similarity index 100%
rename from agreement_legal/data/demo.xml
rename to agreement_legal/demo/demo.xml

From acdeac5e9582e3b5803705a9c90a8fab55d1e33f Mon Sep 17 00:00:00 2001
From: Yves Goldberg <admin@ygol.com>
Date: Wed, 29 May 2019 19:20:57 +0200
Subject: [PATCH 3/4] [UPD] PR review's remarks

---
 agreement_legal/__manifest__.py |   6 +-
 agreement_legal/demo/demo.xml   | 122 ++------------------------------
 2 files changed, 11 insertions(+), 117 deletions(-)

diff --git a/agreement_legal/__manifest__.py b/agreement_legal/__manifest__.py
index 62f4522e..6937485e 100644
--- a/agreement_legal/__manifest__.py
+++ b/agreement_legal/__manifest__.py
@@ -11,14 +11,13 @@
     "website": "https://github.com/OCA/contract",
     "category": "Partner",
     "license": "AGPL-3",
-    "version": "12.0.1.0.0",
+    "version": "12.0.1.0.1",
     "depends": ["contacts", "agreement", "product"],
     "data": [
         "data/ir_sequence.xml",
         "data/module_category.xml",
         "data/agreement_stage.xml",
         "data/agreement_type.xml",
-        "demo/demo.xml",
         "security/res_groups.xml",
         "security/ir.model.access.csv",
         "report/agreement.xml",
@@ -36,6 +35,9 @@
         "views/agreement.xml",
         "views/menu.xml",
     ],
+    "demo": [
+        "demo/demo.xml"
+    ],
     "post_init_hook": "post_init_agreement_legal",
     "application": True,
     "development_status": "Beta",
diff --git a/agreement_legal/demo/demo.xml b/agreement_legal/demo/demo.xml
index eb1b8560..9edf7dd3 100644
--- a/agreement_legal/demo/demo.xml
+++ b/agreement_legal/demo/demo.xml
@@ -6,143 +6,35 @@
 
 <odoo noupdate="1">
 
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market1')]"
-            />
-        </function>
-
-        <value eval="{'noupdate': False}" />
-    </function>
-
     <record id="agreement.market1" model="agreement">
         <field name="description">Hardware IT (C2C-IT0042)</field>
-        <field name="agreement_type_id">1</field>
+        <field name="agreement_type_id" ref="agreement_type_agreement"/>
     </record>
 
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market1')]"
-            />
-        </function>
-        <value eval="{'noupdate': True}" />
-    </function>
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market2')]"
-            />
-        </function>
-
-        <value eval="{'noupdate': False}" />
-    </function>
-
     <record id="agreement.market2" model="agreement">
         <field name="description">Fiber access office Lausanne (C2C-IT0043)</field>
-        <field name="agreement_type_id">2</field>
+        <field name="agreement_type_id" ref="agreement_type_contract"/>
     </record>
 
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market2')]"
-            />
-        </function>
-        <value eval="{'noupdate': True}" />
-    </function>
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market3')]"
-            />
-        </function>
-
-        <value eval="{'noupdate': False}" />
-    </function>
-
     <record id="agreement.market3" model="agreement">
         <field name="description">Vétérinaire (AGR-VETO001)</field>
-        <field name="agreement_type_id">3</field>
+        <field name="agreement_type_id" ref="agreement_type_loi"/>
     </record>
 
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market3')]"
-            />
-        </function>
-        <value eval="{'noupdate': True}" />
-    </function>
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market4')]"
-            />
-        </function>
-
-        <value eval="{'noupdate': False}" />
-    </function>
-
     <record id="agreement.market4" model="agreement">
         <field name="description">Wazo IPBX deployment and maintenance (AGR-TEL001)</field>
-        <field name="agreement_type_id">3</field>
+        <field name="agreement_type_id" ref="agreement_type_loi"/>
     </record>
 
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market4')]"
-            />
-        </function>
-        <value eval="{'noupdate': True}" />
-    </function>
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market5')]"
-            />
-        </function>
-
-        <value eval="{'noupdate': False}" />
-    </function>
-
     <record id="agreement.market5" model="agreement">
         <field name="description">SIP Phones supply (BUY-VOIP012)</field>
-        <field name="agreement_type_id">1</field>
+        <field name="agreement_type_id" ref="agreement_type_agreement"/>
     </record>
 
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market5')]"
-            />
-        </function>
-        <value eval="{'noupdate': True}" />
-    </function>
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market6')]"
-            />
-        </function>
-
-        <value eval="{'noupdate': False}" />
-    </function>
-
     <record id="agreement.market6" model="agreement">
+        <field name="is_template">True</field>
         <field name="description">SIP-ISDN gateways (BUY-VOIP013)</field>
-        <field name="agreement_type_id">2</field>
+        <field name="agreement_type_id" ref="agreement_legal.agreement_type_contract"/>
     </record>
 
-    <function name="write" model="ir.model.data">
-        <function name="search" model="ir.model.data">
-            <value
-                eval="[('module', '=', 'agreement'), ('name', '=', 'market6')]"
-            />
-        </function>
-        <value eval="{'noupdate': True}" />
-    </function>
-
 </odoo>

From f0a6b560c0272d3e645d51863583a2b111281b7d Mon Sep 17 00:00:00 2001
From: Yves Goldberg <admin@ygol.com>
Date: Thu, 30 May 2019 01:09:52 +0200
Subject: [PATCH 4/4] Update agreement_legal/__manifest__.py

Co-Authored-By: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
---
 agreement_legal/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agreement_legal/__manifest__.py b/agreement_legal/__manifest__.py
index 6937485e..253180cb 100644
--- a/agreement_legal/__manifest__.py
+++ b/agreement_legal/__manifest__.py
@@ -11,7 +11,7 @@
     "website": "https://github.com/OCA/contract",
     "category": "Partner",
     "license": "AGPL-3",
-    "version": "12.0.1.0.1",
+    "version": "12.0.1.1.0",
     "depends": ["contacts", "agreement", "product"],
     "data": [
         "data/ir_sequence.xml",