From 4d911d2badbc0cb24ce72dbfa126e8e7f9ce7b56 Mon Sep 17 00:00:00 2001 From: houssine Date: Tue, 21 Feb 2017 16:25:15 +0100 Subject: [PATCH 01/55] [ADD] moving odoo cooperative modules on github --- easy_my_coop_fr/__init__.py | 1 + easy_my_coop_fr/__openerp__.py | 37 +++++++++++++++++++ easy_my_coop_fr/models/__init__.py | 1 + easy_my_coop_fr/models/coop.py | 16 ++++++++ easy_my_coop_fr/views/layout_template.xml | 14 +++++++ .../views/subscription_template.xml | 11 ++++++ 6 files changed, 80 insertions(+) create mode 100644 easy_my_coop_fr/__init__.py create mode 100644 easy_my_coop_fr/__openerp__.py create mode 100644 easy_my_coop_fr/models/__init__.py create mode 100644 easy_my_coop_fr/models/coop.py create mode 100644 easy_my_coop_fr/views/layout_template.xml create mode 100644 easy_my_coop_fr/views/subscription_template.xml diff --git a/easy_my_coop_fr/__init__.py b/easy_my_coop_fr/__init__.py new file mode 100644 index 000000000..9a7e03ede --- /dev/null +++ b/easy_my_coop_fr/__init__.py @@ -0,0 +1 @@ +from . import models \ No newline at end of file diff --git a/easy_my_coop_fr/__openerp__.py b/easy_my_coop_fr/__openerp__.py new file mode 100644 index 000000000..efe2176b1 --- /dev/null +++ b/easy_my_coop_fr/__openerp__.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Copyright (C) 2013-2016 Open Architects Consulting SPRL. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +{ + "name": "Easy My Coop Fr", + "version": "1.0", + "depends": ["easy_my_coop", + "l10n_fr", + "theme_light",], + "author": "Houssine BAKKALI ", + "category": "Cooperative management", + "description": """ + This is the french localization for the easy my coop module + """, + 'data': [ + 'views/subscription_template.xml', + 'views/layout_template.xml' + ], + 'installable': True, + 'application': False, +} \ No newline at end of file diff --git a/easy_my_coop_fr/models/__init__.py b/easy_my_coop_fr/models/__init__.py new file mode 100644 index 000000000..0b756545e --- /dev/null +++ b/easy_my_coop_fr/models/__init__.py @@ -0,0 +1 @@ +from . import coop \ No newline at end of file diff --git a/easy_my_coop_fr/models/coop.py b/easy_my_coop_fr/models/coop.py new file mode 100644 index 000000000..a1da0732b --- /dev/null +++ b/easy_my_coop_fr/models/coop.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from openerp import api, fields, models, _ + + +class subscription_request(models.Model): + _inherit = 'subscription.request' + + def get_required_field(self): + required_fields = super(subscription_request,self).get_required_field() +# if 'no_registre' in required_fields: +# required_fields.remove('no_registre') + if 'iban' in required_fields: + required_fields.remove('iban') + + return required_fields \ No newline at end of file diff --git a/easy_my_coop_fr/views/layout_template.xml b/easy_my_coop_fr/views/layout_template.xml new file mode 100644 index 000000000..b85d5cd81 --- /dev/null +++ b/easy_my_coop_fr/views/layout_template.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/easy_my_coop_fr/views/subscription_template.xml b/easy_my_coop_fr/views/subscription_template.xml new file mode 100644 index 000000000..23f2b8bfd --- /dev/null +++ b/easy_my_coop_fr/views/subscription_template.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file From 8caf13963334211897f6c1165ab0571d42b1dee4 Mon Sep 17 00:00:00 2001 From: houssine Date: Thu, 30 Mar 2017 17:09:48 +0200 Subject: [PATCH 02/55] [IMP] overriding standard template of cooperator certificate --- easy_my_coop_fr/__openerp__.py | 4 +- .../views/certificate_template.xml | 49 +++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 easy_my_coop_fr/views/certificate_template.xml diff --git a/easy_my_coop_fr/__openerp__.py b/easy_my_coop_fr/__openerp__.py index efe2176b1..da97de604 100644 --- a/easy_my_coop_fr/__openerp__.py +++ b/easy_my_coop_fr/__openerp__.py @@ -30,8 +30,8 @@ """, 'data': [ 'views/subscription_template.xml', - 'views/layout_template.xml' + 'views/layout_template.xml', + 'views/certificate_template.xml' ], 'installable': True, - 'application': False, } \ No newline at end of file diff --git a/easy_my_coop_fr/views/certificate_template.xml b/easy_my_coop_fr/views/certificate_template.xml new file mode 100644 index 000000000..2c24efefd --- /dev/null +++ b/easy_my_coop_fr/views/certificate_template.xml @@ -0,0 +1,49 @@ + + + + + + \ No newline at end of file From 40b3e00cfad078f877f3ecb316850fa06ceee2a7 Mon Sep 17 00:00:00 2001 From: houssine Date: Thu, 30 Mar 2017 17:32:57 +0200 Subject: [PATCH 03/55] [IMP] remove hyphen --- easy_my_coop_fr/views/layout_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easy_my_coop_fr/views/layout_template.xml b/easy_my_coop_fr/views/layout_template.xml index b85d5cd81..4db4cd0e0 100644 --- a/easy_my_coop_fr/views/layout_template.xml +++ b/easy_my_coop_fr/views/layout_template.xml @@ -5,7 +5,7 @@ Siret : - - + From 40ad62bd670f8f534c7988b56377bdf2773c4e5d Mon Sep 17 00:00:00 2001 From: houssine Date: Mon, 3 Apr 2017 21:32:56 +0200 Subject: [PATCH 04/55] [IMP] add comment on the certificate --- easy_my_coop_fr/views/certificate_template.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/easy_my_coop_fr/views/certificate_template.xml b/easy_my_coop_fr/views/certificate_template.xml index 2c24efefd..8ea46b133 100644 --- a/easy_my_coop_fr/views/certificate_template.xml +++ b/easy_my_coop_fr/views/certificate_template.xml @@ -45,5 +45,19 @@ e) La société doit être une petite et moyenne entreprise qui satisfait à la + + \ No newline at end of file From ee5018b085632a64d92a537d99cc225fdd09cfd3 Mon Sep 17 00:00:00 2001 From: houssine Date: Wed, 5 Apr 2017 16:01:57 +0200 Subject: [PATCH 05/55] [IMP] change company type for french localization --- easy_my_coop_fr/models/coop.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/easy_my_coop_fr/models/coop.py b/easy_my_coop_fr/models/coop.py index a1da0732b..21f2a4e0c 100644 --- a/easy_my_coop_fr/models/coop.py +++ b/easy_my_coop_fr/models/coop.py @@ -6,6 +6,11 @@ class subscription_request(models.Model): _inherit = 'subscription.request' + company_type = fields.Selection([('asso','Association'), + ('eurl','EURL / Entreprise individuelle'), + ('sarl','SARL'), + ('sa','SA / SAS')]) + def get_required_field(self): required_fields = super(subscription_request,self).get_required_field() # if 'no_registre' in required_fields: From 1221880caab02ad4d66c25d194b50ff99a8c0d1a Mon Sep 17 00:00:00 2001 From: houssine Date: Thu, 6 Apr 2017 16:50:17 +0200 Subject: [PATCH 06/55] [IMP] always return true in case of a french localisation --- easy_my_coop_fr/models/coop.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/easy_my_coop_fr/models/coop.py b/easy_my_coop_fr/models/coop.py index 21f2a4e0c..33532a03d 100644 --- a/easy_my_coop_fr/models/coop.py +++ b/easy_my_coop_fr/models/coop.py @@ -13,9 +13,11 @@ class subscription_request(models.Model): def get_required_field(self): required_fields = super(subscription_request,self).get_required_field() -# if 'no_registre' in required_fields: -# required_fields.remove('no_registre') if 'iban' in required_fields: required_fields.remove('iban') - return required_fields \ No newline at end of file + return required_fields + + def check_belgian_identification_id(self, nat_register_num): + #deactivate number validation for french localization + return True \ No newline at end of file From b0459cb036e519f4c6811bbf6a417d7d47868dd3 Mon Sep 17 00:00:00 2001 From: houssine Date: Tue, 6 Feb 2018 12:03:15 +0100 Subject: [PATCH 07/55] [COPYRIGHT] MAJ copyright and website --- easy_my_coop_fr/__openerp__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/easy_my_coop_fr/__openerp__.py b/easy_my_coop_fr/__openerp__.py index da97de604..8410d32f0 100644 --- a/easy_my_coop_fr/__openerp__.py +++ b/easy_my_coop_fr/__openerp__.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (C) 2013-2016 Open Architects Consulting SPRL. +# Copyright (C) 2013-2017 Open Architects Consulting SPRL. +# Copyright (C) 2018- Coop IT Easy SCRLfs. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -23,8 +24,9 @@ "depends": ["easy_my_coop", "l10n_fr", "theme_light",], - "author": "Houssine BAKKALI ", + "author": "Houssine BAKKALI ", "category": "Cooperative management", + 'webstite': "www.coopiteasy.be", "description": """ This is the french localization for the easy my coop module """, From d9e0e91edaa46a59b4856b3d00f458c21922c1f8 Mon Sep 17 00:00:00 2001 From: houssine Date: Wed, 22 Aug 2018 12:07:49 +0200 Subject: [PATCH 08/55] [PEP8] pep8 code style refactoring --- easy_my_coop_fr/__init__.py | 2 +- easy_my_coop_fr/__openerp__.py | 6 +++--- easy_my_coop_fr/models/__init__.py | 2 +- easy_my_coop_fr/models/coop.py | 26 ++++++++++++++------------ 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/easy_my_coop_fr/__init__.py b/easy_my_coop_fr/__init__.py index 9a7e03ede..0650744f6 100644 --- a/easy_my_coop_fr/__init__.py +++ b/easy_my_coop_fr/__init__.py @@ -1 +1 @@ -from . import models \ No newline at end of file +from . import models diff --git a/easy_my_coop_fr/__openerp__.py b/easy_my_coop_fr/__openerp__.py index 8410d32f0..c479179b2 100644 --- a/easy_my_coop_fr/__openerp__.py +++ b/easy_my_coop_fr/__openerp__.py @@ -23,12 +23,12 @@ "version": "1.0", "depends": ["easy_my_coop", "l10n_fr", - "theme_light",], + "theme_light"], "author": "Houssine BAKKALI ", "category": "Cooperative management", 'webstite': "www.coopiteasy.be", "description": """ - This is the french localization for the easy my coop module + This is the french localization for the easy my coop module """, 'data': [ 'views/subscription_template.xml', @@ -36,4 +36,4 @@ 'views/certificate_template.xml' ], 'installable': True, -} \ No newline at end of file +} diff --git a/easy_my_coop_fr/models/__init__.py b/easy_my_coop_fr/models/__init__.py index 0b756545e..eaae709d6 100644 --- a/easy_my_coop_fr/models/__init__.py +++ b/easy_my_coop_fr/models/__init__.py @@ -1 +1 @@ -from . import coop \ No newline at end of file +from . import coop diff --git a/easy_my_coop_fr/models/coop.py b/easy_my_coop_fr/models/coop.py index 33532a03d..fe67a7742 100644 --- a/easy_my_coop_fr/models/coop.py +++ b/easy_my_coop_fr/models/coop.py @@ -1,23 +1,25 @@ # -*- coding: utf-8 -*- -from openerp import api, fields, models, _ +from openerp import fields, models class subscription_request(models.Model): _inherit = 'subscription.request' - - company_type = fields.Selection([('asso','Association'), - ('eurl','EURL / Entreprise individuelle'), - ('sarl','SARL'), - ('sa','SA / SAS')]) - + + company_type = fields.Selection([ + ('asso', 'Association'), + ('eurl', 'EURL / Entreprise individuelle'), + ('sarl', 'SARL'), + ('sa', 'SA / SAS')]) + def get_required_field(self): - required_fields = super(subscription_request,self).get_required_field() + required_fields = super(subscription_request, self).get_required_field() if 'iban' in required_fields: required_fields.remove('iban') - + return required_fields - + + # override function to disable the check def check_belgian_identification_id(self, nat_register_num): - #deactivate number validation for french localization - return True \ No newline at end of file + # deactivate number validation for french localization + return True From 9a8daaeb1982cc55c804bcb3f48fc58eb91e7243 Mon Sep 17 00:00:00 2001 From: houssine Date: Sat, 6 Apr 2019 11:03:43 +0200 Subject: [PATCH 09/55] [PEP8] fix pep8 --- easy_my_coop_fr/models/coop.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/easy_my_coop_fr/models/coop.py b/easy_my_coop_fr/models/coop.py index fe67a7742..a624f50cb 100644 --- a/easy_my_coop_fr/models/coop.py +++ b/easy_my_coop_fr/models/coop.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- - from openerp import fields, models -class subscription_request(models.Model): +class SubscriptionRequest(models.Model): _inherit = 'subscription.request' company_type = fields.Selection([ @@ -13,11 +12,11 @@ class subscription_request(models.Model): ('sa', 'SA / SAS')]) def get_required_field(self): - required_fields = super(subscription_request, self).get_required_field() - if 'iban' in required_fields: - required_fields.remove('iban') + req_fields = super(SubscriptionRequest, self).get_required_field() + if 'iban' in req_fields: + req_fields.remove('iban') - return required_fields + return req_fields # override function to disable the check def check_belgian_identification_id(self, nat_register_num): From 52adbb94480d04889888792e8976f1ca75d6e27c Mon Sep 17 00:00:00 2001 From: houssine Date: Fri, 10 May 2019 16:42:13 +0200 Subject: [PATCH 10/55] [MIG] migrate module to v12 --- easy_my_coop_fr/__manifest__.py | 23 +++++++++++++++++++ easy_my_coop_fr/__openerp__.py | 39 --------------------------------- 2 files changed, 23 insertions(+), 39 deletions(-) create mode 100644 easy_my_coop_fr/__manifest__.py delete mode 100644 easy_my_coop_fr/__openerp__.py diff --git a/easy_my_coop_fr/__manifest__.py b/easy_my_coop_fr/__manifest__.py new file mode 100644 index 000000000..4740c1c90 --- /dev/null +++ b/easy_my_coop_fr/__manifest__.py @@ -0,0 +1,23 @@ +# Copyright 2013-2018 Open Architects Consulting SPRL. +# Copyright 2018-Coop IT Easy SCRLfs () +# - Houssine BAKKALI - +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).# +{ + "name": "Easy My Coop Fr", + "version": "12.0.1.0.0", + "depends": ["easy_my_coop", + "l10n_fr"], + "author": "Houssine BAKKALI ", + "category": "Cooperative management", + 'webstite': "www.coopiteasy.be", + "license": "AGPL-3", + "description": """ + This is the french localization for the easy my coop module + """, + 'data': [ + 'views/subscription_template.xml', + # 'views/layout_template.xml', + 'views/certificate_template.xml' + ], + 'installable': True, +} diff --git a/easy_my_coop_fr/__openerp__.py b/easy_my_coop_fr/__openerp__.py deleted file mode 100644 index c479179b2..000000000 --- a/easy_my_coop_fr/__openerp__.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Copyright (C) 2013-2017 Open Architects Consulting SPRL. -# Copyright (C) 2018- Coop IT Easy SCRLfs. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -{ - "name": "Easy My Coop Fr", - "version": "1.0", - "depends": ["easy_my_coop", - "l10n_fr", - "theme_light"], - "author": "Houssine BAKKALI ", - "category": "Cooperative management", - 'webstite': "www.coopiteasy.be", - "description": """ - This is the french localization for the easy my coop module - """, - 'data': [ - 'views/subscription_template.xml', - 'views/layout_template.xml', - 'views/certificate_template.xml' - ], - 'installable': True, -} From c9a554549bd7516633197739d14e75b56464fd21 Mon Sep 17 00:00:00 2001 From: houssine Date: Mon, 5 Aug 2019 18:06:48 +0200 Subject: [PATCH 11/55] [REFACT] for legal reason we remove the niss number to email instead --- easy_my_coop_fr/__manifest__.py | 3 +-- easy_my_coop_fr/models/__init__.py | 1 + easy_my_coop_fr/models/coop.py | 13 ++++--------- easy_my_coop_fr/models/partner.py | 12 ++++++++++++ easy_my_coop_fr/views/subscription_template.xml | 2 -- 5 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 easy_my_coop_fr/models/partner.py diff --git a/easy_my_coop_fr/__manifest__.py b/easy_my_coop_fr/__manifest__.py index 4740c1c90..de6ca6a43 100644 --- a/easy_my_coop_fr/__manifest__.py +++ b/easy_my_coop_fr/__manifest__.py @@ -4,7 +4,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).# { "name": "Easy My Coop Fr", - "version": "12.0.1.0.0", + "version": "12.0.1.0.1", "depends": ["easy_my_coop", "l10n_fr"], "author": "Houssine BAKKALI ", @@ -16,7 +16,6 @@ """, 'data': [ 'views/subscription_template.xml', - # 'views/layout_template.xml', 'views/certificate_template.xml' ], 'installable': True, diff --git a/easy_my_coop_fr/models/__init__.py b/easy_my_coop_fr/models/__init__.py index eaae709d6..882e65696 100644 --- a/easy_my_coop_fr/models/__init__.py +++ b/easy_my_coop_fr/models/__init__.py @@ -1 +1,2 @@ from . import coop +from . import partner diff --git a/easy_my_coop_fr/models/coop.py b/easy_my_coop_fr/models/coop.py index a624f50cb..da943092c 100644 --- a/easy_my_coop_fr/models/coop.py +++ b/easy_my_coop_fr/models/coop.py @@ -1,15 +1,15 @@ -# -*- coding: utf-8 -*- -from openerp import fields, models +from odoo import fields, models class SubscriptionRequest(models.Model): _inherit = 'subscription.request' - company_type = fields.Selection([ + company_type = fields.Selection(selection_add=[ ('asso', 'Association'), ('eurl', 'EURL / Entreprise individuelle'), ('sarl', 'SARL'), - ('sa', 'SA / SAS')]) + ('sa', 'SA / SAS') + ]) def get_required_field(self): req_fields = super(SubscriptionRequest, self).get_required_field() @@ -17,8 +17,3 @@ def get_required_field(self): req_fields.remove('iban') return req_fields - - # override function to disable the check - def check_belgian_identification_id(self, nat_register_num): - # deactivate number validation for french localization - return True diff --git a/easy_my_coop_fr/models/partner.py b/easy_my_coop_fr/models/partner.py new file mode 100644 index 000000000..bf69146da --- /dev/null +++ b/easy_my_coop_fr/models/partner.py @@ -0,0 +1,12 @@ +from odoo import fields, models + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + gal_form = fields.Selection(selection_add=[ + ('asso', 'Association'), + ('eurl', 'EURL / Entreprise individuelle'), + ('sarl', 'SARL'), + ('sa', 'SA / SAS') + ]) diff --git a/easy_my_coop_fr/views/subscription_template.xml b/easy_my_coop_fr/views/subscription_template.xml index 23f2b8bfd..615c9c570 100644 --- a/easy_my_coop_fr/views/subscription_template.xml +++ b/easy_my_coop_fr/views/subscription_template.xml @@ -2,8 +2,6 @@ From bf6675b73db81f6151d43128facd4835062dbaca Mon Sep 17 00:00:00 2001 From: houssine Date: Mon, 9 Sep 2019 17:26:22 +0200 Subject: [PATCH 12/55] [FIX] fix selection field --- easy_my_coop_fr/models/coop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easy_my_coop_fr/models/coop.py b/easy_my_coop_fr/models/coop.py index da943092c..b7b205ca8 100644 --- a/easy_my_coop_fr/models/coop.py +++ b/easy_my_coop_fr/models/coop.py @@ -4,7 +4,7 @@ class SubscriptionRequest(models.Model): _inherit = 'subscription.request' - company_type = fields.Selection(selection_add=[ + company_type = fields.Selection([ ('asso', 'Association'), ('eurl', 'EURL / Entreprise individuelle'), ('sarl', 'SARL'), From 6c487c4d6249bdada52b8077a6e2d312baf1142c Mon Sep 17 00:00:00 2001 From: houssine Date: Mon, 9 Sep 2019 17:31:53 +0200 Subject: [PATCH 13/55] [FIX] fix typo and set back selection_add --- easy_my_coop_fr/models/coop.py | 2 +- easy_my_coop_fr/models/partner.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easy_my_coop_fr/models/coop.py b/easy_my_coop_fr/models/coop.py index b7b205ca8..da943092c 100644 --- a/easy_my_coop_fr/models/coop.py +++ b/easy_my_coop_fr/models/coop.py @@ -4,7 +4,7 @@ class SubscriptionRequest(models.Model): _inherit = 'subscription.request' - company_type = fields.Selection([ + company_type = fields.Selection(selection_add=[ ('asso', 'Association'), ('eurl', 'EURL / Entreprise individuelle'), ('sarl', 'SARL'), diff --git a/easy_my_coop_fr/models/partner.py b/easy_my_coop_fr/models/partner.py index bf69146da..fbaa68da9 100644 --- a/easy_my_coop_fr/models/partner.py +++ b/easy_my_coop_fr/models/partner.py @@ -4,7 +4,7 @@ class ResPartner(models.Model): _inherit = 'res.partner' - gal_form = fields.Selection(selection_add=[ + legal_form = fields.Selection(selection_add=[ ('asso', 'Association'), ('eurl', 'EURL / Entreprise individuelle'), ('sarl', 'SARL'), From e6b64a6a4827ca54e909a3bd3610b041bffc39e2 Mon Sep 17 00:00:00 2001 From: houssine Date: Mon, 9 Sep 2019 17:51:17 +0200 Subject: [PATCH 14/55] [FIX] fix inherit_id --- easy_my_coop_fr/views/subscription_template.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/easy_my_coop_fr/views/subscription_template.xml b/easy_my_coop_fr/views/subscription_template.xml index 615c9c570..72a9b094b 100644 --- a/easy_my_coop_fr/views/subscription_template.xml +++ b/easy_my_coop_fr/views/subscription_template.xml @@ -1,9 +1,14 @@ - - \ No newline at end of file + diff --git a/easy_my_coop_fr/views/layout_template.xml b/easy_my_coop_fr/views/layout_template.xml index 4db4cd0e0..df6932f9c 100644 --- a/easy_my_coop_fr/views/layout_template.xml +++ b/easy_my_coop_fr/views/layout_template.xml @@ -4,11 +4,10 @@ - diff --git a/easy_my_coop_fr/views/subscription_template.xml b/easy_my_coop_fr/views/subscription_template.xml index 72a9b094b..500d16bcb 100644 --- a/easy_my_coop_fr/views/subscription_template.xml +++ b/easy_my_coop_fr/views/subscription_template.xml @@ -11,4 +11,4 @@ - \ No newline at end of file + From 9ecb9001b808c97d85909da4781aa4bd25c31ec6 Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Wed, 22 Apr 2020 14:33:12 +0200 Subject: [PATCH 21/55] [REF] pretty xml --- .../views/certificate_template.xml | 154 +++++++++++++----- easy_my_coop_fr/views/layout_template.xml | 23 +-- .../views/subscription_template.xml | 24 +-- 3 files changed, 137 insertions(+), 64 deletions(-) diff --git a/easy_my_coop_fr/views/certificate_template.xml b/easy_my_coop_fr/views/certificate_template.xml index 39fd72356..b8360ccd0 100644 --- a/easy_my_coop_fr/views/certificate_template.xml +++ b/easy_my_coop_fr/views/certificate_template.xml @@ -1,49 +1,115 @@ - - + diff --git a/easy_my_coop_fr/views/layout_template.xml b/easy_my_coop_fr/views/layout_template.xml index df6932f9c..5271d0a57 100644 --- a/easy_my_coop_fr/views/layout_template.xml +++ b/easy_my_coop_fr/views/layout_template.xml @@ -1,13 +1,16 @@ - - - + + + diff --git a/easy_my_coop_fr/views/subscription_template.xml b/easy_my_coop_fr/views/subscription_template.xml index 500d16bcb..65ffc2244 100644 --- a/easy_my_coop_fr/views/subscription_template.xml +++ b/easy_my_coop_fr/views/subscription_template.xml @@ -1,14 +1,18 @@ - - + + - - + + From 9f6c9b5b06a184dfcf4a0db250b2a6170b15dc85 Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Wed, 22 Apr 2020 15:14:26 +0200 Subject: [PATCH 22/55] [REF] comment out unused reports --- easy_my_coop_fr/__manifest__.py | 1 + easy_my_coop_fr/views/layout_template.xml | 26 +++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/easy_my_coop_fr/__manifest__.py b/easy_my_coop_fr/__manifest__.py index b8d2b0f2e..b293f8f4a 100644 --- a/easy_my_coop_fr/__manifest__.py +++ b/easy_my_coop_fr/__manifest__.py @@ -15,6 +15,7 @@ """, "data": [ "views/subscription_template.xml", + "views/layout_template.xml", # todo remove? "views/certificate_template.xml", ], "installable": True, diff --git a/easy_my_coop_fr/views/layout_template.xml b/easy_my_coop_fr/views/layout_template.xml index 5271d0a57..51e8e8384 100644 --- a/easy_my_coop_fr/views/layout_template.xml +++ b/easy_my_coop_fr/views/layout_template.xml @@ -1,16 +1,16 @@ - - - + + + + + + + + + + + + + From cc0547f8a9dfe12d43dfb4c2f86ebbf7e4b37e94 Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Wed, 6 May 2020 18:38:45 +0200 Subject: [PATCH 23/55] [FIX] emc_fr,emc_ch : missing dependency --- easy_my_coop_fr/__manifest__.py | 2 +- easy_my_coop_fr/views/subscription_template.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/easy_my_coop_fr/__manifest__.py b/easy_my_coop_fr/__manifest__.py index b293f8f4a..1a16cd26b 100644 --- a/easy_my_coop_fr/__manifest__.py +++ b/easy_my_coop_fr/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Easy My Coop Fr", "version": "12.0.1.0.1", - "depends": ["easy_my_coop", "l10n_fr"], + "depends": ["easy_my_coop", "easy_my_coop_website", "l10n_fr"], "author": "Houssine BAKKALI ", "category": "Cooperative management", "webstite": "www.coopiteasy.be", diff --git a/easy_my_coop_fr/views/subscription_template.xml b/easy_my_coop_fr/views/subscription_template.xml index 65ffc2244..8dbb0d3ed 100644 --- a/easy_my_coop_fr/views/subscription_template.xml +++ b/easy_my_coop_fr/views/subscription_template.xml @@ -4,6 +4,7 @@ From 90bb432fbfa1652945caa2350107a2655ac56189 Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Wed, 6 May 2020 19:09:12 +0200 Subject: [PATCH 24/55] set author as Coop IT Easy SCRLfs --- easy_my_coop_fr/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easy_my_coop_fr/__manifest__.py b/easy_my_coop_fr/__manifest__.py index 1a16cd26b..92be5a09d 100644 --- a/easy_my_coop_fr/__manifest__.py +++ b/easy_my_coop_fr/__manifest__.py @@ -6,7 +6,7 @@ "name": "Easy My Coop Fr", "version": "12.0.1.0.1", "depends": ["easy_my_coop", "easy_my_coop_website", "l10n_fr"], - "author": "Houssine BAKKALI ", + "author": "Coop IT Easy SCRLfs", "category": "Cooperative management", "webstite": "www.coopiteasy.be", "license": "AGPL-3", From 2bb2acaa8ee2de58bfac99de1cddeb2a4736676c Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Wed, 12 Aug 2020 10:25:31 +0200 Subject: [PATCH 25/55] make travis green again --- easy_my_coop_fr/README.rst | 3 +-- easy_my_coop_fr/static/description/index.html | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/easy_my_coop_fr/README.rst b/easy_my_coop_fr/README.rst index 0fc0495fc..39f8ea6ff 100644 --- a/easy_my_coop_fr/README.rst +++ b/easy_my_coop_fr/README.rst @@ -42,14 +42,13 @@ Credits Authors ~~~~~~~ -* Houssine BAKKALI +* Coop IT Easy SCRLfs Contributors ~~~~~~~~~~~~ * Coop IT Easy SCRLfs - Maintainers ~~~~~~~~~~~ diff --git a/easy_my_coop_fr/static/description/index.html b/easy_my_coop_fr/static/description/index.html index c2efd200d..23f51269e 100644 --- a/easy_my_coop_fr/static/description/index.html +++ b/easy_my_coop_fr/static/description/index.html @@ -394,7 +394,7 @@

