From e3be882a306891a81ca7afdf4b6ceb8897a8fd9b Mon Sep 17 00:00:00 2001 From: Yves Goldberg Date: Wed, 29 May 2019 16:37:03 +0200 Subject: [PATCH 1/8] [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 aae585b4e..627d71d26 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 000000000..eb1b85603 --- /dev/null +++ b/agreement_legal/data/demo.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + Hardware IT (C2C-IT0042) + 1 + + + + + + + + + + + + + + + + + + Fiber access office Lausanne (C2C-IT0043) + 2 + + + + + + + + + + + + + + + + + + Vétérinaire (AGR-VETO001) + 3 + + + + + + + + + + + + + + + + + + Wazo IPBX deployment and maintenance (AGR-TEL001) + 3 + + + + + + + + + + + + + + + + + + SIP Phones supply (BUY-VOIP012) + 1 + + + + + + + + + + + + + + + + + + SIP-ISDN gateways (BUY-VOIP013) + 2 + + + + + + + + + + From 14efba8686fa363e4088248f615a3332571e1ed0 Mon Sep 17 00:00:00 2001 From: Yves Goldberg Date: Wed, 29 May 2019 17:16:11 +0200 Subject: [PATCH 2/8] [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 627d71d26..62f4522ea 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 Date: Wed, 29 May 2019 19:20:57 +0200 Subject: [PATCH 3/8] [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 62f4522ea..6937485e4 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 eb1b85603..9edf7dd3b 100644 --- a/agreement_legal/demo/demo.xml +++ b/agreement_legal/demo/demo.xml @@ -6,143 +6,35 @@ - - - - - - - - Hardware IT (C2C-IT0042) - 1 + - - - - - - - - - - - - - - Fiber access office Lausanne (C2C-IT0043) - 2 + - - - - - - - - - - - - - - Vétérinaire (AGR-VETO001) - 3 + - - - - - - - - - - - - - - Wazo IPBX deployment and maintenance (AGR-TEL001) - 3 + - - - - - - - - - - - - - - SIP Phones supply (BUY-VOIP012) - 1 + - - - - - - - - - - - - - - + True SIP-ISDN gateways (BUY-VOIP013) - 2 + - - - - - - - From f0a6b560c0272d3e645d51863583a2b111281b7d Mon Sep 17 00:00:00 2001 From: Yves Goldberg Date: Thu, 30 May 2019 01:09:52 +0200 Subject: [PATCH 4/8] Update agreement_legal/__manifest__.py Co-Authored-By: Maxime Chambreuil --- 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 6937485e4..253180cbb 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", From 496784bb37be7f997129afcc613e6151e28c45e3 Mon Sep 17 00:00:00 2001 From: Yves Goldberg Date: Wed, 29 May 2019 16:37:03 +0200 Subject: [PATCH 5/8] [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 bbaee16da..d59c4725b 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 000000000..eb1b85603 --- /dev/null +++ b/agreement_legal/data/demo.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + Hardware IT (C2C-IT0042) + 1 + + + + + + + + + + + + + + + + + + Fiber access office Lausanne (C2C-IT0043) + 2 + + + + + + + + + + + + + + + + + + Vétérinaire (AGR-VETO001) + 3 + + + + + + + + + + + + + + + + + + Wazo IPBX deployment and maintenance (AGR-TEL001) + 3 + + + + + + + + + + + + + + + + + + SIP Phones supply (BUY-VOIP012) + 1 + + + + + + + + + + + + + + + + + + SIP-ISDN gateways (BUY-VOIP013) + 2 + + + + + + + + + + From 15fa6cff3cbee2044c46c1b4d98c467dbddb4438 Mon Sep 17 00:00:00 2001 From: Yves Goldberg Date: Wed, 29 May 2019 17:16:11 +0200 Subject: [PATCH 6/8] [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 d59c4725b..510e37632 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 8493b935a04ba50eadb10f17b343620564177cc9 Mon Sep 17 00:00:00 2001 From: Yves Goldberg Date: Wed, 29 May 2019 19:20:57 +0200 Subject: [PATCH 7/8] [UPD] PR review's remarks --- agreement_legal/__manifest__.py | 7 +- agreement_legal/demo/demo.xml | 122 ++------------------------------ 2 files changed, 11 insertions(+), 118 deletions(-) diff --git a/agreement_legal/__manifest__.py b/agreement_legal/__manifest__.py index 510e37632..fdc916968 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,9 +35,11 @@ "views/agreement.xml", "views/menu.xml", ], + "demo": [ + "demo/demo.xml" + ], 'qweb': [ "static/src/xml/domain_widget_view.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 eb1b85603..9edf7dd3b 100644 --- a/agreement_legal/demo/demo.xml +++ b/agreement_legal/demo/demo.xml @@ -6,143 +6,35 @@ - - - - - - - - Hardware IT (C2C-IT0042) - 1 + - - - - - - - - - - - - - - Fiber access office Lausanne (C2C-IT0043) - 2 + - - - - - - - - - - - - - - Vétérinaire (AGR-VETO001) - 3 + - - - - - - - - - - - - - - Wazo IPBX deployment and maintenance (AGR-TEL001) - 3 + - - - - - - - - - - - - - - SIP Phones supply (BUY-VOIP012) - 1 + - - - - - - - - - - - - - - + True SIP-ISDN gateways (BUY-VOIP013) - 2 + - - - - - - - From 155e9cf7b90c65a4a53c14a261ae76b0c81d3ad2 Mon Sep 17 00:00:00 2001 From: Yves Goldberg Date: Sat, 1 Jun 2019 10:09:40 +0200 Subject: [PATCH 8/8] [FIX] typo --- agreement_legal/__manifest__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agreement_legal/__manifest__.py b/agreement_legal/__manifest__.py index 746370688..3ea0aa1a5 100644 --- a/agreement_legal/__manifest__.py +++ b/agreement_legal/__manifest__.py @@ -39,7 +39,8 @@ "demo/demo.xml" ], 'qweb': [ - "static/src/xml/domain_widget_view.xml", + "static/src/xml/domain_widget_view.xml" + ], "post_init_hook": "post_init_agreement_legal", "application": True, "development_status": "Beta",