huge improvement

golem_activity/__manifest__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2016-2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2016-2019 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,7 @@
     'name': 'GOLEM activities',
     'summary': 'Extends Odoo products for multi-activity',
     'description': 'Extends Odoo products for multi-activity',
-    'version': '10.0.2.8.2',
+    'version': '10.0.2.8.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',

golem_activity/security/ir.model.access.csv

@@ -1,22 +1,15 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_product_template_auditor,Access Product Template Auditor,product.model_product_template,golem_base.group_golem_auditor,1,0,0,0
 access_product_template_user,Access Product Template User,product.model_product_template,golem_base.group_golem_user,1,1,1,0
 access_product_template_manager,Access Product Template Manager,product.model_product_template,golem_base.group_golem_manager,1,1,1,1
-access_product_product_auditor,Access Product Product Auditor,product.model_product_product,golem_base.group_golem_auditor,1,0,0,0
 access_product_product_user,Access Product Product User,product.model_product_product,golem_base.group_golem_user,1,1,1,0
 access_product_product_manager,Access Product Product Manager,product.model_product_product,golem_base.group_golem_manager,1,1,1,1
-access_product_price_history_auditor,Access Product Price History Auditor,product.model_product_price_history,golem_base.group_golem_auditor,1,0,0,0
 access_product_price_history_user,Access Product Price History User,product.model_product_price_history,golem_base.group_golem_user,1,1,1,0
 access_product_price_history_manager,Access Product Price History Manager,product.model_product_price_history,golem_base.group_golem_manager,1,1,1,1
-access_product_category_auditor,Access Product Category Auditor,product.model_product_category,golem_base.group_golem_auditor,1,0,0,0
 access_product_category_user,Access Product Category User,product.model_product_category,golem_base.group_golem_user,1,0,0,0
 access_product_category_manager,Access Product Category Manager,product.model_product_category,golem_base.group_golem_manager,1,1,1,1
-access_golem_activity_auditor,Access GOLEM Activity Auditor,model_golem_activity,golem_base.group_golem_auditor,1,0,0,0
 access_golem_activity_user,Access GOLEM Activity User,model_golem_activity,golem_base.group_golem_user,1,1,1,0
 access_golem_activity_manager,Access GOLEM Activity Manager,model_golem_activity,golem_base.group_golem_manager,1,1,1,1
-access_golem_activity_type_auditor,Access GOLEM Activity Type Auditor,model_golem_activity_type,golem_base.group_golem_auditor,1,0,0,0
 access_golem_activity_type_user,Access GOLEM Activity Type User,model_golem_activity_type,golem_base.group_golem_user,1,1,1,0
 access_golem_activity_type_manager,Access GOLEM Activity Type Manager,model_golem_activity_type,golem_base.group_golem_manager,1,1,1,1
-access_golem_activity_audience_auditor,Access GOLEM Activity Audience Auditor,model_golem_activity_audience,golem_base.group_golem_auditor,1,0,0,0
 access_golem_activity_audience_user,Access GOLEM Activity Audience User,model_golem_activity_audience,golem_base.group_golem_user,1,1,1,0
 access_golem_activity_audience_manager,Access GOLEM Activity Audience Manager,model_golem_activity_audience,golem_base.group_golem_manager,1,1,1,1

golem_activity/views/golem_activity_views.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
-Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -188,8 +187,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <!-- Actions -->
     <act_window id="golem_activity_action" name="GOLEM Activities"
-      res_model="golem.activity" view_mode="tree,form,calendar"
+      res_model="golem.activity" view_mode="tree,form,calendar" />
-      context="{'search_default_season_default': 1}"/>
     <act_window id="golem_activity_type_action" name="GOLEM Activity Types"
       res_model="golem.activity.type" view_mode="tree" />
     <act_window id="golem_activity_audience_action" name="GOLEM Activity Audiences"
@@ -203,25 +201,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <!-- Menus -->
     <menuitem id="golem_activity_menu" name="Activities" sequence="30"
-      groups="golem_base.group_golem_user,golem_base.group_golem_auditor"
+      groups="golem_base.group_golem_user"
       web_icon="golem_activity,static/description/icon.png" />
     <menuitem id="golem_activity_menu_list" name="Activities"
-      groups="golem_base.group_golem_user,golem_base.group_golem_auditor"
+      groups="golem_base.group_golem_user"
       parent="golem_activity_menu" sequence="1" action="golem_activity_action" />
     <menuitem id="golem_activity_menu_configuration" name="Configuration"
       parent="golem_activity_menu" sequence="90"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor" />
+      groups="golem_base.group_golem_manager" />
     <menuitem id="golem_activity_type_menu_list" name="Activity Types"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor"
+      groups="golem_base.group_golem_manager"
       parent="golem_activity_menu_configuration" sequence="5"
       action="golem_activity_type_action" />
     <menuitem id="golem_activity_audience_menu_list" name="Activity Audiences"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor"
+      groups="golem_base.group_golem_manager"
       parent="golem_activity_menu_configuration" sequence="7"
       action="golem_activity_audience_action" />
     <menuitem  id="product_category_menu" name="Categories"
       parent="golem_activity_menu_configuration" sequence="10"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor"
+      groups="golem_base.group_golem_manager"
       action="product_category_action" />
 
   </data>

golem_activity_queue/security/ir.model.access.csv

@@ -1,4 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-golem_activity_queue_auditor_rule,GOLEM Activity Queue Auditor Rule,model_golem_activity_queue,golem_base.group_golem_auditor,1,0,0,0
 golem_activity_queue_user_rule,GOLEM Activity Queue User Rule,model_golem_activity_queue,golem_base.group_golem_user,1,1,1,1
 golem_activity_queue_manager_rule,GOLEM Activity Queue Manager Rule,model_golem_activity_queue,golem_base.group_golem_manager,1,1,1,1