Credits

Authors

From 6c86876c7340ebe63c3a770fc5840eacd56439d8 Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Tue, 11 May 2021 11:52:50 +0200 Subject: [PATCH 26/55] [REF] pre-commit semanticless fixes --- easy_my_coop_fr/__manifest__.py | 2 +- easy_my_coop_fr/static/description/index.html | 2 +- .../views/certificate_template.xml | 70 +++++++++++-------- easy_my_coop_fr/views/layout_template.xml | 2 +- .../views/subscription_template.xml | 18 +++-- 5 files changed, 54 insertions(+), 40 deletions(-) diff --git a/easy_my_coop_fr/__manifest__.py b/easy_my_coop_fr/__manifest__.py index 92be5a09d..3ce9c5352 100644 --- a/easy_my_coop_fr/__manifest__.py +++ b/easy_my_coop_fr/__manifest__.py @@ -8,7 +8,7 @@ "depends": ["easy_my_coop", "easy_my_coop_website", "l10n_fr"], "author": "Coop IT Easy SCRLfs", "category": "Cooperative management", - "webstite": "www.coopiteasy.be", + "website": "https://github.com/OCA/sale-workflow", "license": "AGPL-3", "summary": """ This is the french localization for the easy my coop module diff --git a/easy_my_coop_fr/static/description/index.html b/easy_my_coop_fr/static/description/index.html index 23f51269e..4333d2282 100644 --- a/easy_my_coop_fr/static/description/index.html +++ b/easy_my_coop_fr/static/description/index.html @@ -3,7 +3,7 @@ - + Easy My Coop Fr -
-

Easy My Coop Fr

+
+

Cooperator France Localization

Beta License: AGPL-3 coopiteasy/vertical-cooperative

-

This is the french localization for the easy my coop module

+

This is the French localization for the Cooperators module.

Features:

  • Add French legal form of companies on partner and on Subscription Request
    • From b730e53831d9f3b48e1fae03507248e8b3134c00 Mon Sep 17 00:00:00 2001 From: Victor Champonnois Date: Thu, 1 Sep 2022 14:12:42 +0200 Subject: [PATCH 50/55] Add auto-install to localization modules --- l10n_fr_cooperator/__manifest__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/l10n_fr_cooperator/__manifest__.py b/l10n_fr_cooperator/__manifest__.py index 34c3323c4..1d01d48ef 100644 --- a/l10n_fr_cooperator/__manifest__.py +++ b/l10n_fr_cooperator/__manifest__.py @@ -17,4 +17,5 @@ "views/certificate_template.xml", ], "installable": True, + "auto-install": True, } From 763bf1571065145e9ea557f769d4ce0e37bbdf9c Mon Sep 17 00:00:00 2001 From: Github GRAP Bot Date: Mon, 5 Sep 2022 15:47:01 +0000 Subject: [PATCH 51/55] l10n_fr_cooperator 12.0.1.2.0 --- l10n_fr_cooperator/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10n_fr_cooperator/__manifest__.py b/l10n_fr_cooperator/__manifest__.py index 1d01d48ef..3f188c669 100644 --- a/l10n_fr_cooperator/__manifest__.py +++ b/l10n_fr_cooperator/__manifest__.py @@ -4,7 +4,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).# { "name": "Cooperator France Localization", - "version": "12.0.1.1.0", + "version": "12.0.1.2.0", "depends": ["cooperator", "cooperator_website", "l10n_fr"], "author": "Coop IT Easy SC", "category": "Cooperative management", From b0f2d0a69887ffd4eaa6c251b21ba179a06cd647 Mon Sep 17 00:00:00 2001 From: Carmen Bianca BAKKER Date: Thu, 12 Oct 2023 11:56:20 +0200 Subject: [PATCH 52/55] [MIG] l10n_fr_cooperator: Migration to 13.0 Signed-off-by: Carmen Bianca BAKKER --- l10n_fr_cooperator/__manifest__.py | 4 ++-- l10n_fr_cooperator/views/certificate_template.xml | 12 ++++-------- .../odoo/addons/l10n_fr_cooperator | 1 + setup/l10n_fr_cooperator/setup.py | 6 ++++++ 4 files changed, 13 insertions(+), 10 deletions(-) create mode 120000 setup/l10n_fr_cooperator/odoo/addons/l10n_fr_cooperator create mode 100644 setup/l10n_fr_cooperator/setup.py diff --git a/l10n_fr_cooperator/__manifest__.py b/l10n_fr_cooperator/__manifest__.py index 3f188c669..8ed26e76a 100644 --- a/l10n_fr_cooperator/__manifest__.py +++ b/l10n_fr_cooperator/__manifest__.py @@ -4,11 +4,11 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).# { "name": "Cooperator France Localization", - "version": "12.0.1.2.0", + "version": "13.0.1.0.0", "depends": ["cooperator", "cooperator_website", "l10n_fr"], "author": "Coop IT Easy SC", "category": "Cooperative management", - "website": "https://coopiteasy.be", + "website": "https://github.com/OCA/cooperative", "license": "AGPL-3", "summary": """ This is the French localization for the Cooperators module diff --git a/l10n_fr_cooperator/views/certificate_template.xml b/l10n_fr_cooperator/views/certificate_template.xml index c2d38c8a3..b40c1eab1 100644 --- a/l10n_fr_cooperator/views/certificate_template.xml +++ b/l10n_fr_cooperator/views/certificate_template.xml @@ -1,13 +1,10 @@ - - diff --git a/setup/l10n_fr_cooperator/odoo/addons/l10n_fr_cooperator b/setup/l10n_fr_cooperator/odoo/addons/l10n_fr_cooperator new file mode 120000 index 000000000..e65de37a2 --- /dev/null +++ b/setup/l10n_fr_cooperator/odoo/addons/l10n_fr_cooperator @@ -0,0 +1 @@ +../../../../l10n_fr_cooperator \ No newline at end of file diff --git a/setup/l10n_fr_cooperator/setup.py b/setup/l10n_fr_cooperator/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/l10n_fr_cooperator/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 0f8f2572f33deab4be767d3a0d9a94438c2fc5dc Mon Sep 17 00:00:00 2001 From: Carmen Bianca BAKKER Date: Thu, 12 Oct 2023 11:57:29 +0200 Subject: [PATCH 53/55] [FIX] l10n_fr_cooperator: Dedent XML Signed-off-by: Carmen Bianca BAKKER --- .../views/certificate_template.xml | 145 +++++++++--------- 1 file changed, 72 insertions(+), 73 deletions(-) diff --git a/l10n_fr_cooperator/views/certificate_template.xml b/l10n_fr_cooperator/views/certificate_template.xml index b40c1eab1..d9a3a1f44 100644 --- a/l10n_fr_cooperator/views/certificate_template.xml +++ b/l10n_fr_cooperator/views/certificate_template.xml @@ -1,80 +1,79 @@ - + + +

    + Ce document atteste d’une souscription en numéraire au + capital d’une société, répondant à la définition + communautaire de la Petite et Moyenne Entreprise, dont + les titres ne sont pas admis aux négociations sur un + marché d’instruments financiers français ou étranger en + application de l’article 199 terdecies 0A du CGI. +
    + Conformément aux statuts, les souscriptions de parts + sociales de type A et B n’ouvre pas droit à + rémunération. +
    + La société remplit les conditions mentionnées aux c, d + et e du 2° du I de l’article 199 terdecies-0 A du code + général des impôts : +
    + c) La société est soumise à l’impôt sur les sociétés + dans les conditions de droit commun ; +
    +
    + c bis) La société compte au moins deux salariés à la + clôture de son premier exercice ou un salarié si elle + est soumise à l’obligation de s’inscrire à la chambre de + métiers et de l’artisanat ; +
    +
    + d) La société exerce une activité commerciale, + industrielle, artisanale, libérale ou agricole, à + l’exclusion des activités procurant des revenus garantis + en raison de l’existence d’un tarif réglementé de rachat + de la production, des activités financières, des + activités de gestion de patrimoine mobilier définie à + l’article 885 O quater et des activités immobilières. + Toutefois, les exclusions relatives à l’exercice d’une + activité financière ou immobilière ne sont pas + applicables aux entreprises solidaires mentionnées à + l’article L. 3332-17-1 du code du travail. +
    + La société n’exerce pas une activité de production + d’électricité utilisant l’énergie radiative du soleil ; +
    +
    + d bis) Les actifs de la société ne sont pas constitués + de façon prépondérante de métaux précieux, d’œuvres + d’art, d’objets de collection, d’antiquités, de chevaux + de course ou de concours ou, sauf si l’objet même de son + activité consiste en leur consommation ou en leur vente + au détail, de vins ou d’alcools ; +
    +
    + d ter) Les souscriptions au capital de la société + confèrent aux souscripteurs les seuls droits résultant + de la qualité d’actionnaire ou d’associé, à l’exclusion + de toute autre contrepartie notamment sous la forme de + tarifs préférentiels ou d’accès prioritaire aux biens + produits ou aux services rendus par la société ; +
    +
    + e) La société doit être une petite et moyenne entreprise + qui satisfait à la définition des petites et moyennes + entreprises qui figure à l’annexe I au règlement (CE) n° + 800/2008 de la Commission du 6 août 2008 déclarant + certaines catégories d’aide compatibles avec le marché + commun en application des articles 87 et 88 du traité + (Règlement général d’exemption par catégorie) ; +
    +

    +     +     From 49983c9ee3f8ec63510d8bbe2a935097376ac00b Mon Sep 17 00:00:00 2001 From: Carmen Bianca BAKKER Date: Thu, 12 Oct 2023 13:22:55 +0200 Subject: [PATCH 54/55] [MIG] l10n_fr_cooperator: Migration to 14.0 Signed-off-by: Carmen Bianca BAKKER --- l10n_fr_cooperator/__manifest__.py | 2 +- l10n_fr_cooperator/models/partner.py | 8 +++++++- l10n_fr_cooperator/models/subscription_request.py | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/l10n_fr_cooperator/__manifest__.py b/l10n_fr_cooperator/__manifest__.py index 8ed26e76a..b29eb1d1d 100644 --- a/l10n_fr_cooperator/__manifest__.py +++ b/l10n_fr_cooperator/__manifest__.py @@ -4,7 +4,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).# { "name": "Cooperator France Localization", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "depends": ["cooperator", "cooperator_website", "l10n_fr"], "author": "Coop IT Easy SC", "category": "Cooperative management", diff --git a/l10n_fr_cooperator/models/partner.py b/l10n_fr_cooperator/models/partner.py index 682fe9384..92e9af79c 100644 --- a/l10n_fr_cooperator/models/partner.py +++ b/l10n_fr_cooperator/models/partner.py @@ -10,5 +10,11 @@ class ResPartner(models.Model): ("eurl", "EURL / Entreprise individuelle"), ("sarl", "SARL"), ("sa", "SA / SAS"), - ] + ], + ondelete={ + "asso": "set null", + "eurl": "set null", + "sarl": "set null", + "sa": "set null", + }, ) diff --git a/l10n_fr_cooperator/models/subscription_request.py b/l10n_fr_cooperator/models/subscription_request.py index d5558ac39..a1b18c145 100644 --- a/l10n_fr_cooperator/models/subscription_request.py +++ b/l10n_fr_cooperator/models/subscription_request.py @@ -10,7 +10,13 @@ class SubscriptionRequest(models.Model): ("eurl", "EURL / Entreprise individuelle"), ("sarl", "SARL"), ("sa", "SA / SAS"), - ] + ], + ondelete={ + "asso": "set null", + "eurl": "set null", + "sarl": "set null", + "sa": "set null", + }, ) def get_required_field(self): From 32ee9a225f963947fc7b5f7764c0a5281845dcd3 Mon Sep 17 00:00:00 2001 From: Carmen Bianca BAKKER Date: Fri, 13 Oct 2023 11:02:48 +0200 Subject: [PATCH 55/55] [FIX] l10n_fr_cooperator: Add OCA to authors Signed-off-by: Carmen Bianca BAKKER --- l10n_fr_cooperator/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10n_fr_cooperator/__manifest__.py b/l10n_fr_cooperator/__manifest__.py index b29eb1d1d..ab2565a85 100644 --- a/l10n_fr_cooperator/__manifest__.py +++ b/l10n_fr_cooperator/__manifest__.py @@ -6,7 +6,7 @@ "name": "Cooperator France Localization", "version": "14.0.1.0.0", "depends": ["cooperator", "cooperator_website", "l10n_fr"], - "author": "Coop IT Easy SC", + "author": "Coop IT Easy SC, Odoo Community Association (OCA)", "category": "Cooperative management", "website": "https://github.com/OCA/cooperative", "license": "AGPL-3",