From b40e25eccb140fb3fda6cbde8909c214ab7bac49 Mon Sep 17 00:00:00 2001
From: Thibault Francois <francois.th@gmail.com>
Date: Sun, 28 May 2017 23:00:18 +0200
Subject: [PATCH 01/34] =?UTF-8?q?[TASK=200044=5Fb]=20Gestion=20des=20shift?=
 =?UTF-8?q?s=20:=20visualiser=20le=20cr=C3=A9neau=20sur=20la=20fiche=20du?=
 =?UTF-8?q?=20membre=20r=C3=A9gulier=20+=20[ADD]=20Tab=20worker=20informat?=
 =?UTF-8?q?ion=20for=20all=20information=20linked=20with=20the=20work=20in?=
 =?UTF-8?q?=20the=20cooperative=20+=20[ADD]=20share=20type=20for=20beescoo?=
 =?UTF-8?q?p=20+=20[ADD]=20Specific=20module=20that=20make=20the=20link=20?=
 =?UTF-8?q?between=20beesdoo=20and=20easy=5Fmy=5Fcoop=20:=20compute=20the?=
 =?UTF-8?q?=20share=5Ftype=20base=20on=20the=20share=20bought?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beesdoo_easy_my_coop/__init__.py            |  2 ++
 beesdoo_easy_my_coop/__openerp__.py         | 30 +++++++++++++++++++++
 beesdoo_easy_my_coop/data/product_share.xml | 23 ++++++++++++++++
 beesdoo_easy_my_coop/models/__init__.py     |  1 +
 beesdoo_easy_my_coop/models/res_partner.py  | 14 ++++++++++
 5 files changed, 70 insertions(+)
 create mode 100644 beesdoo_easy_my_coop/__init__.py
 create mode 100644 beesdoo_easy_my_coop/__openerp__.py
 create mode 100644 beesdoo_easy_my_coop/data/product_share.xml
 create mode 100644 beesdoo_easy_my_coop/models/__init__.py
 create mode 100644 beesdoo_easy_my_coop/models/res_partner.py

diff --git a/beesdoo_easy_my_coop/__init__.py b/beesdoo_easy_my_coop/__init__.py
new file mode 100644
index 0000000..0f7cb6b
--- /dev/null
+++ b/beesdoo_easy_my_coop/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import models
\ No newline at end of file
diff --git a/beesdoo_easy_my_coop/__openerp__.py b/beesdoo_easy_my_coop/__openerp__.py
new file mode 100644
index 0000000..9e17648
--- /dev/null
+++ b/beesdoo_easy_my_coop/__openerp__.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "Beescoop link with easy my coop",
+
+    'summary': """
+        Module that made the link between beesdoo customization and easy_my_coop
+    """,
+
+    'description': """
+    """,
+
+    'author': "Beescoop - Cellule IT",
+    'website': "https://github.com/beescoop/Obeesdoo",
+
+    # Categories can be used to filter modules in modules listing
+    # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
+    # for the full list
+    'category': 'Cooperative management',
+    'version': '1.0',
+
+    # any module necessary for this one to work correctly
+    'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop'],
+
+    # always loaded
+    'data': [
+        'data/product_share.xml',
+    ],
+    # only loaded in demonstration mode
+}
+
diff --git a/beesdoo_easy_my_coop/data/product_share.xml b/beesdoo_easy_my_coop/data/product_share.xml
new file mode 100644
index 0000000..50db413
--- /dev/null
+++ b/beesdoo_easy_my_coop/data/product_share.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="share_a" model="product.template" >
+            <field name="name">Acquisition de parts A de Beescoop scrl</field>
+            <field name="default_code">share_a</field>
+            <field name="customer" eval="True" />
+            <field name="is_share" eval="True" />
+        </record>
+        <record id="share_b" model="product.template" >
+            <field name="name">Acquisition de parts B de Beescoop scrl</field>
+            <field name="default_code">share_b</field>
+            <field name="customer" eval="True" />
+            <field name="is_share" eval="True" />
+        </record>
+        <record id="share_c" model="product.template" >
+            <field name="name">Acquisition de parts C de Beescoop scrl</field>
+            <field name="default_code">share_c</field>
+            <field name="customer" eval="False" />
+            <field name="is_share" eval="True" />
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/beesdoo_easy_my_coop/models/__init__.py b/beesdoo_easy_my_coop/models/__init__.py
new file mode 100644
index 0000000..f6dfb12
--- /dev/null
+++ b/beesdoo_easy_my_coop/models/__init__.py
@@ -0,0 +1 @@
+import res_partner
\ No newline at end of file
diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
new file mode 100644
index 0000000..c007247
--- /dev/null
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+from openerp import models, fields, api, _
+
+class Partner(models.Model):
+    _inherit = 'res.partner'
+
+    share_type = fields.Selection(compute='_get_share_product_type')
+
+    @api.multi
+    @api.depends('share_ids', 'share_ids.share_product_id', 'share_ids.share_product_id.default_code')
+    def _get_share_product_type(self):
+        for rec in self:
+            codes = rec.share_ids.mapped('share_product_id.default_code')
+            rec.share_type = codes[0] if codes else ''
\ No newline at end of file

From f303dd06c193df1c541592c25f6c19e9a7c4bd47 Mon Sep 17 00:00:00 2001
From: Thibault Francois <francois.th@gmail.com>
Date: Fri, 23 Jun 2017 22:38:24 +0200
Subject: [PATCH 02/34] [FIX] use existing field for cooperator type + [CLEAN]
 hide useless tab for physical person

---
 beesdoo_easy_my_coop/__openerp__.py        |  4 +++-
 beesdoo_easy_my_coop/models/res_partner.py | 19 ++++++++++++++++---
 beesdoo_easy_my_coop/views/partner.xml     | 11 +++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 beesdoo_easy_my_coop/views/partner.xml

diff --git a/beesdoo_easy_my_coop/__openerp__.py b/beesdoo_easy_my_coop/__openerp__.py
index 9e17648..993515a 100644
--- a/beesdoo_easy_my_coop/__openerp__.py
+++ b/beesdoo_easy_my_coop/__openerp__.py
@@ -19,12 +19,14 @@
     'version': '1.0',
 
     # any module necessary for this one to work correctly
-    'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop'],
+    'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', ],
 
     # always loaded
     'data': [
         'data/product_share.xml',
+        'views/partner.xml',
     ],
+    'auto_install': True,
     # only loaded in demonstration mode
 }
 
diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index c007247..598d072 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -4,11 +4,24 @@ from openerp import models, fields, api, _
 class Partner(models.Model):
     _inherit = 'res.partner'
 
-    share_type = fields.Selection(compute='_get_share_product_type')
+    cooperator_type = fields.Selection(selection='_get_share_type', compute='_compute_share_type', string='Cooperator Type', store=True)
 
     @api.multi
     @api.depends('share_ids', 'share_ids.share_product_id', 'share_ids.share_product_id.default_code')
-    def _get_share_product_type(self):
+    def _compute_share_type(self):
         for rec in self:
             codes = rec.share_ids.mapped('share_product_id.default_code')
-            rec.share_type = codes[0] if codes else ''
\ No newline at end of file
+            rec.cooperator_type = codes[0] if codes else ''
+
+    @api.multi
+    def _get_share_type(self):
+        share_type_list = [('','')]
+        for share_type in self.env['product.product'].search([('is_share','=',True)]):
+            share_type_list.append((share_type.default_code, share_type.short_name))
+        return share_type_list
+
+    @api.noguess
+    def _auto_init(self, cr, context=None):
+        cr.execute("ALTER TABLE res_partner DROP COLUMN IF EXISTS cooperator_type")
+        res = super(Partner, self)._auto_init(cr, context=context)
+        return res
\ No newline at end of file
diff --git a/beesdoo_easy_my_coop/views/partner.xml b/beesdoo_easy_my_coop/views/partner.xml
new file mode 100644
index 0000000..b0d2fee
--- /dev/null
+++ b/beesdoo_easy_my_coop/views/partner.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+	<record model="ir.ui.view" id="beesdoo_partner_form_view_remove_duplicate_cooperator_type">
+		<field name="name">beesdoo.partner.form.view.remove_duplicate_cooperator_type</field>
+		<field name="model">res.partner</field>
+		<field name="inherit_id" ref="beesdoo_base.beesdoo_partner_form_view" />
+		<field name="arch" type="xml">
+			<field name="cooperator_type" position="replace" />
+		</field>
+	</record>
+</odoo>

From 93584deec55ce4ed4a4eff446be40351607e323b Mon Sep 17 00:00:00 2001
From: Thibault Francois <francois.th@gmail.com>
Date: Sun, 8 Oct 2017 18:55:40 +0200
Subject: [PATCH 03/34] [FIX] Make the runbot green again, remove the warning

---
 beesdoo_easy_my_coop/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beesdoo_easy_my_coop/__openerp__.py b/beesdoo_easy_my_coop/__openerp__.py
index 993515a..cae610c 100644
--- a/beesdoo_easy_my_coop/__openerp__.py
+++ b/beesdoo_easy_my_coop/__openerp__.py
@@ -19,7 +19,7 @@
     'version': '1.0',
 
     # any module necessary for this one to work correctly