golem_activity_registration/__manifest__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017-2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2017-2019 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -18,7 +18,7 @@
 {
     'name': 'GOLEM Activity Member Registrations',
     'summary': 'GOLEM Activities Member Registrations management',
-    'version': '10.0.1.6.5',
+    'version': '10.0.1.6.4',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',

golem_activity_registration/security/ir.model.access.csv

@@ -1,4 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_activity_registration_auditor,Access GOLEM Activity Registration Auditor,model_golem_activity_registration,golem_base.group_golem_auditor,1,0,0,0
 access_golem_activity_registration_user,Access GOLEM Activity Registration User,model_golem_activity_registration,golem_base.group_golem_user,1,1,1,1
 access_golem_activity_registration_manager,Access GOLEM Activity Registration Manager,model_golem_activity_registration,golem_base.group_golem_manager,1,1,1,1

golem_activity_registration/views/golem_activity_registration_views.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2017-2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2017-2019 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -86,7 +86,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <menuitem id="golem_activity_registration_menu" name="Activity registrations"
       parent="golem_activity.golem_activity_menu"
       action="golem_activity_registration_action"
-      groups="golem_base.group_golem_user,golem_base.group_golem_auditor"
+      groups="golem_base.group_golem_user"
       sequence="20" />
 
   </data>

golem_activity_registration/wizard/golem_activity_registration_analysis_wizard_views.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright 2019-2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2019 Fabien Bourgeois <fabien@yaltik.com>
-Copyright 2019-2020 Youssef El Ouahby <youssef@yaltik.com>
+Copyright 2019 Youssef El Ouahby <youssef@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -59,7 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <menuitem id="golem_activity_registration_analysis_menu"
       name="Registration Analysis"
       parent="golem_activity.golem_activity_menu"
-      groups="golem_base.group_golem_user,golem_base.group_golem_auditor"
       action="golem_registrations_analysis_action" sequence="50" />
 
   </data>

golem_activity_registration_custom_price/security/ir.model.access.csv

@@ -1,7 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_payment_rule_familyquotient_slice_auditor,Access GOLEM Payment Rule Familyquotient Slice auditor,model_golem_payment_rule_familyquotient_slice,golem_base.group_golem_auditor,1,0,0,0
 access_golem_payment_rule_familyquotient_slice_user,Access GOLEM Payment Rule Familyquotient Slice User,model_golem_payment_rule_familyquotient_slice,golem_base.group_golem_user,1,0,0,0
 access_golem_payment_rule_familyquotient_slice_manager,Access GOLEM Payment Rule Familyquotient Slice Manager,model_golem_payment_rule_familyquotient_slice,golem_base.group_golem_manager,1,1,1,1
-access_golem_activity_priceline_auditor,Access GOLEM Activity Price Line Auditor,model_golem_activity_price_line,golem_base.group_golem_auditor,1,0,0,0
 access_golem_activity_priceline_user,Access GOLEM Activity Price Line User,model_golem_activity_price_line,golem_base.group_golem_user,1,0,0,0
 access_golem_activity_priceline_manager,Access GOLEM Activity Price Line Manager,model_golem_activity_price_line,golem_base.group_golem_manager,1,1,1,1

golem_activity_registration_custom_price/views/golem_payment_rule_quotient_slice_views.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2018-2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <!-- Menus -->
     <menuitem id="golem_payment_rule_menu" name="Pricing rules"
       parent="golem_activity.golem_activity_menu_configuration"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor" sequence="20" />
+      groups="golem_base.group_golem_manager" sequence="20" />
     <menuitem id="golem_payment_rule_qfslice_menu" name="Family Quotients"
       parent="golem_payment_rule_menu" action="golem_payment_rule_qfslice_action"
       sequence="10" />

golem_admin/__manifest__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2018-2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -22,7 +22,7 @@
         - New application on top menu ;
         - Management of users and groups, companies ;
         - Good default access / rights to do. ''',
-    'version': '10.0.0.1.4',
+    'version': '10.0.0.1.3',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',

golem_admin/security/ir.model.access.csv

@@ -4,8 +4,3 @@ access_res_users_group_golem_manager,Access Users GOLEM Manager,base.model_res_u
 access_res_groups_group_golem_manager,Access Groups GOLEM Manager,base.model_res_groups,golem_base.group_golem_manager,1,1,0,0
 access_ir_module_category_group_golem_manager,Access IR Module Category GOLEM Manager,base.model_ir_module_category,golem_base.group_golem_manager,1,0,0,0
 access_ir_ui_view_group_golem_manager,Access IR UI View GOLEM Manager,base.model_ir_ui_view,golem_base.group_golem_manager,1,1,0,0
-access_res_company_group_golem_auditor,Access Companies GOLEM Auditor,base.model_res_company,golem_base.group_golem_auditor,1,0,0,0
-access_res_users_group_golem_auditor,Access Users GOLEM Auditor,base.model_res_users,golem_base.group_golem_auditor,1,0,0,0
-access_res_groups_group_golem_auditor,Access Groups GOLEM Auditor,base.model_res_groups,golem_base.group_golem_auditor,1,0,0,0
-access_ir_module_category_group_golem_auditor,Access IR Module Category GOLEM Auditor,base.model_ir_module_category,golem_base.group_golem_auditor,1,0,0,0
-access_ir_ui_view_group_golem_auditor,Access IR UI View GOLEM Auditor,base.model_ir_ui_view,golem_base.group_golem_auditor,1,0,0,0

golem_admin/views/golem_admin_views.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright 2018-2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -23,16 +23,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <!-- Menus -->
     <menuitem id="security_menu" name="Security" sequence="400"
       web_icon="golem_admin,static/description/icon.png"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor" />
+      groups="golem_base.group_golem_manager" />
     <menuitem id="res_groups_menu" action="base.action_res_groups"
       parent="security_menu" sequence="10"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor" />
+      groups="golem_base.group_golem_manager" />
     <menuitem id="res_users_menu" action="base.action_res_users"
       parent="security_menu" sequence="5"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor" />
+      groups="golem_base.group_golem_manager" />
     <menuitem id="res_company_menu" action="base.action_res_company_form"
       parent="security_menu" sequence="10"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor" />
+      groups="golem_base.group_golem_manager" />
 
   </data>
 </odoo>

golem_base/__manifest__.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2016-2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2016-2018 Fabien Bourgeois <fabien@yaltik.com>
-#    Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,14 +18,14 @@
 {
     'name': 'GOLEM base module for global dependencies',
     'summary': 'GOLEM base installs base and shared dependencies for GOLEM',
-    'version': '10.0.1.1.2',
+    'version': '10.0.1.0.5',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
     'application': False,
     'installable': True,
     'depends': ['document', 'report', 'membership', 'contacts', 'mail',
-                'account', 'account_voucher', 'partner_firstname',
+                'account_voucher', 'partner_firstname',
                 'partner_contact_birthdate', 'partner_contact_gender',
                 'l10n_fr', 'l10n_fr_state', 'l10n_fr_department',
                 'l10n_fr_siret',
@@ -35,7 +34,6 @@
                 'web_responsive', 'backend_theme_v10',
                 'web_widget_x2many_2d_matrix'],
     'data': ['security/golem_security.xml',
-             'security/ir.model.access.csv',
              'views/menus.xml',
              'views/yaltik_base_assets.xml']
 }

golem_base/i18n/fr.po

@@ -6,19 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-28 16:28+0000\n"
+"POT-Creation-Date: 2017-05-01 14:19+0000\n"
-"PO-Revision-Date: 2020-05-28 18:36+0200\n"
+"PO-Revision-Date: 2017-06-28 17:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Language: fr\n"
-
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. module: golem_base
-#: model:res.groups,name:golem_base.group_golem_auditor
-msgid "GOLEM Auditor"
-msgstr "Auditeur"
 
 #. module: golem_base
 #: model:res.groups,name:golem_base.group_golem_manager
@@ -35,11 +31,6 @@ msgstr "Utilisateur"
 msgid "Membership Products"
 msgstr "Types d'adhésions"
 
-#. module: golem_base
-#: model:ir.model,name:golem_base.model_ir_mail_server
-msgid "ir.mail_server"
-msgstr "ir.mail_server"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_company_form
 #: model:ir.actions.act_window,name:base.company_normal_action_tree

golem_base/i18n/golem_base.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-28 16:28+0000\n"
+"POT-Creation-Date: 2017-05-01 14:19+0000\n"
-"PO-Revision-Date: 2020-05-28 16:28+0000\n"
+"PO-Revision-Date: 2017-05-01 14:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,11 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: golem_base
-#: model:res.groups,name:golem_base.group_golem_auditor
-msgid "GOLEM Auditor"
-msgstr ""
-
 #. module: golem_base
 #: model:res.groups,name:golem_base.group_golem_manager
 msgid "GOLEM Manager"
@@ -35,8 +30,3 @@ msgstr ""
 msgid "Membership Products"
 msgstr ""
 
-#. module: golem_base
-#: model:ir.model,name:golem_base.model_ir_mail_server
-msgid "ir.mail_server"
-msgstr ""
-

golem_base/models/ir_mail_server.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2018-2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,27 +21,8 @@ from odoo import models, fields
 
 
 class IrMailServer(models.Model):
-    """ IR Mail Server adaptations """
+    """IR Mail Server fix for >64 characters pass """
     _inherit = 'ir.mail_server'
 
-    # IR Mail Server fix for >64 characters pass
     smtp_user = fields.Char(size=100)
     smtp_pass = fields.Char(size=100)
-
-    def build_email(self, email_from, email_to, subject, body, email_cc=None,
-                    email_bcc=None, reply_to=False, attachments=None,
-                    message_id=None, references=None, object_id=False,
-                    subtype='plain', headers=None, body_alternative=None,
-                    subtype_alternative='plain'):
-        """ Overwrite to supercharge from_to """
-        get_param = self.env['ir.config_parameter'].sudo().get_param
-        force_email_from = get_param('mail.force.email_from', email_from)
-        if force_email_from != email_from:
-            email_from = force_email_from
-            reply_to = force_email_from
-        msg = super(IrMailServer, self).build_email(
-            email_from, email_to, subject, body, email_cc, email_bcc,
-            reply_to, attachments, message_id, references, object_id, subtype,
-            headers, body_alternative, subtype_alternative
-        )
-        return msg

golem_base/security/golem_security.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright 2017-2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <odoo>
   <data noupdate="0">
     <!-- Groups -->
-    <record id="base.group_partner_manager" model="res.groups">
-      <field name="category_id" ref="base.module_category_golem"/>
-    </record>
     <record id="group_golem_user" model="res.groups">
       <field name="name">GOLEM user</field>
       <field name="category_id"
@@ -33,13 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         ref('base.group_partner_manager'),
         ref('account.group_account_invoice')])]"/>
     </record>
-
-    <record id="group_golem_auditor" model="res.groups">
-      <field name="name">GOLEM Auditor</field>
-      <field name="category_id" ref="base.module_category_golem"/>
-      <field name="implied_ids" eval="[(4, ref('base.group_portal'))]"/>
-    </record>
-
     <record id="group_golem_manager" model="res.groups">
       <field name="name">GOLEM Manager</field>
       <field name="category_id" ref="base.module_category_golem"/>

golem_base/security/ir.model.access.csv

@@ -1,11 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_res_partner_auditor,Access Res Partner Auditor,base.model_res_partner,golem_base.group_golem_auditor,1,0,0,0
-access_res_partner_category_auditor,Access Res Partner Category Auditor,base.model_res_partner_category,golem_base.group_golem_auditor,1,0,0,0
-access_account_invoice_auditor,Access Account Invoice Auditor,account.model_account_invoice,golem_base.group_golem_auditor,1,0,0,0
-access_account_invoice_tax_auditor,Access Account Invoice Tax Auditor,account.model_account_invoice_tax,group_golem_auditor,1,0,0,0
-access_account_invoice_line_auditor,Access Account Invoice Line Auditor,account.model_account_invoice_line,group_golem_auditor,1,0,0,0
-access_account_move_line_auditor,Access Account Move Line Auditor,account.model_account_move_line,group_golem_auditor,1,0,0,0
-access_account_journal_auditor,Access Account Journal Auditor,account.model_account_journal,group_golem_auditor,1,0,0,0
-access_account_voucher_auditor,Access Account Voucher Auditor,account_voucher.model_account_voucher,golem_base.group_golem_auditor,1,0,0,0
-access_account_voucher_line_auditor,Access Account Voucher Line Auditor,account_voucher.model_account_voucher_line,group_golem_auditor,1,0,0,0
-access_account_account_tag_auditor,Access Account Account Tax Auditor,account.model_account_account_tag,group_golem_auditor,1,0,0,0

golem_base/views/menus.xml

@@ -28,20 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       action="membership.action_membership_products"
       parent="membership.menu_marketing_config_association" sequence="20"
       groups="golem_base.group_golem_manager" />
-    <menuitem name="Invoicing"
-      id="account.menu_finance"
-      groups="account.group_account_user,account.group_account_manager,account.group_account_invoice,group_golem_auditor"
-      web_icon="account,static/description/icon.png"
-      sequence="40"/>
-    <menuitem id="account.menu_finance_configuration"
-      name="Configuration"
-      parent="account.menu_finance" sequence="15" groups="account.group_account_invoice,group_golem_auditor"/>
-
-    <menuitem id="account.account_account_menu"
-      name="Accounting"
-      parent="account.menu_finance_configuration"
-      sequence="2"
-      groups="account.group_account_invoice,group_golem_auditor"/>
     <!-- Members Analysis for managers only -->
     <record id="membership.menu_report_membership" model="ir.ui.menu">
       <field name="groups_id"

golem_event/i18n/fr.po

@@ -1,27 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* golem_event
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-28 07:40+0000\n"
-"PO-Revision-Date: 2020-05-28 09:42+0200\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: golem_event
-#: model:ir.ui.view,arch_db:golem_event.golem_event_inherit_view_event_search
-msgid "Current and Upcoming"
-msgstr "En cours et à venir"
-
-#. module: golem_event
-#: model:ir.ui.view,arch_db:golem_event.golem_event_inherit_view_event_search
-msgid "Current and upcoming events from today"
-msgstr "Événements en cours et à venir par rapport à aujourd'hui"
-

golem_event/i18n/golem_event.pot

@@ -1,27 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* golem_event
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-28 07:40+0000\n"
-"PO-Revision-Date: 2020-05-28 07:40+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: golem_event
-#: model:ir.ui.view,arch_db:golem_event.golem_event_inherit_view_event_search
-msgid "Current and Upcoming"
-msgstr ""
-
-#. module: golem_event
-#: model:ir.ui.view,arch_db:golem_event.golem_event_inherit_view_event_search
-msgid "Current and upcoming events from today"
-msgstr ""
-

golem_event/views/event_views.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
-Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
-<odoo>
-    <data>
-
-        <!-- Search -->
-        <record id="golem_event_inherit_view_event_search" model="ir.ui.view">
-            <field name="name">Event Search Adaptations</field>
-            <field name="inherit_id" ref="event.view_event_search"/>
-            <field name="model">event.event</field>
-            <field name="arch" type="xml">
-                <filter name="upcoming" position="replace">
-                    <filter string="Current and Upcoming" name="upcoming"
-                        domain="['&amp;', ('state', '!=', 'cancel'), '|',
-                        ('date_begin','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0))),
-                        ('date_end','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]"
-                        help="Current and upcoming events from today" />
-                </filter>
-            </field>
-        </record>
-
-    </data>
-</odoo>

golem_family/__manifest__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2016-2021 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2016-2018 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,7 @@
     'name': 'GOLEM families',
     'summary': 'GOLEM Members Families',
     'description': 'GOLEM Members Families',
-    'version': '10.0.2.6.0',
+    'version': '10.0.2.5.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Youssef El Ouahby',
     'license': 'AGPL-3',

golem_family/i18n/fr.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-14 14:45+0000\n"
+"POT-Creation-Date: 2018-10-26 15:44+0000\n"
-"PO-Revision-Date: 2021-01-14 15:45+0100\n"
+"PO-Revision-Date: 2018-10-26 17:45+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -170,8 +170,8 @@ msgid "Family"
 msgstr "Famille"
 
 #. module: golem_family
-#: code:addons/golem_family/models/golem_family.py:59
+#: code:addons/golem_family/models/golem_family.py:49
-#: code:addons/golem_family/models/golem_family.py:93
+#: code:addons/golem_family/models/golem_family.py:83
 #, python-format
 msgid "Family Members"
 msgstr "Membres de la famille"
@@ -181,13 +181,6 @@ msgstr "Membres de la famille"
 msgid "Family form"
 msgstr "Fiche Famille"
 
-#. module: golem_family
-#: model:ir.model.fields,field_description:golem_family.field_golem_member_family_member_names
-#: model:ir.model.fields,field_description:golem_family.field_res_partner_family_member_names
-#: model:ir.model.fields,field_description:golem_family.field_res_users_family_member_names
-msgid "Family member names"
-msgstr "Noms des membres de la famille"
-
 #. module: golem_family
 #: model:ir.ui.view,arch_db:golem_family.golem_family_form
 msgid "Family members"

golem_family/i18n/golem_family.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-14 14:45+0000\n"
+"POT-Creation-Date: 2018-10-26 15:44+0000\n"
-"PO-Revision-Date: 2021-01-14 14:45+0000\n"
+"PO-Revision-Date: 2018-10-26 15:44+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -170,8 +170,8 @@ msgid "Family"
 msgstr ""
 
 #. module: golem_family
-#: code:addons/golem_family/models/golem_family.py:59
+#: code:addons/golem_family/models/golem_family.py:49
-#: code:addons/golem_family/models/golem_family.py:93
+#: code:addons/golem_family/models/golem_family.py:83
 #, python-format
 msgid "Family Members"
 msgstr ""
@@ -181,13 +181,6 @@ msgstr ""
 msgid "Family form"
 msgstr ""
 
-#. module: golem_family
-#: model:ir.model.fields,field_description:golem_family.field_golem_member_family_member_names
-#: model:ir.model.fields,field_description:golem_family.field_res_partner_family_member_names
-#: model:ir.model.fields,field_description:golem_family.field_res_users_family_member_names
-msgid "Family member names"
-msgstr ""
-
 #. module: golem_family
 #: model:ir.ui.view,arch_db:golem_family.golem_family_form
 msgid "Family members"

golem_family/models/golem_family.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017-2021 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
 #    Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -42,16 +42,6 @@ class ResPartner(models.Model):
                                   index=True)
     family_count = fields.Integer(related='family_id.count')
 
-    family_member_names = fields.Char(compute='_compute_family_member_names',
-                                      index=True, store=True)
-
-    @api.depends('family_id', 'family_id.member_ids')
-    def _compute_family_member_names(self):
-        """ Computes family member names, for search """
-        for member in self:
-            if member.family_id:
-                member.family_member_names = u', '.join(member.family_id.member_ids.mapped('name'))
-
     @api.multi
     def button_family_members(self):
         """ Go to family view, from partner """

golem_family/security/ir.model.access.csv

@@ -1,6 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_family_auditor,Access GOLEM Family Auditor,model_golem_family,golem_base.group_golem_auditor,1,0,0,0
 access_golem_family_user,Access GOLEM Family User,model_golem_family,golem_base.group_golem_user,1,1,1,1
-access_golem_family_role_auditor,Access GOLEM Family Role Auditor,model_golem_family_role,golem_base.group_golem_auditor,1,0,0,0
 access_golem_family_role_user,Access GOLEM Family Role User,model_golem_family_role,golem_base.group_golem_user,1,0,0,0
 access_golem_family_role_manager,Access GOLEM Family Role Manager,model_golem_family_role,golem_base.group_golem_manager,1,1,1,1

golem_family/views/golem_family_views.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright 2017-2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
-Copyright 2018-2020 Youssef El Ouahby <youssef@yaltik.com>
+Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -214,15 +214,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <!-- Menus -->
     <menuitem id="golem_family_menu" name="Families"
-      sequence="17"
+      sequence="17" groups="golem_base.group_golem_user"
-      groups="golem_base.group_golem_user,golem_base.group_golem_auditor"
       web_icon="golem_family,static/description/icon.png" />
     <menuitem id="golem_family_menu_list" name="Families"
       parent="golem_family_menu" action="golem_family_action_list" sequence="1"
-      groups="golem_base.group_golem_user,golem_base.group_golem_auditor" />
+      groups="golem_base.group_golem_user" />
     <menuitem id="golem_family_role_menu" name="Roles"
       parent="golem_family_menu" action="golem_family_role_action" sequence="5"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor" />
+      groups="golem_base.group_golem_manager" />
 
   </data>
 </odoo>

golem_family/views/golem_member_views.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright 2017-2021 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -92,7 +92,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="arch" type="xml">
         <field name="name" position="after">
           <field name="family_id" />
-          <field name="family_member_names" />
         </field>
       </field>
     </record>

golem_family_history/security/ir.model.access.csv

@@ -1,3 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_family_history_auditor,Access GOLEM Family History Auditor,model_golem_family_history,golem_base.group_golem_auditor,1,0,0,0
 access_golem_family_history_user,Access GOLEM Family History User,model_golem_family_history,golem_base.group_golem_user,1,1,1,1

golem_member/__manifest__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2016-2021 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2016-2020 Fabien Bourgeois <fabien@yaltik.com>
 #    Copyright 2018 Michel Dessenne <michel@yaltik.com>
 #    Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
 
@@ -21,7 +21,7 @@
     'name': 'GOLEM non-profit members',
     'summary': 'Extends Odoo contacts for MJC',
     'description': 'Extends Odoo contacts for MJC',
-    'version': '10.0.2.8.4',
+    'version': '10.0.2.8.1',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',

golem_member/models/golem_member.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#    Copyright 2016-2021 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2016-2019 Fabien Bourgeois <fabien@yaltik.com>
 #    Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -103,30 +103,14 @@ class ResPartner(models.Model):
 
     def _search_age(self, operator, value):
         """ Age search function """
-        if operator not in ('=', '!=', '<', '<=', '>', '>='):
+        if operator != '=':
             err = _('Unsupported operator for age search')
             raise NotImplementedError(err)
         today = date.today()
-        birthdate_date = today - timedelta(days=365.25 * value)
+        min_birthdate_date = today - timedelta(days=365.25 * value)
-        if operator in ('=', '!='):
+        max_birthdate_date = today - timedelta(days=365.25 * (value + 1))
-            birthdate_date = today - timedelta(days=365.25 * value)
+        return ['&', ('birthdate_date', '>', max_birthdate_date),
-            max_birthdate_date = today - timedelta(days=365.25 * (value + 1))
+                ('birthdate_date', '<=', min_birthdate_date)]
-            if operator == '=':
-                return ['&', ('birthdate_date', '>', max_birthdate_date),
-                        ('birthdate_date', '<=', birthdate_date)]
-            else:
-                return ['|', ('birthdate_date', '<=', max_birthdate_date),
-                        ('birthdate_date', '>', birthdate_date)]
-        else:
-            if operator == '>':
-                operator = '<'
-            elif operator == '>=':
-                operator = '<='
-            elif operator == '<':
-                operator = '>'
-            else:
-                operator = '>='
-            return [('birthdate_date', operator, birthdate_date)]
 
     @api.model
     def _get_default_nationality_id(self):

golem_member/security/ir.model.access.csv

@@ -1,13 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_member_auditor,Access GOLEM Member Auditor,model_golem_member,golem_base.group_golem_auditor,1,0,0,0
 access_golem_member_user,Access GOLEM Member User,model_golem_member,golem_base.group_golem_user,1,1,1,1
-access_partner_area_auditor,Access GOLEM Partner Area Auditor,model_golem_partner_area,golem_base.group_golem_auditor,1,0,0,0
 access_partner_area_user,Access GOLEM Partner Area User,model_golem_partner_area,golem_base.group_golem_user,1,1,1,1
-access_partner_area_street_auditor,Access GOLEM Partner Area Street Auditor,model_golem_partner_area_street,golem_base.group_golem_auditor,1,0,0,0
 access_partner_area_street_user,Access GOLEM Partner Area Street User,model_golem_partner_area_street,golem_base.group_golem_user,1,1,1,1
-access_golem_member_season_auditor,Access GOLEM Member Season Auditor,model_golem_member_number,golem_base.group_golem_auditor,1,0,0,0
 access_golem_member_season_user,Access GOLEM Member Season User,model_golem_member_number,golem_base.group_golem_user,1,1,1,1
 access_ir_config_parameter_manager,Access IR Config Parameter Manager,base.model_ir_config_parameter,golem_base.group_golem_manager,1,1,1,1
 access_golem_age_range_manager,Access Golem Age Range Manager,model_golem_member_age_range,golem_base.group_golem_manager,1,1,1,1
-access_golem_age_range_auditor,Access Golem Age Range Auditor,model_golem_member_age_range,golem_base.group_golem_auditor,1,0,0,0
 access_golem_age_range_user,Access Golem Age Range User,model_golem_member_age_range,golem_base.group_golem_user,1,0,0,0

golem_member/views/golem_member_views.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright 2017-2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2017-2019 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -55,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <record id="email_template_partner" model="mail.template">
         <field name="ref_ir_act_window" ref="action_partner_mass_mail"/>
     </record>
-0
+
     <!-- Forms -->
     <record id="golem_member_form" model="ir.ui.view">
       <field name="name">GOLEM Member Form</field>
@@ -217,8 +217,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <field name="city" />
           <field name="country_id" />
           <field name="number" />
-          <field name="number_manual" />
-          <field name="is_number_manual" />
           <field name="season_ids" />
           <field name="category_id"/>
           <templates>
@@ -237,8 +235,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 <div class="oe_kanban_details">
                   <h4 class="oe_partner_heading">
                     <a type="open"><field name="display_name" /></a>
-                    <t t-if="record.is_number_manual == False and record.number.raw_value != ''">(N° <field name="number" />)</t>
+                    <t t-if="record.number.raw_value != ''">(N° <field name="number" />)</t>
-                    <t t-if="record.is_number_manual and record.number_manual.raw_value != ''">(N° <field name="number_manual" />)</t>
                   </h4>
                   <div class="oe_kanban_partner_categories" />
                   <div class="oe_kanban_partner_links" />
@@ -283,7 +280,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <tree string="GOLEM Members">
           <field name="season_ids" options="{'no_create': True}" />
           <field name="number" />
-          <field name="number_manual" string="Member number" />
           <field name="name" />
           <field name="contact_address" />
           <field name="phone" />
@@ -299,8 +295,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="model">golem.member</field>
       <field name="arch" type="xml">
         <search>
-          <field name="number"
+          <field name="number" />
-            filter_domain="['|', ('number', 'ilike', self), ('number_manual', 'ilike', self)]" />
           <field name="name" />
           <field name="season_ids" widget="many2one" />
           <field name="area_id" />
@@ -346,16 +341,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <!-- Add new menu items -->
     <menuitem id="golem_member_user_menu" name="Service users"
       parent="golem_membership.menu_association" sequence="5"
-      action="golem_member_user_action" groups="golem_base.group_golem_user,golem_base.group_golem_auditor" />
+      action="golem_member_user_action" groups="golem_base.group_golem_user" />
     <menuitem id="golem_members_menu" name="Subscribers"
       parent="golem_membership.menu_association" sequence="10"
-      action="golem_member_action" groups="golem_base.group_golem_user,golem_base.group_golem_auditor" />
+      action="golem_member_action" groups="golem_base.group_golem_user" />
     <menuitem id="golem_member_tool_menu" name="Tools"
       parent="golem_membership.menu_association" sequence="80"
       groups="golem_base.group_golem_user" />
     <menuitem id="res_partner_category_menu" name="Service User Tags"
       parent="golem_membership.menu_config_association" sequence="15"
       action="res_partner_category_action"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor" />
+      groups="golem_base.group_golem_manager" />
   </data>
 </odoo>

golem_member/wizard/golem_member_analysis_wizard_views.xml

@@ -2,7 +2,7 @@
 
 <!--
 Copyright 2019-2020 Fabien Bourgeois <fabien@yaltik.com>
-Copyright 2019-2020 Youssef El Ouahby <youssef@yaltik.com>
+Copyright 2019 Youssef El Ouahby <youssef@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -58,7 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <menuitem id="golem_analysis_menu" name="Service User Analysis"
       parent="golem_membership.menu_association" sequence="50"
-      groups="golem_base.group_golem_user,golem_base.group_golem_auditor"
       action="golem_analysis_action"/>
 
   </data>

golem_member_history/security/ir.model.access.csv

@@ -1,3 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_member_history_auditor,Access GOLEM Member History Auditor,model_golem_member_history,golem_base.group_golem_auditor,1,0,0,0
 access_golem_member_history_user,Access GOLEM Member History User,model_golem_member_history,golem_base.group_golem_user,1,1,1,1

golem_member_minor/security/ir.model.access.csv

@@ -1,3 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_legal_guardian_auditor,Access GOLEM Legal Guardian Auditor,model_golem_legal_guardian,golem_base.group_golem_auditor,1,0,0,0
 access_golem_legal_guardian_user,Access GOLEM Legal Guardian User,model_golem_legal_guardian,golem_base.group_golem_user,1,1,1,1

golem_member_skills/security/ir.model.access.csv

@@ -1,4 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_member_skills_auditor,Access GOLEM Member Skills Auditor,model_golem_member_skill,golem_base.group_golem_auditor,1,0,0,0
 access_golem_member_skills_user,Access GOLEM Member Skills User,model_golem_member_skill,golem_base.group_golem_user,1,1,1,0
 access_golem_member_skills_manager,Access GOLEM Member Skills Manager,model_golem_member_skill,golem_base.group_golem_manager,1,1,1,1

golem_member_skills/views/golem_member_views.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright 2017-2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2017 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -66,7 +66,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       name="Member skills"
       parent="membership.menu_marketing_config_association"
       action="golem_member_skill_action"
-      sequence="15" groups="golem_base.group_golem_manager,golem_base.group_golem_auditor" />
+      sequence="15" groups="golem_base.group_golem_manager" />
 
   </data>
 </odoo>

golem_payment/__manifest__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017-2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -20,14 +20,13 @@
     'summary': 'Usage of account invoice and account payments',
     'description': ''' Ability to create invoice(s) from activity subscriptions
     and anticipate multiple payments. ''',
-    'version': '10.0.0.3.2',
+    'version': '10.0.0.3.1',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
     'application': True,
     'installable': True,
-    'depends': ['base', 'account', 'account_voucher', 'payment', 'product',
+    'depends': ['account', 'payment', 'golem_season'],
-                'golem_base', 'golem_season'],
     'data': ['views/golem_payment_views.xml',
              'views/golem_account_payment_views.xml',
              'security/ir.model.access.csv']

golem_payment/security/ir.model.access.csv

@@ -1,11 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_payment_schedule_auditor,Access GOLEM Payment Schedule Auditor,model_golem_payment_schedule,golem_base.group_golem_auditor,1,0,0,0
 access_golem_payment_schedule_user,Access GOLEM Payment Schedule User,model_golem_payment_schedule,golem_base.group_golem_user,1,0,0,0
 access_golem_payment_schedule_manager,Access GOLEM Payment Schedule Manager,model_golem_payment_schedule,golem_base.group_golem_manager,1,1,1,1
-access_golem_payment_schedule_day_auditor,Access GOLEM Payment Schedule Day Auditor,model_golem_payment_schedule_day,golem_base.group_golem_auditor,1,0,0,0
 access_golem_payment_schedule_day_user,Access GOLEM Payment Schedule Day User,model_golem_payment_schedule_day,golem_base.group_golem_user,1,0,0,0
 access_golem_payment_schedule_day_manager,Access GOLEM Payment Schedule Day Manager,model_golem_payment_schedule_day,golem_base.group_golem_manager,1,1,1,1
-access_product_template_auditor,Access Product Template Auditor,product.model_product_template,golem_base.group_golem_auditor,1,0,0,0
-access_account_payment_auditor,Access Account Payment Auditor,account.model_account_payment,golem_base.group_golem_auditor,1,0,0,0
-access_payment_acquirer_auditor,Access Payment Acquirer Auditor,payment.model_payment_acquirer,golem_base.group_golem_auditor,1,0,0,0
-access_payment_transaction_auditor,Access Payment transaction Auditor,payment.model_payment_transaction,golem_base.group_golem_auditor,1,0,0,0

golem_payment/views/golem_payment_views.xml

@@ -80,7 +80,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <!-- Menus -->
     <menuitem id="golem_payment_schedule_menu_list" sequence="5"
       parent="payment.root_payment_menu" action="golem_payment_schedule_action"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor" />
+      groups="golem_base.group_golem_manager" />
 
 
   </data>

golem_pcs/__manifest__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
-#    Copyright 2018-2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,7 @@
 {
     'name': 'GOLEM Professions and Socioprofessional Categories',
     'summary': 'GOLEM Professions and Socioprofessional Categories',
-    'version': '10.0.0.2.1',
+    'version': '10.0.0.2.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Youssef El ouahby',
     'license': 'AGPL-3',

golem_pcs/security/ir.model.access.csv

@@ -1,5 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_golem_pcs_user,Access GOLEM PCS User,model_golem_pcs,base.group_user,1,0,0,0
-access_golem_pcs_golem_auditor,Access GOLEM PCS GOLEM Auditor,model_golem_pcs,golem_base.group_golem_auditor,1,0,0,0
 access_golem_pcs_golem_user,Access GOLEM PCS GOLEM User,model_golem_pcs,golem_base.group_golem_user,1,0,0,0
 access_golem_pcs_golem_manager,Access GOLEM PCS GOLEM Manager,model_golem_pcs,golem_base.group_golem_manager,1,1,1,1

golem_resource/__manifest__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
-#    Copyright 2018-2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -20,7 +20,7 @@
     'name': 'GOLEM non-profit resources',
     'summary': 'GOLEM resources management',
     'description': ''' GOLEM resources management ''',
-    'version': '10.0.1.14.1',
+    'version': '10.0.1.14.0',
     'category': 'GOLEM',
     'author': 'Youssef El Ouahby, Fabien Bourgeois',
     'license': 'AGPL-3',

golem_resource/security/ir.model.access.csv

@@ -1,13 +1,9 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_resource_auditor,Access GOLEM Resource Auditor,model_golem_resource,golem_base.group_golem_auditor,1,0,0,0
 access_golem_resource_user,Access GOLEM Resource User,model_golem_resource,golem_base.group_golem_user,1,0,0,0
 access_golem_resource_manager,Access GOLEM Resource Manager,model_golem_resource,golem_base.group_golem_manager,1,1,1,1
-access_golem_resource_type_auditor,Access GOLEM Resource Type Auditor,model_golem_resource_type,golem_base.group_golem_auditor,1,0,0,0
 access_golem_resource_type_user,Access GOLEM Resource Type User,model_golem_resource_type,golem_base.group_golem_user,1,0,0,0
 access_golem_resource_type_manager,Access GOLEM Resource Type Manager,model_golem_resource_type,golem_base.group_golem_manager,1,1,1,1
-access_golem_resource_reservation_auditor,Access GOLEM Resource Reservation Auditor,model_golem_resource_reservation,golem_base.group_golem_auditor,1,0,0,0
 access_golem_resource_reservation_user,Access GOLEM Resource Reservation User,model_golem_resource_reservation,golem_base.group_golem_user,1,1,1,0
 access_golem_resource_reservation_manager,Access GOLEM Resource Reservation Manager,model_golem_resource_reservation,golem_base.group_golem_manager,1,1,1,1
-access_golem_resource_timetable_auditor,Access GOLEM Resource Timetable Auditor,model_golem_resource_timetable,golem_base.group_golem_auditor,1,0,0,0
 access_golem_resource_timetable_user,Access GOLEM Resource Timetable User,model_golem_resource_timetable,golem_base.group_golem_user,1,0,0,0
 access_golem_resource_timetable_manager,Access GOLEM Resource Timetable Manager,model_golem_resource_timetable,golem_base.group_golem_manager,1,1,1,1

golem_resource/views/golem_resource_views.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2018-2020 Youssef El Ouahby <youssef@yaltik.com>
+Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
-Copyright 2018-2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -68,24 +68,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                   <field name="supervisor_id" />
               </group>
             </group>
-            <group string="availability configuration">
+            <notebook>
-                <group colspan="2">
+              <page name="availability" string="availability configuration">
-                  <field name="id" invisible="1"/>
+              <group>
-                  <field name="availability_24_7"/>
+                  <group colspan="2">
-                  <field name="availability_start" />
+                    <field name="id" invisible="1"/>
-                  <field name="availability_stop" />
+                    <field name="availability_24_7"/>
-                </group>
+                    <field name="availability_start" />
-                <p attrs="{'invisible': ['|',
+                    <field name="availability_stop" />
-                  ('id', '!=', False),
+                  </group>
-                  ('availability_24_7', '=', True)]}">
+                  <p attrs="{'invisible': ['|',
-                  Please save the resource before fixing the timetable availability"
+                    ('id', '!=', False),
-                </p>
+                    ('availability_24_7', '=', True)]}">
-                <group colspan="2" attrs="{'invisible': [('availability_24_7', '=', True)]}">
+                    Please save the resource before fixing the timetable availability"
-                  <field name="timetable_ids"
+                  </p>
-                    context="{'default_resource_id': active_id}"
+                  <group colspan="2" attrs="{'invisible': [('availability_24_7', '=', True)]}">
-                    attrs="{'readonly': [('id', '=', False)]}" />
+                    <field name="timetable_ids"
-                </group>
+                      context="{'default_resource_id': active_id}"
-            </group>
+                      attrs="{'readonly': [('id', '=', False)]}" />
+                  </group>
+              </group>
+            </page>
+          </notebook>
           </sheet>
           <div class="oe_chatter">
               <field name="message_follower_ids" widget="mail_followers" />
@@ -128,12 +132,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <!-- Menus -->
     <menuitem id="golem_resource_menu" name="Resources"
-      sequence="55" groups="golem_base.group_golem_user,golem_base.group_golem_auditor"
+      sequence="55" groups="golem_base.group_golem_user"
       web_icon="golem_resource,static/description/icon.png" />
     <menuitem id="resource_list_menu" name="Resources" parent="golem_resource_menu"
       action="golem_resource_action" sequence="10" />
     <menuitem id="resource_configuration_menu" name="Configuration"
-      parent="golem_resource_menu" groups="golem_base.group_golem_manager,golem_base.group_golem_auditor"
+      parent="golem_resource_menu" groups="golem_base.group_golem_manager"
       sequence="90" />
 
   </data>

golem_resource_holiday/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
+#    Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
 #    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -15,3 +15,5 @@
 #
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from . import models

golem_resource_holiday/__manifest__.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
+#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+{
+    'name': 'GOLEM resources holiday',
+    'summary': 'GOLEM resources holiday',
+    'description': ''' GOLEM resources holiday ''',
+    'version': '10.0.0.0.1',
+    'category': 'GOLEM',
+    'author': 'Youssef El Ouahby, Fabien Bourgeois',
+    'license': 'AGPL-3',
+    'application': True,
+    'installable': True,
+    'depends': ['golem_resource'],
+    'data': [
+        #security
+        'security/ir.model.access.csv',
+        #views
+        'views/golem_resource_views.xml',
+        'views/golem_resource_holiday_views.xml',
+        'views/golem_resource_holiday_period_views.xml'
+    ]
+}

golem_resource_holiday/models/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
 #    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -16,16 +16,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-{
+
-    'name': 'GOLEM events',
+from . import ( golem_resource_holiday, golem_resource_holiday_period,
-    'summary': 'Extends Odoo events',
+                golem_resource, golem_resource_holiday_selection,
-    'description': 'Extends Odoo events',
+                golem_resource_reservation)
-    'version': '10.0.0.1.0',
-    'category': 'GOLEM',
-    'author': 'Fabien Bourgeois, Youssef EL OUAHBY',
-    'license': 'AGPL-3',
-    'application': False,
-    'installable': True,
-    'depends': ['golem_base', 'event'],
-    'data': ['views/event_views.xml']
-}

golem_resource_holiday/models/golem_resource.py

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+""" GOLEM Resources Adaptations """
+
+from odoo import models, fields, api, _
+
+
+class GolemResource(models.Model):
+    """ GOLEM Resource Model """
+    _inherit = 'golem.resource'
+
+    holiday_period_ids = fields.Many2many('golem.resource.holiday.period', string='Holiday period list')
+
+    holiday_selection_ids = fields.One2many('golem.resource.holiday.selection', 'resource_id',
+                                            string='Holiday selection')
+
+    @api.constrains('holiday_period_ids')
+    def synchronise_holiday_selection(self):
+        """ Synchronise holiday selection """
+        for resource in self:
+            period_ids = resource.holiday_period_ids.ids
+
+            #compute selections 2 remove from list if any
+            self.env['golem.resource.holiday.selection'].search([
+                ('resource_id', '=', resource.id),
+                ('period_id', 'not in', period_ids)
+                ]).unlink()
+            #selection_2_remove.unlink()
+
+            #compute selection to add to list if any
+            if resource.holiday_period_ids:
+                existing_holiday = self.env['golem.resource.holiday.selection'].search([
+                    ('resource_id', '=', resource.id)]).mapped('holiday_id')
+                holiday_2_add = self.env['golem.resource.holiday'].search([
+                    ('period_id', 'in', period_ids)]) - existing_holiday
+
+                for holiday in holiday_2_add:
+                    self.env['golem.resource.holiday.selection'].create({
+                        'holiday_id' : holiday.id,
+                        'resource_id': resource.id,
+                    })

golem_resource_holiday/models/golem_resource_holiday.py

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+""" GOLEM Resource holiday Management"""
+
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+
+
+class GolemResourceHoliday(models.Model):
+    """ GOLEM Resource Holiday Management """
+    _name = 'golem.resource.holiday'
+    _description = 'GOLEM Resource Holiday Managementl'
+    _inherit = 'mail.thread'
+    _order = 'name asc'
+
+    name = fields.Char(compute='_compute_name', store=True)
+    period_id = fields.Many2one('golem.resource.holiday.period', string='Holiday period',
+                                ondelete='cascade')
+    date_start = fields.Date('Holiday start')
+    date_end = fields.Date('Holiday end')
+
+    @api.depends('period_id', 'date_start', 'date_end')
+    def _compute_name(self):
+        """ Computes holiday name """
+        for holiday in self:
+            holiday.name = u'{}/{}:{}'.format(holiday.period_id.name,
+                                              holiday.date_start,
+                                              holiday.date_end)
+
+    @api.constrains('date_start', 'date_end')
+    def _check_date_consistency(self):
+        """ Checks date consistency """
+        for holiday in self:
+            if holiday.date_end <= holiday.date_start:
+                raise ValidationError(_('Date end should be after than '
+                                        'date start'))

golem_resource_holiday/models/golem_resource_holiday_period.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+""" GOLEM Resource holiday period Management """
+
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+
+
+class GolemResourceHolidayPeriod(models.Model):
+    """ GOLEM Resource Holiday Period """
+    _name = 'golem.resource.holiday.period'
+    _description = 'GOLEM Resource Holiday Period Managementl'
+    _inherit = 'mail.thread'
+    _order = 'name asc'
+
+    name = fields.Char(required=True, index=True)
+    active = fields.Boolean(default=True)

golem_resource_holiday/models/golem_resource_holiday_selection.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+""" GOLEM Resource Holiday Selection Management """
+
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+
+
+class GolemResourceHolidaySelection(models.Model):
+    """ GOLEM Resource Holiday Selection"""
+    _name = 'golem.resource.holiday.selection'
+    _description = 'GOLEM Resource Holiday Selection Management'
+
+    holiday_id = fields.Many2one('golem.resource.holiday', 'Holiday', required=True)
+    resource_id = fields.Many2one('golem.resource', required=True)
+    is_reservation_possible = fields.Boolean(string='Reservation during holiday')
+    period_id = fields.Many2one(related='holiday_id.period_id', store=True)

golem_resource_holiday/models/golem_resource_reservation.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+""" GOLEM Resources Reservation Adaptations """
+
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+
+
+class GolemResourceReservation(models.Model):
+    """ GOLEM Resource Reservation Model """
+    _inherit = 'golem.resource.reservation'
+
+    @api.constrains('resource_id', 'date_start', 'date_stop')
+    def check_resource_holiday_date(self):
+        for reservation in self:
+            resource_holiday = reservation.resource_id.holiday_selection_ids.filtered(lambda s: not s.is_reservation_possible)
+            if resource_holiday:
+                for holiday in resource_holiday:
+                    if (holiday.holiday_id.date_start < reservation.date_start < holiday.holiday_id.date_end) or \
+                       (holiday.holiday_id.date_start < reservation.date_stop < holiday.holiday_id.date_end):
+                        raise ValidationError(_('This resource cannot be reserved during the'
+                                                ' period between {} and {}, as there is a holiday, please choose '
+                                                'another date').format(holiday.holiday_id.date_start,
+                                                                       holiday.holiday_id.date_end
+                                                                       ))

golem_resource_holiday/security/ir.model.access.csv

@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_golem_resource_holiday_user,Access GOLEM Resource Holiday User,model_golem_resource_holiday,golem_base.group_golem_user,1,0,0,0
+access_golem_resource_holiday_period_user,Access GOLEM Resource Holiday Period User,model_golem_resource_holiday_period,golem_base.group_golem_user,1,0,0,0
+access_golem_resource_holiday_period_selection_user,Access GOLEM Resource Holiday Period Selection User,model_golem_resource_holiday_period_selection,golem_base.group_golem_user,1,0,0,0
+access_golem_resource_holiday_manager,Access GOLEM Resource Holiday Manager,model_golem_resource_holiday,golem_base.group_golem_manager,1,1,1,1
+access_golem_resource_holiday_period_manager,Access GOLEM Resource Holiday Period Manager,model_golem_resource_holiday_period,golem_base.group_golem_manager,1,1,1,1
+access_golem_resource_holiday_period_selection_manager,Access GOLEM Resource Holiday Period Selection Manager,model_golem_resource_holiday_period_selection,golem_base.group_golem_manager,1,1,1,1

golem_resource_holiday/views/golem_resource_holiday_period_views.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<odoo>
+  <data>
+
+    <!-- Trees -->
+    <record model="ir.ui.view" id="golem_resource_holiday_period_view_tree">
+      <field name="name">GOLEM Resource Holiday Period Tree</field>
+      <field name="model">golem.resource.holiday.period</field>
+      <field name="arch" type="xml">
+        <tree>
+          <field name="name"/>
+        </tree>
+      </field>
+    </record>
+
+    <!-- Forms -->
+    <record model="ir.ui.view" id="golem_resource_holiday_period_view_form">
+      <field name="name">GOLEM Resource Holiday Period Form</field>
+      <field name="model">golem.resource.holiday.period</field>
+      <field name="arch" type="xml">
+        <form>
+          <sheet>
+            <group>
+              <group>
+                <field name="name"/>
+              </group>
+              <group>
+                <field name="active"/>
+              </group>
+            </group>
+          </sheet>
+          <div class="oe_chatter">
+              <field name="message_follower_ids" widget="mail_followers" />
+              <field name="message_ids" widget="mail_thread" />
+          </div>
+        </form>
+      </field>
+    </record>
+
+    <!-- Searches -->
+    <record model="ir.ui.view" id="golem_resource_holiday_period_view_search">
+      <field name="name">GOLEM Resource Holiday Period search</field>
+      <field name="model">golem.resource.holiday.period</field>
+      <field name="arch" type="xml">
+        <search>
+          <field name="name" />
+        </search>
+      </field>
+    </record>
+
+    <!-- Actions -->
+    <act_window id="golem_resource_holiday_period_action" name="Resource Holiday Period"
+      res_model="golem.resource.holiday.period" view_mode="tree,form" />
+
+    <!-- Menus -->
+    <menuitem id="resource_holiday_period_menu" name="Period"
+      parent="resource_holiday_root_menu"
+      action="golem_resource_holiday_period_action"
+      sequence="20" />
+
+  </data>
+</odoo>

golem_resource_holiday/views/golem_resource_holiday_views.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<odoo>
+  <data>
+
+    <!-- Trees -->
+    <record model="ir.ui.view" id="golem_resource_holiday_view_tree">
+      <field name="name">GOLEM Resource Holiday Tree</field>
+      <field name="model">golem.resource.holiday</field>
+      <field name="arch" type="xml">
+        <tree>
+          <field name="name"/>
+          <field name="period_id"/>
+          <field name="date_start"/>
+          <field name="date_end"/>
+        </tree>
+      </field>
+    </record>
+
+    <!-- Forms -->
+    <record model="ir.ui.view" id="golem_resource_holiday_view_form">
+      <field name="name">GOLEM Resource Holiday Form</field>
+      <field name="model">golem.resource.holiday</field>
+      <field name="arch" type="xml">
+        <form>
+          <sheet>
+            <group>
+              <group>
+                <field name="period_id" options="{'no_create': True}"/>
+              </group>
+              <group>
+                <field name="date_start"/>
+                <field name="date_end"/>
+              </group>
+            </group>
+          </sheet>
+          <div class="oe_chatter">
+              <field name="message_follower_ids" widget="mail_followers" />
+              <field name="message_ids" widget="mail_thread" />
+          </div>
+        </form>
+      </field>
+    </record>
+
+    <!-- Searches -->
+    <record model="ir.ui.view" id="golem_resource_holiday_view_search">
+      <field name="name">GOLEM Resource Holiday search</field>
+      <field name="model">golem.resource.holiday</field>
+      <field name="arch" type="xml">
+        <search>
+          <field name="name" />
+          <field name="period_id" />
+          <filter name="group_period" string="Period"
+            context="{'group_by': 'period_id'}"/>
+        </search>
+      </field>
+    </record>
+
+    <!-- Actions -->
+    <act_window id="golem_resource_holiday_action" name="Resource Holiday"
+      res_model="golem.resource.holiday" view_mode="tree,form" />
+
+    <!-- Menus -->
+    <menuitem id="resource_holiday_root_menu" name="Resources Holiday"
+      parent="golem_resource.resource_configuration_menu"
+      sequence="50"/>
+    <menuitem id="resource_holiday_menu" name="Holiday"
+      parent="resource_holiday_root_menu"
+      action="golem_resource_holiday_action"
+      sequence="10"/>
+
+  </data>
+</odoo>

golem_resource_holiday/views/golem_resource_views.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<odoo>
+  <data>
+    <!-- Forms -->
+    <record model="ir.ui.view"
+      id="golem_resource_view_form_inherit_golem_resource_holiday">
+      <field name="name"> GOLEM Resource Form inherit GOLEM Resource Holiday</field>
+      <field name="model">golem.resource</field>
+      <field name='inherit_id' ref="golem_resource.golem_resource_view_form"/>
+      <field name="arch" type="xml">
+      <page name="availability" position="after">
+        <page name="holiday_period_selection" string="Holiday Period Selection">
+          <group>
+              <field name="holiday_period_ids" widget="many2many_tags" options="{'no_create': True}"/>
+              <field name="holiday_selection_ids"
+                context="{'default_resource_id': active_id}"
+                attrs="{'invisible': [('holiday_period_ids', '=', [])]}">
+                <tree create="false" edit="true" delete="false" editable="top">
+                  <field name="resource_id" invisible="1"/>
+                  <field name="holiday_id" readonly="1"/>
+                  <field name="is_reservation_possible"/>
+                </tree>
+              </field>
+          </group>
+        </page>
+      </page>
+      </field>
+    </record>
+  </data>
+</odoo>

golem_resource_option/security/ir.model.access.csv

@@ -1,4 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_resource_option_auditor,Access GOLEM Resource Option Auditor,model_golem_resource_option,golem_base.group_golem_auditor,1,0,0,0
 access_golem_resource_option_user,Access GOLEM Resource Option User,model_golem_resource_option,golem_base.group_golem_user,1,0,0,0
 access_golem_resource_option_manager,Access GOLEM Resource Option Manager,model_golem_resource_option,golem_base.group_golem_manager,1,1,1,1

golem_resource_pack/security/ir.model.access.csv

@@ -1,4 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_resource_pack_auditor,Access GOLEM Resource Pack Auditor,model_golem_resource_pack,golem_base.group_golem_auditor,1,0,0,0
 access_golem_resource_pack_user,Access GOLEM Resource Pack User,model_golem_resource_pack,golem_base.group_golem_user,1,1,1,0
 access_golem_resource_pack_manager,Access GOLEM Resource Pack Manager,model_golem_resource_pack,golem_base.group_golem_manager,1,1,1,1

golem_resource_report/views/golem_resource_report_menu.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2018-2020 Youssef El Ouahby <youssef@yaltik.com>
+Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
-Copyright 2018-2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -32,8 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <!-- Menus -->
     <menuitem id="report_menu" name="Report"
-      parent="golem_resource.golem_resource_menu" sequence="80"
+      parent="golem_resource.golem_resource_menu" sequence="80" />
-      groups="golem_base.group_golem_user,golem_base.group_golem_auditor" />
     <menuitem id="reservation_resource_day_menu"
       name="Reservations per resource and day" parent="report_menu"
       action="reservation_resource_day_action" sequence="10" />

golem_season/__manifest__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2016-2022 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2016-2018 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -22,7 +22,7 @@
     - add season with name and period ;
     - choose on per default season ;
     - link optionnally one or many memberships types''',
-    'version': '10.0.1.3.0',
+    'version': '10.0.1.2.2',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',

golem_season/i18n/fr.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-14 10:03+0000\n"
+"POT-Creation-Date: 2018-08-27 09:48+0000\n"
-"PO-Revision-Date: 2022-06-14 12:04+0200\n"
+"PO-Revision-Date: 2018-08-27 11:49+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,16 +16,11 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:94
+#: code:addons/golem_season/models/golem_season.py:93
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
 
-#. module: golem_season
-#: model:ir.model.fields,field_description:golem_season.field_golem_season_active
-msgid "Active"
-msgstr "Actif"
-
 #. module: golem_season
 #: model:ir.model.fields,field_description:golem_season.field_golem_season_member_counter
 msgid "Counter for member number generation"
@@ -42,7 +37,7 @@ msgid "Created on"
 msgstr "Créé le"
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:77
+#: code:addons/golem_season/models/golem_season.py:76
 #, python-format
 msgid "Current period cannot be included into another existing period."
 msgstr "La période actuelle est en conflit avec une période existante."
@@ -68,7 +63,7 @@ msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:73
+#: code:addons/golem_season/models/golem_season.py:72
 #, python-format
 msgid "End of the period is in range of an existing period."
 msgstr "La fin de la période est en conflit avec une période existante."
@@ -89,11 +84,6 @@ msgstr "Saisons"
 msgid "ID"
 msgstr "ID"
 
-#. module: golem_season
-#: model:ir.ui.view,arch_db:golem_season.golem_season_search
-msgid "Inactive"
-msgstr "Archivée"
-
 #. module: golem_season
 #: model:ir.model.fields,field_description:golem_season.field_golem_season___last_update
 msgid "Last Modified on"
@@ -123,7 +113,7 @@ msgstr "Activer cette saison par défaut"
 #. module: golem_season
 #: model:ir.model.fields,field_description:golem_season.field_golem_season_membership_ids
 msgid "Membership types"
-msgstr "Membership types"
+msgstr "Adhésions liées"
 
 #. module: golem_season
 #: model:ir.model.fields,field_description:golem_season.field_golem_season_date_end
@@ -157,28 +147,28 @@ msgid "Seasons"
 msgstr "Saisons"
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:64
+#: code:addons/golem_season/models/golem_season.py:63
 #, python-format
 msgid "Start of the period cannot be after end of the period."
 msgstr "Le début de la période ne peut être postérieur à sa fin."
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:69
+#: code:addons/golem_season/models/golem_season.py:68
 #, python-format
 msgid "Start of the period is in range of an existing period."
 msgstr "Le début de la période est en conflit avec une période existante."
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:60
+#: code:addons/golem_season/models/golem_season.py:59
 #, python-format
 msgid "The date end is required"
-msgstr "The date end is required"
+msgstr "La date de fin est nécessaire"
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:62
+#: code:addons/golem_season/models/golem_season.py:61
 #, python-format
 msgid "The date start is required"
-msgstr "The date start is required"
+msgstr "La date de début est nécessaire"
 
 #. module: golem_season
 #: code:addons/golem_season/models/golem_season.py:29
@@ -188,7 +178,7 @@ msgid "This season name has already been used."
 msgstr "Ce nom pour la saison a déjà été utilisé. Merci d'en choisir un autre."
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:109
+#: code:addons/golem_season/models/golem_season.py:108
 #, python-format
 msgid "You can't delete the default season"
 msgstr "Vous ne pouvez pas supprimer la saison par défaut"

golem_season/i18n/golem_season.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-14 10:03+0000\n"
+"POT-Creation-Date: 2018-08-27 09:48+0000\n"
-"PO-Revision-Date: 2022-06-14 10:03+0000\n"
+"PO-Revision-Date: 2018-08-27 09:48+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,16 +16,11 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:94
+#: code:addons/golem_season/models/golem_season.py:93
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
-#. module: golem_season
-#: model:ir.model.fields,field_description:golem_season.field_golem_season_active
-msgid "Active"
-msgstr ""
-
 #. module: golem_season
 #: model:ir.model.fields,field_description:golem_season.field_golem_season_member_counter
 msgid "Counter for member number generation"
@@ -42,7 +37,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:77
+#: code:addons/golem_season/models/golem_season.py:76
 #, python-format
 msgid "Current period cannot be included into another existing period."
 msgstr ""
@@ -68,7 +63,7 @@ msgid "Display Name"
 msgstr ""
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:73
+#: code:addons/golem_season/models/golem_season.py:72
 #, python-format
 msgid "End of the period is in range of an existing period."
 msgstr ""
@@ -89,11 +84,6 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: golem_season
-#: model:ir.ui.view,arch_db:golem_season.golem_season_search
-msgid "Inactive"
-msgstr ""
-
 #. module: golem_season
 #: model:ir.model.fields,field_description:golem_season.field_golem_season___last_update
 msgid "Last Modified on"
@@ -157,25 +147,25 @@ msgid "Seasons"
 msgstr ""
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:64
+#: code:addons/golem_season/models/golem_season.py:63
 #, python-format
 msgid "Start of the period cannot be after end of the period."
 msgstr ""
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:69
+#: code:addons/golem_season/models/golem_season.py:68
 #, python-format
 msgid "Start of the period is in range of an existing period."
 msgstr ""
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:60
+#: code:addons/golem_season/models/golem_season.py:59
 #, python-format
 msgid "The date end is required"
 msgstr ""
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:62
+#: code:addons/golem_season/models/golem_season.py:61
 #, python-format
 msgid "The date start is required"
 msgstr ""
@@ -188,7 +178,7 @@ msgid "This season name has already been used."
 msgstr ""
 
 #. module: golem_season
-#: code:addons/golem_season/models/golem_season.py:109
+#: code:addons/golem_season/models/golem_season.py:108
 #, python-format
 msgid "You can't delete the default season"
 msgstr ""

golem_season/models/golem_season.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2016-2022 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2016-2018 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -29,7 +29,6 @@ class GolemSeason(models.Model):
                          _('This season name has already been used.'))]
 
     name = fields.Char('Season name', copy=False, required=True)