-    'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', ],
+    'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', 'easy_my_coop_eater'],
 
     # always loaded
     'data': [

From 130fc48ce8861a28e1e0a8c723c31326b1741f0e Mon Sep 17 00:00:00 2001
From: Thibault Francois <francois.th@gmail.com>
Date: Sat, 24 Mar 2018 17:02:13 +0100
Subject: [PATCH 04/34] =?UTF-8?q?[IMP]=20008-z-D=20:=20mettre=20=C3=A0=20j?=
 =?UTF-8?q?our=20les=20filtres=20Cooperateur=20de=20base=20pour=20prendre?=
 =?UTF-8?q?=20coop=20effectif:=20Change=20the=20domain=20to=20take=20into?=
 =?UTF-8?q?=20account=20the=20field=20member?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beesdoo_easy_my_coop/views/partner.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/beesdoo_easy_my_coop/views/partner.xml b/beesdoo_easy_my_coop/views/partner.xml
index b0d2fee..983cbf4 100644
--- a/beesdoo_easy_my_coop/views/partner.xml
+++ b/beesdoo_easy_my_coop/views/partner.xml
@@ -8,4 +8,21 @@
 			<field name="cooperator_type" position="replace" />
 		</field>
 	</record>
+
+    <record model="ir.ui.view" id="beesdoo_easy_my_coop_partner_search_view">
+        <field name="name">beesdoo_easy_my_coop.partner.search.view</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="beesdoo_base.beesdoo_partner_search_view" />
+        <field name="arch" type="xml">
+            <filter name="type_a" position="replace">
+                <filter name="type_a" string="Cooperator type A" domain="[('cooperator_type', '=', 'share_a'), ('member', '=', True)]" />
+            </filter>
+            <filter name="type_b" position="replace">
+                <filter name="type_b" string="Cooperator type B" domain="[('cooperator_type', '=', 'share_b'), ('member', '=', True)]" />
+            </filter>
+            <filter name="type_c" position="replace">
+                <filter name="type_c" string="Cooperator type C" domain="[('cooperator_type', '=', 'share_c'), ('member', '=', True)]" />
+            </filter>
+        </field>
+    </record>
 </odoo>

From eaf19fc5c1bb3aae0db0ed7fd03615b91296a6ca Mon Sep 17 00:00:00 2001
From: Thibault Francois <francois.th@gmail.com>
Date: Sat, 24 Mar 2018 18:22:56 +0100
Subject: [PATCH 05/34] =?UTF-8?q?[IMP]=20008-z-C=20:=20enlever=20le=20type?=
 =?UTF-8?q?=20de=20coop=C3=A9rateur=20sur=20anciens=20coop=C3=A9rateurs:?=
 =?UTF-8?q?=20when=20share=20number=20is=200,=20you=20have=20no=20cooperat?=
 =?UTF-8?q?or=20type=20anymore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beesdoo_easy_my_coop/models/res_partner.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index 598d072..8507332 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -7,11 +7,13 @@ class Partner(models.Model):
     cooperator_type = fields.Selection(selection='_get_share_type', compute='_compute_share_type', string='Cooperator Type', store=True)
 
     @api.multi
-    @api.depends('share_ids', 'share_ids.share_product_id', 'share_ids.share_product_id.default_code')
+    @api.depends('share_ids', 'share_ids.share_product_id', 'share_ids.share_product_id.default_code', 'share_ids.share_number')
     def _compute_share_type(self):
         for rec in self:
-            codes = rec.share_ids.mapped('share_product_id.default_code')
-            rec.cooperator_type = codes[0] if codes else ''
+            if rec.share_ids and rec.share_ids[0].share_number > 0:
+                rec.cooperator_type = rec.share_ids[0].share_product_id.default_code
+            else:
+                rec.cooperator_type = ''
 
     @api.multi
     def _get_share_type(self):

From 1713c5f6a8c3d47df9754fb9093feb63ba2fd12d Mon Sep 17 00:00:00 2001
From: Thibault Francois <francois.th@gmail.com>
Date: Sun, 24 Jun 2018 23:34:01 +0200
Subject: [PATCH 06/34] [FIX] Double header on partner form

---
 beesdoo_easy_my_coop/views/partner.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/beesdoo_easy_my_coop/views/partner.xml b/beesdoo_easy_my_coop/views/partner.xml
index 983cbf4..e479c63 100644
--- a/beesdoo_easy_my_coop/views/partner.xml
+++ b/beesdoo_easy_my_coop/views/partner.xml
@@ -25,4 +25,20 @@
             </filter>
         </field>
     </record>
+
+    <record model="ir.ui.view" id="beesdoo_partner_form_view_remove_duplicate_header">
+        <field name="name">beesdoo.partner.form.view.remove_duplicate_cooperator_type</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="beesdoo_base.beesdoo_partner_form_view" />
+        <field name="arch" type="xml">
+            <xpath expr="header" position="replace" />
+            <xpath expr="//field[@name='state']" position="before">
+                <button string="Create Subscription" name="%(easy_my_coop.action_view_create_subscription)d"
+                                type="action" context="{'default_active_id': active_id}" groups="easy_my_coop.group_energiris_manager"/>
+                 <button string="Update info" name="%(easy_my_coop.action_view_update_partner_info)d"
+                                type="action" context="{'default_active_id': active_id}" groups="easy_my_coop.group_energiris_manager"/>
+            </xpath>
+        </field>
+        <field name="priority">99</field>
+    </record>
 </odoo>

From 5d4c56274b24771213dfe20b3e885db4bc8794db Mon Sep 17 00:00:00 2001
From: Thibault Francois <francois.th@gmail.com>
Date: Sun, 24 Jun 2018 23:45:04 +0200
Subject: [PATCH 07/34] [ADD] Can shop field on res.partner that take into
 account the cooperator type and the cooperator status

---
 beesdoo_easy_my_coop/models/res_partner.py | 12 ++++++++++++
 beesdoo_easy_my_coop/views/partner.xml     |  7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index 8507332..1bde775 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -5,6 +5,18 @@ class Partner(models.Model):
     _inherit = 'res.partner'
 
     cooperator_type = fields.Selection(selection='_get_share_type', compute='_compute_share_type', string='Cooperator Type', store=True)
+    can_shop = fields.Boolean(compute='_can_shop', store=True)
+
+    @api.depends('cooperator_type', 'cooperative_status_ids', 'cooperative_status_ids.can_shop')
+    def _can_shop(self):
+        for rec in self:
+            if rec.cooperator_type == 'share_b':
+                rec.can_shop = True
+            elif rec.cooperative_status_ids and rec.cooperative_status_ids[0].can_shop:
+                rec.can_shop = True
+            else:
+                rec.can_shop = False
+
 
     @api.multi
     @api.depends('share_ids', 'share_ids.share_product_id', 'share_ids.share_product_id.default_code', 'share_ids.share_number')
diff --git a/beesdoo_easy_my_coop/views/partner.xml b/beesdoo_easy_my_coop/views/partner.xml
index e479c63..ad869bf 100644
--- a/beesdoo_easy_my_coop/views/partner.xml
+++ b/beesdoo_easy_my_coop/views/partner.xml
@@ -27,9 +27,9 @@
     </record>
 
     <record model="ir.ui.view" id="beesdoo_partner_form_view_remove_duplicate_header">
-        <field name="name">beesdoo.partner.form.view.remove_duplicate_cooperator_type</field>
+        <field name="name">beesdoo.partner.form.view.remove_duplicate_header</field>
         <field name="model">res.partner</field>
-        <field name="inherit_id" ref="beesdoo_base.beesdoo_partner_form_view" />
+        <field name="inherit_id" ref="beesdoo_shift.super_coop_partner_inherited_view_form" />
         <field name="arch" type="xml">
             <xpath expr="header" position="replace" />
             <xpath expr="//field[@name='state']" position="before">
@@ -38,6 +38,9 @@
                  <button string="Update info" name="%(easy_my_coop.action_view_update_partner_info)d"
                                 type="action" context="{'default_active_id': active_id}" groups="easy_my_coop.group_energiris_manager"/>
             </xpath>
+            <xpath expr="//field[@name='info_session']" position="before">
+                <field name="can_shop" />
+            </xpath>
         </field>
         <field name="priority">99</field>
     </record>

From 27212ed664dec750a31f3e97d4c5a98a2c4aa367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Fri, 31 May 2019 12:03:47 +0200
Subject: [PATCH 08/34] [ADD] b_easy_my_coop: Info Session in new cooperator
 form

This adds, in the new cooperator form in the website, a checkbox that
the user can check if he already has taken part to an information
session.

This information will be saved in the partner object and will be used to
automatically check the info_session field of the cooperator_status when
it will be created by the wizard.
---
 beesdoo_easy_my_coop/__init__.py              |  3 +-
 beesdoo_easy_my_coop/__openerp__.py           |  2 ++
 beesdoo_easy_my_coop/models/__init__.py       |  3 +-
 beesdoo_easy_my_coop/models/res_partner.py    |  4 +++
 .../models/subscription_request.py            | 20 +++++++++++
 .../views/subscription_request.xml            | 18 ++++++++++
 .../views/subscription_templates.xml          | 34 +++++++++++++++++++
 beesdoo_easy_my_coop/wizards/__init__.py      |  1 +
 .../wizards/beesdoo_shift_subscribe.py        | 25 ++++++++++++++
 9 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 beesdoo_easy_my_coop/models/subscription_request.py
 create mode 100644 beesdoo_easy_my_coop/views/subscription_request.xml
 create mode 100644 beesdoo_easy_my_coop/views/subscription_templates.xml
 create mode 100644 beesdoo_easy_my_coop/wizards/__init__.py
 create mode 100644 beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py

diff --git a/beesdoo_easy_my_coop/__init__.py b/beesdoo_easy_my_coop/__init__.py
index 0f7cb6b..164f90c 100644
--- a/beesdoo_easy_my_coop/__init__.py
+++ b/beesdoo_easy_my_coop/__init__.py
@@ -1,2 +1,3 @@
 # -*- coding: utf-8 -*-
-import models
\ No newline at end of file
+import models
+from . import wizards
diff --git a/beesdoo_easy_my_coop/__openerp__.py b/beesdoo_easy_my_coop/__openerp__.py
index cae610c..8c1e40d 100644
--- a/beesdoo_easy_my_coop/__openerp__.py
+++ b/beesdoo_easy_my_coop/__openerp__.py
@@ -25,6 +25,8 @@
     'data': [
         'data/product_share.xml',
         'views/partner.xml',
+        'views/subscription_request.xml',
+        'views/subscription_templates.xml',
     ],
     'auto_install': True,
     # only loaded in demonstration mode
diff --git a/beesdoo_easy_my_coop/models/__init__.py b/beesdoo_easy_my_coop/models/__init__.py
index f6dfb12..07eb334 100644
--- a/beesdoo_easy_my_coop/models/__init__.py
+++ b/beesdoo_easy_my_coop/models/__init__.py
@@ -1 +1,2 @@
-import res_partner
\ No newline at end of file
+import res_partner
+from . import subscription_request
diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index 1bde775..21f13ac 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -6,6 +6,10 @@ class Partner(models.Model):
 
     cooperator_type = fields.Selection(selection='_get_share_type', compute='_compute_share_type', string='Cooperator Type', store=True)
     can_shop = fields.Boolean(compute='_can_shop', store=True)
+    info_session_confirmed = fields.Boolean(
+        string="Confirmed presence to info session",
+        default=False,
+    )
 
     @api.depends('cooperator_type', 'cooperative_status_ids', 'cooperative_status_ids.can_shop')
     def _can_shop(self):
diff --git a/beesdoo_easy_my_coop/models/subscription_request.py b/beesdoo_easy_my_coop/models/subscription_request.py
new file mode 100644
index 0000000..e59316b
--- /dev/null
+++ b/beesdoo_easy_my_coop/models/subscription_request.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Copyright 2019 Coop IT Easy SCRLfs
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openerp import api, fields, models, _
+
+
+class SubscriptionRequest(models.Model):
+
+    _inherit = 'subscription.request'
+
+    info_session_confirmed = fields.Boolean(
+        string="Confirmed Info Session",
+        default=False,
+    )
+
+    def get_partner_vals(self):
+        partner_vals = super(SubscriptionRequest, self).get_partner_vals()
+        partner_vals['info_session_confirmed'] = self.info_session_confirmed
+        return partner_vals
diff --git a/beesdoo_easy_my_coop/views/subscription_request.xml b/beesdoo_easy_my_coop/views/subscription_request.xml
new file mode 100644
index 0000000..1b75719
--- /dev/null
+++ b/beesdoo_easy_my_coop/views/subscription_request.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 Coop IT Easy SCRLfs
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+
+    <record model="ir.ui.view" id="subscription_request_form_view">
+        <field name="name">subscription.request.form (in beesdoo_easy_my_coop)</field>
+        <field name="model">subscription.request</field>
+        <field name="inherit_id" ref="easy_my_coop.subscription_request_form"/>
+        <field name="arch" type="xml">
+            <field name="data_policy_approved" position="before">
+                <field name="info_session_confirmed"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/beesdoo_easy_my_coop/views/subscription_templates.xml b/beesdoo_easy_my_coop/views/subscription_templates.xml
new file mode 100644
index 0000000..b480c8d
--- /dev/null
+++ b/beesdoo_easy_my_coop/views/subscription_templates.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 Coop IT Easy SCRLfs
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+
+  <template id="beesdoo_easy_my_coop.becomecooperator"
+            name="Become Cooperator (in beesdoo_easy_my_coop)"
+            inherit_id="easy_my_coop.becomecooperator">
+      <xpath expr="//input[@name='data_policy_approved']/../.." position="before">
+          <div t-attf-class="form-group" >
+              <label class="col-md-3 col-sm-4 control-label" for="info_session_confirmed">Info Session</label>
+              <div class="col-md-1 col-sm-2">
+                  <input type="checkbox"
+                    class="form-control"
+                    name="info_session_confirmed"
+                    required="True"
+                    t-attf-value="#{info_session_confirmed or ''}"/>
+              </div>
+              <div class="col-md-6 col-sm-6">
+                  <t t-call="beesdoo_easy_my_coop.info_session_confirmed_text"/>
+              </div>
+          </div>
+      </xpath>
+  </template>
+
+  <data noupdate="1">
+    <template id="beesdoo_easy_my_coop.info_session_confirmed_text"
+              name="Info Session Confirmed Text">
+        Check if you have already take part to an information session.
+    </template>
+  </data>
+
+</odoo>
diff --git a/beesdoo_easy_my_coop/wizards/__init__.py b/beesdoo_easy_my_coop/wizards/__init__.py
new file mode 100644
index 0000000..eb54c76
--- /dev/null
+++ b/beesdoo_easy_my_coop/wizards/__init__.py
@@ -0,0 +1 @@
+from . import beesdoo_shift_subscribe
diff --git a/beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py b/beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py
new file mode 100644
index 0000000..a411179
--- /dev/null
+++ b/beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Copyright 2019 Coop IT Easy SCRLfs
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openerp import api, fields, models, _
+
+
+class Subscribe(models.TransientModel):
+
+    _inherit = 'beesdoo.shift.subscribe'
+
+    def _get_info_session_followed(self):
+        """
+        Check if the user has checked the info_session_confirmed in the
+        form to become new cooperator.
+        """
+        followed = super(Subscribe, self)._get_info_session_followed()
+        if not followed:
+            return (self.env['res.partner']
+                    .browse(self._context.get('active_id'))
+                    .info_session_confirmed)
+        return followed
+
+    info_session = fields.Boolean(default=_get_info_session_followed)
+

From 90d0765017af81ffd3d798ff0bc0f79cc107e1d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Tue, 4 Jun 2019 11:24:09 +0200
Subject: [PATCH 09/34] [FIX] b_easy_my_coop: Info Session must not be required
 field

In the form to become a new cooperator, the field info_session_confirmed
was required but not in the form validation. This commit fixes that
incoherence but changing the form to let field info_session_confirmed
not required.
---
 beesdoo_easy_my_coop/views/subscription_templates.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/beesdoo_easy_my_coop/views/subscription_templates.xml b/beesdoo_easy_my_coop/views/subscription_templates.xml
index b480c8d..6292abf 100644
--- a/beesdoo_easy_my_coop/views/subscription_templates.xml
+++ b/beesdoo_easy_my_coop/views/subscription_templates.xml
@@ -14,7 +14,6 @@
                   <input type="checkbox"
                     class="form-control"
                     name="info_session_confirmed"
-                    required="True"
                     t-attf-value="#{info_session_confirmed or ''}"/>
               </div>
               <div class="col-md-6 col-sm-6">

From fbc9ff702ddb284857bb213fc56d79ec370d62d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Tue, 11 Jun 2019 11:50:17 +0200
Subject: [PATCH 10/34] [IMP] b_emc: Info session confirmation in new coop form

This lets user configure if the info session confirmation should be
shown and/or required in the new cooperator form.
---
 beesdoo_easy_my_coop/__init__.py              |  1 +
 beesdoo_easy_my_coop/__openerp__.py           |  3 +-
 beesdoo_easy_my_coop/controllers/__init__.py  |  2 ++
 beesdoo_easy_my_coop/controllers/main.py      | 19 ++++++++++++
 beesdoo_easy_my_coop/models/__init__.py       |  1 +
 beesdoo_easy_my_coop/models/res_company.py    | 27 +++++++++++++++++
 .../models/subscription_request.py            |  7 +++++
 beesdoo_easy_my_coop/views/res_company.xml    | 20 +++++++++++++
 .../views/subscription_templates.xml          | 29 ++++++++-----------
 9 files changed, 91 insertions(+), 18 deletions(-)
 create mode 100644 beesdoo_easy_my_coop/controllers/__init__.py
 create mode 100644 beesdoo_easy_my_coop/controllers/main.py
 create mode 100644 beesdoo_easy_my_coop/models/res_company.py
 create mode 100644 beesdoo_easy_my_coop/views/res_company.xml

diff --git a/beesdoo_easy_my_coop/__init__.py b/beesdoo_easy_my_coop/__init__.py
index 164f90c..c311c55 100644
--- a/beesdoo_easy_my_coop/__init__.py
+++ b/beesdoo_easy_my_coop/__init__.py
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
 import models
 from . import wizards
+from . import controllers
diff --git a/beesdoo_easy_my_coop/__openerp__.py b/beesdoo_easy_my_coop/__openerp__.py
index 8c1e40d..94e4f50 100644
--- a/beesdoo_easy_my_coop/__openerp__.py
+++ b/beesdoo_easy_my_coop/__openerp__.py
@@ -16,7 +16,7 @@
     # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
     # for the full list
     'category': 'Cooperative management',
-    'version': '1.0',
+    'version': '9.0.1.1.0',
 
     # any module necessary for this one to work correctly
     'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', 'easy_my_coop_eater'],
@@ -25,6 +25,7 @@
     'data': [
         'data/product_share.xml',
         'views/partner.xml',
+        'views/res_company.xml',
         'views/subscription_request.xml',
         'views/subscription_templates.xml',
     ],
diff --git a/beesdoo_easy_my_coop/controllers/__init__.py b/beesdoo_easy_my_coop/controllers/__init__.py
new file mode 100644
index 0000000..757b12a
--- /dev/null
+++ b/beesdoo_easy_my_coop/controllers/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import main
diff --git a/beesdoo_easy_my_coop/controllers/main.py b/beesdoo_easy_my_coop/controllers/main.py
new file mode 100644
index 0000000..3e8a587
--- /dev/null
+++ b/beesdoo_easy_my_coop/controllers/main.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from openerp import http
+from openerp.http import request
+
+from openerp.addons.easy_my_coop.controllers.main import WebsiteSubscription as Base
+
+class WebsiteSubscription(Base):
+
+    @http.route()
+    def display_become_cooperator_page(self, **kwargs):
+        response = (super(WebsiteSubscription, self)
+                    .display_become_cooperator_page(**kwargs))
+        cmp = request.env['res.company']._company_default_get()
+        response.qcontext.update({
+            'display_info_session': cmp.display_info_session_confirmation,
+            'info_session_required': cmp.info_session_confirmation_required,
+            'info_session_text': cmp.info_session_confirmation_text,
+        })
+        return response
diff --git a/beesdoo_easy_my_coop/models/__init__.py b/beesdoo_easy_my_coop/models/__init__.py
index 07eb334..def4978 100644
--- a/beesdoo_easy_my_coop/models/__init__.py
+++ b/beesdoo_easy_my_coop/models/__init__.py
@@ -1,2 +1,3 @@
 import res_partner
 from . import subscription_request
+from . import res_company
diff --git a/beesdoo_easy_my_coop/models/res_company.py b/beesdoo_easy_my_coop/models/res_company.py
new file mode 100644
index 0000000..bd1f360
--- /dev/null
+++ b/beesdoo_easy_my_coop/models/res_company.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright 2019 Coop IT Easy SCRLfs
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openerp import api, fields, models, _
+
+
+class ResCompany(models.Model):
+
+    _inherit = 'res.company'
+    display_info_session_confirmation = fields.Boolean(
+        help="Choose to display a info session checkbox on the cooperator"
+        " website form."
+    )
+    info_session_confirmation_required = fields.Boolean(
+        string="Is info session confirmation required?"
+    )
+    info_session_confirmation_text = fields.Html(
+        translate=True,
+        help="Text to display aside the checkbox to confirm"
+        " participation to an info session."
+    )
+
+    @api.onchange('info_session_confirmation_required')
+    def onchange_info_session_confirmatio_required(self):
+        if self.info_session_confirmation_required:
+            self.display_info_session_confirmation = True
diff --git a/beesdoo_easy_my_coop/models/subscription_request.py b/beesdoo_easy_my_coop/models/subscription_request.py
index e59316b..77e8b5d 100644
--- a/beesdoo_easy_my_coop/models/subscription_request.py
+++ b/beesdoo_easy_my_coop/models/subscription_request.py
@@ -18,3 +18,10 @@ class SubscriptionRequest(models.Model):
         partner_vals = super(SubscriptionRequest, self).get_partner_vals()
         partner_vals['info_session_confirmed'] = self.info_session_confirmed
         return partner_vals
+
+    def get_required_field(self):
+        required_fields = super(SubscriptionRequest, self).get_required_fiels()
+        company = self.env['res.company']._company_default_get()
+        if company.info_session_confirmation_required:
+            required_fields.append('info_session_confirmed')
+        return required_fields
diff --git a/beesdoo_easy_my_coop/views/res_company.xml b/beesdoo_easy_my_coop/views/res_company.xml
new file mode 100644
index 0000000..daa8557
--- /dev/null
+++ b/beesdoo_easy_my_coop/views/res_company.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 Coop IT Easy SCRLfs
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+
+    <record model="ir.ui.view" id="res_company_form_view">
+        <field name="name">res.company.form (in beesdoo_easy_my_coop)</field>
+        <field name="model">res.company</field>
+        <field name="inherit_id" ref="easy_my_coop.view_company_inherit_form2"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='coop_grp']//field[@name='display_data_policy_approval']" position="before">
+                <field name="display_info_session_confirmation"/>
+                <field name="info_session_confirmation_required"/>
+                <field name="info_session_confirmation_text"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/beesdoo_easy_my_coop/views/subscription_templates.xml b/beesdoo_easy_my_coop/views/subscription_templates.xml
index 6292abf..264204a 100644
--- a/beesdoo_easy_my_coop/views/subscription_templates.xml
+++ b/beesdoo_easy_my_coop/views/subscription_templates.xml
@@ -7,27 +7,22 @@
   <template id="beesdoo_easy_my_coop.becomecooperator"
             name="Become Cooperator (in beesdoo_easy_my_coop)"
             inherit_id="easy_my_coop.becomecooperator">
-      <xpath expr="//input[@name='data_policy_approved']/../.." position="before">
-          <div t-attf-class="form-group" >
+      <xpath expr="//div[@id='data_policy_approved']" position="before">
+          <div id="info_session_confirmed" t-if="display_info_session" t-attf-class="form-group" >
               <label class="col-md-3 col-sm-4 control-label" for="info_session_confirmed">Info Session</label>
-              <div class="col-md-1 col-sm-2">
-                  <input type="checkbox"
-                    class="form-control"
-                    name="info_session_confirmed"
-                    t-attf-value="#{info_session_confirmed or ''}"/>
-              </div>
-              <div class="col-md-6 col-sm-6">
-                  <t t-call="beesdoo_easy_my_coop.info_session_confirmed_text"/>
+              <div class="col-md-9 col-sm-8">
+                  <div class="checkbox">
+                      <label>
+                          <input type="checkbox"
+                                 name="info_session_confirmed"
+                                 t-att="{'required': 'required'} if info_session_required else {}"
+                                 t-attf-value="#{data_policy_approved or ''}"/>
+                          <t t-raw="info_session_text"/>
+                      </label>
+                  </div>
               </div>
           </div>
       </xpath>
   </template>
 
-  <data noupdate="1">
-    <template id="beesdoo_easy_my_coop.info_session_confirmed_text"
-              name="Info Session Confirmed Text">
-        Check if you have already take part to an information session.
-    </template>
-  </data>
-
 </odoo>

From d637fe9e87b5b3edb9c2cba232633adf36a17594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Tue, 11 Jun 2019 17:30:55 +0200
Subject: [PATCH 11/34] [FIX] b_emc: Function misspelled

---
 beesdoo_easy_my_coop/__openerp__.py                 | 2 +-
 beesdoo_easy_my_coop/models/subscription_request.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/beesdoo_easy_my_coop/__openerp__.py b/beesdoo_easy_my_coop/__openerp__.py
index 94e4f50..76b7e8b 100644
--- a/beesdoo_easy_my_coop/__openerp__.py
+++ b/beesdoo_easy_my_coop/__openerp__.py
@@ -16,7 +16,7 @@
     # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
     # for the full list
     'category': 'Cooperative management',
-    'version': '9.0.1.1.0',
+    'version': '9.0.1.1.1',
 
     # any module necessary for this one to work correctly
     'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', 'easy_my_coop_eater'],
diff --git a/beesdoo_easy_my_coop/models/subscription_request.py b/beesdoo_easy_my_coop/models/subscription_request.py
index 77e8b5d..9d18653 100644
--- a/beesdoo_easy_my_coop/models/subscription_request.py
+++ b/beesdoo_easy_my_coop/models/subscription_request.py
@@ -20,7 +20,7 @@ class SubscriptionRequest(models.Model):
         return partner_vals
 
     def get_required_field(self):
-        required_fields = super(SubscriptionRequest, self).get_required_fiels()
+        required_fields = super(SubscriptionRequest, self).get_required_field()
         company = self.env['res.company']._company_default_get()
         if company.info_session_confirmation_required:
             required_fields.append('info_session_confirmed')

From d12efd12d6484d118c62a8e4ba6087b9edbbdb36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Tue, 11 Jun 2019 18:51:31 +0200
Subject: [PATCH 12/34] [FIX] b_emc: Info session not always displayed

The info session was not always displayed on the form to become new
cooperator, despite a good configuration.
---
 beesdoo_easy_my_coop/__openerp__.py      |  2 +-
 beesdoo_easy_my_coop/controllers/main.py | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/beesdoo_easy_my_coop/__openerp__.py b/beesdoo_easy_my_coop/__openerp__.py
index 76b7e8b..08abe57 100644
--- a/beesdoo_easy_my_coop/__openerp__.py
+++ b/beesdoo_easy_my_coop/__openerp__.py
@@ -16,7 +16,7 @@
     # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
     # for the full list
     'category': 'Cooperative management',
-    'version': '9.0.1.1.1',
+    'version': '9.0.1.1.2',
 
     # any module necessary for this one to work correctly
     'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', 'easy_my_coop_eater'],
diff --git a/beesdoo_easy_my_coop/controllers/main.py b/beesdoo_easy_my_coop/controllers/main.py
index 3e8a587..58e81bd 100644
--- a/beesdoo_easy_my_coop/controllers/main.py
+++ b/beesdoo_easy_my_coop/controllers/main.py
@@ -6,14 +6,15 @@ from openerp.addons.easy_my_coop.controllers.main import WebsiteSubscription as
 
 class WebsiteSubscription(Base):
 
-    @http.route()
-    def display_become_cooperator_page(self, **kwargs):
-        response = (super(WebsiteSubscription, self)
-                    .display_become_cooperator_page(**kwargs))
+    def fill_values(self, values, is_company, logged, load_from_user=False):
+        values = super(WebsiteSubscription, self).fill_values(values,
+                                                              is_company,
+                                                              logged,
+                                                              load_from_user)
         cmp = request.env['res.company']._company_default_get()
-        response.qcontext.update({
+        values.update({
             'display_info_session': cmp.display_info_session_confirmation,
             'info_session_required': cmp.info_session_confirmation_required,
             'info_session_text': cmp.info_session_confirmation_text,
         })
-        return response
+        return values

From 815169d5c65470d108c4621fe376a66bcb6c14fd Mon Sep 17 00:00:00 2001
From: Elouan Le Bars <elouan@coopiteasy.be>
Date: Tue, 5 Nov 2019 18:25:17 +0100
Subject: [PATCH 13/34] [FIX] Mandatory field not displayed

Mandatory configuration approval field must be displayed now.

Same modifications as in f406155d5c7250b773a70ec7b8b4d6dd6bdd3da7
---
 beesdoo_easy_my_coop/__openerp__.py                      | 3 +--
 .../migrations/9.0.1.1.3/pre-migration.py                | 9 +++++++++
 beesdoo_easy_my_coop/models/res_company.py               | 9 +++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 beesdoo_easy_my_coop/migrations/9.0.1.1.3/pre-migration.py

diff --git a/beesdoo_easy_my_coop/__openerp__.py b/beesdoo_easy_my_coop/__openerp__.py
index 08abe57..1610526 100644
--- a/beesdoo_easy_my_coop/__openerp__.py
+++ b/beesdoo_easy_my_coop/__openerp__.py
@@ -16,7 +16,7 @@
     # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
     # for the full list
     'category': 'Cooperative management',
-    'version': '9.0.1.1.2',
+    'version': '9.0.1.1.3',
 
     # any module necessary for this one to work correctly
     'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', 'easy_my_coop_eater'],
@@ -32,4 +32,3 @@
     'auto_install': True,
     # only loaded in demonstration mode
 }
-
diff --git a/beesdoo_easy_my_coop/migrations/9.0.1.1.3/pre-migration.py b/beesdoo_easy_my_coop/migrations/9.0.1.1.3/pre-migration.py
new file mode 100644
index 0000000..e47dc66
--- /dev/null
+++ b/beesdoo_easy_my_coop/migrations/9.0.1.1.3/pre-migration.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+def migrate(cr, version):
+    if not version:
+        return
+
+    cr.execute("UPDATE res_company "
+                "SET info_session_confirmation_required = FALSE "
+                "WHERE display_info_session_confirmation = FALSE")
diff --git a/beesdoo_easy_my_coop/models/res_company.py b/beesdoo_easy_my_coop/models/res_company.py
index bd1f360..38bfb96 100644
--- a/beesdoo_easy_my_coop/models/res_company.py
+++ b/beesdoo_easy_my_coop/models/res_company.py
@@ -25,3 +25,12 @@ class ResCompany(models.Model):
     def onchange_info_session_confirmatio_required(self):
         if self.info_session_confirmation_required:
             self.display_info_session_confirmation = True
+
+    _sql_constraints = [(
+        'info_session_approval_constraint',
+        """CHECK ((info_session_confirmation_required=FALSE
+            AND display_info_session_confirmation=FALSE)
+            OR display_info_session_confirmation=TRUE)
+        """,
+        "Approval can't be mandatory and not displayed."
+    )]

From 6259df1110480941bd68a05558db19f6fe59e176 Mon Sep 17 00:00:00 2001
From: Cyrille Bollu <cyrpub@bollu.be>
Date: Mon, 27 Jan 2020 17:00:10 +0100
Subject: [PATCH 14/34] [MIG] beesdoo_easy_my_coop: Migration to 10.0

---
 beesdoo_easy_my_coop/{__openerp__.py => __manifest__.py} | 2 +-
 beesdoo_easy_my_coop/controllers/main.py                 | 6 +++---
 .../migrations/9.0.1.1.3/pre-migration.py                | 9 ---------
 beesdoo_easy_my_coop/models/res_company.py               | 2 +-
 beesdoo_easy_my_coop/models/res_partner.py               | 2 +-
 beesdoo_easy_my_coop/models/subscription_request.py      | 2 +-
 beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py  | 2 +-
 7 files changed, 8 insertions(+), 17 deletions(-)
 rename beesdoo_easy_my_coop/{__openerp__.py => __manifest__.py} (97%)
 delete mode 100644 beesdoo_easy_my_coop/migrations/9.0.1.1.3/pre-migration.py

diff --git a/beesdoo_easy_my_coop/__openerp__.py b/beesdoo_easy_my_coop/__manifest__.py
similarity index 97%
rename from beesdoo_easy_my_coop/__openerp__.py
rename to beesdoo_easy_my_coop/__manifest__.py
index 1610526..c84aea4 100644
--- a/beesdoo_easy_my_coop/__openerp__.py
+++ b/beesdoo_easy_my_coop/__manifest__.py
@@ -16,7 +16,7 @@
     # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
     # for the full list
     'category': 'Cooperative management',
-    'version': '9.0.1.1.3',
+    'version': '10.0.1.0.0',
 
     # any module necessary for this one to work correctly
     'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', 'easy_my_coop_eater'],
diff --git a/beesdoo_easy_my_coop/controllers/main.py b/beesdoo_easy_my_coop/controllers/main.py
index 58e81bd..10b2ab2 100644
--- a/beesdoo_easy_my_coop/controllers/main.py
+++ b/beesdoo_easy_my_coop/controllers/main.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-from openerp import http
-from openerp.http import request
+from odoo import http
+from odoo.http import request
 
-from openerp.addons.easy_my_coop.controllers.main import WebsiteSubscription as Base
+from odoo.addons.easy_my_coop.controllers.main import WebsiteSubscription as Base
 
 class WebsiteSubscription(Base):
 
diff --git a/beesdoo_easy_my_coop/migrations/9.0.1.1.3/pre-migration.py b/beesdoo_easy_my_coop/migrations/9.0.1.1.3/pre-migration.py
deleted file mode 100644
index e47dc66..0000000
--- a/beesdoo_easy_my_coop/migrations/9.0.1.1.3/pre-migration.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-
-def migrate(cr, version):
-    if not version:
-        return
-
-    cr.execute("UPDATE res_company "
-                "SET info_session_confirmation_required = FALSE "
-                "WHERE display_info_session_confirmation = FALSE")
diff --git a/beesdoo_easy_my_coop/models/res_company.py b/beesdoo_easy_my_coop/models/res_company.py
index 38bfb96..6da70d6 100644
--- a/beesdoo_easy_my_coop/models/res_company.py
+++ b/beesdoo_easy_my_coop/models/res_company.py
@@ -2,7 +2,7 @@
 # Copyright 2019 Coop IT Easy SCRLfs
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import api, fields, models, _
+from odoo import api, fields, models, _
 
 
 class ResCompany(models.Model):
diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index 21f13ac..b276140 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from openerp import models, fields, api, _
+from odoo import models, fields, api, _
 
 class Partner(models.Model):
     _inherit = 'res.partner'
diff --git a/beesdoo_easy_my_coop/models/subscription_request.py b/beesdoo_easy_my_coop/models/subscription_request.py
index 9d18653..92c46ae 100644
--- a/beesdoo_easy_my_coop/models/subscription_request.py
+++ b/beesdoo_easy_my_coop/models/subscription_request.py
@@ -2,7 +2,7 @@
 # Copyright 2019 Coop IT Easy SCRLfs
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import api, fields, models, _
+from odoo import api, fields, models, _
 
 
 class SubscriptionRequest(models.Model):
diff --git a/beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py b/beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py
index a411179..4614762 100644
--- a/beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py
+++ b/beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py
@@ -2,7 +2,7 @@
 # Copyright 2019 Coop IT Easy SCRLfs
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import api, fields, models, _
+from odoo import api, fields, models, _
 
 
 class Subscribe(models.TransientModel):

From dc2b6ad2779969c8de1c1535c3c454a28618b1c3 Mon Sep 17 00:00:00 2001
From: Cyrille Bollu <cyrpub@bollu.be>
Date: Mon, 27 Jan 2020 17:03:39 +0100
Subject: [PATCH 15/34] [MIG] beesdoo_easy_my_coop: Migration to 11.0

---
 beesdoo_easy_my_coop/__init__.py                        | 3 +--
 beesdoo_easy_my_coop/__manifest__.py                    | 3 +--
 beesdoo_easy_my_coop/controllers/__init__.py            | 1 -
 beesdoo_easy_my_coop/controllers/main.py                | 1 -
 beesdoo_easy_my_coop/models/__init__.py                 | 2 +-
 beesdoo_easy_my_coop/models/res_company.py              | 1 -
 beesdoo_easy_my_coop/models/res_partner.py              | 1 -
 beesdoo_easy_my_coop/models/subscription_request.py     | 1 -
 beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py | 1 -
 9 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/beesdoo_easy_my_coop/__init__.py b/beesdoo_easy_my_coop/__init__.py
index c311c55..4ba7940 100644
--- a/beesdoo_easy_my_coop/__init__.py
+++ b/beesdoo_easy_my_coop/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
-import models
+from . import models
 from . import wizards
 from . import controllers
diff --git a/beesdoo_easy_my_coop/__manifest__.py b/beesdoo_easy_my_coop/__manifest__.py
index c84aea4..bd49c85 100644
--- a/beesdoo_easy_my_coop/__manifest__.py
+++ b/beesdoo_easy_my_coop/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Beescoop link with easy my coop",
 
@@ -16,7 +15,7 @@
     # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
     # for the full list
     'category': 'Cooperative management',
-    'version': '10.0.1.0.0',
+    'version': '11.0.1.0.0',
 
     # any module necessary for this one to work correctly
     'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', 'easy_my_coop_eater'],
diff --git a/beesdoo_easy_my_coop/controllers/__init__.py b/beesdoo_easy_my_coop/controllers/__init__.py
index 757b12a..12a7e52 100644
--- a/beesdoo_easy_my_coop/controllers/__init__.py
+++ b/beesdoo_easy_my_coop/controllers/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 from . import main
diff --git a/beesdoo_easy_my_coop/controllers/main.py b/beesdoo_easy_my_coop/controllers/main.py
index 10b2ab2..4f61e18 100644
--- a/beesdoo_easy_my_coop/controllers/main.py
+++ b/beesdoo_easy_my_coop/controllers/main.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from odoo import http
 from odoo.http import request
 
diff --git a/beesdoo_easy_my_coop/models/__init__.py b/beesdoo_easy_my_coop/models/__init__.py
index def4978..00b712c 100644
--- a/beesdoo_easy_my_coop/models/__init__.py
+++ b/beesdoo_easy_my_coop/models/__init__.py
@@ -1,3 +1,3 @@
-import res_partner
+from . import res_partner
 from . import subscription_request
 from . import res_company
diff --git a/beesdoo_easy_my_coop/models/res_company.py b/beesdoo_easy_my_coop/models/res_company.py
index 6da70d6..7be05ce 100644
--- a/beesdoo_easy_my_coop/models/res_company.py
+++ b/beesdoo_easy_my_coop/models/res_company.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2019 Coop IT Easy SCRLfs
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index b276140..8922e8f 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from odoo import models, fields, api, _
 
 class Partner(models.Model):
diff --git a/beesdoo_easy_my_coop/models/subscription_request.py b/beesdoo_easy_my_coop/models/subscription_request.py
index 92c46ae..8c4b734 100644
--- a/beesdoo_easy_my_coop/models/subscription_request.py
+++ b/beesdoo_easy_my_coop/models/subscription_request.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2019 Coop IT Easy SCRLfs
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py b/beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py
index 4614762..7cc79f5 100644
--- a/beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py
+++ b/beesdoo_easy_my_coop/wizards/beesdoo_shift_subscribe.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2019 Coop IT Easy SCRLfs
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 

From 60a1a65a17856819826ce6d9e32a3bf4991f9906 Mon Sep 17 00:00:00 2001
From: Cyrille Bollu <cyrpub@bollu.be>
Date: Mon, 27 Jan 2020 17:10:52 +0100
Subject: [PATCH 16/34] [MIG] beesdoo_easy_my_coop: Migration to 12.0

---
 beesdoo_easy_my_coop/__manifest__.py                  | 2 +-
 beesdoo_easy_my_coop/views/subscription_templates.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/beesdoo_easy_my_coop/__manifest__.py b/beesdoo_easy_my_coop/__manifest__.py