-    active = fields.Boolean(default=True)
     membership_ids = fields.One2many('product.template', 'membership_season_id',
                                      string='Membership types',
                                      domain=[('membership', '=', True)])

golem_season/security/ir.model.access.csv

@@ -1,4 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_golem_season_auditor,Access GOLEM Season Auditor,model_golem_season,golem_base.group_golem_auditor,1,0,0,0
 access_golem_season_user,Access GOLEM Season User,model_golem_season,golem_base.group_golem_user,1,1,0,0
 access_golem_season_manager,Access GOLEM Season Manager,model_golem_season,golem_base.group_golem_manager,1,1,1,1

golem_season/views/golem_season_views.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright 2016-2022 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2016-2018 Fabien Bourgeois <fabien@yaltik.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 attrs="{'required': [('date_end', '!=', False)]}" />
               <field name="date_end"
                 attrs="{'required': [('date_start', '!=', False)]}" />
-              <field name="active" />
             </group>
           </sheet>
         </form>
@@ -72,9 +71,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <field name="name" />
           <filter name="default_season" string="Default season"
            domain="[('is_default', '=', True)]" />
-          <separator />
-          <filter name="inactive" string="Inactive"
-           domain="[('active', '=', False)]" />
         </search>
       </field>
     </record>
@@ -85,11 +81,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <!-- Menus -->
     <menuitem id="golem_season_menu" name="GOLEM Seasons" sequence="100"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor"
+      groups="golem_base.group_golem_manager"
       web_icon="golem_season,static/description/icon.png" />
     <menuitem id="golem_season_menu_list" name="Seasons" sequence="1"
       parent="golem_season_menu" action="golem_season_action"
-      groups="golem_base.group_golem_manager,golem_base.group_golem_auditor" />
+      groups="golem_base.group_golem_manager" />
 
   </data>
 </odoo>