index bd49c85..9baa2d7 100644
--- a/beesdoo_easy_my_coop/__manifest__.py
+++ b/beesdoo_easy_my_coop/__manifest__.py
@@ -15,7 +15,7 @@
     # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
     # for the full list
     'category': 'Cooperative management',
-    'version': '11.0.1.0.0',
+    'version': '12.0.1.0.0',
 
     # any module necessary for this one to work correctly
     'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', 'easy_my_coop_eater'],
diff --git a/beesdoo_easy_my_coop/views/subscription_templates.xml b/beesdoo_easy_my_coop/views/subscription_templates.xml
index 264204a..3f2cac0 100644
--- a/beesdoo_easy_my_coop/views/subscription_templates.xml
+++ b/beesdoo_easy_my_coop/views/subscription_templates.xml
@@ -12,7 +12,7 @@
               <label class="col-md-3 col-sm-4 control-label" for="info_session_confirmed">Info Session</label>
               <div class="col-md-9 col-sm-8">
                   <div class="checkbox">
-                      <label>
+                      <label for="info_session_confirmed">
                           <input type="checkbox"
                                  name="info_session_confirmed"
                                  t-att="{'required': 'required'} if info_session_required else {}"

From ddda33015a2ccd6ca8f9a27381248e0272f244e4 Mon Sep 17 00:00:00 2001
From: houssine <houssine.bakkali@gmail.com>
Date: Sun, 29 Mar 2020 21:19:23 +0200
Subject: [PATCH 17/34] [IMP] add can shop boolean on the share product

It will avoid to test on hardcoded values. It also makes several shares
allowing to shop product from the coop
---
 beesdoo_easy_my_coop/__manifest__.py    | 16 ++++++++--------
 beesdoo_easy_my_coop/models/__init__.py |  1 +
 beesdoo_easy_my_coop/models/product.py  |  8 ++++++++
 beesdoo_easy_my_coop/views/product.xml  | 13 +++++++++++++
 4 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 beesdoo_easy_my_coop/models/product.py
 create mode 100644 beesdoo_easy_my_coop/views/product.xml

diff --git a/beesdoo_easy_my_coop/__manifest__.py b/beesdoo_easy_my_coop/__manifest__.py
index 9baa2d7..ccd9b29 100644
--- a/beesdoo_easy_my_coop/__manifest__.py
+++ b/beesdoo_easy_my_coop/__manifest__.py
@@ -2,7 +2,8 @@
     'name': "Beescoop link with easy my coop",
 
     'summary': """
-        Module that made the link between beesdoo customization and easy_my_coop
+        Module that made the link between beesdoo customization
+        and easy_my_coop
     """,
 
     'description': """
@@ -11,23 +12,22 @@
     'author': "Beescoop - Cellule IT",
     'website': "https://github.com/beescoop/Obeesdoo",
 
-    # Categories can be used to filter modules in modules listing
-    # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
-    # for the full list
     'category': 'Cooperative management',
     'version': '12.0.1.0.0',
 
-    # any module necessary for this one to work correctly
-    'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', 'easy_my_coop_eater'],
+    'depends': ['beesdoo_base',
+                'beesdoo_shift',
+                'easy_my_coop',
+                'easy_my_coop_eater'
+                ],
 
-    # always loaded
     'data': [
         'data/product_share.xml',
         'views/partner.xml',
         'views/res_company.xml',
         'views/subscription_request.xml',
         'views/subscription_templates.xml',
+        'views/product.xml'
     ],
     'auto_install': True,
-    # only loaded in demonstration mode
 }
diff --git a/beesdoo_easy_my_coop/models/__init__.py b/beesdoo_easy_my_coop/models/__init__.py
index 00b712c..e856cc7 100644
--- a/beesdoo_easy_my_coop/models/__init__.py
+++ b/beesdoo_easy_my_coop/models/__init__.py
@@ -1,3 +1,4 @@
 from . import res_partner
 from . import subscription_request
 from . import res_company
+from . import product
diff --git a/beesdoo_easy_my_coop/models/product.py b/beesdoo_easy_my_coop/models/product.py
new file mode 100644
index 0000000..2bdeca0
--- /dev/null
+++ b/beesdoo_easy_my_coop/models/product.py
@@ -0,0 +1,8 @@
+from odoo import models, fields
+
+
+class ProductTemplate(models.Model):
+
+    inherit = 'product.template'
+
+    can_shop = fields.Boolean(string="Is share?")
diff --git a/beesdoo_easy_my_coop/views/product.xml b/beesdoo_easy_my_coop/views/product.xml
new file mode 100644
index 0000000..6316bae
--- /dev/null
+++ b/beesdoo_easy_my_coop/views/product.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+	<record id="product_template_share_form_view_beesdoo_emc" model="ir.ui.view">
+        <field name="name">product.template.share.form</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="easy_my_coop.product_template_share_form_view"/>
+        <field name="arch" type="xml">
+            <field name="customer" position="after">
+                <field name="can_shop"/>
+            </field>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file

From a0d2b56def064c417d8d4c074ab949e36e0e374b Mon Sep 17 00:00:00 2001
From: houssine <houssine.bakkali@gmail.com>
Date: Sun, 29 Mar 2020 21:21:24 +0200
Subject: [PATCH 18/34] [REFACT] refactor the code make can shop extendable and
 configurable.

---
 beesdoo_easy_my_coop/models/res_partner.py | 40 +++++++---------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index 8922e8f..6960c5a 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -1,44 +1,28 @@
-from odoo import models, fields, api, _
+from odoo import models, fields, api
+
 
 class Partner(models.Model):
     _inherit = 'res.partner'
 
-    cooperator_type = fields.Selection(selection='_get_share_type', compute='_compute_share_type', string='Cooperator Type', store=True)
     can_shop = fields.Boolean(compute='_can_shop', store=True)
     info_session_confirmed = fields.Boolean(
         string="Confirmed presence to info session",
         default=False,
     )
 
-    @api.depends('cooperator_type', 'cooperative_status_ids', 'cooperative_status_ids.can_shop')
+    @api.depends('cooperator_type',
+                 'cooperative_status_ids',
+                 'cooperative_status_ids.can_shop')
     def _can_shop(self):
+        product_obj = self.env['product.template']
+        can_shop_shares = product_obj.search([('is_share', '=', True),
+                                              ('can_shop', '=', True)
+                                              ]).mapped('default_code')
         for rec in self:
-            if rec.cooperator_type == 'share_b':
+            if rec.cooperator_type in can_shop_shares:
                 rec.can_shop = True
-            elif rec.cooperative_status_ids and rec.cooperative_status_ids[0].can_shop:
+            elif (rec.cooperative_status_ids
+                  and rec.cooperative_status_ids[0].can_shop):
                 rec.can_shop = True
             else:
                 rec.can_shop = False
-
-
-    @api.multi
-    @api.depends('share_ids', 'share_ids.share_product_id', 'share_ids.share_product_id.default_code', 'share_ids.share_number')
-    def _compute_share_type(self):
-        for rec in self:
-            if rec.share_ids and rec.share_ids[0].share_number > 0:
-                rec.cooperator_type = rec.share_ids[0].share_product_id.default_code
-            else:
-                rec.cooperator_type = ''
-
-    @api.multi
-    def _get_share_type(self):
-        share_type_list = [('','')]
-        for share_type in self.env['product.product'].search([('is_share','=',True)]):
-            share_type_list.append((share_type.default_code, share_type.short_name))
-        return share_type_list
-
-    @api.noguess
-    def _auto_init(self, cr, context=None):
-        cr.execute("ALTER TABLE res_partner DROP COLUMN IF EXISTS cooperator_type")
-        res = super(Partner, self)._auto_init(cr, context=context)
-        return res
\ No newline at end of file

From f25f0b6f984c03a95c341ad72cd332a253afc078 Mon Sep 17 00:00:00 2001
From: houssine <houssine.bakkali@gmail.com>
Date: Sun, 29 Mar 2020 22:30:32 +0200
Subject: [PATCH 19/34] [IMP] remove unnecessary views and update security
 groups

---
 beesdoo_easy_my_coop/views/partner.xml | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/beesdoo_easy_my_coop/views/partner.xml b/beesdoo_easy_my_coop/views/partner.xml
index ad869bf..b523166 100644
--- a/beesdoo_easy_my_coop/views/partner.xml
+++ b/beesdoo_easy_my_coop/views/partner.xml
@@ -9,23 +9,6 @@
 		</field>
 	</record>
 
-    <record model="ir.ui.view" id="beesdoo_easy_my_coop_partner_search_view">
-        <field name="name">beesdoo_easy_my_coop.partner.search.view</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="beesdoo_base.beesdoo_partner_search_view" />
-        <field name="arch" type="xml">
-            <filter name="type_a" position="replace">
-                <filter name="type_a" string="Cooperator type A" domain="[('cooperator_type', '=', 'share_a'), ('member', '=', True)]" />
-            </filter>
-            <filter name="type_b" position="replace">
-                <filter name="type_b" string="Cooperator type B" domain="[('cooperator_type', '=', 'share_b'), ('member', '=', True)]" />
-            </filter>
-            <filter name="type_c" position="replace">
-                <filter name="type_c" string="Cooperator type C" domain="[('cooperator_type', '=', 'share_c'), ('member', '=', True)]" />
-            </filter>
-        </field>
-    </record>
-
     <record model="ir.ui.view" id="beesdoo_partner_form_view_remove_duplicate_header">
         <field name="name">beesdoo.partner.form.view.remove_duplicate_header</field>
         <field name="model">res.partner</field>
@@ -34,9 +17,9 @@
             <xpath expr="header" position="replace" />
             <xpath expr="//field[@name='state']" position="before">
                 <button string="Create Subscription" name="%(easy_my_coop.action_view_create_subscription)d"
-                                type="action" context="{'default_active_id': active_id}" groups="easy_my_coop.group_energiris_manager"/>
+                                type="action" context="{'default_active_id': active_id}" groups="easy_my_coop.group_easy_my_coop_manager"/>
                  <button string="Update info" name="%(easy_my_coop.action_view_update_partner_info)d"
-                                type="action" context="{'default_active_id': active_id}" groups="easy_my_coop.group_energiris_manager"/>
+                                type="action" context="{'default_active_id': active_id}" groups="easy_my_coop.group_easy_my_coop_manager"/>
             </xpath>
             <xpath expr="//field[@name='info_session']" position="before">
                 <field name="can_shop" />

From e8ee6009ee9705ad4eacf7b82c72ddc1c3e61fd2 Mon Sep 17 00:00:00 2001
From: Houssine BAKKALI <houssine.bakkali@gmail.com>
Date: Fri, 17 Apr 2020 11:18:05 +0200
Subject: [PATCH 20/34] [FIX] fix module name in import

---
 beesdoo_easy_my_coop/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beesdoo_easy_my_coop/controllers/main.py b/beesdoo_easy_my_coop/controllers/main.py
index 4f61e18..5e1cff4 100644
--- a/beesdoo_easy_my_coop/controllers/main.py
+++ b/beesdoo_easy_my_coop/controllers/main.py
@@ -1,7 +1,7 @@
 from odoo import http
 from odoo.http import request
 
-from odoo.addons.easy_my_coop.controllers.main import WebsiteSubscription as Base
+from odoo.addons.easy_my_coop_website.controllers.main import WebsiteSubscription as Base
 
 class WebsiteSubscription(Base):
 

From d5bfdc76b6568348ffcc236fab3a85a51eac2126 Mon Sep 17 00:00:00 2001
From: Houssine BAKKALI <houssine.bakkali@gmail.com>
Date: Fri, 17 Apr 2020 11:38:57 +0200
Subject: [PATCH 21/34] [FIX] fix missing underscore for _inherit

---
 beesdoo_easy_my_coop/models/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beesdoo_easy_my_coop/models/product.py b/beesdoo_easy_my_coop/models/product.py
index 2bdeca0..35fc68f 100644
--- a/beesdoo_easy_my_coop/models/product.py
+++ b/beesdoo_easy_my_coop/models/product.py
@@ -3,6 +3,6 @@ from odoo import models, fields
 
 class ProductTemplate(models.Model):
 
-    inherit = 'product.template'
+    _inherit = 'product.template'
 
     can_shop = fields.Boolean(string="Is share?")

From 899beb9b946c3035b6dcc4298a6768c7af323796 Mon Sep 17 00:00:00 2001
From: Vincent Van Rossem <vvrossem@gmail.com>
Date: Wed, 22 Apr 2020 17:13:38 +0200
Subject: [PATCH 22/34] [FIX] beesdoo_easy_my_coop: correct XML external ID

---
 beesdoo_easy_my_coop/views/subscription_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beesdoo_easy_my_coop/views/subscription_templates.xml b/beesdoo_easy_my_coop/views/subscription_templates.xml
index 3f2cac0..44fd0e8 100644
--- a/beesdoo_easy_my_coop/views/subscription_templates.xml
+++ b/beesdoo_easy_my_coop/views/subscription_templates.xml
@@ -6,7 +6,7 @@
 
   <template id="beesdoo_easy_my_coop.becomecooperator"
             name="Become Cooperator (in beesdoo_easy_my_coop)"
-            inherit_id="easy_my_coop.becomecooperator">
+            inherit_id="easy_my_coop_website.becomecooperator">
       <xpath expr="//div[@id='data_policy_approved']" position="before">
           <div id="info_session_confirmed" t-if="display_info_session" t-attf-class="form-group" >
               <label class="col-md-3 col-sm-4 control-label" for="info_session_confirmed">Info Session</label>

From c16c6ddf34da4a8008fd3fb41ea1659a9b794bf2 Mon Sep 17 00:00:00 2001
From: Vincent Van Rossem <vvrossem@gmail.com>
Date: Wed, 22 Apr 2020 17:15:13 +0200
Subject: [PATCH 23/34] [FIX] beesdoo_easy_my_coop: missing dependency

---
 beesdoo_easy_my_coop/__manifest__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/beesdoo_easy_my_coop/__manifest__.py b/beesdoo_easy_my_coop/__manifest__.py
index ccd9b29..8a1708a 100644
--- a/beesdoo_easy_my_coop/__manifest__.py
+++ b/beesdoo_easy_my_coop/__manifest__.py
@@ -18,7 +18,8 @@
     'depends': ['beesdoo_base',
                 'beesdoo_shift',
                 'easy_my_coop',
-                'easy_my_coop_eater'
+                'easy_my_coop_eater',
+                'easy_my_coop_website',
                 ],
 
     'data': [

From 9093854ca6d5ac41f6a9031ce7df8737f495b2a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Thu, 7 May 2020 18:59:08 +0200
Subject: [PATCH 24/34] [REF] b_base: @api.one -> self.ensure_one()

---
 beesdoo_base/models/partner.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py
index 5e6470a..694096b 100644
--- a/beesdoo_base/models/partner.py
+++ b/beesdoo_base/models/partner.py
@@ -19,9 +19,9 @@ class Partner(models.Model):
     cooperator_type = fields.Selection([('share_a', 'Share A'), ('share_b', 'Share B'), ('share_c', 'Share C')], store=True, compute=None)
 
 
-    @api.one
     @api.depends('parent_eater_id', 'parent_eater_id.barcode', 'eater', 'member_card_ids')
     def _get_bar_code(self):
+        self.ensure_one()
         if self.eater == 'eater':
             self.parent_barcode = self.parent_eater_id.barcode
         elif self.member_card_ids:
@@ -29,12 +29,12 @@ class Partner(models.Model):
                 if c.valid:
                     self.barcode = c.barcode
 
-    @api.one
     @api.constrains('child_eater_ids', 'parent_eater_id')
     def _check_number_of_eaters(self):
         """The owner of an A share can have a maximum of two eaters but
         the owner of a B share can have a maximum of three eaters.
         """
+        self.ensure_one()
         # Get the default_code of the share for the current eater and his parent
         share_type_code = self.cooperator_type
         parent_share_type_code = self.parent_eater_id.cooperator_type
@@ -58,8 +58,8 @@ class Partner(models.Model):
                     command[0] = 3
         return super(Partner, self).write(values)
 
-    @api.one
     def _deactivate_active_cards(self):
+        self.ensure_one()
         for card in self.member_card_ids.filtered('valid'):
             card.valid = False
             card.end_date = fields.Date.today()

From dafdf345ba1f53693fdcd88472daad1a6ba64934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Thu, 7 May 2020 19:01:19 +0200
Subject: [PATCH 25/34] [CHG] b_base: country_id is not belgium by default
 anymore

---
 beesdoo_base/models/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py
index 694096b..9f0e35b 100644
--- a/beesdoo_base/models/partner.py
+++ b/beesdoo_base/models/partner.py
@@ -12,7 +12,7 @@ class Partner(models.Model):
     barcode = fields.Char(compute="_get_bar_code", string='Barcode', store=True)
     parent_barcode = fields.Char(compute="_get_bar_code", string='Parent Barcode', store=True)
     member_card_ids = fields.One2many('member.card', 'partner_id')
-    country_id = fields.Many2one(required=True, default=lambda self: self.env.ref('base.be'))
+    country_id = fields.Many2one(required=True)
 
     member_card_to_be_printed = fields.Boolean('Print BEES card?')
     last_printed = fields.Datetime('Last printed on')

From 53719aaba127ecb7dced518108a0e921a0682321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Fri, 8 May 2020 16:18:02 +0200
Subject: [PATCH 26/34] [CHG] b_base: Remove cooperator_type info

This new b_base module focus on adding member cards and eater
functionality.

Constrain about number of eater should be customise for each
cooperative. And if the cooperative is using easy_my_coop module the
maximum number of eater should be specified on the share product.

Also cooperator_type has no meaning here. For cooperative that uses
easy_my_coop, cooperator_type is a computed field based on the share
that the cooperator owns.

beesdoo_easy_my_coop and beesdoo_worker_status will be modified for
taking this into account.
---
 beesdoo_base/__manifest__.py   |  1 +
 beesdoo_base/demo/eaters.xml   | 43 ++++++++++++++++++++++++++++++++++
 beesdoo_base/models/partner.py | 35 ++++++---------------------
 beesdoo_base/views/partner.xml | 20 ----------------
 4 files changed, 51 insertions(+), 48 deletions(-)
 create mode 100644 beesdoo_base/demo/eaters.xml

diff --git a/beesdoo_base/__manifest__.py b/beesdoo_base/__manifest__.py
index dd0c497..2ad0665 100644
--- a/beesdoo_base/__manifest__.py
+++ b/beesdoo_base/__manifest__.py
@@ -34,5 +34,6 @@
     'installable': True,
     'demo': [
         'demo/cooperators.xml',
+        'demo/eaters.xml',
     ]
 }
diff --git a/beesdoo_base/demo/eaters.xml b/beesdoo_base/demo/eaters.xml
new file mode 100644
index 0000000..13dc5f3
--- /dev/null
+++ b/beesdoo_base/demo/eaters.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2019 Coop IT Easy
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+<odoo>
+    <record id="eater1" model="res.partner">
+        <field name="name">Gilles Eaterbeek</field>
+        <field name="firstname">Gilles</field>
+        <field name="lastname">Eaterbeek</field>
+        <field name="eater">eater</field>
+        <field name="is_company" eval="False"/>
+        <field name="customer" eval="True"/>
+    </record>
+
+    <record id="eater2" model="res.partner">
+        <field name="name">Constant Eateration</field>
+        <field name="firstname">Constant</field>
+        <field name="lastname">Eateration</field>
+        <field name="eater">eater</field>
+        <field name="is_company" eval="False"/>
+        <field name="customer" eval="True"/>
+    </record>
+
+    <record id="eater3" model="res.partner">
+        <field name="name">Alexander G. Eaterphone</field>
+        <field name="firstname">Alexander G.</field>
+        <field name="lastname">Eaterphone</field>
+        <field name="eater">eater</field>
+        <field name="is_company" eval="False"/>
+        <field name="customer" eval="True"/>
+    </record>
+
+    <record id="eater4" model="res.partner">
+        <field name="name">Tim Eaternet</field>
+        <field name="firstname">Tim</field>
+        <field name="lastname">Eaternet</field>
+        <field name="eater">eater</field>
+        <field name="is_company" eval="False"/>
+        <field name="customer" eval="True"/>
+    </record>
+</odoo>
+
diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py
index 9f0e35b..34a0e02 100644
--- a/beesdoo_base/models/partner.py
+++ b/beesdoo_base/models/partner.py
@@ -12,40 +12,19 @@ class Partner(models.Model):
     barcode = fields.Char(compute="_get_bar_code", string='Barcode', store=True)
     parent_barcode = fields.Char(compute="_get_bar_code", string='Parent Barcode', store=True)
     member_card_ids = fields.One2many('member.card', 'partner_id')
-    country_id = fields.Many2one(required=True)
 
     member_card_to_be_printed = fields.Boolean('Print BEES card?')
     last_printed = fields.Datetime('Last printed on')
-    cooperator_type = fields.Selection([('share_a', 'Share A'), ('share_b', 'Share B'), ('share_c', 'Share C')], store=True, compute=None)
-
 
     @api.depends('parent_eater_id', 'parent_eater_id.barcode', 'eater', 'member_card_ids')
     def _get_bar_code(self):
-        self.ensure_one()
-        if self.eater == 'eater':
-            self.parent_barcode = self.parent_eater_id.barcode
-        elif self.member_card_ids:
-            for c in self.member_card_ids:
-                if c.valid:
-                    self.barcode = c.barcode
-
-    @api.constrains('child_eater_ids', 'parent_eater_id')
-    def _check_number_of_eaters(self):
-        """The owner of an A share can have a maximum of two eaters but
-        the owner of a B share can have a maximum of three eaters.
-        """
-        self.ensure_one()
-        # Get the default_code of the share for the current eater and his parent
-        share_type_code = self.cooperator_type
-        parent_share_type_code = self.parent_eater_id.cooperator_type
-        # Raise exception
-        if share_type_code == 'share_b' or parent_share_type_code == 'share_b':
-            if len(self.child_eater_ids) > 3 or len(self.parent_eater_id.child_eater_ids) > 3:
-                raise ValidationError(_('You can only set three additional eaters per worker'))
-        else:
-            if len(self.child_eater_ids) > 2 or len(self.parent_eater_id.child_eater_ids) > 2:
-                raise ValidationError(_('You can only set two additional eaters per worker'))
-
+        for rec in self:
+            if rec.eater == 'eater':
+                rec.parent_barcode = rec.parent_eater_id.barcode
+            elif rec.member_card_ids:
+                for c in rec.member_card_ids:
+                    if c.valid:
+                        rec.barcode = c.barcode
 
     @api.multi
     def write(self, values):
diff --git a/beesdoo_base/views/partner.xml b/beesdoo_base/views/partner.xml
index efa8d96..6a2c6a7 100644
--- a/beesdoo_base/views/partner.xml
+++ b/beesdoo_base/views/partner.xml
@@ -19,19 +19,12 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="point_of_sale.view_partner_property_form" />
         <field name="arch" type="xml">
-            <field name="type" position="before">
-                <field name="cooperator_type"/>
-            </field>
             <field name="website" position="after">
                 <field name="eater"
                     attrs="{'invisible': [('customer', '=', False)]}" />
                 <field name="parent_eater_id"
                     attrs="{'invisible' : [('eater', '!=', 'eater')]}" />
             </field>
-            <xpath expr="//notebook/page[1]" position="attributes">
-                <attribute name="attrs">{'invisible':
-                    [('cooperator_type', '=', 'share_a')]}</attribute>
-            </xpath>
             <xpath expr="//notebook" position="inside">
                 <page string="Member Card"
                     attrs="{'invisible': ['|', ('customer', '=', False), ('eater', 'not in', ('worker_eater', 'eater'))]}">
@@ -87,19 +80,6 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="beesdoo_partner_search_view">
-        <field name="name">beesdoo.partner.search.view</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_res_partner_filter" />
-        <field name="arch" type="xml">
-            <filter name="type_person" position="after">
-                <filter name="type_a" string="Cooperator type A" domain="[('cooperator_type', '=', 'share_a')]" />
-                <filter name="type_b" string="Cooperator type B" domain="[('cooperator_type', '=', 'share_b')]" />
-                <filter name="type_c" string="Cooperator type C" domain="[('cooperator_type', '=', 'share_c')]" />
-            </filter>
-        </field>
-    </record>
-
 
     <!-- S022 : By default a supplier should be a company -->
     <record id="base.action_partner_supplier_form" model="ir.actions.act_window">

From 6ed4c5a5e225a661cfd174bc2247d94f7ba2ab14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Fri, 8 May 2020 16:28:05 +0200
Subject: [PATCH 27/34] [CHG] b_emc: Eater max is configurable

---
 beesdoo_easy_my_coop/__manifest__.py          |  5 +-
 beesdoo_easy_my_coop/data/product_share.xml   | 23 ------
 beesdoo_easy_my_coop/demo/product_share.xml   | 74 ++++++++++++++++++
 beesdoo_easy_my_coop/models/product.py        | 16 +++-
 beesdoo_easy_my_coop/models/res_partner.py    | 50 +++++++-----
 beesdoo_easy_my_coop/tests/__init__.py        |  1 +
 .../tests/test_res_partner.py                 | 78 +++++++++++++++++++
 beesdoo_easy_my_coop/views/partner.xml        | 30 -------
 beesdoo_easy_my_coop/views/product.xml        |  5 +-
 9 files changed, 206 insertions(+), 76 deletions(-)
 delete mode 100644 beesdoo_easy_my_coop/data/product_share.xml
 create mode 100644 beesdoo_easy_my_coop/demo/product_share.xml
 create mode 100644 beesdoo_easy_my_coop/tests/__init__.py
 create mode 100644 beesdoo_easy_my_coop/tests/test_res_partner.py
 delete mode 100644 beesdoo_easy_my_coop/views/partner.xml

diff --git a/beesdoo_easy_my_coop/__manifest__.py b/beesdoo_easy_my_coop/__manifest__.py
index 8a1708a..aa1bc3e 100644
--- a/beesdoo_easy_my_coop/__manifest__.py
+++ b/beesdoo_easy_my_coop/__manifest__.py
@@ -23,12 +23,13 @@
                 ],
 
     'data': [
-        'data/product_share.xml',
-        'views/partner.xml',
         'views/res_company.xml',
         'views/subscription_request.xml',
         'views/subscription_templates.xml',
         'views/product.xml'
     ],
+    'demo': [
+        'demo/product_share.xml',
+    ],
     'auto_install': True,
 }
diff --git a/beesdoo_easy_my_coop/data/product_share.xml b/beesdoo_easy_my_coop/data/product_share.xml
deleted file mode 100644
index 50db413..0000000
--- a/beesdoo_easy_my_coop/data/product_share.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <record id="share_a" model="product.template" >
-            <field name="name">Acquisition de parts A de Beescoop scrl</field>
-            <field name="default_code">share_a</field>
-            <field name="customer" eval="True" />
-            <field name="is_share" eval="True" />
-        </record>
-        <record id="share_b" model="product.template" >
-            <field name="name">Acquisition de parts B de Beescoop scrl</field>
-            <field name="default_code">share_b</field>
-            <field name="customer" eval="True" />
-            <field name="is_share" eval="True" />
-        </record>
-        <record id="share_c" model="product.template" >
-            <field name="name">Acquisition de parts C de Beescoop scrl</field>
-            <field name="default_code">share_c</field>
-            <field name="customer" eval="False" />
-            <field name="is_share" eval="True" />
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/beesdoo_easy_my_coop/demo/product_share.xml b/beesdoo_easy_my_coop/demo/product_share.xml
new file mode 100644
index 0000000..cc7eca9
--- /dev/null
+++ b/beesdoo_easy_my_coop/demo/product_share.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Share products -->
+    <record id="share_a" model="product.product" >
+        <field name="name">Acquisition de parts A de Beescoop scrl</field>
+        <field name="default_code">share_a</field>
+        <field name="customer" eval="True" />
+        <field name="allow_working" eval="True" />
+        <field name="max_nb_eater_allowed">3</field>
+        <field name="is_share" eval="True" />
+    </record>
+    <record id="share_b" model="product.product" >
+        <field name="name">Acquisition de parts B de Beescoop scrl</field>
+        <field name="default_code">share_b</field>
+        <field name="customer" eval="True" />
+        <field name="allow_working" eval="False" />
+        <field name="max_nb_eater_allowed">2</field>
+        <field name="is_share" eval="True" />
+    </record>
+    <record id="share_c" model="product.product" >
+        <field name="name">Acquisition de parts C de Beescoop scrl</field>
+        <field name="default_code">share_c</field>
+        <field name="customer" eval="False" />
+        <field name="allow_working" eval="False" />
+        <field name="max_nb_eater_allowed">-1</field>
+        <field name="is_share" eval="True" />
+    </record>
+
+    <!-- Share lines -->
+    <record id="shareline_coop_1" model="share.line">
+        <field name="share_product_id" ref="share_a"/>
+        <field name="share_number">2</field>
+        <field name="effective_date">2020-01-01</field>
+        <field name="partner_id"
+            ref="beesdoo_base.res_partner_cooperator_1_demo"/>
+    </record>
+    <record id="beesdoo_base.res_partner_cooperator_1_demo"
+        model="res.partner">
+        <field name="cooperator" eval="True"/>
+        <field name="member" eval="True"/>
+        <field name="share_ids" eval="[(4, ref('shareline_coop_1'))]"/>
+        <field name="cooperator_type">share_a</field>
+    </record>
+
+    <record id="shareline_coop_2" model="share.line">
+        <field name="share_product_id" ref="share_b"/>
+        <field name="share_number">4</field>
+        <field name="effective_date">2020-01-01</field>
+        <field name="partner_id"
+            ref="beesdoo_base.res_partner_cooperator_2_demo"/>
+    </record>
+    <record id="beesdoo_base.res_partner_cooperator_2_demo"
+        model="res.partner">
+        <field name="cooperator" eval="True"/>
+        <field name="member" eval="True"/>
+        <field name="share_ids" eval="[(4, ref('shareline_coop_2'))]"/>
+        <field name="cooperator_type">share_b</field>
+    </record>
+
+    <record id="shareline_coop_3" model="share.line">
+        <field name="share_product_id" ref="share_c"/>
+        <field name="share_number">6</field>
+        <field name="effective_date">2020-01-01</field>
+        <field name="partner_id"
+            ref="beesdoo_base.res_partner_cooperator_3_demo"/>
+    </record>
+    <record id="beesdoo_base.res_partner_cooperator_3_demo"
+        model="res.partner">
+        <field name="cooperator" eval="True"/>
+        <field name="member" eval="True"/>
+        <field name="share_ids" eval="[(4, ref('shareline_coop_3'))]"/>
+        <field name="cooperator_type">share_c</field>
+    </record>
+</odoo>
diff --git a/beesdoo_easy_my_coop/models/product.py b/beesdoo_easy_my_coop/models/product.py
index 35fc68f..91b6800 100644
--- a/beesdoo_easy_my_coop/models/product.py
+++ b/beesdoo_easy_my_coop/models/product.py
@@ -5,4 +5,18 @@ class ProductTemplate(models.Model):
 
     _inherit = 'product.template'
 
-    can_shop = fields.Boolean(string="Is share?")
+    max_nb_eater_allowed = fields.Integer(
+        string="Max number of eater allowed",
+        default=-1,
+        help=(
+            "Maximum number of eater allowed for the owner of the share. "
+            "A negative value means no maximum."
+        )
+    )
+    allow_working = fields.Boolean(
+        string="Allow owner to work?",
+        help=(
+            "Owner of this type of share are allowed to participate to the "
+            "shift system."
+        )
+    )
diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index 6960c5a..55095f6 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -1,28 +1,42 @@
-from odoo import models, fields, api
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
 
 
 class Partner(models.Model):
     _inherit = 'res.partner'
 
-    can_shop = fields.Boolean(compute='_can_shop', store=True)
     info_session_confirmed = fields.Boolean(
         string="Confirmed presence to info session",
         default=False,
     )
 
-    @api.depends('cooperator_type',
-                 'cooperative_status_ids',
-                 'cooperative_status_ids.can_shop')
-    def _can_shop(self):
-        product_obj = self.env['product.template']
-        can_shop_shares = product_obj.search([('is_share', '=', True),
-                                              ('can_shop', '=', True)
-                                              ]).mapped('default_code')
-        for rec in self:
-            if rec.cooperator_type in can_shop_shares:
-                rec.can_shop = True
-            elif (rec.cooperative_status_ids
-                  and rec.cooperative_status_ids[0].can_shop):
-                rec.can_shop = True
-            else:
-                rec.can_shop = False
+    @api.constrains('child_eater_ids', 'parent_eater_id')
+    def _check_number_of_eaters(self):
+        """
+        Check the maximum number of eaters that can be assigned to a
+        share owner.
+        """
+        self.ensure_one()
+        share_type = None
+        if self.cooperator_type:
+            share_type = (
+                self.env['product.template']
+                .search([('default_code', '=', self.cooperator_type)])
+            )[0]
+        # If the current partner owns no share, check his parent.
+        if not share_type:
+            share_type = (
+                self.env['product.template']
+                .search([
+                    ('default_code', '=', self.parent_eater_id.cooperator_type)
+                ])
+            )[0]
+        if (
+            share_type
+            and share_type.max_nb_eater_allowed >= 0
+            and len(self.child_eater_ids) > share_type.max_nb_eater_allowed
+        ):
+            raise ValidationError(
+                _('You can only set %d additional eaters per worker')
+                % share_type.max_nb_eater_allowed
+            )
diff --git a/beesdoo_easy_my_coop/tests/__init__.py b/beesdoo_easy_my_coop/tests/__init__.py
new file mode 100644
index 0000000..d57d215
--- /dev/null
+++ b/beesdoo_easy_my_coop/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_res_partner
diff --git a/beesdoo_easy_my_coop/tests/test_res_partner.py b/beesdoo_easy_my_coop/tests/test_res_partner.py
new file mode 100644
index 0000000..3aa292b
--- /dev/null
+++ b/beesdoo_easy_my_coop/tests/test_res_partner.py
@@ -0,0 +1,78 @@
+# Copyright 2020 Coop IT Easy SCRLfs (<http://www.coopiteasy.be>)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import exceptions
+from odoo.exceptions import ValidationError
+from odoo.tests.common import TransactionCase
+
+
+class TestResPartner(TransactionCase):
+    def setUp(self):
+        super().setUp()
+        self.eater1 = self.env.ref("beesdoo_base.eater1")
+        self.eater2 = self.env.ref("beesdoo_base.eater2")
+        self.eater3 = self.env.ref("beesdoo_base.eater3")
+        self.eater4 = self.env.ref("beesdoo_base.eater4")
+
+    def test_max_eater_assignment_share_a(self):
+        """
+        Test adding eater to a cooperator and raise when max is
+        reached.
+        """
+        coop1 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_1_demo"
+        )
+        coop1.write({"child_eater_ids": [(4, self.eater1.id)]})
+        self.assertEqual(len(coop1.child_eater_ids), 1)
+        coop1.write({"child_eater_ids": [(4, self.eater2.id)]})
+        self.assertEqual(len(coop1.child_eater_ids), 2)
+        coop1.write({"child_eater_ids": [(4, self.eater3.id)]})
+        self.assertEqual(len(coop1.child_eater_ids), 3)
+        with self.assertRaises(ValidationError) as econtext:
+            coop1.write({"child_eater_ids": [(4, self.eater4.id)]})
+        self.assertIn("can only set", str(econtext.exception))
+
+    def test_max_eater_assignment_share_b(self):
+        """
+        Test adding eater to a cooperator and raise when max is
+        reached.
+        """
+        coop2 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_2_demo"
+        )
+        coop2.write({"child_eater_ids": [(4, self.eater1.id)]})
+        self.assertEqual(len(coop2.child_eater_ids), 1)
+        coop2.write({"child_eater_ids": [(4, self.eater2.id)]})
+        self.assertEqual(len(coop2.child_eater_ids), 2)
+        with self.assertRaises(ValidationError) as econtext:
+            coop2.write({"child_eater_ids": [(4, self.eater3.id)]})
+        self.assertIn("can only set", str(econtext.exception))
+
+    def test_unlimited_eater_assignment_share_c(self):
+        """
+        Test that share_c can have an unlimited number of eater.
+        """
+        coop3 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_3_demo"
+        )
+        coop3.write({"child_eater_ids": [(4, self.eater1.id)]})
+        self.assertEqual(len(coop3.child_eater_ids), 1)
+        coop3.write({"child_eater_ids": [(4, self.eater2.id)]})
+        self.assertEqual(len(coop3.child_eater_ids), 2)
+        coop3.write({"child_eater_ids": [(4, self.eater3.id)]})
+        self.assertEqual(len(coop3.child_eater_ids), 3)
+        coop3.write({"child_eater_ids": [(4, self.eater4.id)]})
+        self.assertEqual(len(coop3.child_eater_ids), 4)
+
+    def test_share_with_no_eater_assignment_allowed(self):
+        """
+        Test that share that doesn't allow eater assignment.
+        """
+        share_c = self.env.ref("beesdoo_easy_my_coop.share_c")
+        share_c.max_nb_eater_allowed = 0
+        coop3 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_3_demo"
+        )
+        with self.assertRaises(ValidationError) as econtext:
+            coop3.write({"child_eater_ids": [(4, self.eater3.id)]})
+        self.assertIn("can only set", str(econtext.exception))
diff --git a/beesdoo_easy_my_coop/views/partner.xml b/beesdoo_easy_my_coop/views/partner.xml
deleted file mode 100644
index b523166..0000000
--- a/beesdoo_easy_my_coop/views/partner.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-	<record model="ir.ui.view" id="beesdoo_partner_form_view_remove_duplicate_cooperator_type">
-		<field name="name">beesdoo.partner.form.view.remove_duplicate_cooperator_type</field>
-		<field name="model">res.partner</field>
-		<field name="inherit_id" ref="beesdoo_base.beesdoo_partner_form_view" />
-		<field name="arch" type="xml">
-			<field name="cooperator_type" position="replace" />
-		</field>
-	</record>
-
-    <record model="ir.ui.view" id="beesdoo_partner_form_view_remove_duplicate_header">
-        <field name="name">beesdoo.partner.form.view.remove_duplicate_header</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="beesdoo_shift.super_coop_partner_inherited_view_form" />
-        <field name="arch" type="xml">
-            <xpath expr="header" position="replace" />
-            <xpath expr="//field[@name='state']" position="before">
-                <button string="Create Subscription" name="%(easy_my_coop.action_view_create_subscription)d"
-                                type="action" context="{'default_active_id': active_id}" groups="easy_my_coop.group_easy_my_coop_manager"/>
-                 <button string="Update info" name="%(easy_my_coop.action_view_update_partner_info)d"
-                                type="action" context="{'default_active_id': active_id}" groups="easy_my_coop.group_easy_my_coop_manager"/>
-            </xpath>
-            <xpath expr="//field[@name='info_session']" position="before">
-                <field name="can_shop" />
-            </xpath>
-        </field>
-        <field name="priority">99</field>
-    </record>
-</odoo>
diff --git a/beesdoo_easy_my_coop/views/product.xml b/beesdoo_easy_my_coop/views/product.xml
index 6316bae..09f8461 100644
--- a/beesdoo_easy_my_coop/views/product.xml
+++ b/beesdoo_easy_my_coop/views/product.xml
@@ -6,8 +6,9 @@
         <field name="inherit_id" ref="easy_my_coop.product_template_share_form_view"/>
         <field name="arch" type="xml">
             <field name="customer" position="after">
-                <field name="can_shop"/>
+                <field name="allow_working"/>
+                <field name="max_nb_eater_allowed"/>
             </field>
         </field>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>

From 3c9e2afe4a8021498c7d2ac5c7456c1a1ac876ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Fri, 8 May 2020 19:33:04 +0200
Subject: [PATCH 28/34] [FIX] b_worker_status: is_worker computation in b_emc

---
 beesdoo_easy_my_coop/models/res_partner.py    | 37 ++++++++++++++++
 .../tests/test_res_partner.py                 | 43 +++++++++++++++++++
 .../models/cooperative_status.py              | 19 --------
 3 files changed, 80 insertions(+), 19 deletions(-)

diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index 55095f6..d5a4145 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -1,3 +1,6 @@
+# Copyright 2019-2020 Coop IT Easy SCRLfs
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 
@@ -9,6 +12,40 @@ class Partner(models.Model):
         string="Confirmed presence to info session",
         default=False,
     )
+    is_worker = fields.Boolean(
+        compute="_is_worker",
+        search="_search_worker",
+        readonly=True,
+        related=""
+    )
+
+    @api.depends(
+        'share_ids',
+        'share_ids.share_product_id',
+        'share_ids.share_product_id.default_code',
+        'share_ids.share_number',
+    )
+    def _is_worker(self):
+        """
+        Return True if the partner can participate tho the shift system.
+        This is defined on the share type.
+        """
+        for rec in self:
+            share_type = None
+            if rec.cooperator_type:
+                share_type = (
+                    self.env['product.template']
+                    .search([('default_code', '=', rec.cooperator_type)])
+                )[0]
+            if share_type:
+                rec.is_worker = share_type.allow_working
+                rec.worker_store = share_type.allow_working
+            else:
+                rec.is_worker = False
+                rec.worker_store = False
+
+    def _search_worker(self, operator, value):
+        return [('worker_store', operator, value)]
 
     @api.constrains('child_eater_ids', 'parent_eater_id')
     def _check_number_of_eaters(self):
diff --git a/beesdoo_easy_my_coop/tests/test_res_partner.py b/beesdoo_easy_my_coop/tests/test_res_partner.py
index 3aa292b..28c750d 100644
--- a/beesdoo_easy_my_coop/tests/test_res_partner.py
+++ b/beesdoo_easy_my_coop/tests/test_res_partner.py
@@ -76,3 +76,46 @@ class TestResPartner(TransactionCase):
         with self.assertRaises(ValidationError) as econtext:
             coop3.write({"child_eater_ids": [(4, self.eater3.id)]})
         self.assertIn("can only set", str(econtext.exception))
+
+    def test_is_worker_share_a(self):
+        """
+        Test that a cooperator is a worker based on his share type.
+        """
+        coop1 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_1_demo"
+        )
+        # Run computed field
+        coop1._is_worker()
+        self.assertEqual(coop1.is_worker, True)
+
+    def test_is_worker_share_b(self):
+        """
+        Test that a cooperator is a worker based on his share type.
+        """
+        coop2 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_2_demo"
+        )
+        # Run computed field
+        coop2._is_worker()
+        self.assertEqual(coop2.is_worker, False)
+
+    def test_search_worker(self):
+        """
+        Test that the search function returns worker based on the
+        'is_worker' field.
+        """
+        coop1 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_1_demo"
+        )
+        coop2 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_2_demo"
+        )
+        # Run computed field
+        coop1._is_worker()
+        coop2._is_worker()
+        workers = self.env["res.partner"].search([("is_worker", "=", True)])
+        self.assertIn(coop1, workers)
+        self.assertNotIn(coop2, workers)
+        workers = self.env["res.partner"].search([("is_worker", "=", False)])
+        self.assertNotIn(coop1, workers)
+        self.assertIn(coop2, workers)
diff --git a/beesdoo_worker_status/models/cooperative_status.py b/beesdoo_worker_status/models/cooperative_status.py
index af9c54f..6fb2b62 100644
--- a/beesdoo_worker_status/models/cooperative_status.py
+++ b/beesdoo_worker_status/models/cooperative_status.py
@@ -263,22 +263,3 @@ class CooperativeStatus(models.Model):
         if not delta % self._period:
             return today
         return add_days_delta(today, self._period - (delta % self._period))
-
-
-class ResPartner(models.Model):
-    _inherit = 'res.partner'
-    """
-        Override is_worker definition
-        You need have subscribe to a A Share
-    """
-    is_worker = fields.Boolean(compute="_is_worker", search="_search_worker", readonly=True, related="")
-
-    def _is_worker(self):
-        for rec in self:
-            rec.is_worker = rec.cooperator_type == 'share_a'
-
-    def _search_worker(self, operator, value):
-        if (operator == '=' and value) or (operator == '!=' and not value):
-            return [('cooperator_type', '=', 'share_a')]
-        else:
-            return [('cooperator_type', '!=', 'share_a')]

From 07566d25b3c00c39ab2ec31a3c8f82ea0806b98b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Fri, 8 May 2020 19:51:04 +0200
Subject: [PATCH 29/34] [MOV] b_shift: res.partner definition in separated file

---
 beesdoo_shift/models/__init__.py           |  1 +
 beesdoo_shift/models/cooperative_status.py | 78 --------------------
 beesdoo_shift/models/res_partner.py        | 84 ++++++++++++++++++++++
 3 files changed, 85 insertions(+), 78 deletions(-)
 create mode 100644 beesdoo_shift/models/res_partner.py

diff --git a/beesdoo_shift/models/__init__.py b/beesdoo_shift/models/__init__.py
index ddc930b..7b98f32 100644
--- a/beesdoo_shift/models/__init__.py
+++ b/beesdoo_shift/models/__init__.py
@@ -2,3 +2,4 @@
 from . import task
 from . import planning
 from . import cooperative_status
+from . import res_partner
diff --git a/beesdoo_shift/models/cooperative_status.py b/beesdoo_shift/models/cooperative_status.py
index 9f369bf..d9e1514 100644
--- a/beesdoo_shift/models/cooperative_status.py
+++ b/beesdoo_shift/models/cooperative_status.py
@@ -312,81 +312,3 @@ class ShiftCronJournal(models.Model):
         if not self.user_has_groups('beesdoo_shift.group_cooperative_admin'):
             raise ValidationError(_("You don't have the access to perform this action"))
         self.sudo().env['cooperative.status']._cron_compute_counter_irregular(today=self.date)
-
-class ResPartner(models.Model):
-    """
-    One2many relationship with CooperativeStatus should
-    be replaced by inheritance.
-    """
-    _inherit = 'res.partner'
-
-    worker_store = fields.Boolean(default=False)
-    is_worker = fields.Boolean(related="worker_store", string="Worker", readonly=False)
-    cooperative_status_ids = fields.One2many('cooperative.status', 'cooperator_id', readonly=True)
-    super = fields.Boolean(related='cooperative_status_ids.super', string="Super Cooperative", readonly=True, store=True)
-    info_session = fields.Boolean(related='cooperative_status_ids.info_session', string='Information Session ?', readonly=True, store=True)
-    info_session_date = fields.Date(related='cooperative_status_ids.info_session_date', string='Information Session Date', readonly=True, store=True)
-    working_mode = fields.Selection(related='cooperative_status_ids.working_mode', readonly=True, store=True)
-    exempt_reason_id = fields.Many2one(related='cooperative_status_ids.exempt_reason_id', readonly=True, store=True)
-    state = fields.Selection(related='cooperative_status_ids.status', readonly=True, store=True)
-    extension_start_time = fields.Date(related='cooperative_status_ids.extension_start_time', string="Extension Start Day", readonly=True, store=True)
-    subscribed_shift_ids = fields.Many2many('beesdoo.shift.template')
-
-    @api.multi
-    def coop_subscribe(self):
-        return {
-           'name': _('Subscribe Cooperator'),
-           'type': 'ir.actions.act_window',
-           'view_type': 'form',
-           'view_mode': 'form',
-           'res_model': 'beesdoo.shift.subscribe',
-           'target': 'new',
-        }
-
-    @api.multi
-    def coop_unsubscribe(self):
-        res = self.coop_subscribe()
-        res['context'] = {'default_unsubscribed': True}
-        return res
-
-    @api.multi
-    def manual_extension(self):
-        return {
-           'name': _('Manual Extension'),
-           'type': 'ir.actions.act_window',
-           'view_type': 'form',
-           'view_mode': 'form',
-           'res_model': 'beesdoo.shift.extension',
-           'target': 'new',
-        }
-
-    @api.multi
-    def auto_extension(self):
-        res = self.manual_extension()
-        res['context'] = {'default_auto': True}
-        res['name'] = _('Trigger Grace Delay')
-        return res
-
-    @api.multi
-    def register_holiday(self):
-        return {
-           'name': _('Register Holiday'),
-           'type': 'ir.actions.act_window',
-           'view_type': 'form',
-           'view_mode': 'form',
-           'res_model': 'beesdoo.shift.holiday',
-           'target': 'new',
-        }
-
-    @api.multi
-    def temporary_exempt(self):
-        return {
-           'name': _('Temporary Exemption'),
-           'type': 'ir.actions.act_window',
-           'view_type': 'form',
-           'view_mode': 'form',
-           'res_model': 'beesdoo.shift.temporary_exemption',
-           'target': 'new',
-        }
-
-    #TODO access right + vue on res.partner
diff --git a/beesdoo_shift/models/res_partner.py b/beesdoo_shift/models/res_partner.py
new file mode 100644
index 0000000..2d7138c
--- /dev/null
+++ b/beesdoo_shift/models/res_partner.py
@@ -0,0 +1,84 @@
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError, UserError
+
+from datetime import timedelta, datetime
+import logging
+
+
+class ResPartner(models.Model):
+    """
+    One2many relationship with CooperativeStatus should
+    be replaced by inheritance.
+    """
+    _inherit = 'res.partner'
+
+    worker_store = fields.Boolean(default=False)
+    is_worker = fields.Boolean(related="worker_store", string="Worker", readonly=False)
+    cooperative_status_ids = fields.One2many('cooperative.status', 'cooperator_id', readonly=True)
+    super = fields.Boolean(related='cooperative_status_ids.super', string="Super Cooperative", readonly=True, store=True)
+    info_session = fields.Boolean(related='cooperative_status_ids.info_session', string='Information Session ?', readonly=True, store=True)
+    info_session_date = fields.Date(related='cooperative_status_ids.info_session_date', string='Information Session Date', readonly=True, store=True)
+    working_mode = fields.Selection(related='cooperative_status_ids.working_mode', readonly=True, store=True)
+    exempt_reason_id = fields.Many2one(related='cooperative_status_ids.exempt_reason_id', readonly=True, store=True)
+    state = fields.Selection(related='cooperative_status_ids.status', readonly=True, store=True)
+    extension_start_time = fields.Date(related='cooperative_status_ids.extension_start_time', string="Extension Start Day", readonly=True, store=True)
+    subscribed_shift_ids = fields.Many2many('beesdoo.shift.template')
+
+    @api.multi
+    def coop_subscribe(self):
+        return {
+           'name': _('Subscribe Cooperator'),
+           'type': 'ir.actions.act_window',
+           'view_type': 'form',
+           'view_mode': 'form',
+           'res_model': 'beesdoo.shift.subscribe',
+           'target': 'new',
+        }
+
+    @api.multi
+    def coop_unsubscribe(self):
+        res = self.coop_subscribe()
+        res['context'] = {'default_unsubscribed': True}
+        return res
+
+    @api.multi
+    def manual_extension(self):
+        return {
+           'name': _('Manual Extension'),
+           'type': 'ir.actions.act_window',
+           'view_type': 'form',
+           'view_mode': 'form',
+           'res_model': 'beesdoo.shift.extension',
+           'target': 'new',
+        }
+
+    @api.multi
+    def auto_extension(self):
+        res = self.manual_extension()
+        res['context'] = {'default_auto': True}
+        res['name'] = _('Trigger Grace Delay')
+        return res
+
+    @api.multi
+    def register_holiday(self):
+        return {
+           'name': _('Register Holiday'),
+           'type': 'ir.actions.act_window',
+           'view_type': 'form',
+           'view_mode': 'form',
+           'res_model': 'beesdoo.shift.holiday',
+           'target': 'new',
+        }
+
+    @api.multi
+    def temporary_exempt(self):
+        return {
+           'name': _('Temporary Exemption'),
+           'type': 'ir.actions.act_window',
+           'view_type': 'form',
+           'view_mode': 'form',
+           'res_model': 'beesdoo.shift.temporary_exemption',
+           'target': 'new',
+        }
+
+    #TODO access right + vue on res.partner

From d8c8837ed35e333a9dcb89f2ab584de7527b6bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Fri, 8 May 2020 20:13:14 +0200
Subject: [PATCH 30/34] [IMP] b_emc: Merge emc_eater into b_emc

---
 beesdoo_easy_my_coop/__manifest__.py    |  4 ++--
 beesdoo_easy_my_coop/models/__init__.py |  1 +
 beesdoo_easy_my_coop/models/coop.py     | 31 +++++++++++++++++++++++++
 beesdoo_easy_my_coop/models/product.py  |  4 ++++
 beesdoo_easy_my_coop/views/product.xml  |  7 ++++--
 5 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 beesdoo_easy_my_coop/models/coop.py

diff --git a/beesdoo_easy_my_coop/__manifest__.py b/beesdoo_easy_my_coop/__manifest__.py
index aa1bc3e..c3e3ad4 100644
--- a/beesdoo_easy_my_coop/__manifest__.py
+++ b/beesdoo_easy_my_coop/__manifest__.py
@@ -9,7 +9,7 @@
     'description': """
     """,
 
-    'author': "Beescoop - Cellule IT",
+    'author': "BEES coop, Coop IT Easy",
     'website': "https://github.com/beescoop/Obeesdoo",
 
     'category': 'Cooperative management',
@@ -18,8 +18,8 @@
     'depends': ['beesdoo_base',
                 'beesdoo_shift',
                 'easy_my_coop',
-                'easy_my_coop_eater',
                 'easy_my_coop_website',
+                'partner_age',
                 ],
 
     'data': [
diff --git a/beesdoo_easy_my_coop/models/__init__.py b/beesdoo_easy_my_coop/models/__init__.py
index e856cc7..bb81dfc 100644
--- a/beesdoo_easy_my_coop/models/__init__.py
+++ b/beesdoo_easy_my_coop/models/__init__.py
@@ -2,3 +2,4 @@ from . import res_partner
 from . import subscription_request
 from . import res_company
 from . import product
+from . import coop
diff --git a/beesdoo_easy_my_coop/models/coop.py b/beesdoo_easy_my_coop/models/coop.py
new file mode 100644
index 0000000..2a422a0
--- /dev/null
+++ b/beesdoo_easy_my_coop/models/coop.py
@@ -0,0 +1,31 @@
+from odoo import api, models
+
+
+class SubscriptionRequest(models.Model):
+    _inherit = "subscription.request"
+
+    _majority = 18
+
+    def get_eater_vals(self, partner, share_product_id):
+        vals = {}
+        eater = share_product_id.eater
+
+        if partner.is_company or partner.age < self._majority:
+            eater = "eater"
+
+        vals["eater"] = eater
+
+        return vals
+
+    @api.one
+    def validate_subscription_request(self):
+
+        invoice = super(
+            SubscriptionRequest, self
+        ).validate_subscription_request()[0]
+        partner = invoice.partner_id
+
+        vals = self.get_eater_vals(partner, self.share_product_id)
+        partner.write(vals)
+
+        return invoice
diff --git a/beesdoo_easy_my_coop/models/product.py b/beesdoo_easy_my_coop/models/product.py
index 91b6800..46f53a9 100644
--- a/beesdoo_easy_my_coop/models/product.py
+++ b/beesdoo_easy_my_coop/models/product.py
@@ -20,3 +20,7 @@ class ProductTemplate(models.Model):
             "shift system."
         )
     )
+    eater = fields.Selection(
+        [("eater", "Eater"), ("worker_eater", "Worker and Eater")],
+        string="Eater/Worker",
+    )
diff --git a/beesdoo_easy_my_coop/views/product.xml b/beesdoo_easy_my_coop/views/product.xml
index 09f8461..0a87d3f 100644
--- a/beesdoo_easy_my_coop/views/product.xml
+++ b/beesdoo_easy_my_coop/views/product.xml
@@ -6,8 +6,11 @@
         <field name="inherit_id" ref="easy_my_coop.product_template_share_form_view"/>
         <field name="arch" type="xml">
             <field name="customer" position="after">
-                <field name="allow_working"/>
-                <field name="max_nb_eater_allowed"/>
+                <field name="allow_working" attrs="{'invisible':[('is_share','=',False)]}"/>
+                <field name="max_nb_eater_allowed" attrs="{'invisible':[('is_share','=',False)]}"/>
+            </field>
+            <field name="minimum_quantity" position="after">
+                <field name="eater" attrs="{'invisible':[('is_share','=',False)]}"/>
             </field>
         </field>
     </record>

From d6b45f1fa2a8129b8f9dec2b4ad6ffa7f24247d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Tue, 26 May 2020 17:15:13 +0200
Subject: [PATCH 31/34] [FIX] b_base, b_emc: writing several eater at once

---
 beesdoo_base/models/partner.py                |  9 +++-
 beesdoo_easy_my_coop/models/res_partner.py    | 52 ++++++++++---------
 .../tests/test_res_partner.py                 | 31 +++++++++++
 3 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py
index 34a0e02..e96fbac 100644
--- a/beesdoo_base/models/partner.py
+++ b/beesdoo_base/models/partner.py
@@ -28,8 +28,13 @@ class Partner(models.Model):
 
     @api.multi
     def write(self, values):
-        if values.get('parent_eater_id') and self.parent_eater_id:
-            raise ValidationError(_('You try to assign a eater to a worker but this easer is alread assign to %s please remove it before') % self.parent_eater_id.name)
+        for rec in self:
+            if (
+                values.get('parent_eater_id')
+                and rec.parent_eater_id
+                and rec.parent_eater_id.id != values.get("parent_eater_id")
+            ):
+                raise ValidationError(_('You try to assign a eater to a worker but this eater is already assign to %s please remove it before') % rec.parent_eater_id.name)
         # replace many2many command when writing on child_eater_ids to just remove the link
         if 'child_eater_ids' in values:
             for command in values['child_eater_ids']:
diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index d5a4145..d683df7 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -53,27 +53,31 @@ class Partner(models.Model):
         Check the maximum number of eaters that can be assigned to a
         share owner.
         """
-        self.ensure_one()
-        share_type = None
-        if self.cooperator_type:
-            share_type = (
-                self.env['product.template']
-                .search([('default_code', '=', self.cooperator_type)])
-            )[0]
-        # If the current partner owns no share, check his parent.
-        if not share_type:
-            share_type = (
-                self.env['product.template']
-                .search([
-                    ('default_code', '=', self.parent_eater_id.cooperator_type)
-                ])
-            )[0]
-        if (
-            share_type
-            and share_type.max_nb_eater_allowed >= 0
-            and len(self.child_eater_ids) > share_type.max_nb_eater_allowed
-        ):
-            raise ValidationError(
-                _('You can only set %d additional eaters per worker')
-                % share_type.max_nb_eater_allowed
-            )
+        for rec in self:
+            share_type = None
+            if rec.cooperator_type:
+                share_type = (
+                    self.env['product.template']
+                    .search([('default_code', '=', rec.cooperator_type)])
+                )[0]
+            # If the current partner owns no share, check his parent.
+            if not share_type:
+                share_type = (
+                    self.env['product.template']
+                    .search([
+                        (
+                            'default_code',
+                            '=',
+                            rec.parent_eater_id.cooperator_type
+                        )
+                    ])
+                )[0]
+            if (
+                share_type
+                and share_type.max_nb_eater_allowed >= 0
+                and len(rec.child_eater_ids) > share_type.max_nb_eater_allowed
+            ):
+                raise ValidationError(
+                    _('You can only set %d additional eaters per worker')
+                    % share_type.max_nb_eater_allowed
+                )
diff --git a/beesdoo_easy_my_coop/tests/test_res_partner.py b/beesdoo_easy_my_coop/tests/test_res_partner.py
index 28c750d..a65b110 100644
--- a/beesdoo_easy_my_coop/tests/test_res_partner.py
+++ b/beesdoo_easy_my_coop/tests/test_res_partner.py
@@ -77,6 +77,37 @@ class TestResPartner(TransactionCase):
             coop3.write({"child_eater_ids": [(4, self.eater3.id)]})
         self.assertIn("can only set", str(econtext.exception))
 
+    def test_multiple_eater_assignement_share_a(self):
+        """
+        Test adding multiple eater in one write.
+        """
+        coop1 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_1_demo"
+        )
+        coop1.write(
+            {
+                "child_eater_ids": [
+                    (4, self.eater1.id),
+                    (4, self.eater2.id),
+                    (4, self.eater3.id),
+                ]
+            }
+        )
+        self.assertEqual(len(coop1.child_eater_ids), 3)
+
+    def test_parent_assignement_to_eater(self):
+        """
+        Test adding a parent to multiple eater in one write from the eater.
+        """
+        coop1 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_1_demo"
+        )
+        eaters = self.eater1
+        eaters |= self.eater2
+        eaters |= self.eater3
+        eaters.write({"parent_eater_id": coop1.id})
+        self.assertEqual(len(coop1.child_eater_ids), 3)
+
     def test_is_worker_share_a(self):
         """
         Test that a cooperator is a worker based on his share type.

From 0b93dd1cf682dce34b94188f82ef19645ea53bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Tue, 26 May 2020 18:42:21 +0200
Subject: [PATCH 32/34] [ADD] b_shift,b_emc: can_shop status on res_partner

---
 beesdoo_easy_my_coop/demo/product_share.xml   |  5 ++-
 beesdoo_easy_my_coop/models/product.py        |  4 ++
 beesdoo_easy_my_coop/models/res_partner.py    | 45 ++++++++++++++++---
 .../tests/test_res_partner.py                 | 22 +++++++++
 beesdoo_easy_my_coop/views/product.xml        |  1 +
 beesdoo_shift/models/res_partner.py           | 14 ++++++
 beesdoo_shift/views/cooperative_status.xml    |  1 +
 7 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/beesdoo_easy_my_coop/demo/product_share.xml b/beesdoo_easy_my_coop/demo/product_share.xml
index cc7eca9..9e8ab6e 100644
--- a/beesdoo_easy_my_coop/demo/product_share.xml
+++ b/beesdoo_easy_my_coop/demo/product_share.xml
@@ -6,6 +6,7 @@
         <field name="default_code">share_a</field>
         <field name="customer" eval="True" />
         <field name="allow_working" eval="True" />
+        <field name="allow_shopping" eval="True" />
         <field name="max_nb_eater_allowed">3</field>
         <field name="is_share" eval="True" />
     </record>
@@ -14,14 +15,16 @@
         <field name="default_code">share_b</field>
         <field name="customer" eval="True" />
         <field name="allow_working" eval="False" />
+        <field name="allow_shopping" eval="True" />
         <field name="max_nb_eater_allowed">2</field>
         <field name="is_share" eval="True" />
     </record>
     <record id="share_c" model="product.product" >
         <field name="name">Acquisition de parts C de Beescoop scrl</field>
         <field name="default_code">share_c</field>
-        <field name="customer" eval="False" />
+        <field name="customer" eval="True" />
         <field name="allow_working" eval="False" />
+        <field name="allow_shopping" eval="False" />
         <field name="max_nb_eater_allowed">-1</field>
         <field name="is_share" eval="True" />
     </record>
diff --git a/beesdoo_easy_my_coop/models/product.py b/beesdoo_easy_my_coop/models/product.py
index 46f53a9..f8828e9 100644
--- a/beesdoo_easy_my_coop/models/product.py
+++ b/beesdoo_easy_my_coop/models/product.py
@@ -20,6 +20,10 @@ class ProductTemplate(models.Model):
             "shift system."
         )
     )
+    allow_shopping = fields.Boolean(
+        string="Allow owner to shop?",
+        help="Owner of this type of share are allowed to shop.",
+    )
     eater = fields.Selection(
         [("eater", "Eater"), ("worker_eater", "Worker and Eater")],
         string="Eater/Worker",
diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index d683df7..1088674 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -19,6 +19,19 @@ class Partner(models.Model):
         related=""
     )
 
+    def _cooperator_share_type(self):
+        """
+        Return the share.type that correspond to the cooperator_type.
+        """
+        self.ensure_one()
+        share_type = None
+        if self.cooperator_type:
+            share_type = (
+                self.env['product.template']
+                .search([('default_code', '=', self.cooperator_type)])
+            )[0]
+        return share_type
+
     @api.depends(
         'share_ids',
         'share_ids.share_product_id',
@@ -31,12 +44,7 @@ class Partner(models.Model):
         This is defined on the share type.
         """
         for rec in self:
-            share_type = None
-            if rec.cooperator_type:
-                share_type = (
-                    self.env['product.template']
-                    .search([('default_code', '=', rec.cooperator_type)])
-                )[0]
+            share_type = rec._cooperator_share_type()
             if share_type:
                 rec.is_worker = share_type.allow_working
                 rec.worker_store = share_type.allow_working
@@ -47,6 +55,31 @@ class Partner(models.Model):
     def _search_worker(self, operator, value):
         return [('worker_store', operator, value)]
 
+    @api.depends(
+        "cooperative_status_ids",
+        "share_ids",
+        "share_ids.share_product_id",
+        "share_ids.share_product_id.default_code",
+        "share_ids.share_number",
+    )
+    def _compute_can_shop(self):
+        """
+        Overwrite default behavior to take the owned share into account.
+        """
+        for rec in self:
+            share_type = rec._cooperator_share_type()
+            if share_type:
+                rec.can_shop = (
+                    rec.cooperative_status_ids.can_shop
+                    if rec.cooperative_status_ids
+                    else share_type.allow_shopping
+                )
+            else:
+                rec.can_shop = (
+                    rec.cooperative_status_ids.can_shop
+                    if rec.cooperative_status_ids else False
+                )
+
     @api.constrains('child_eater_ids', 'parent_eater_id')
     def _check_number_of_eaters(self):
         """
diff --git a/beesdoo_easy_my_coop/tests/test_res_partner.py b/beesdoo_easy_my_coop/tests/test_res_partner.py
index a65b110..66bc5d3 100644
--- a/beesdoo_easy_my_coop/tests/test_res_partner.py
+++ b/beesdoo_easy_my_coop/tests/test_res_partner.py
@@ -150,3 +150,25 @@ class TestResPartner(TransactionCase):
         workers = self.env["res.partner"].search([("is_worker", "=", False)])
         self.assertNotIn(coop1, workers)
         self.assertIn(coop2, workers)
+
+    def test_compute_can_shop_share_a(self):
+        """
+        Test that a cooperator can shop based on his share type.
+        """
+        coop1 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_1_demo"
+        )
+        # Run computed field
+        coop1._compute_can_shop()
+        self.assertEqual(coop1.can_shop, True)
+
+    def test_compute_can_shop_share_c(self):
+        """
+        Test that a cooperator can shop based on his share type.
+        """
+        coop3 = self.env.ref(
+            "beesdoo_base.res_partner_cooperator_3_demo"
+        )
+        # Run computed field
+        coop3._compute_can_shop()
+        self.assertEqual(coop3.can_shop, False)
diff --git a/beesdoo_easy_my_coop/views/product.xml b/beesdoo_easy_my_coop/views/product.xml
index 0a87d3f..0cb48e1 100644
--- a/beesdoo_easy_my_coop/views/product.xml
+++ b/beesdoo_easy_my_coop/views/product.xml
@@ -7,6 +7,7 @@
         <field name="arch" type="xml">
             <field name="customer" position="after">
                 <field name="allow_working" attrs="{'invisible':[('is_share','=',False)]}"/>
+                <field name="allow_shopping" attrs="{'invisible':[('is_share','=',False)]}"/>
                 <field name="max_nb_eater_allowed" attrs="{'invisible':[('is_share','=',False)]}"/>
             </field>
             <field name="minimum_quantity" position="after">
diff --git a/beesdoo_shift/models/res_partner.py b/beesdoo_shift/models/res_partner.py
index 2d7138c..7cefcbe 100644
--- a/beesdoo_shift/models/res_partner.py
+++ b/beesdoo_shift/models/res_partner.py
@@ -14,6 +14,7 @@ class ResPartner(models.Model):
 
     worker_store = fields.Boolean(default=False)
     is_worker = fields.Boolean(related="worker_store", string="Worker", readonly=False)
+    can_shop = fields.Boolean(string="Is worker allowed to shop?", compute="_compute_can_shop", store=True)
     cooperative_status_ids = fields.One2many('cooperative.status', 'cooperator_id', readonly=True)
     super = fields.Boolean(related='cooperative_status_ids.super', string="Super Cooperative", readonly=True, store=True)
     info_session = fields.Boolean(related='cooperative_status_ids.info_session', string='Information Session ?', readonly=True, store=True)
@@ -24,6 +25,19 @@ class ResPartner(models.Model):
     extension_start_time = fields.Date(related='cooperative_status_ids.extension_start_time', string="Extension Start Day", readonly=True, store=True)
     subscribed_shift_ids = fields.Many2many('beesdoo.shift.template')
 
+    @api.depends("cooperative_status_ids")
+    def _compute_can_shop(self):
+        """
+        Shopping authorisation may vary on the can_shop status of the
+        cooperative.status but also other parameters.
+        Overwrite this function to change the default behavior.
+        """
+        for rec in self:
+            if rec.cooperative_status_ids:
+                rec.can_shop = rec.cooperative_status_ids.can_shop
+            else:
+                rec.can_shop = True
+
     @api.multi
     def coop_subscribe(self):
         return {
diff --git a/beesdoo_shift/views/cooperative_status.xml b/beesdoo_shift/views/cooperative_status.xml
index 282a7bc..aea4327 100644
--- a/beesdoo_shift/views/cooperative_status.xml
+++ b/beesdoo_shift/views/cooperative_status.xml
@@ -38,6 +38,7 @@
             </xpath>
             <xpath expr="//field[@name='type']" position="before">
                 <field name="is_worker"/>
+                <field name="can_shop"/>
             </xpath>
             <xpath expr="//notebook" position="inside">
                 <page string="Worker information"

From 079fac058506eb13271a0c1a560d3c9faafa65cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Wed, 27 May 2020 16:56:51 +0200
Subject: [PATCH 33/34] [FIX] b_emc: Constraint when editing parent_eater_id

---
 beesdoo_easy_my_coop/models/res_partner.py    | 46 +++++++++++--------
 .../tests/test_res_partner.py                 | 27 +++++++++++
 2 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index 1088674..b5eaf72 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -80,31 +80,37 @@ class Partner(models.Model):
                     if rec.cooperative_status_ids else False
                 )
 
-    @api.constrains('child_eater_ids', 'parent_eater_id')
-    def _check_number_of_eaters(self):
+    @api.constrains('parent_eater_id')
+    def _check_max_parent_eaters(self):
+        """
+        Check that the parent_eater_id in parnter in self doesn't exceed
+        the maximum eater limit.
+        See also: _check_max_child_eaters()
+        """
+        for rec in self:
+            if rec.parent_eater_id:
+                share_type = rec.parent_eater_id._cooperator_share_type()
+                if (
+                    share_type
+                    and share_type.max_nb_eater_allowed >= 0
+                    and len(
+                        rec.parent_eater_id.child_eater_ids
+                    ) > share_type.max_nb_eater_allowed
+                ):
+                    raise ValidationError(
+                        _('You can only set %d additional eaters per worker')
+                        % share_type.max_nb_eater_allowed
+                    )
+
+    @api.constrains('child_eater_ids')
+    def _check_max_child_eaters(self):
         """
         Check the maximum number of eaters that can be assigned to a
         share owner.
+        See also: _check_max_parent_eaters()
         """
         for rec in self:
-            share_type = None
-            if rec.cooperator_type:
-                share_type = (
-                    self.env['product.template']
-                    .search([('default_code', '=', rec.cooperator_type)])
-                )[0]
-            # If the current partner owns no share, check his parent.
-            if not share_type:
-                share_type = (
-                    self.env['product.template']
-                    .search([
-                        (
-                            'default_code',
-                            '=',
-                            rec.parent_eater_id.cooperator_type
-                        )
-                    ])
-                )[0]
+            share_type = rec._cooperator_share_type()
             if (
                 share_type
                 and share_type.max_nb_eater_allowed >= 0
diff --git a/beesdoo_easy_my_coop/tests/test_res_partner.py b/beesdoo_easy_my_coop/tests/test_res_partner.py
index 66bc5d3..fd42b64 100644
--- a/beesdoo_easy_my_coop/tests/test_res_partner.py
+++ b/beesdoo_easy_my_coop/tests/test_res_partner.py
@@ -31,6 +31,19 @@ class TestResPartner(TransactionCase):
         with self.assertRaises(ValidationError) as econtext:
             coop1.write({"child_eater_ids": [(4, self.eater4.id)]})
         self.assertIn("can only set", str(econtext.exception))
+        # Reset
+        coop1.write({"child_eater_ids": [(5, None, None)]})
+        self.assertEqual(len(coop1.child_eater_ids), 0)
+        # Test by editing parent_eater_id
+        self.eater1.write({"parent_eater_id": coop1.id})
+        self.assertEqual(len(coop1.child_eater_ids), 1)
+        self.eater2.write({"parent_eater_id": coop1.id})
+        self.assertEqual(len(coop1.child_eater_ids), 2)
+        self.eater3.write({"parent_eater_id": coop1.id})
+        self.assertEqual(len(coop1.child_eater_ids), 3)
+        with self.assertRaises(ValidationError) as econtext:
+            self.eater4.write({"parent_eater_id": coop1.id})
+        self.assertIn("can only set", str(econtext.exception))
 
     def test_max_eater_assignment_share_b(self):
         """
@@ -47,6 +60,17 @@ class TestResPartner(TransactionCase):
         with self.assertRaises(ValidationError) as econtext:
             coop2.write({"child_eater_ids": [(4, self.eater3.id)]})
         self.assertIn("can only set", str(econtext.exception))
+        # Reset
+        coop2.write({"child_eater_ids": [(5, None, None)]})
+        self.assertEqual(len(coop2.child_eater_ids), 0)
+        # Test by editing parent_eater_id
+        self.eater1.write({"parent_eater_id": coop2.id})
+        self.assertEqual(len(coop2.child_eater_ids), 1)
+        self.eater2.write({"parent_eater_id": coop2.id})
+        self.assertEqual(len(coop2.child_eater_ids), 2)
+        with self.assertRaises(ValidationError) as econtext:
+            self.eater3.write({"parent_eater_id": coop2.id})
+        self.assertIn("can only set", str(econtext.exception))
 
     def test_unlimited_eater_assignment_share_c(self):
         """
@@ -76,6 +100,9 @@ class TestResPartner(TransactionCase):
         with self.assertRaises(ValidationError) as econtext:
             coop3.write({"child_eater_ids": [(4, self.eater3.id)]})
         self.assertIn("can only set", str(econtext.exception))
+        with self.assertRaises(ValidationError) as econtext:
+            self.eater1.write({"parent_eater_id": coop3.id})
+        self.assertIn("can only set", str(econtext.exception))
 
     def test_multiple_eater_assignement_share_a(self):
         """

From f1b33e914353e835022adf77a79961847c50b59f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Sun, 31 May 2020 11:34:42 +0200
Subject: [PATCH 34/34] [FIX] b_shift,b_base: can_shop computation on
 res_partner

---
 beesdoo_easy_my_coop/models/res_partner.py    |  6 +++--
 .../tests/test_res_partner.py                 |  4 +++
 beesdoo_shift/__manifest__.py                 |  1 +
 .../demo/workers.xml                          | 25 ++++++++++++++-----
 beesdoo_worker_status/__manifest__.py         |  1 -
 5 files changed, 28 insertions(+), 9 deletions(-)
 rename {beesdoo_worker_status => beesdoo_shift}/demo/workers.xml (67%)

diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py
index b5eaf72..de69114 100644
--- a/beesdoo_easy_my_coop/models/res_partner.py
+++ b/beesdoo_easy_my_coop/models/res_partner.py
@@ -57,6 +57,8 @@ class Partner(models.Model):
 
     @api.depends(
         "cooperative_status_ids",
+        "cooperative_status_ids.status",
+        "cooperative_status_ids.can_shop",
         "share_ids",
         "share_ids.share_product_id",
         "share_ids.share_product_id.default_code",
@@ -71,13 +73,13 @@ class Partner(models.Model):
             if share_type:
                 rec.can_shop = (
                     rec.cooperative_status_ids.can_shop
-                    if rec.cooperative_status_ids
+                    if rec.is_worker and rec.cooperative_status_ids
                     else share_type.allow_shopping
                 )
             else:
                 rec.can_shop = (
                     rec.cooperative_status_ids.can_shop
-                    if rec.cooperative_status_ids else False
+                    if rec.is_worker and rec.cooperative_status_ids else False
                 )
 
     @api.constrains('parent_eater_id')
diff --git a/beesdoo_easy_my_coop/tests/test_res_partner.py b/beesdoo_easy_my_coop/tests/test_res_partner.py
index fd42b64..742c487 100644
--- a/beesdoo_easy_my_coop/tests/test_res_partner.py
+++ b/beesdoo_easy_my_coop/tests/test_res_partner.py
@@ -188,6 +188,10 @@ class TestResPartner(TransactionCase):
         # Run computed field
         coop1._compute_can_shop()
         self.assertEqual(coop1.can_shop, True)
+        # Now unsubscribe the coop
+        coop1.cooperative_status_ids.status = 'resigning'
+        self.assertEqual(coop1.cooperative_status_ids.can_shop, False)
+        self.assertEqual(coop1.can_shop, False)
 
     def test_compute_can_shop_share_c(self):
         """
diff --git a/beesdoo_shift/__manifest__.py b/beesdoo_shift/__manifest__.py
index 368e210..08db04f 100644
--- a/beesdoo_shift/__manifest__.py
+++ b/beesdoo_shift/__manifest__.py
@@ -40,5 +40,6 @@
     ],
     'demo': [
         "demo/templates.xml",
+        "demo/workers.xml",
     ]
 }
diff --git a/beesdoo_worker_status/demo/workers.xml b/beesdoo_shift/demo/workers.xml
similarity index 67%
rename from beesdoo_worker_status/demo/workers.xml
rename to beesdoo_shift/demo/workers.xml
index 13edb20..b9880c2 100644
--- a/beesdoo_worker_status/demo/workers.xml
+++ b/beesdoo_shift/demo/workers.xml
@@ -4,7 +4,8 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
 <odoo>
-    <record id="beesdoo_shift_cooperative_status_1_demo" model="cooperative.status">
+
+    <record id="cooperative_status_1_demo" model="cooperative.status">
         <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_1_demo" />
         <field name="info_session" eval="True" />
         <field name="info_session_date" eval="datetime.now() - timedelta(days=58)" />
@@ -15,9 +16,11 @@
 
     <record id="beesdoo_base.res_partner_cooperator_1_demo" model="res.partner">
         <field name="working_mode">regular</field>
+        <field name="is_worker" eval="True"/>
+        <field name="cooperative_status_ids" eval="[(6, 0, [ref('beesdoo_shift.cooperative_status_1_demo')])]"/>
     </record>
 
-    <record id="beesdoo_shift_cooperative_status_2_demo" model="cooperative.status">
+    <record id="cooperative_status_2_demo" model="cooperative.status">
         <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_2_demo" />
         <field name="info_session" eval="False" />
         <field name="sr">2</field>
@@ -27,9 +30,11 @@
 
     <record id="beesdoo_base.res_partner_cooperator_2_demo" model="res.partner">
         <field name="working_mode">irregular</field>
+        <field name="is_worker" eval="True"/>
+        <field name="cooperative_status_ids" eval="[(6, 0, [ref('beesdoo_shift.cooperative_status_2_demo')])]"/>
     </record>
 
-    <record id="beesdoo_shift_cooperative_status_3_demo" model="cooperative.status">
+    <record id="cooperative_status_3_demo" model="cooperative.status">
         <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_3_demo" />
         <field name="info_session" eval="True" />
         <field name="info_session_date" eval="datetime.now() - timedelta(days=98)" />
@@ -39,9 +44,11 @@
 
     <record id="beesdoo_base.res_partner_cooperator_3_demo" model="res.partner">
         <field name="working_mode">regular</field>
+        <field name="is_worker" eval="True"/>
+        <field name="cooperative_status_ids" eval="[(6, 0, [ref('beesdoo_shift.cooperative_status_3_demo')])]"/>
     </record>
 
-    <record id="beesdoo_shift_cooperative_status_4_demo" model="cooperative.status">
+    <record id="cooperative_status_4_demo" model="cooperative.status">
         <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_4_demo" />
         <field name="sr">2</field>
         <field name="working_mode">irregular</field>
@@ -50,9 +57,11 @@
 
     <record id="beesdoo_base.res_partner_cooperator_4_demo" model="res.partner">
         <field name="working_mode">irregular</field>
+        <field name="is_worker" eval="True"/>
+        <field name="cooperative_status_ids" eval="[(6, 0, [ref('beesdoo_shift.cooperative_status_4_demo')])]"/>
     </record>
 
-    <record id="beesdoo_shift_cooperative_status_5_demo" model="cooperative.status">
+    <record id="cooperative_status_5_demo" model="cooperative.status">
         <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_5_demo" />
         <field name="sr">2</field>
         <field name="working_mode">regular</field>
@@ -60,9 +69,11 @@
 
     <record id="beesdoo_base.res_partner_cooperator_5_demo" model="res.partner">
         <field name="working_mode">regular</field>
+        <field name="is_worker" eval="True"/>
+        <field name="cooperative_status_ids" eval="[(6, 0, [ref('beesdoo_shift.cooperative_status_5_demo')])]"/>
     </record>
 
-    <record id="beesdoo_shift_cooperative_status_6_demo" model="cooperative.status">
+    <record id="cooperative_status_6_demo" model="cooperative.status">
         <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_6_demo" />
         <field name="info_session" eval="True" />
         <field name="info_session_date" eval="datetime.now() - timedelta(days=36)" />
@@ -72,6 +83,8 @@
 
     <record id="beesdoo_base.res_partner_cooperator_6_demo" model="res.partner">
         <field name="working_mode">regular</field>
+        <field name="is_worker" eval="True"/>
+        <field name="cooperative_status_ids" eval="[(6, 0, [ref('beesdoo_shift.cooperative_status_6_demo')])]"/>
     </record>
 
 </odoo>
diff --git a/beesdoo_worker_status/__manifest__.py b/beesdoo_worker_status/__manifest__.py
index d241d9c..abcefa2 100644
--- a/beesdoo_worker_status/__manifest__.py
+++ b/beesdoo_worker_status/__manifest__.py
@@ -23,7 +23,6 @@
     ],
     'demo': [
         "demo/cooperators.xml",
-        "demo/workers.xml",
         "demo/tasks.xml",
     ]
 }