golem_activity/__manifest__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2016-2020 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 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.6.1',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',

golem_activity/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: 2018-11-01 15:16+0000\n"
+"POT-Creation-Date: 2018-08-09 13:33+0000\n"
-"PO-Revision-Date: 2018-11-01 16:17+0100\n"
+"PO-Revision-Date: 2018-08-09 15:47+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -173,13 +173,13 @@ msgid "Activity audience"
 msgstr "Public"
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:167
+#: code:addons/golem_activity/models/golem_activity.py:160
 #, python-format
 msgid "Activity end date can not be set after linked season end."
 msgstr "La date de fin ne peut pas être apprêt la date de fin de la saison."
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:163
+#: code:addons/golem_activity/models/golem_activity.py:156
 #, python-format
 msgid "Activity start date can not be set before linked season start."
 msgstr "La date de début ne peut pas être avant la date de début de la saison."
@@ -194,12 +194,6 @@ msgstr "Type d'activité"
 msgid "Adults"
 msgstr "Adultes"
 
-#. module: golem_activity
-#: model:ir.model.fields,field_description:golem_activity.field_res_partner_animator_activity_ids
-#: model:ir.model.fields,field_description:golem_activity.field_res_users_animator_activity_ids
-msgid "Animated activities"
-msgstr "Activités animées"
-
 #. module: golem_activity
 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_animator_id
 msgid "Animator"
@@ -211,7 +205,7 @@ msgid "Arts martiaux"
 msgstr "Arts martiaux"
 
 #. module: golem_activity
-#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_audience_id_4022
+#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_audience_id_4516
 msgid "Audience"
 msgstr "Public"
 
@@ -398,7 +392,7 @@ msgid "Expense Account"
 msgstr "Compte de dépenses"
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:185
+#: code:addons/golem_activity/models/golem_activity.py:178
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Friday"
@@ -579,7 +573,7 @@ msgid "Membership Start Date"
 msgstr "Date de début d'adhésion"
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:181
+#: code:addons/golem_activity/models/golem_activity.py:174
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Monday"
@@ -596,11 +590,6 @@ msgstr "Nom"
 msgid "Others"
 msgstr "Autres"
 
-#. module: golem_activity
-#: model:ir.model,name:golem_activity.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
-
 #. module: golem_activity
 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_price
 msgid "Price"
@@ -666,6 +655,12 @@ msgstr "Description achat"
 msgid "Purchase Unit of Measure"
 msgstr "Unité de mesure d'achat"
 
+#. module: golem_activity
+#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_resource_ids
+#: model:ir.model.fields,field_description:golem_activity.field_product_product_resource_ids
+msgid "Resource ids"
+msgstr "Resources"
+
 #. module: golem_activity
 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_description_sale
 msgid "Sale Description"
@@ -677,7 +672,7 @@ msgid "Sale Price"
 msgstr "Prix de vente"
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:186
+#: code:addons/golem_activity/models/golem_activity.py:179
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Saturday"
@@ -730,8 +725,8 @@ msgid "Start date"
 msgstr "Date de début"
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:160
+#: code:addons/golem_activity/models/golem_activity.py:153
-#: code:addons/golem_activity/models/golem_activity.py:212
+#: code:addons/golem_activity/models/golem_activity.py:205
 #, 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 antérieure à sa fin"
@@ -747,7 +742,7 @@ msgid "Stop time"
 msgstr "Heure de fin"
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:187
+#: code:addons/golem_activity/models/golem_activity.py:180
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Sunday"
@@ -798,7 +793,7 @@ msgid "This field holds the image used as image for the activity."
 msgstr "This field holds the image used as image for the activity."
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:184
+#: code:addons/golem_activity/models/golem_activity.py:177
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Thursday"
@@ -815,14 +810,14 @@ msgid "True"
 msgstr "True"
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:182
+#: code:addons/golem_activity/models/golem_activity.py:175
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Tuesday"
 msgstr "Mardi"
 
 #. module: golem_activity
-#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3987
+#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3929
 #: model:ir.ui.view,arch_db:golem_activity.golem_activity_report_template
 msgid "Type"
 msgstr "Type"
@@ -859,7 +854,7 @@ msgid "Warranty"
 msgstr "Garantie"
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:183
+#: code:addons/golem_activity/models/golem_activity.py:176
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Wednesday"

golem_activity/i18n/golem_activity.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-01 15:16+0000\n"
+"POT-Creation-Date: 2018-08-09 13:33+0000\n"
-"PO-Revision-Date: 2018-11-01 15:16+0000\n"
+"PO-Revision-Date: 2018-08-09 13:33+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -170,13 +170,13 @@ msgid "Activity audience"
 msgstr ""
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:167
+#: code:addons/golem_activity/models/golem_activity.py:160
 #, python-format
 msgid "Activity end date can not be set after linked season end."
 msgstr ""
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:163
+#: code:addons/golem_activity/models/golem_activity.py:156
 #, python-format
 msgid "Activity start date can not be set before linked season start."
 msgstr ""
@@ -191,12 +191,6 @@ msgstr ""
 msgid "Adults"
 msgstr ""
 
-#. module: golem_activity
-#: model:ir.model.fields,field_description:golem_activity.field_res_partner_animator_activity_ids
-#: model:ir.model.fields,field_description:golem_activity.field_res_users_animator_activity_ids
-msgid "Animated activities"
-msgstr ""
-
 #. module: golem_activity
 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_animator_id
 msgid "Animator"
@@ -208,7 +202,7 @@ msgid "Arts martiaux"
 msgstr ""
 
 #. module: golem_activity
-#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_audience_id_4022
+#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_audience_id_4516
 msgid "Audience"
 msgstr ""
 
@@ -395,7 +389,7 @@ msgid "Expense Account"
 msgstr ""
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:185
+#: code:addons/golem_activity/models/golem_activity.py:178
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Friday"
@@ -576,7 +570,7 @@ msgid "Membership Start Date"
 msgstr ""
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:181
+#: code:addons/golem_activity/models/golem_activity.py:174
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Monday"
@@ -593,11 +587,6 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#. module: golem_activity
-#: model:ir.model,name:golem_activity.model_res_partner
-msgid "Partner"
-msgstr ""
-
 #. module: golem_activity
 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_price
 msgid "Price"
@@ -663,6 +652,12 @@ msgstr ""
 msgid "Purchase Unit of Measure"
 msgstr ""
 
+#. module: golem_activity
+#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_resource_ids
+#: model:ir.model.fields,field_description:golem_activity.field_product_product_resource_ids
+msgid "Resource ids"
+msgstr ""
+
 #. module: golem_activity
 #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_description_sale
 msgid "Sale Description"
@@ -674,7 +669,7 @@ msgid "Sale Price"
 msgstr ""
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:186
+#: code:addons/golem_activity/models/golem_activity.py:179
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Saturday"
@@ -727,8 +722,8 @@ msgid "Start date"
 msgstr ""
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:160
+#: code:addons/golem_activity/models/golem_activity.py:153
-#: code:addons/golem_activity/models/golem_activity.py:212
+#: code:addons/golem_activity/models/golem_activity.py:205
 #, python-format
 msgid "Start of the period cannot be after end of the period."
 msgstr ""
@@ -744,7 +739,7 @@ msgid "Stop time"
 msgstr ""
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:187
+#: code:addons/golem_activity/models/golem_activity.py:180
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Sunday"
@@ -795,7 +790,7 @@ msgid "This field holds the image used as image for the activity."
 msgstr ""
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:184
+#: code:addons/golem_activity/models/golem_activity.py:177
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Thursday"
@@ -812,14 +807,14 @@ msgid "True"
 msgstr ""
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:182
+#: code:addons/golem_activity/models/golem_activity.py:175
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Tuesday"
 msgstr ""
 
 #. module: golem_activity
-#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3987
+#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3929
 #: model:ir.ui.view,arch_db:golem_activity.golem_activity_report_template
 msgid "Type"
 msgstr ""
@@ -856,7 +851,7 @@ msgid "Warranty"
 msgstr ""
 
 #. module: golem_activity
-#: code:addons/golem_activity/models/golem_activity.py:183
+#: code:addons/golem_activity/models/golem_activity.py:176
 #: selection:golem.activity,weekday:0
 #, python-format
 msgid "Wednesday"

golem_activity/models/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2016-2019 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2016 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
@@ -15,4 +15,4 @@
 #    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 golem_activity, golem_season
+from . import golem_activity

golem_activity/models/golem_activity.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017-2019 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
@@ -105,7 +105,8 @@ class GolemActivity(models.Model):
                                 index=True, auto_join=True,
                                 ondelete='restrict')
     is_default = fields.Boolean('Default season?',
-                                compute='_compute_is_default', store=True)
+                                compute='_compute_is_default',
+                                search='_search_is_default')
 
     @api.depends('season_id')
     def _compute_is_default(self):
@@ -114,6 +115,18 @@ class GolemActivity(models.Model):
         for activity in self:
             activity.is_default = (default_season == activity.season_id)
 
+    @api.multi
+    def _search_is_default(self, operator, value):
+        """ Search function for is default """
+        if operator in ('in', '='):
+            operator = '=' if value else '!='
+        elif operator in ('not in', '!='):
+            operator = '!=' if value else '='
+        else:
+            err = _('Unsupported operator for defautl season search')
+            raise NotImplementedError(err)
+        return [('season_id', operator, self.default_season().id)]
+
     animator_id = fields.Many2one('res.partner', string='Animator',
                                   index=True, auto_join=True,
                                   domain=[('is_company', '=', False)])
@@ -208,11 +221,3 @@ class ProductCategory(models.Model):
 
     property_account_income_categ_id = fields.Many2one(required=True)
     property_account_expense_categ_id = fields.Many2one(required=True)
-
-class ResPartner(models.Model):
-    """ GOLEM Member partner adaptations """
-    _inherit = 'res.partner'
-
-    animator_activity_ids = fields.One2many('golem.activity', 'animator_id',
-                                            string='Animated activities',
-                                            auto_join=True)

golem_activity/models/golem_season.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 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 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 Season adaptations """
-
-from odoo import models, api
-
-
-class GolemSeason(models.Model):
-    """ GOLEM Season adaptations """
-    _inherit = 'golem.season'
-
-    @api.multi
-    def do_default_season(self):
-        """ Regenerates is_default when season changes """
-        self.ensure_one()
-        res = super(GolemSeason, self).do_default_season()
-        all_activities = self.env['golem.activity'].search([])
-        all_activities._compute_is_default()
-        return res

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/__init__.py

@@ -15,4 +15,4 @@
 #    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, wizard
+from . import models

golem_activity_registration/__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
@@ -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.4.5',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',
@@ -30,7 +30,5 @@
              'views/golem_activity_views.xml',
              'report/golem_member_card_templates.xml',
              'security/ir.model.access.csv',
-             'report/golem_activity_report_templates.xml',
+             'report/golem_activity_report_templates.xml']
-             'wizard/golem_activity_registration_analysis_wizard_views.xml',
-             'wizard/golem_member_analysis_views.xml']
 }

golem_activity_registration/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: 2019-01-21 10:49+0000\n"
+"POT-Creation-Date: 2018-08-09 14:23+0000\n"
-"PO-Revision-Date: 2019-01-21 11:51+0100\n"
+"PO-Revision-Date: 2018-08-09 16:38+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -53,7 +53,6 @@ msgstr "Activités de la saison par défaut"
 
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_activity_id
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_member_analysis_activity_id
 msgid "Activity"
 msgstr "Activité"
 
@@ -62,46 +61,16 @@ msgstr "Activité"
 msgid "Activity registrations"
 msgstr "Inscriptions"
 
-#. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_age_computing
-msgid "Age"
-msgstr "Âge"
-
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_member_activity_registration_all_ids
 msgid "All activities"
 msgstr "Toutes les activités"
 
-#. module: golem_activity_registration
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_analysis_wizard_view_form
-msgid "Analyse Registrations"
-msgstr "Analyse des inscriptions"
-
-#. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_analyse_type
-msgid "Analyse type"
-msgstr "Type d'analyse"
-
-#. module: golem_activity_registration
-#: model:ir.actions.act_window,name:golem_activity_registration.golem_registrations_analysis_action
-msgid "Analysis"
-msgstr "Analyse"
-
 #. module: golem_activity_registration
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration
 msgid "Animator"
 msgstr "Intervenant"
 
-#. module: golem_activity_registration
-#: selection:golem.activity.registration.analysis.wizard,age_computing:0
-msgid "At season start"
-msgstr "Au début de la saison"
-
-#. module: golem_activity_registration
-#: selection:golem.activity.registration.analysis.wizard,age_computing:0
-msgid "At season stop"
-msgstr "À la fin de la saison"
-
 #. module: golem_activity_registration
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_tree
 msgid "Base price"
@@ -110,12 +79,7 @@ msgstr "Prix de base"
 #. module: golem_activity_registration
 #: model:ir.model.fields,help:golem_activity_registration.field_golem_activity_registration_activity_price
 msgid "Base price to compute the customer price. Sometimes called the catalog price."
-msgstr "Prix de base pour calculer le prix client. Parfois appelé prix catalogue."
+msgstr "Prix de base pour calculer le prix usager. Parfois appelé prix catalogue."
-
-#. module: golem_activity_registration
-#: selection:golem.activity.registration.analysis.wizard,analyse_type:0
-msgid "By area and activity"
-msgstr "Par territoire et activité"
 
 #. module: golem_activity_registration
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_search
@@ -123,13 +87,11 @@ msgid "By season"
 msgstr "Par saison"
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_create_uid
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_create_date
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_create_date
 msgid "Created on"
 msgstr "Créé le"
@@ -155,7 +117,6 @@ msgid "Default season?"
 msgstr "Saison par défaut?"
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_display_name
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_display_name
 msgid "Display Name"
 msgstr "Nom affiché"
@@ -180,11 +141,6 @@ msgstr "Activité"
 msgid "GOLEM Activity Registration"
 msgstr "Inscription à l'activité"
 
-#. module: golem_activity_registration
-#: model:ir.model,name:golem_activity_registration.model_golem_activity_registration_analysis_wizard
-msgid "GOLEM Activity Registration Analysis Wizard Adaptation "
-msgstr "GOLEM Activity Registration Analysis Wizard Adaptation "
-
 #. module: golem_activity_registration
 #: model:ir.actions.act_window,name:golem_activity_registration.golem_activity_registration_action
 msgid "GOLEM Activity Registration List"
@@ -195,18 +151,12 @@ msgstr "Liste des inscriptions aux activités"
 msgid "GOLEM Member"
 msgstr "Adhérent"
 
-#. module: golem_activity_registration
-#: model:ir.model,name:golem_activity_registration.model_golem_member_analysis
-msgid "GOLEM Members Analysis Adaption"
-msgstr "GOLEM Members Analysis Adaption"
-
 #. module: golem_activity_registration
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration
 msgid "Hours"
 msgstr "Horaires"
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_id
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_id
 msgid "ID"
 msgstr "ID"
@@ -218,28 +168,19 @@ msgstr "Fixe :"
 
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration___last_update
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard___last_update
 msgid "Last Modified on"
 msgstr "Dernière Modification le"
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_write_uid
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_write_date
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
-#. module: golem_activity_registration
-#: code:addons/golem_activity_registration/wizard/golem_activity_registration_analysis_wizard.py:86
-#, python-format
-msgid "Member Analysis"
-msgstr "Analyse des usagers"
-
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_activity_registration_ids
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_form_inherit_registration
@@ -247,16 +188,10 @@ msgid "Members"
 msgstr "Adhérents"
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_name
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration
 msgid "Name"
 msgstr "Nom"
 
-#. module: golem_activity_registration
-#: selection:golem.activity.registration.analysis.wizard,age_computing:0
-msgid "Now"
-msgstr "Ce jour"
-
 #. module: golem_activity_registration
 #: code:addons/golem_activity_registration/models/golem_activity_registration.py:39
 #: sql_constraint:golem.activity:0
@@ -269,22 +204,6 @@ msgstr "Le nombre de places ne peut pas être négatif"
 msgid "On default season, there is no activity for this member."
 msgstr "Sur la saison par défaut, il n'y a pas d'activité pour cet usager."
 
-#. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_only_for_subscriber
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_search_inherit_registration
-msgid "Only for subscriber"
-msgstr "Réservé aux adhérents"
-
-#. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_season_end
-msgid "Period end"
-msgstr "Fin de la période"
-
-#. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_season_start
-msgid "Period start"
-msgstr "Début de la période"
-
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_places
 msgid "Places"
@@ -300,16 +219,6 @@ msgstr "Places prises"
 msgid "Practiced activities"
 msgstr "Activités pratiquées"
 
-#. module: golem_activity_registration
-#: code:addons/golem_activity_registration/wizard/golem_activity_registration_analysis_wizard.py:36
-#: model:ir.ui.menu,name:golem_activity_registration.golem_activity_registration_analysis_menu
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_analysis_wizard_view_form
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_analysis_pivot_age_end_activity_area
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_analysis_pivot_age_now_activity_area
-#, python-format
-msgid "Registration Analysis"
-msgstr "Analyse des inscriptions"
-
 #. module: golem_activity_registration
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_tree_inherit_registration
 msgid "Remain"
@@ -326,23 +235,17 @@ msgid "Sale Price"
 msgstr "Prix de vente"
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_season_id
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_season_id
 msgid "Season"
 msgstr "Saison"
 
-#. module: golem_activity_registration
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_analysis_pivot_age_start_activity_area
-msgid "Service User Analysis"
-msgstr "Analyse des usagers"
-
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_member_id
 msgid "Service user"
 msgstr "Usager"
 
 #. module: golem_activity_registration
-#: code:addons/golem_activity_registration/models/golem_activity_registration.py:71
+#: code:addons/golem_activity_registration/models/golem_activity_registration.py:70
 #, python-format
 msgid "Sorry, there is no more place !"
 msgstr "Désolé, il n'y a  plus de place disponible !"
@@ -353,19 +256,13 @@ msgid "Subscription"
 msgstr "Inscription"
 
 #. module: golem_activity_registration
-#: code:addons/golem_activity_registration/models/golem_activity_registration.py:119
+#: code:addons/golem_activity_registration/models/golem_activity_registration.py:100
-#, python-format
-msgid "Subscription can not be executed : the targeted activity is only for subscriber."
-msgstr "L'inscription n'a pas pu être faite : l'activité choisie est réservée aux adhérents."
-
-#. module: golem_activity_registration
-#: code:addons/golem_activity_registration/models/golem_activity_registration.py:123
 #, python-format
 msgid "Subscription can not be executed : the targeted member is not on the same season as the activity."
 msgstr "L'inscription n'a pas pu être enregistrée : l'usager visé n'est pas ahdérant pour la même saison que celle pendant laquelle se déroule l'activité."
 
 #. module: golem_activity_registration
-#: code:addons/golem_activity_registration/models/golem_activity_registration.py:93
+#: code:addons/golem_activity_registration/models/golem_activity_registration.py:92
 #: sql_constraint:golem.activity.registration:0
 #, python-format
 msgid "This member has already been registered for this activity."

golem_activity_registration/i18n/golem_activity_registration.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-21 10:49+0000\n"
+"POT-Creation-Date: 2018-08-09 14:23+0000\n"
-"PO-Revision-Date: 2019-01-21 10:49+0000\n"
+"PO-Revision-Date: 2018-08-09 14:23+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -53,7 +53,6 @@ msgstr ""
 
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_activity_id
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_member_analysis_activity_id
 msgid "Activity"
 msgstr ""
 
@@ -62,46 +61,16 @@ msgstr ""
 msgid "Activity registrations"
 msgstr ""
 
-#. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_age_computing
-msgid "Age"
-msgstr ""
-
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_member_activity_registration_all_ids
 msgid "All activities"
 msgstr ""
 
-#. module: golem_activity_registration
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_analysis_wizard_view_form
-msgid "Analyse Registrations"
-msgstr ""
-
-#. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_analyse_type
-msgid "Analyse type"
-msgstr ""
-
-#. module: golem_activity_registration
-#: model:ir.actions.act_window,name:golem_activity_registration.golem_registrations_analysis_action
-msgid "Analysis"
-msgstr ""
-
 #. module: golem_activity_registration
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration
 msgid "Animator"
 msgstr ""
 
-#. module: golem_activity_registration
-#: selection:golem.activity.registration.analysis.wizard,age_computing:0
-msgid "At season start"
-msgstr ""
-
-#. module: golem_activity_registration
-#: selection:golem.activity.registration.analysis.wizard,age_computing:0
-msgid "At season stop"
-msgstr ""
-
 #. module: golem_activity_registration
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_tree
 msgid "Base price"
@@ -112,24 +81,17 @@ msgstr ""
 msgid "Base price to compute the customer price. Sometimes called the catalog price."
 msgstr ""
 
-#. module: golem_activity_registration
-#: selection:golem.activity.registration.analysis.wizard,analyse_type:0
-msgid "By area and activity"
-msgstr ""
-
 #. module: golem_activity_registration
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_search
 msgid "By season"
 msgstr ""
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_create_uid
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_create_date
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_create_date
 msgid "Created on"
 msgstr ""
@@ -155,7 +117,6 @@ msgid "Default season?"
 msgstr ""
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_display_name
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_display_name
 msgid "Display Name"
 msgstr ""
@@ -180,11 +141,6 @@ msgstr ""
 msgid "GOLEM Activity Registration"
 msgstr ""
 
-#. module: golem_activity_registration
-#: model:ir.model,name:golem_activity_registration.model_golem_activity_registration_analysis_wizard
-msgid "GOLEM Activity Registration Analysis Wizard Adaptation "
-msgstr ""
-
 #. module: golem_activity_registration
 #: model:ir.actions.act_window,name:golem_activity_registration.golem_activity_registration_action
 msgid "GOLEM Activity Registration List"
@@ -195,18 +151,12 @@ msgstr ""
 msgid "GOLEM Member"
 msgstr ""
 
-#. module: golem_activity_registration
-#: model:ir.model,name:golem_activity_registration.model_golem_member_analysis
-msgid "GOLEM Members Analysis Adaption"
-msgstr ""
-
 #. module: golem_activity_registration
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration
 msgid "Hours"
 msgstr ""
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_id
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_id
 msgid "ID"
 msgstr ""
@@ -218,28 +168,19 @@ msgstr ""
 
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration___last_update
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard___last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_write_uid
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_write_date
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: golem_activity_registration
-#: code:addons/golem_activity_registration/wizard/golem_activity_registration_analysis_wizard.py:86
-#, python-format
-msgid "Member Analysis"
-msgstr ""
-
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_activity_registration_ids
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_form_inherit_registration
@@ -247,16 +188,10 @@ msgid "Members"
 msgstr ""
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_name
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_card_template_inherit_golem_activity_resgitration
 msgid "Name"
 msgstr ""
 
-#. module: golem_activity_registration
-#: selection:golem.activity.registration.analysis.wizard,age_computing:0
-msgid "Now"
-msgstr ""
-
 #. module: golem_activity_registration
 #: code:addons/golem_activity_registration/models/golem_activity_registration.py:39
 #: sql_constraint:golem.activity:0
@@ -269,22 +204,6 @@ msgstr ""
 msgid "On default season, there is no activity for this member."
 msgstr ""
 
-#. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_only_for_subscriber
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_search_inherit_registration
-msgid "Only for subscriber"
-msgstr ""
-
-#. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_season_end
-msgid "Period end"
-msgstr ""
-
-#. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_season_start
-msgid "Period start"
-msgstr ""
-
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_places
 msgid "Places"
@@ -300,16 +219,6 @@ msgstr ""
 msgid "Practiced activities"
 msgstr ""
 
-#. module: golem_activity_registration
-#: code:addons/golem_activity_registration/wizard/golem_activity_registration_analysis_wizard.py:36
-#: model:ir.ui.menu,name:golem_activity_registration.golem_activity_registration_analysis_menu
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_analysis_wizard_view_form
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_analysis_pivot_age_end_activity_area
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_analysis_pivot_age_now_activity_area
-#, python-format
-msgid "Registration Analysis"
-msgstr ""
-
 #. module: golem_activity_registration
 #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_tree_inherit_registration
 msgid "Remain"
@@ -326,23 +235,17 @@ msgid "Sale Price"
 msgstr ""
 
 #. module: golem_activity_registration
-#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_analysis_wizard_season_id
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_season_id
 msgid "Season"
 msgstr ""
 
-#. module: golem_activity_registration
-#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_analysis_pivot_age_start_activity_area
-msgid "Service User Analysis"
-msgstr ""
-
 #. module: golem_activity_registration
 #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_member_id
 msgid "Service user"
 msgstr ""
 
 #. module: golem_activity_registration
-#: code:addons/golem_activity_registration/models/golem_activity_registration.py:71
+#: code:addons/golem_activity_registration/models/golem_activity_registration.py:70
 #, python-format
 msgid "Sorry, there is no more place !"
 msgstr ""
@@ -353,19 +256,13 @@ msgid "Subscription"
 msgstr ""
 
 #. module: golem_activity_registration
-#: code:addons/golem_activity_registration/models/golem_activity_registration.py:119
+#: code:addons/golem_activity_registration/models/golem_activity_registration.py:100
-#, python-format
-msgid "Subscription can not be executed : the targeted activity is only for subscriber."
-msgstr ""
-
-#. module: golem_activity_registration
-#: code:addons/golem_activity_registration/models/golem_activity_registration.py:123
 #, python-format
 msgid "Subscription can not be executed : the targeted member is not on the same season as the activity."
 msgstr ""
 
 #. module: golem_activity_registration
-#: code:addons/golem_activity_registration/models/golem_activity_registration.py:93
+#: code:addons/golem_activity_registration/models/golem_activity_registration.py:92
 #: sql_constraint:golem.activity.registration:0
 #, python-format
 msgid "This member has already been registered for this activity."

golem_activity_registration/models/golem_activity_registration.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#    Copyright 2017-2019 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
@@ -43,7 +43,6 @@ class GolemActivity(models.Model):
                                                 index=True)
     places_used = fields.Integer('Places used', compute='compute_places_used',
                                  store=True)
-    only_for_subscriber = fields.Boolean(default=False)
 
     @api.multi
     @api.depends('activity_registration_ids')
@@ -76,7 +75,7 @@ class GolemActivityRegistration(models.Model):
     """ GOLEM Activity Registration """
     _name = 'golem.activity.registration'
     _description = 'GOLEM Activity Registration'
-    _rec_name = 'activity_id'
+    _rec_name ='activity_id'
 
     member_id = fields.Many2one('golem.member', string='Service user',
                                 required=True, ondelete='cascade', index=True)
@@ -92,33 +91,11 @@ class GolemActivityRegistration(models.Model):
         ('registration_uniq', 'UNIQUE (member_id, activity_id)',
          _('This member has already been registered for this activity.'))]
 
-    @api.onchange('activity_id', 'activity_id.only_for_subscriber')
-    def onchange_activity_subcrib(self):
-        """ If activity only for subscribers : do not allow non subscribers """
-        domain = [('is_default', '=', True)]
-        if self.activity_id.only_for_subscriber:
-            domain.append(('membership_state', 'not in', ('none', 'canceled', 'old')))
-        return {'domain':  {'member_id': domain}}
-
-    @api.onchange('member_id')
-    def onchange_member_subcrib(self):
-        """ If not subscriber : do not show subscribers only activities """
-        domain = [('is_default', '=', True)]
-        if self.member_id and self.member_id.membership_state in ('none', 'canceled', 'old'):
-            domain.append(('only_for_subscriber', '=', False))
-        return {'domain':  {'activity_id': domain}}
-
-
     @api.constrains('member_id', 'activity_id')
     def _check_season_reliability(self):
         """ Forbid registration when member season if not coherent with
         activity season or are duplicates """
         for reg in self:
-            if (reg.activity_id.only_for_subscriber and \
-                reg.member_id.membership_state in ['none', 'canceled', 'old']):
-                emsg = _('Subscription can not be executed : the targeted '
-                         'activity is only for subscriber.')
-                raise models.ValidationError(emsg)
             if reg.activity_id.season_id not in reg.member_id.season_ids:
                 emsg = _('Subscription can not be executed : the targeted '
                          'member is not on the same season as the activity.')

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-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/>.
           <field name="activity_id" domain="[('is_default', '=', True)]"
             invisible="not context.get('activity_show', 1)" />
           <field name="activity_price" string="Base price" sum="Total"
-            invisible="not context.get('activity_show', 1)" readonly="1" />
+            invisible="not context.get('activity_show', 1)" />
         </tree>
       </field>
     </record>
@@ -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/views/golem_activity_views.xml

@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             </group>
           </page>
         </page>
-        <field name="audience_id" position="before">
-          <field name="only_for_subscriber"/>
-        </field>
       </field>
     </record>
 
@@ -69,8 +66,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <filter name="season_default" position="after">
           <filter name="full_activity" string="Full"
            domain="[('places_remain', '=', 0)]" />
-          <filter name="only_for_subscriber" string="Only for subscriber"
-           domain="[('only_for_subscriber', '=', True)]"/>
         </filter>
       </field>
     </record>

golem_activity_registration/wizard/__init__.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2019 Fabien Bourgeois <fabien@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 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/>.
-
-from . import golem_activity_registration_analysis_wizard, golem_member_analysis

golem_activity_registration/wizard/golem_activity_registration_analysis_wizard.py

@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#    Copyright 2019 Fabien Bourgeois <fabien@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 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 Activity Registration Analysis Wizard Management """
-
-import logging
-from odoo import models, fields, api, _
-_LOGGER = logging.getLogger(__name__)
-
-
-class GolemActivityRegistrationAnalysisWizard(models.TransientModel):
-    """ GOLEM Activity Registration Analysis Wizard Management  """
-    _name = 'golem.activity.registration.analysis.wizard'
-    _description = 'GOLEM Activity Registration Analysis Wizard Management '
-
-    def default_season(self):
-        """ Get default season """
-        domain = [('is_default', '=', True)]
-        return self.env['golem.season'].search(domain, limit=1)
-
-    name = fields.Char(default='/')
-    season_id = fields.Many2one('golem.season', 'Season', required=True,
-                                default=default_season, ondelete='cascade')
-    season_start = fields.Date(related='season_id.date_start')
-    season_end = fields.Date(related='season_id.date_end')
-    analyse_type = fields.Selection([('activity_area', 'By area and activity')],
-                                    default='activity_area', required=True)
-    age_computing = fields.Selection([('season_start', 'At season start'),
-                                      ('season_end', 'At season stop'),
-                                      ('now', 'Now')], required=True,
-                                     default='season_start', string='Age')
-
-    @api.multi
-    def get_pivot_view(self):
-        """ get pivot view """
-        self.ensure_one()
-        rec = self[0]
-        ref = u''
-        if rec.age_computing == 'season_start':
-            if rec.analyse_type == 'activity_area':
-                ref = (u'golem_activity_registration.'
-                       'golem_member_analysis_pivot_age_start_activity_area')
-        elif rec.age_computing == 'season_end':
-            if rec.analyse_type == 'activity_area':
-                ref = (u'golem_activity_registration.'
-                       'golem_member_analysis_pivot_age_end_activity_area')
-        else: # now
-            if rec.analyse_type == 'activity_area':
-                ref = (u'golem_activity_registration.'
-                       'golem_member_analysis_pivot_age_now_activity_area')
-        return self.env.ref(ref, False)
-
-    @api.multi
-    def get_registrations(self):
-        """ Returns registrations """
-        self.ensure_one()
-        return self.env['golem.activity.registration'].search(
-            [('season_id', '=', self[0].season_id.id)]
-        )
-
-
-    @api.multi
-    def registration_analyse(self):
-        """ registration analyse """
-        self.ensure_one()
-        analysis_rec = self[0]
-        # Remove existing analysis lines for current analysis
-        self.env['golem.member.analysis'].search(
-            [('resgistration_analysis_id', '=', analysis_rec.id)]
-        ).unlink()
-
-        registrations = analysis_rec.get_registrations()
-        if registrations:
-            for registration in registrations:
-                self.env['golem.member.analysis'].create({
-                    'season_id': analysis_rec.season_id.id,
-                    'member_id': registration.member_id.id,
-                    'activity_id': registration.activity_id.id,
-                    'resgistration_analysis_id': analysis_rec.id
-                    })
-        analyse_pivot = analysis_rec.get_pivot_view()
-        return {
-            'name': _('Registration Analysis'),
-            'type': 'ir.actions.act_window',
-            'res_model': 'golem.member.analysis',
-            'domain': [('resgistration_analysis_id', '=', analysis_rec.id)],
-            'view_type': 'pivot',
-            'view_mode': 'pivot',
-            'view_id': analyse_pivot.id,
-            'target': 'current',
-        }

golem_activity_registration/wizard/golem_activity_registration_analysis_wizard_views.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2019-2020 Fabien Bourgeois <fabien@yaltik.com>
-Copyright 2019-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_activity_registration_analysis_wizard_view_form">
-      <field name="name">GOLEM Activity Registration Analyse Wizard Form</field>
-      <field name="model">golem.activity.registration.analysis.wizard</field>
-      <field name="arch" type="xml">
-        <form string="Registration Analysis">
-          <header>
-            <button name="registration_analyse" string="Analyse Registrations"
-              type="object" class="oe_highlight" />
-          </header>
-          <sheet>
-            <group>
-              <group>
-              <field name="season_id" options="{'no_create': True}"/>
-              </group>
-              <group>
-                <field name="season_start" readonly="1"/>
-                <field name="season_end" readonly="1"/>
-              </group>
-              <group>
-                <field name="analyse_type" widget="radio"/>
-                <field name="age_computing" widget="radio"/>
-              </group>
-            </group>
-          </sheet>
-
-        </form>
-      </field>
-  </record>
-
-    <!-- Actions -->
-    <act_window id="golem_registrations_analysis_action" name="Analysis"
-      res_model="golem.activity.registration.analysis.wizard" view_mode="form"
-      target="current"/>
-
-    <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>
-</odoo>

golem_activity_registration/wizard/golem_member_analysis.py

@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#    Copyright 2019 Fabien Bourgeois <fabien@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 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 Members Analysis Adaptation """
-
-import logging
-from odoo import models, fields, api, _
-_LOGGER = logging.getLogger(__name__)
-
-class GolemMemberAnalysis(models.TransientModel):
-    """ GOLEM Member Analysis Adaptation """
-    _inherit = 'golem.member.analysis'
-    _description = 'GOLEM Member Analysis Adaptation'
-
-    resgistration_analysis_id = fields.Many2one(
-        'golem.activity.registration.analysis.wizard', index=True
-    )
-    activity_id = fields.Many2one('golem.activity', 'Activity')

golem_activity_registration/wizard/golem_member_analysis_views.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2019 Fabien Bourgeois <fabien@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
-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>
-
-    <!-- Pivots -->
-    <record id="golem_member_analysis_pivot_age_start_activity_area" model="ir.ui.view">
-      <field name="name">Golem Member Analysis Age Start Activity Area Pivot</field>
-      <field name="model">golem.member.analysis</field>
-      <field name="arch" type="xml">
-        <pivot string="Service User Analysis">
-          <field name="age_range_start_season" type="col"/>
-          <field name="activity_id" type="row"/>
-          <field name="area_id" type="row"/>
-        </pivot>
-      </field>
-    </record>
-    <record id="golem_member_analysis_pivot_age_end_activity_area" model="ir.ui.view">
-      <field name="name">Golem Member Analysis Age End Activity Area Pivot</field>
-      <field name="model">golem.member.analysis</field>
-      <field name="arch" type="xml">
-        <pivot string="Registration Analysis">
-          <field name="age_range_end_season" type="col"/>
-          <field name="activity_id" type="row"/>
-          <field name="area_id" type="row"/>
-        </pivot>
-      </field>
-    </record>
-    <record id="golem_member_analysis_pivot_age_now_activity_area" model="ir.ui.view">
-      <field name="name">Golem Member Analysis Age Now Activity Area Pivot</field>
-      <field name="model">golem.member.analysis</field>
-      <field name="arch" type="xml">
-        <pivot string="Registration Analysis">
-          <field name="age_range_now" type="col"/>
-          <field name="activity_id" type="row"/>
-          <field name="area_id" type="row"/>
-        </pivot>
-      </field>
-    </record>
-
-  </data>
-</odoo>

golem_activity_registration_custom_price/__manifest__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2018-2019 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,11 +20,11 @@
     'summary': 'GOLEM Activity Registration Custom Price',
     'description': '''GOLEM Activity Registration Custom Price :
     - allow set of 1:n slices based on family quotient ;
-    - allow set 1:n root area data ;
+    - allow set 1:n area data ;
     - allow set price per area and slice ;
     - computes automatically applicable price ;
     - anticipate ruleset to be implemented for computing.''',
-    'version': '10.0.0.3.2',
+    'version': '10.0.0.1.2',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
@@ -36,6 +36,5 @@
              'views/golem_payment_rule_quotient_slice_views.xml',
              'views/golem_member_views.xml',
              'views/golem_activity_views.xml',
-             'wizard/golem_activity_registration_invoicing_views.xml',
+             'wizard/golem_activity_registration_invoicing_views.xml']
-             'wizard/golem_member_analysis_views.xml']
 }

golem_activity_registration_custom_price/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: 2019-01-21 10:20+0000\n"
+"POT-Creation-Date: 2018-08-03 23:02+0000\n"
-"PO-Revision-Date: 2019-01-21 11:21+0100\n"
+"PO-Revision-Date: 2018-08-04 01:17+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -70,7 +70,7 @@ msgid "Current family quotient slice cannot be included into another existing sl
 msgstr "La tranche de quotient familial ne peut être incluse dans une tranche existante."
 
 #. module: golem_activity_registration_custom_price
-#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:30
+#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:29
 #: model:ir.ui.view,arch_db:golem_activity_registration_custom_price.golem_activity_registration_invoicing_form_inherit_custom_price
 #, python-format
 msgid "Default price"
@@ -89,13 +89,13 @@ msgid "Family Quotients"
 msgstr "Quotients familiaux"
 
 #. module: golem_activity_registration_custom_price
-#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:62
+#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:61
 #, python-format
 msgid "Family quotient and area"
 msgstr "Quotient familial et territoire"
 
 #. module: golem_activity_registration_custom_price
-#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:60
+#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:59
 #, python-format
 msgid "Family quotient but random area"
 msgstr "Quotient familial mais territoire aléatoire"
@@ -116,11 +116,6 @@ msgstr "La borne basse du quotient familial fait partie d'une tranche existante.
 msgid "Family quotient slice"
 msgstr "Tranche de quotient familial"
 
-#. module: golem_activity_registration_custom_price
-#: model:ir.model.fields,field_description:golem_activity_registration_custom_price.field_golem_member_analysis_family_quotient_slice_id
-msgid "Family quotient slice id"
-msgstr "Tranche de quotient familial"
-
 #. module: golem_activity_registration_custom_price
 #: model:ir.model.fields,field_description:golem_activity_registration_custom_price.field_golem_payment_rule_familyquotient_slice_family_quotient_to
 msgid "Family quotient to"
@@ -152,21 +147,16 @@ msgstr "GOLEM Activity Registration Invoicing Lines"
 msgid "GOLEM Member"
 msgstr "Usager"
 
-#. module: golem_activity_registration_custom_price
-#: model:ir.model,name:golem_activity_registration_custom_price.model_golem_member_analysis_wizard
-msgid "GOLEM Members Analysis  Wizard Adaptation"
-msgstr "GOLEM Members Analysis  Wizard Adaptation"
-
-#. module: golem_activity_registration_custom_price
-#: model:ir.model,name:golem_activity_registration_custom_price.model_golem_member_analysis
-msgid "GOLEM Members Analysis Adaption"
-msgstr "GOLEM Members Analysis Adaption"
-
 #. module: golem_activity_registration_custom_price
 #: model:ir.model,name:golem_activity_registration_custom_price.model_golem_payment_rule_familyquotient_slice
 msgid "GOLEM Payment Rule Family Quotient Slice"
 msgstr "GOLEM Payment Rule Family Quotient Slice"
 
+#. module: golem_activity_registration_custom_price
+#: model:ir.model,name:golem_activity_registration_custom_price.model_golem_payment_rule_geo
+msgid "GOLEM Payment Rule Geo"
+msgstr "GOLEM Payment Rule Geo"
+
 #. module: golem_activity_registration_custom_price
 #: model:ir.model.fields,field_description:golem_activity_registration_custom_price.field_golem_activity_price_line_id
 #: model:ir.model.fields,field_description:golem_activity_registration_custom_price.field_golem_payment_rule_familyquotient_slice_id
@@ -216,11 +206,6 @@ msgstr "Lignes tarifaires"
 msgid "Prices"
 msgstr "Tarifs"
 
-#. module: golem_activity_registration_custom_price
-#: model:ir.model.fields,field_description:golem_activity_registration_custom_price.field_golem_activity_registration_invoicing_line_pricing_info
-msgid "Pricing info"
-msgstr "Information tarifaire"
-
 #. module: golem_activity_registration_custom_price
 #: model:ir.ui.menu,name:golem_activity_registration_custom_price.golem_payment_rule_menu
 msgid "Pricing rules"
@@ -241,16 +226,11 @@ msgstr "Prix de vente"
 msgid "Sequence"
 msgstr "Séquence"
 
-#. module: golem_activity_registration_custom_price
-#: model:ir.ui.view,arch_db:golem_activity_registration_custom_price.golem_member_analysis_pivot_fquotientslice_area
-msgid "Service User Analysis"
-msgstr "Analyse des usagers"
-
 #. module: golem_activity_registration_custom_price
 #: code:addons/golem_activity_registration_custom_price/models/golem_payment_rule_quotient_slice.py:49
 #, python-format
 msgid "The 'to' family quotient must be higher than the 'from' one."
-msgstr "La borne haute du quotient familial doit être supérieure à la borne basse."
+msgstr "La borne haute du quotient familial doit être supérieur à la borne basse."
 
 #. module: golem_activity_registration_custom_price
 #: code:addons/golem_activity_registration_custom_price/models/golem_activity_price_line.py:30

golem_activity_registration_custom_price/i18n/golem_activity_registration_custom_price.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-21 10:20+0000\n"
+"POT-Creation-Date: 2018-08-03 23:02+0000\n"
-"PO-Revision-Date: 2019-01-21 10:20+0000\n"
+"PO-Revision-Date: 2018-08-03 23:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -70,7 +70,7 @@ msgid "Current family quotient slice cannot be included into another existing sl
 msgstr ""
 
 #. module: golem_activity_registration_custom_price
-#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:30
+#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:29
 #: model:ir.ui.view,arch_db:golem_activity_registration_custom_price.golem_activity_registration_invoicing_form_inherit_custom_price
 #, python-format
 msgid "Default price"
@@ -89,13 +89,13 @@ msgid "Family Quotients"
 msgstr ""
 
 #. module: golem_activity_registration_custom_price
-#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:62
+#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:61
 #, python-format
 msgid "Family quotient and area"
 msgstr ""
 
 #. module: golem_activity_registration_custom_price
-#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:60
+#: code:addons/golem_activity_registration_custom_price/models/golem_member.py:59
 #, python-format
 msgid "Family quotient but random area"
 msgstr ""
@@ -116,11 +116,6 @@ msgstr ""
 msgid "Family quotient slice"
 msgstr ""
 
-#. module: golem_activity_registration_custom_price
-#: model:ir.model.fields,field_description:golem_activity_registration_custom_price.field_golem_member_analysis_family_quotient_slice_id
-msgid "Family quotient slice id"
-msgstr ""
-
 #. module: golem_activity_registration_custom_price
 #: model:ir.model.fields,field_description:golem_activity_registration_custom_price.field_golem_payment_rule_familyquotient_slice_family_quotient_to
 msgid "Family quotient to"
@@ -152,21 +147,16 @@ msgstr ""
 msgid "GOLEM Member"
 msgstr ""
 
-#. module: golem_activity_registration_custom_price
-#: model:ir.model,name:golem_activity_registration_custom_price.model_golem_member_analysis_wizard
-msgid "GOLEM Members Analysis  Wizard Adaptation"
-msgstr ""
-
-#. module: golem_activity_registration_custom_price
-#: model:ir.model,name:golem_activity_registration_custom_price.model_golem_member_analysis
-msgid "GOLEM Members Analysis Adaption"
-msgstr ""
-
 #. module: golem_activity_registration_custom_price
 #: model:ir.model,name:golem_activity_registration_custom_price.model_golem_payment_rule_familyquotient_slice
 msgid "GOLEM Payment Rule Family Quotient Slice"
 msgstr ""
 
+#. module: golem_activity_registration_custom_price
+#: model:ir.model,name:golem_activity_registration_custom_price.model_golem_payment_rule_geo
+msgid "GOLEM Payment Rule Geo"
+msgstr ""
+
 #. module: golem_activity_registration_custom_price
 #: model:ir.model.fields,field_description:golem_activity_registration_custom_price.field_golem_activity_price_line_id
 #: model:ir.model.fields,field_description:golem_activity_registration_custom_price.field_golem_payment_rule_familyquotient_slice_id
@@ -216,11 +206,6 @@ msgstr ""
 msgid "Prices"
 msgstr ""
 
-#. module: golem_activity_registration_custom_price
-#: model:ir.model.fields,field_description:golem_activity_registration_custom_price.field_golem_activity_registration_invoicing_line_pricing_info
-msgid "Pricing info"
-msgstr ""
-
 #. module: golem_activity_registration_custom_price
 #: model:ir.ui.menu,name:golem_activity_registration_custom_price.golem_payment_rule_menu
 msgid "Pricing rules"
@@ -241,11 +226,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: golem_activity_registration_custom_price
-#: model:ir.ui.view,arch_db:golem_activity_registration_custom_price.golem_member_analysis_pivot_fquotientslice_area
-msgid "Service User Analysis"
-msgstr ""
-
 #. module: golem_activity_registration_custom_price
 #: code:addons/golem_activity_registration_custom_price/models/golem_payment_rule_quotient_slice.py:49
 #, python-format

golem_activity_registration_custom_price/models/golem_activity.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 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
 #    it under the terms of the GNU Affero General Public License as
@@ -44,7 +43,7 @@ class GolemActivity(models.Model):
         existing_combinations = [u'%s-%s' % (line.area_id.id, line.slice_id.id)
                                  for line in activity.price_line_ids]
         slice_ids = self.env['golem.payment.rule.familyquotient.slice'].search([])
-        for area_id in self.env['golem.partner.area'].search([('parent_id', '=', False)]):
+        for area_id in self.env['golem.partner.area'].search([]):
             for slice_id in slice_ids:
                 combination = u'%s-%s' % (area_id.id, slice_id.id)
                 if combination not in existing_combinations:

golem_activity_registration_custom_price/models/golem_member.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 #    Copyright 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
 #    it under the terms of the GNU Affero General Public License as
@@ -41,7 +40,7 @@ class GolemMember(models.Model):
                 area_ids = self.env['golem.partner.area'].search([])
                 if member.area_id:
                     applicable_areas += area_ids.filtered(
-                        lambda r: r == member.area_id.root_id
+                        lambda r: r == member.area_id
                     )
                 if not applicable_areas and area_ids:
                     applicable_areas += area_ids[0]

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_payment_rule_familyquotient_slice_manager,Access GOLEM Payment Rule Familyquotient Slice Manager,model_golem_payment_rule_familyquotient_slice,golem_base.group_golem_manager,0,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_activity_registration_custom_price/wizard/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2018-2019 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
@@ -15,5 +15,4 @@
 #    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 (golem_activity_registration_invoicing,
+from . import golem_activity_registration_invoicing
-               golem_member_analysis, golem_member_analysis_wizard)

golem_activity_registration_custom_price/wizard/golem_member_analysis.py

@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#    Copyright 2019 Fabien Bourgeois <fabien@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 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 Members Analysis Pivot Adaption """
-
-from odoo import models, fields, api
-
-
-class GolemMemberAnalysisPivot(models.TransientModel):
-    """ GOLEM Members Analysis Pivot Adaption """
-    _inherit = 'golem.member.analysis'
-    _description = 'GOLEM Members Analysis Adaption'
-
-
-    family_quotient_slice_id = fields.Many2one(
-        'golem.payment.rule.familyquotient.slice', index=True, ondelete='cascade',
-        store=True, compute='_compute_family_quotient_slice_id'
-    )
-
-    @api.depends('family_quotient')
-    def _compute_family_quotient_slice_id(self):
-        """ Computes family quotient slice """
-        for rec in self:
-            if rec.family_quotient:
-                fq_int = int(rec.family_quotient)
-                domain = [('family_quotient_from', '<=', fq_int),
-                          ('family_quotient_to', '>=', fq_int)]
-                rule_slice_id = self.env['golem.payment.rule.familyquotient.slice'].search(
-                    domain, limit=1
-                )
-                if rule_slice_id:
-                    rec.family_quotient_slice_id = rule_slice_id

golem_activity_registration_custom_price/wizard/golem_member_analysis_views.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2019 Fabien Bourgeois <fabien@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
-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>
-
-    <!-- Pivot -->
-    <record id="golem_member_analysis_pivot_fquotientslice_area" model="ir.ui.view">
-      <field name="name">Golem Member Analysis Fquotient Slice and Area Pivot</field>
-      <field name="model">golem.member.analysis</field>
-      <field name="arch" type="xml">
-        <pivot string="Service User Analysis">
-          <field name="area_id" type="col"/>
-          <field name="family_quotient_slice_id" type="row"/>
-        </pivot>
-      </field>
-    </record>
-
-  </data>
-</odoo>

golem_activity_registration_custom_price/wizard/golem_member_analysis_wizard.py

@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#    Copyright 2019 Fabien Bourgeois <fabien@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 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 Members Analysis Adaptation """
-
-from odoo import models, fields, api
-
-
-class GolemMemberAnalysis(models.TransientModel):
-    """ GOLEM Members Analysis Adaptation """
-    _inherit = 'golem.member.analysis.wizard'
-    _description = 'GOLEM Members Analysis  Wizard Adaptation'
-
-    analyse_type = fields.Selection(
-        selection_add=[('fquotientslice_area',
-                        'By family quotient slice and area')]
-    )
-
-    @api.multi
-    def get_pivot_view(self):
-        """ override  get_pivot_view function """
-        self.ensure_one()
-        rec = self[0]
-        pivot_view = super(GolemMemberAnalysis, self).get_pivot_view()
-        if pivot_view:
-            return pivot_view
-        if rec.analyse_type == 'fquotientslice_area':
-            return self.env.ref(
-                ('golem_activity_registration_custom_price.'
-                'golem_member_analysis_pivot_fquotientslice_area'),
-                False
-            )
-        return False

golem_activity_registration_payment/__manifest__.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2018-2019 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 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
 #    it under the terms of the GNU Affero General Public License as
@@ -20,7 +19,7 @@
     'name': 'GOLEM Activity Member Registration Payments',
     'summary': 'GOLEM Activities Member Registration Payments',
     'description': 'GOLEM Activities Member Registration Payments',
-    'version': '10.0.0.7.1',
+    'version': '10.0.0.3.6',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
@@ -30,7 +29,5 @@
     'data': ['views/golem_member_views.xml',
              'views/golem_activity_registration_views.xml',
              'report/golem_member_card_templates.xml',
-             'wizard/golem_activity_registration_invoicing.xml',
+             'wizard/golem_activity_registration_invoicing.xml']
-             'views/golem_activity_views.xml',
-             'views/account_invoice.xml']
 }

golem_activity_registration_payment/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: 2019-01-21 11:30+0000\n"
+"POT-Creation-Date: 2018-08-27 10:09+0000\n"
-"PO-Revision-Date: 2019-01-21 12:31+0100\n"
+"PO-Revision-Date: 2018-08-27 12:10+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -49,7 +49,7 @@ msgid "Activity id"
 msgstr "Activité liée"
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/models/golem_member.py:78
+#: code:addons/golem_activity_registration_payment/models/golem_member.py:76
 #, python-format
 msgid "All confirmed registrations had already been invoiced."
 msgstr "Toutes les inscriptions confirmées ont déjà été facturées."
@@ -60,11 +60,6 @@ msgstr "Toutes les inscriptions confirmées ont déjà été facturées."
 msgid "Amount"
 msgstr "Montant"
 
-#. module: golem_activity_registration_payment
-#: model:ir.ui.view,arch_db:golem_activity_registration_payment.invoice_search_inherited_activity_registration_payment
-msgid "By Month"
-msgstr "Mois de facturation"
-
 #. module: golem_activity_registration_payment
 #: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment
 msgid "By invoice state"
@@ -129,18 +124,6 @@ msgstr "Afficher les paiements"
 msgid "Draft Invoice"
 msgstr "Facture en brouillon"
 
-#. module: golem_activity_registration_payment
-#: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_free_activity
-#: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_free_activity
-#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_search_inherit_activity_registration_payment
-msgid "Free activity"
-msgstr "Gratuit"
-
-#. module: golem_activity_registration_payment
-#: model:ir.model,name:golem_activity_registration_payment.model_golem_activity
-msgid "GOLEM Activity"
-msgstr "Activité"
-
 #. module: golem_activity_registration_payment
 #: model:ir.model,name:golem_activity_registration_payment.model_golem_activity_registration
 msgid "GOLEM Activity Registration"
@@ -162,14 +145,14 @@ msgid "GOLEM Member"
 msgstr "Adhérent"
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:161
+#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:151
 #: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_invoicing_invoice_id
 #, python-format
 msgid "Generated invoice"
 msgstr "Facture générée"
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:176
+#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:166
 #: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_invoicing_payment_ids
 #, python-format
 msgid "Generated payments"
@@ -266,11 +249,6 @@ msgstr "Dernière mise à jour par"
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
-#. module: golem_activity_registration_payment
-#: model:ir.ui.view,arch_db:golem_activity_registration_payment.invoice_search_inherited_activity_registration_payment
-msgid "Last year invoices"
-msgstr "Année dernière"
-
 #. module: golem_activity_registration_payment
 #: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_invoicing_member_id
 msgid "Member"
@@ -333,7 +311,7 @@ msgid "Registration id"
 msgstr "Inscription"
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/models/golem_member.py:71
+#: code:addons/golem_activity_registration_payment/models/golem_member.py:69
 #: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_invoicing_view_form
 #, python-format
 msgid "Registration invoicing"
@@ -361,22 +339,17 @@ msgid "Status"
 msgstr "État"
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:157
+#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:147
 #, python-format
 msgid "There is no generated invoice."
 msgstr "Il n'y a pas de facture générée."
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:172
+#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:162
 #, python-format
 msgid "There is no generated payments."
 msgstr "Il n'y a pas de paiement généré."
 
-#. module: golem_activity_registration_payment
-#: model:ir.ui.view,arch_db:golem_activity_registration_payment.invoice_search_inherited_activity_registration_payment
-msgid "This year invoices"
-msgstr "Cette année"
-
 #. module: golem_activity_registration_payment
 #: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_invoicing_view_form
 msgid "Total"

golem_activity_registration_payment/i18n/golem_activity_registration_payment.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-21 11:30+0000\n"
+"POT-Creation-Date: 2018-08-27 10:09+0000\n"
-"PO-Revision-Date: 2019-01-21 11:30+0000\n"
+"PO-Revision-Date: 2018-08-27 10:09+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgid "Activity id"
 msgstr ""
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/models/golem_member.py:78
+#: code:addons/golem_activity_registration_payment/models/golem_member.py:76
 #, python-format
 msgid "All confirmed registrations had already been invoiced."
 msgstr ""
@@ -56,11 +56,6 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
-#. module: golem_activity_registration_payment
-#: model:ir.ui.view,arch_db:golem_activity_registration_payment.invoice_search_inherited_activity_registration_payment
-msgid "By Month"
-msgstr ""
-
 #. module: golem_activity_registration_payment
 #: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment
 msgid "By invoice state"
@@ -125,18 +120,6 @@ msgstr ""
 msgid "Draft Invoice"
 msgstr ""
 
-#. module: golem_activity_registration_payment
-#: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_free_activity
-#: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_free_activity
-#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_search_inherit_activity_registration_payment
-msgid "Free activity"
-msgstr ""
-
-#. module: golem_activity_registration_payment
-#: model:ir.model,name:golem_activity_registration_payment.model_golem_activity
-msgid "GOLEM Activity"
-msgstr ""
-
 #. module: golem_activity_registration_payment
 #: model:ir.model,name:golem_activity_registration_payment.model_golem_activity_registration
 msgid "GOLEM Activity Registration"
@@ -158,14 +141,14 @@ msgid "GOLEM Member"
 msgstr ""
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:161
+#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:151
 #: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_invoicing_invoice_id
 #, python-format
 msgid "Generated invoice"
 msgstr ""
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:176
+#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:166
 #: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_invoicing_payment_ids
 #, python-format
 msgid "Generated payments"
@@ -262,11 +245,6 @@ msgstr ""
 msgid "Last Updated on"
 msgstr ""
 
-#. module: golem_activity_registration_payment
-#: model:ir.ui.view,arch_db:golem_activity_registration_payment.invoice_search_inherited_activity_registration_payment
-msgid "Last year invoices"
-msgstr ""
-
 #. module: golem_activity_registration_payment
 #: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_invoicing_member_id
 msgid "Member"
@@ -329,7 +307,7 @@ msgid "Registration id"
 msgstr ""
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/models/golem_member.py:71
+#: code:addons/golem_activity_registration_payment/models/golem_member.py:69
 #: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_invoicing_view_form
 #, python-format
 msgid "Registration invoicing"
@@ -357,22 +335,17 @@ msgid "Status"
 msgstr ""
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:157
+#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:147
 #, python-format
 msgid "There is no generated invoice."
 msgstr ""
 
 #. module: golem_activity_registration_payment
-#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:172
+#: code:addons/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py:162
 #, python-format
 msgid "There is no generated payments."
 msgstr ""
 
-#. module: golem_activity_registration_payment
-#: model:ir.ui.view,arch_db:golem_activity_registration_payment.invoice_search_inherited_activity_registration_payment
-msgid "This year invoices"
-msgstr ""
-
 #. module: golem_activity_registration_payment
 #: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_invoicing_view_form
 msgid "Total"

golem_activity_registration_payment/models/__init__.py

@@ -15,4 +15,4 @@
 #    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 golem_member, golem_activity_registration, golem_activity
+from . import golem_member, golem_activity_registration

golem_activity_registration_payment/models/golem_activity.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2018 Youssef El Ouahby <youssef@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 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 Activity adaptations """
-
-from odoo import models, fields, api
-
-class GolemActivity(models.Model):
-    """ GOLEM Activity adaptations """
-    _inherit = 'golem.activity'
-
-    free_activity = fields.Boolean(default=False)
-
-    @api.onchange('free_activity')
-    def onchange_free_activity(self):
-        """ If free activity, price should be 0.0 """
-        for activity in self:
-            if activity.free_activity:
-                activity.list_price = 0.0

golem_activity_registration_payment/models/golem_activity_registration.py

@@ -31,4 +31,3 @@ class GolemActivityRegistration(models.Model):
     invoice_id = fields.Many2one(related='invoice_line_id.invoice_id')
     invoice_state = fields.Selection(related='invoice_line_id.invoice_id.state',
                                      store=True)
-    free_activity = fields.Boolean(related='activity_id.free_activity')

golem_activity_registration_payment/models/golem_member.py

@@ -35,7 +35,6 @@ class GolemMember(models.Model):
             regis = member.activity_registration_ids
             regis = regis.filtered(
                 lambda r: (r.state == 'confirmed' and
-                           not r.activity_id.free_activity and
                            (not r.invoice_line_id or
                             r.invoice_line_id.invoice_id.state == 'cancel'))
             )
@@ -53,10 +52,9 @@ class GolemMember(models.Model):
         self.ensure_one()
         member = self[0]
         registrations = member.activity_registration_ids.filtered(
-            lambda r: (r.state == 'confirmed' and
+            lambda r: r.state == 'confirmed' and
-                       not r.activity_id.free_activity and
             (not r.invoice_line_id or
-                        r.invoice_line_id.invoice_id.state == 'cancel'))
+             r.invoice_line_id.invoice_id.state == 'cancel')
         )
         if registrations:
             invoicing = self.env['golem.activity.registration.invoicing'].create({

golem_activity_registration_payment/views/account_invoice.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2019 Fabien Bourgeois <fabien@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
-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>
-
-    <!-- Searches -->
-    <record id="invoice_search_inherited_activity_registration_payment" model="ir.ui.view">
-      <field name="name">account.invoice.search.iherited.activity.registration.payment</field>
-      <field name="model">account.invoice</field>
-      <field name="inherit_id" ref="account.view_account_invoice_filter" />
-      <field name="arch" type="xml">
-         <xpath expr="//group[1]" position="inside">
-           <filter name="invoice_last_year" string="Last year invoices"
-            domain="[('date_invoice', '&gt;=', (context_today() - datetime.timedelta(days=365.25)).strftime('%Y-01-01')), ('date_invoice', '&lt;', context_today().strftime('%Y-01-01'))]" />
-          <filter name="invoice_this_year" string="This year invoices"
-            domain="[('date_invoice', '&gt;=', context_today().strftime('%Y-01-01'))]" />
-           <filter name="group_by_month" string="By Month" context="{'group_by':'date_invoice:month'}"/>
-         </xpath>
-      </field>
-    </record>
-
-  </data>
-</odoo>

golem_activity_registration_payment/views/golem_activity_registration_views.xml

@@ -45,12 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="inherit_id"
         ref="golem_activity_registration_state.golem_activity_registration_tree_inherit_state" />
       <field name="arch" type="xml">
-        <field name="activity_price" position="before">
-          <field name="free_activity" readonly="1" />
-        </field>
-        <field name="activity_price" position="attributes">
-          <attribute name="attrs">{'readonly': [('free_activity', '=', True)]}</attribute>
-        </field>
         <field name="state" position="after">
           <field name="invoice_line_id" invisible="1" />
           <field name="invoice_state" string="Invoice state" />

golem_activity_registration_payment/views/golem_activity_views.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2018 Youssef El Ouahby <youssef@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
-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 id="golem_activity_form_inherit_activity_registration_payment"
-      model="ir.ui.view">
-     <field name="name">Golem activity form adaptations</field>
-     <field name="model">golem.activity</field>
-     <field name="inherit_id" ref="golem_activity.golem_activity_form" />
-     <field name="arch" type="xml">
-      <field name="list_price" position="attributes">
-        <attribute name="attrs">{'invisible': [('free_activity', '=', True)]}</attribute>
-      </field>
-      <field name="list_price" position="before">
-        <field name='free_activity' />
-      </field>
-     </field>
-   </record>
-
-   <!-- Search -->
-   <record id="golem_activity_search_inherit_activity_registration_payment"
-  model="ir.ui.view">
-     <field name="name">Golem Activity Search adaptations</field>
-     <field name="model">golem.activity</field>
-     <field name="inherit_id" ref="golem_activity.golem_activity_search" />
-     <field name="arch" type="xml">
-       <filter name="season_default" position="after">
-         <filter name="free_activity" string="Free activity"
-           domain="[('free_activity', '=', True)]" />
-       </filter>
-     </field>
-    </record>
-  </data>
-</odoo>

golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017-2019 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
 #    it under the terms of the GNU Affero General Public License as
@@ -30,11 +29,9 @@ class GolemActivityRegistrationInvoicingLine(models.TransientModel):
     _description = 'GOLEM Activity Registration Invoicing Lines'
 
     invoicing_id = fields.Many2one('golem.activity.registration.invoicing',
-                                   required=True, ondelete='cascade')
+                                   required=True)
-    registration_id = fields.Many2one('golem.activity.registration', required=True,
+    registration_id = fields.Many2one('golem.activity.registration', required=True)
-                                      ondelete='cascade')
+    activity_id = fields.Many2one('golem.activity', required=True, readonly=True)
-    activity_id = fields.Many2one('golem.activity', required=True, readonly=True,
-                                  ondelete='cascade')
     price = fields.Monetary()
     currency_id = fields.Many2one(related='activity_id.currency_id')
 
@@ -65,6 +62,7 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
                                  ondelete='cascade')
     payment_ids = fields.Many2many('account.payment', string='Generated payments')
 
+
     def _create_invoice_line(self, product, price, invoice):
         """ Create invoice line : needs cache record for onchange, then real
         writing... """
@@ -83,22 +81,14 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
     def _create_invoice(self):
         """ Create invoice and lines """
         self.ensure_one()
-        partner = self[0].member_id.partner_id
+        partner = self.member_id.partner_id
-        #check if there is a draft invoice for the current customer
-        member_line = partner.member_lines.filtered(
-            lambda ml: (ml.membership_id.membership_season_id == self.season_id
-                        and ml.account_invoice_id.state == 'draft')
-            )
-        if member_line:
-            invoice = member_line[0].account_invoice_id
-        else:
         invoice = self.env['account.invoice'].create({
             'partner_id': partner.id,
             'account_id': partner.property_account_receivable_id.id,
             'fiscal_position_id': partner.property_account_position_id.id
         })
         for line in self.line_ids:
-            product = line.activity_id.product_id.product_variant_id
+            product = line.activity_id.product_id
             invoice_line = self._create_invoice_line(product, line.price, invoice)
             line.registration_id.invoice_line_id = invoice_line.id
         return invoice
@@ -156,14 +146,10 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
         if not self.invoice_id:
             uerr = _('There is no generated invoice.')
             raise UserError(uerr)
-        search_view_id = self.env.ref('account.view_account_invoice_filter')
-        form_view_id = self.env.ref('account.invoice_form')
-        tree_view_ref = self.env.ref('account.invoice_tree', False)
         return {
             'type': 'ir.actions.act_window',
             'name': _('Generated invoice'),
-            'view_mode': 'form',
+            'view_mode': 'form,tree',
-            'view_id': form_view_id.id,
             'res_model': 'account.invoice',
             'res_id': self[0].invoice_id.id
         }

golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.xml

@@ -2,7 +2,6 @@
 
 <!--
 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
 it under the terms of the GNU Affero General Public License as published by

golem_activity_registration_payment_family_minor/__init__.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    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 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/>.
-
-from . import wizard

golem_activity_registration_payment_family_minor/__manifest__.py

@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    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 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 Activity Payment for Minors inside families',
-    'summary': 'GOLEM Activity Registration Payment for Minors inside families',
-    'version': '10.0.0.1.0',
-    'category': 'GOLEM',
-    'author': 'Fabien Bourgeois',
-    'license': 'AGPL-3',
-    'application': False,
-    'installable': True,
-    'auto_install': True,
-    'depends': ['golem_family', 'golem_activity_registration_payment_member_minor'],
-}

golem_activity_registration_payment_family_minor/i18n/fr.po

@@ -1,22 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* golem_activity_registration_payment_family_minor
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-01 17:44+0000\n"
-"PO-Revision-Date: 2018-11-01 17:44+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_activity_registration_payment_family_minor
-#: model:ir.model,name:golem_activity_registration_payment_family_minor.model_golem_activity_registration_invoicing
-msgid "GOLEM Activity Registration Invoicing Wizard"
-msgstr "GOLEM Activity Registration Invoicing Wizard"
-

golem_activity_registration_payment_family_minor/i18n/golem_activity_registration_payment_family_minor.pot

@@ -1,22 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* golem_activity_registration_payment_family_minor
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-01 17:44+0000\n"
-"PO-Revision-Date: 2018-11-01 17:44+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_activity_registration_payment_family_minor
-#: model:ir.model,name:golem_activity_registration_payment_family_minor.model_golem_activity_registration_invoicing
-msgid "GOLEM Activity Registration Invoicing Wizard"
-msgstr ""
-

golem_activity_registration_payment_family_minor/wizard/golem_activity_registration_invoicing.py

@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    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
-#    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 Activity Registration Invoicing Wizard """
-
-from odoo import models, api
-
-
-class GolemActivityRegistrationInvoicing(models.TransientModel):
-    """ GOLEM Activity Registration Invoicing Wizard """
-    _inherit = 'golem.activity.registration.invoicing'
-
-    @api.depends('member_id')
-    def _compute_guardian_ids(self):
-        res = super(GolemActivityRegistrationInvoicing, self)._compute_guardian_ids()
-        for rec in self:
-            if rec.member_id.family_member_ids:
-                rec.guardian_ids += rec.member_id.family_member_ids.filtered(
-                    lambda r: r.id != self.member_id.partner_id.id
-                )
-        return res

golem_activity_registration_payment_member_minor/__init__.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2018-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 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/>.
-
-from . import wizard, models

golem_activity_registration_payment_member_minor/__manifest__.py

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2018-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 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 Activity Payment for Minors',
-    'summary': 'GOLEM Activity Registration Payment for Minors',
-    'version': '10.0.0.2.0',
-    'category': 'GOLEM',
-    'author': 'Fabien Bourgeois',
-    'license': 'AGPL-3',
-    'application': False,
-    'installable': True,
-    'auto_install': True,
-    'depends': ['golem_member_minor', 'golem_activity_registration_payment',
-                'golem_member_account'],
-    'data': ['views/golem_activity_registration_invoicing.xml']
-}

golem_activity_registration_payment_member_minor/i18n/fr.po

@@ -1,43 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* golem_activity_registration_payment_member_minor
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-01 18:52+0000\n"
-"PO-Revision-Date: 2018-11-01 19:53+0100\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_activity_registration_payment_member_minor
-#: model:ir.model,name:golem_activity_registration_payment_member_minor.model_golem_activity_registration_invoicing
-msgid "GOLEM Activity Registration Invoicing Wizard"
-msgstr "GOLEM Activity Registration Invoicing Wizard"
-
-#. module: golem_activity_registration_payment_member_minor
-#: model:ir.model.fields,field_description:golem_activity_registration_payment_member_minor.field_golem_activity_registration_invoicing_guardian_ids
-msgid "Guardian ids"
-msgstr "Représentants légaux"
-
-#. module: golem_activity_registration_payment_member_minor
-#: model:ir.model.fields,field_description:golem_activity_registration_payment_member_minor.field_golem_activity_registration_invoicing_is_minor
-msgid "Is minor?"
-msgstr "Est mineur?"
-
-#. module: golem_activity_registration_payment_member_minor
-#: model:ir.model.fields,field_description:golem_activity_registration_payment_member_minor.field_golem_activity_registration_invoicing_on_the_name_of
-msgid "On the Name of"
-msgstr "Pour le compte de"
-
-#. module: golem_activity_registration_payment_member_minor
-#: code:addons/golem_activity_registration_payment_member_minor/wizard/golem_activity_registration_invoicing.py:66
-#, python-format
-msgid "This member is a minor, please fill on the name of so you invoice this registration"
-msgstr "Cet usager est un mineur, merci de remplir le champ pour le compte de pour permettre la facturation"
-

golem_activity_registration_payment_member_minor/i18n/golem_activity_registration_payment_member_minor.pot

@@ -1,43 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* golem_activity_registration_payment_member_minor
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-01 18:52+0000\n"
-"PO-Revision-Date: 2018-11-01 18:52+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_activity_registration_payment_member_minor
-#: model:ir.model,name:golem_activity_registration_payment_member_minor.model_golem_activity_registration_invoicing
-msgid "GOLEM Activity Registration Invoicing Wizard"
-msgstr ""
-
-#. module: golem_activity_registration_payment_member_minor
-#: model:ir.model.fields,field_description:golem_activity_registration_payment_member_minor.field_golem_activity_registration_invoicing_guardian_ids
-msgid "Guardian ids"
-msgstr ""
-
-#. module: golem_activity_registration_payment_member_minor
-#: model:ir.model.fields,field_description:golem_activity_registration_payment_member_minor.field_golem_activity_registration_invoicing_is_minor
-msgid "Is minor?"
-msgstr ""
-
-#. module: golem_activity_registration_payment_member_minor
-#: model:ir.model.fields,field_description:golem_activity_registration_payment_member_minor.field_golem_activity_registration_invoicing_on_the_name_of
-msgid "On the Name of"
-msgstr ""
-
-#. module: golem_activity_registration_payment_member_minor
-#: code:addons/golem_activity_registration_payment_member_minor/wizard/golem_activity_registration_invoicing.py:66
-#, python-format
-msgid "This member is a minor, please fill on the name of so you invoice this registration"
-msgstr ""
-

golem_activity_registration_payment_member_minor/models/__init__.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 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 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/>.
-
-from . import golem_member

golem_activity_registration_payment_member_minor/models/golem_member.py

@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 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 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 Member adaptations """
-
-from odoo import models, api
-
-
-class GolemMember(models.Model):
-    """ GOLEM Member adaptations """
-    _inherit = 'golem.member'
-
-    @api.multi
-    def open_partner_invoices(self):
-        """ Overwrite open member invoices """
-        self.ensure_one()
-        domain = ['|',
-                  ('partner_id', '=', self.partner_id.id),
-                  ('partner_ids', '=', self.partner_id.id)]
-        invoice_ids = self.env['account.invoice'].search(domain)
-        action = self.env.ref('account.action_invoice_tree1').read()[0]
-        action['context'] = {'type':'out_invoice', 'journal_type': 'sale',
-                             'default_partner_id': self[0].partner_id.id}
-        action['domain'] = [('id', 'in', invoice_ids.ids)]
-        return action
-
-    @api.multi
-    def open_partner_payments(self):
-        """ Overwrite open member payments """
-        self.ensure_one()
-        # Get related invoices
-        domain = ['|',
-                  ('partner_id', '=', self.partner_id.id),
-                  ('partner_ids', '=', self.partner_id.id)]
-        invoice_ids = self.env['account.invoice'].search(domain)
-        # Get related payments
-        domain = ['|',
-                  ('partner_id', '=', self.partner_id.id),
-                  ('invoice_ids', 'in', invoice_ids.ids)]
-        payment_ids = self.env['account.payment'].search(domain)
-
-        action = self.env.ref('account.action_account_payments').read()[0]
-        action['context'] = {'default_payment_type': 'inbound',
-                             'default_partner_type': 'customer',
-                             'default_partner_id': self[0].partner_id.id}
-        action['domain'] = [('id', 'in', payment_ids.ids)]
-        return action

golem_activity_registration_payment_member_minor/views/golem_activity_registration_invoicing.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-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
-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>
-
-    <!-- Form -->
-    <record id="golem_activity_registration_invoicing_view_form_inherit_member_minor"
-      model="ir.ui.view">
-      <field name="name">GOLEM Activity Registration Invoicing Form</field>
-      <field name="model">golem.activity.registration.invoicing</field>
-      <field name="inherit_id"
-        ref="golem_activity_registration_payment.golem_activity_registration_invoicing_view_form" />
-      <field name="arch" type="xml">
-        <field name="member_id" position="after">
-          <field name="on_the_name_of"
-            attrs="{'invisible': [('is_minor', '=', False)], 'required': [('is_minor', '=', True)]}"
-            options="{'no_create': True}"
-            domain="[('id', 'in', guardian_ids[0][2])]" />
-          <field name="is_minor" invisible="1" />
-          <field name="guardian_ids" invisible="1" widget="many2many_tags" />
-        </field>
-      </field>
-    </record>
-
-  </data>
-</odoo>

golem_activity_registration_payment_member_minor/wizard/__init__.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    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 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/>.
-
-from . import golem_activity_registration_invoicing

golem_activity_registration_payment_member_minor/wizard/golem_activity_registration_invoicing.py

@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    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
-#    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 Activity Registration Invoicing Wizard """
-
-from odoo import models, fields, api, _
-from odoo.exceptions import ValidationError
-
-
-class GolemActivityRegistrationInvoicing(models.TransientModel):
-    """ GOLEM Activity Registration Invoicing Wizard """
-    _inherit = 'golem.activity.registration.invoicing'
-
-    guardian_ids = fields.Many2many('res.partner', compute='_compute_guardian_ids')
-    on_the_name_of = fields.Many2one('res.partner', 'On the Name of',
-                                     ondelete='cascade')
-    is_minor = fields.Boolean(related='member_id.is_minor')
-
-    @api.depends('member_id')
-    def _compute_guardian_ids(self):
-        for rec in self:
-            guardian_ids = rec.member_id.legal_guardian_ids.mapped('legal_guardian_id').ids
-            rec.guardian_ids = [(6, 0, guardian_ids)]
-
-    @api.multi
-    def _create_invoice(self):
-        """ Create invoice and lines """
-        self.ensure_one()
-        invoice = super(GolemActivityRegistrationInvoicing, self)._create_invoice()
-        if self[0].is_minor:
-            invoice.write({'partner_id': self[0].on_the_name_of.id,
-                           'is_minor_invoice': True,
-                           'partner_ids': [(6, 0, [self[0].on_the_name_of.id,
-                                                   self[0].member_id.partner_id.id])]})
-        return invoice
-
-    def _create_payments(self, invoice):
-        """ Create payment if schedule has been chosen : handling minor case """
-        self.ensure_one()
-        payments = super(GolemActivityRegistrationInvoicing, self)._create_payments(invoice)
-        if self.on_the_name_of:
-            payments.write({'partner_id': self.on_the_name_of.id})
-        return payments
-
-    @api.multi
-    def validate(self):
-        """ Validate and create invoice and payments """
-        self.ensure_one()
-        action = super(GolemActivityRegistrationInvoicing, self).validate()
-        if self.is_minor and not self.on_the_name_of:
-            err = _('This member is a minor, please fill on the name of so you '
-                    'invoice this registration')
-            raise ValidationError(err)
-        return action
-

golem_activity_registration_state/__init__.py

@@ -15,4 +15,4 @@
 #    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, wizard
+from . import models

golem_activity_registration_state/__manifest__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017-2019 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
@@ -19,7 +19,7 @@
     'name': 'GOLEM Activity Session Member Registrations States',
     'summary': 'GOLEM Activities Session Member Registration states',
     'description': 'GOLEM Activities Session Member Registration states',
-    'version': '10.0.2.3.0',
+    'version': '10.0.2.2.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',

golem_activity_registration_state/models/golem_activity_registration.py

@@ -18,7 +18,7 @@
 """ GOLEM Activity Registration State """
 
 from odoo import models, fields, api, _
-from odoo.exceptions import UserError, ValidationError
+from odoo.exceptions import UserError
 
 class GolemMember(models.Model):
     """ GOLEM Member adaptations """
@@ -89,10 +89,9 @@ class GolemActivityRegistration(models.Model):
     def state_remove(self):
         """ Remove registrations, only if canceled """
         if self.filtered(lambda r: r.state != 'canceled'):
-            uerr = _('You can not remove a uncanceled registration.')
+            uerr = _('You can not confirm a canceled registration.')
             raise UserError(uerr)
         self.unlink()
-        return {'type': 'ir.actions.client', 'tag': 'reload'}
 
     @api.multi
     def write(self, values):

golem_activity_registration_state/views/golem_activity_registration_views.xml

@@ -45,21 +45,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <attribute name="delete">0</attribute>
         </tree>
         <tree position="inside">
-          <field name="id" invisible="1" />
           <field name="state" readonly="1" />
           <button type="object" name="state_draft" string="Reset to draft"
-            icon="fa-arrow-up" attrs="{'invisible': ['|', ('id', '=', False), ('state', '=', 'draft')]}"
+            icon="fa-arrow-up" attrs="{'invisible': [('state', '=', 'draft')]}"
             invisible="not context.get('action_show', 1)" />
           <button type="object" name="state_confirm" string="Confirm"
-            icon="fa-check" attrs="{'invisible': ['|', ('id', '=', False), ('state', '!=', 'draft')]}"
+            icon="fa-check" attrs="{'invisible': [('state', '!=', 'draft')]}"
             invisible="not context.get('action_show', 1)" />
           <button type="object" name="state_cancel" string="Cancel"
-            icon="fa-ban" attrs="{'invisible': ['|', ('id', '=', False), ('state', '=', 'canceled')]}"
+            icon="fa-ban" attrs="{'invisible': [('state', '=', 'canceled')]}"
             invisible="not context.get('action_show', 1)" />
           <button type="object" name="state_remove" string="Remove"
             icon="fa-trash"
             confirm="Are you sure you want to remove this subscription ?"
-            attrs="{'invisible': ['|', ('id', '=', False), ('state', '!=', 'canceled')]}"
+            attrs="{'invisible': [('state', '!=', 'canceled')]}"
             invisible="not context.get('action_show', 1)" />
         </tree>
       </field>

golem_activity_registration_state/wizard/__init__.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2019 Fabien Bourgeois <fabien@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 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/>.
-
-from . import golem_activity_registration_analysis_wizard

golem_activity_registration_state/wizard/golem_activity_registration_analysis_wizard.py

@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#    Copyright 2019 Fabien Bourgeois <fabien@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 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 Activity Registration Analysis Wizard Adaptation """
-
-from odoo import models, fields, api
-
-
-class GolemActivityRegistrationAnalysisWizard(models.TransientModel):
-    """ GOLEM Activity Registration Analysis Wizard Adaptation  """
-    _inherit = 'golem.activity.registration.analysis.wizard'
-    _description = 'GOLEM Activity Registration Analysis Wizard Adaptation '
-
-    @api.multi
-    def get_registrations(self):
-        """ Returns registrations """
-        self.ensure_one()
-        return self.env['golem.activity.registration'].search(
-            [('season_id', '=', self[0].season_id.id),
-             ('state', '=', 'confirmed')]
-        )

golem_admin/__init__.py

@@ -14,5 +14,3 @@
 #
 #    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_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.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',

golem_admin/models/__init__.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    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 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/>.
-
-from . import res_partner

golem_admin/models/res_partner.py

@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    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 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/>.
-
-""" Partner adaptations """
-
-from odoo import models, fields, api
-
-
-class Partner(models.Model):
-    """ Partner adaptations """
-    _inherit = 'res.partner'
-
-    signup_token = fields.Char(groups="golem_base.group_golem_manager")
-    signup_type = fields.Char(groups="golem_base.group_golem_manager")
-    signup_expiration = fields.Datetime(groups="golem_base.group_golem_manager")
-
-    @api.multi
-    def write(self, vals):
-        """ Overwrite native function to workaround admin only write on fields
-        signup*, as it's impossible to overwrite groups attribute """
-        if (('signup_token' in vals or 'signup_type' in vals or
-                'signup_expiration' in vals)
-                and self.env.user.has_group('golem_base.group_golem_manager')):
-            return super(Partner, self.sudo()).write(vals)
-        return super(Partner, self).write(vals)

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/__init__.py

@@ -1,17 +0,0 @@
-# -*- 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/>.

golem_event/__manifest__.py

@@ -1,31 +0,0 @@
-# -*- 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 events',
-    'summary': 'Extends Odoo events',
-    'description': 'Extends Odoo events',
-    '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_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,9 +19,9 @@
     'name': 'GOLEM families',
     'summary': 'GOLEM Members Families',
     'description': 'GOLEM Members Families',
-    'version': '10.0.2.6.0',
+    'version': '10.0.2.3.1',
     'category': 'GOLEM',
-    'author': 'Fabien Bourgeois, Youssef El Ouahby',
+    'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
     'application': False,
     'installable': True,

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-08-01 10:12+0000\n"
-"PO-Revision-Date: 2021-01-14 15:45+0100\n"
+"PO-Revision-Date: 2018-08-01 12:15+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -52,31 +52,6 @@ msgstr "<strong>Région</strong> :"
 msgid "Address"
 msgstr "Adresse"
 
-#. module: golem_family
-#: model:ir.model.fields,field_description:golem_family.field_golem_family_area_id
-msgid "Area"
-msgstr "Territoire"
-
-#. module: golem_family
-#: model:ir.model.fields,field_description:golem_family.field_golem_family_area_from_street
-msgid "Area from street"
-msgstr "Territoire automatique depuis la rue"
-
-#. module: golem_family
-#: model:ir.ui.view,arch_db:golem_family.golem_family_form
-msgid "Area, quarter..."
-msgstr "Lieu, quartier..."
-
-#. module: golem_family
-#: model:ir.model.fields,help:golem_family.field_golem_family_area_id
-msgid "Area, quarter... for statistics and activity price."
-msgstr "Lieu, quartier... pour les statistiques et les tarifs des activités."
-
-#. module: golem_family
-#: model:ir.ui.view,arch_db:golem_family.golem_family_search
-msgid "By area"
-msgstr "Par territoire"
-
 #. module: golem_family
 #: model:ir.ui.view,arch_db:golem_family.golem_family_search
 msgid "By city"
@@ -170,8 +145,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:50
-#: code:addons/golem_family/models/golem_family.py:93
+#: code:addons/golem_family/models/golem_family.py:84
 #, python-format
 msgid "Family Members"
 msgstr "Membres de la famille"
@@ -181,13 +156,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"
@@ -340,16 +308,6 @@ msgstr "Role"
 msgid "Roles"
 msgstr "Roles"
 
-#. module: golem_family
-#: model:ir.model.fields,field_description:golem_family.field_golem_family_single_parent
-msgid "Single parent"
-msgstr "Monoparentale"
-
-#. module: golem_family
-#: model:ir.ui.view,arch_db:golem_family.golem_family_search
-msgid "Single-parent"
-msgstr "Monoparentale"
-
 #. module: golem_family
 #: model:ir.model.fields,field_description:golem_family.field_golem_family_state_id
 #: model:ir.model.fields,field_description:golem_family.field_golem_member_family_state_id
@@ -430,4 +388,3 @@ msgstr "membres"
 #: model:ir.ui.view,arch_db:golem_family.golem_member_form_inherit_golem_family
 msgid "name@example.org"
 msgstr "name@example.org"
-

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-08-01 10:12+0000\n"
-"PO-Revision-Date: 2021-01-14 14:45+0000\n"
+"PO-Revision-Date: 2018-08-01 10:12+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -52,31 +52,6 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#. module: golem_family
-#: model:ir.model.fields,field_description:golem_family.field_golem_family_area_id
-msgid "Area"
-msgstr ""
-
-#. module: golem_family
-#: model:ir.model.fields,field_description:golem_family.field_golem_family_area_from_street
-msgid "Area from street"
-msgstr ""
-
-#. module: golem_family
-#: model:ir.ui.view,arch_db:golem_family.golem_family_form
-msgid "Area, quarter..."
-msgstr ""
-
-#. module: golem_family
-#: model:ir.model.fields,help:golem_family.field_golem_family_area_id
-msgid "Area, quarter... for statistics and activity price."
-msgstr ""
-
-#. module: golem_family
-#: model:ir.ui.view,arch_db:golem_family.golem_family_search
-msgid "By area"
-msgstr ""
-
 #. module: golem_family
 #: model:ir.ui.view,arch_db:golem_family.golem_family_search
 msgid "By city"
@@ -170,8 +145,8 @@ msgid "Family"
 msgstr ""
 
 #. module: golem_family
-#: code:addons/golem_family/models/golem_family.py:59
+#: code:addons/golem_family/models/golem_family.py:50
-#: code:addons/golem_family/models/golem_family.py:93
+#: code:addons/golem_family/models/golem_family.py:84
 #, python-format
 msgid "Family Members"
 msgstr ""
@@ -181,13 +156,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"
@@ -340,16 +308,6 @@ msgstr ""
 msgid "Roles"
 msgstr ""
 
-#. module: golem_family
-#: model:ir.model.fields,field_description:golem_family.field_golem_family_single_parent
-msgid "Single parent"
-msgstr ""
-
-#. module: golem_family
-#: model:ir.ui.view,arch_db:golem_family.golem_family_search
-msgid "Single-parent"
-msgstr ""
-
 #. module: golem_family
 #: model:ir.model.fields,field_description:golem_family.field_golem_family_state_id
 #: model:ir.model.fields,field_description:golem_family.field_golem_member_family_state_id

golem_family/models/golem_family.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2017-2021 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2017 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
 #    it under the terms of the GNU Affero General Public License as
@@ -42,16 +41,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 """
@@ -151,15 +140,10 @@ class GolemFamily(models.Model):
 
     member_ids = fields.One2many('res.partner', 'family_id', 'Members',
                                  domain=[('is_company', '=', False)])
-    single_parent = fields.Boolean()
     note = fields.Text()
     count = fields.Integer(compute='_compute_count', store=True)
 
-    area_id = fields.Many2one(
+    single_parent = fields.Boolean()
-        'golem.partner.area', index=True, auto_join=True, string='Area',
-        help="Area, quarter... for statistics and activity price."
-    )
-    area_from_street = fields.Boolean(store=False, default=False)
 
     @api.depends('member_ids')
     def _compute_count(self):
@@ -177,34 +161,6 @@ class GolemFamily(models.Model):
                                'zip': family.member_ids[0].zip,
                                'city': family.member_ids[0].city})
 
-    @api.onchange('street')
-    def onchange_street(self):
-        """ Area auto assignement """
-        for family in self:
-            mstreet = family.street.strip() if family.street else False
-            if mstreet and not family.area_id:
-                street_id = self.env['golem.partner.area.street'].search(
-                    [('name', 'ilike', mstreet)], limit=1
-                )
-                if street_id:
-                    family.area_id = street_id.area_id
-                    family.area_from_street = True
-
-    @api.constrains('street')
-    def save_street(self):
-        """ Save street if no exist """
-        for family in self:
-            if family.street and not family.area_from_street:
-                mstreet = family.street.strip()
-                street_id = self.env['golem.partner.area.street'].search(
-                    [('name', 'ilike', mstreet)]
-                )
-                if not street_id:
-                    self.env['golem.partner.area.street'].create(
-                        {'name': mstreet, 'area_id': family.area_id.id}
-                    )
-
-
 class GolemFamilyRole(models.Model):
     """ GOLEM Family Role """
     _name = 'golem.family.role'

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,7 @@
 <?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>
 
 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
@@ -35,18 +34,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                   <label for="name" string="Family" class="oe_edit_only" />
                   <field name="name" class="oe_inline" placeholder="Name" />
                 </h1>
+                <label for="single_parent" string="Single-Parent Family"/>
+                <field name="single_parent"/>
               </div>
             </group>
-            <group>
-              <field name="single_parent" />
-            </group>
             <group string="Address">
               <group>
                 <field name="street" placeholder="Street..." />
                 <field name="street2" />
                 <field name="zip" placeholder="ZIP" />
-                <field name="area_id" placeholder="Area, quarter..."
-                  options="{'no_create': true}" />
                 <field name="city" placeholder="City" />
               </group>
               <group>
@@ -188,17 +184,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="arch" type="xml">
         <search>
           <field name="name" />
-          <field name='area_id' />
           <field name="zip" />
           <field name="city" />
           <field name="phone" />
           <field name="mobile" />
           <field name="email" />
-          <filter name="single_parent" string="Single-parent"
+          <filter name="single_parent" string="Single-parent Family"
-            domain="[('single_parent', '=', True)]" />
+            domain="[('single_parent', '=', True)]"/>
           <group string="Group By">
-            <filter name='group_by_area_id' string="By area"
-              context='{"group_by": "area_id"}'/>
             <filter name="group_city" string="By city"
               context="{'group_by': 'city'}"/>
           </group>
@@ -214,15 +207,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/__init__.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2018 Youssef El Ouahby <youssef@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 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/>.
-
-from . import models

golem_family_history/__manifest__.py

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2018 Youssef El Ouahby <youssef@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 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 Families History',
-    'summary': 'GOLEM Families History',
-    'description': 'GOLEM Families History',
-    'version': '10.0.0.1.1',
-    'category': 'GOLEM',
-    'author': 'Fabien Bourgeois, Youssef El ouahby',
-    'license': 'AGPL-3',
-    'application': False,
-    'installable': True,
-    'depends': ['golem_family'],
-    'data': ['security/ir.model.access.csv', 'views/golem_family_views.xml']
-}

golem_family_history/i18n/fr.po

@@ -1,114 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* golem_family_history
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-26 15:44+0000\n"
-"PO-Revision-Date: 2018-10-26 17:46+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_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_area_id
-msgid "Area"
-msgstr "Territoire"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_city
-msgid "City"
-msgstr "Ville"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_country_id
-msgid "Country"
-msgstr "Pays"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_create_uid
-msgid "Created by"
-msgstr "Créé par"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_create_date
-msgid "Created on"
-msgstr "Créé le"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_display_name
-msgid "Display Name"
-msgstr "Nom affiché"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_family_id
-msgid "Family"
-msgstr "Famille"
-
-#. module: golem_family_history
-#: model:ir.model,name:golem_family_history.model_golem_family
-msgid "GOLEM Family Entity"
-msgstr "Famille"
-
-#. module: golem_family_history
-#: model:ir.model,name:golem_family_history.model_golem_family_history
-msgid "GOLEM Family History Management"
-msgstr "GOLEM Family History Management"
-
-#. module: golem_family_history
-#: model:ir.ui.view,arch_db:golem_family_history.golem_family_form_inherit_golem_family_history
-msgid "History"
-msgstr "Historique"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_family_history_ids
-msgid "History details"
-msgstr "Historique"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_id
-msgid "ID"
-msgstr "ID"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history___last_update
-msgid "Last Modified on"
-msgstr "Dernière Modification le"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_write_uid
-msgid "Last Updated by"
-msgstr "Dernière mise à jour par"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_write_date
-msgid "Last Updated on"
-msgstr "Dernière mise à jour le"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_member_ids
-msgid "Members"
-msgstr "Adhérents"
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_season_id
-msgid "Season"
-msgstr "Saison"
-
-#. module: golem_family_history
-#: code:addons/golem_family_history/models/golem_family_history.py:30
-#: sql_constraint:golem.family.history:0
-#, python-format
-msgid "You can only have one history line for each family and season combination."
-msgstr "Vous ne pouvez avoir qu'une seule ligne par famille par saison."
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_zip_code
-msgid "ZIP"
-msgstr "Code postal"
-

golem_family_history/i18n/golem_family_history.pot

@@ -1,114 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* golem_family_history
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-26 15:44+0000\n"
-"PO-Revision-Date: 2018-10-26 15:44+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_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_area_id
-msgid "Area"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_city
-msgid "City"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_country_id
-msgid "Country"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_family_id
-msgid "Family"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model,name:golem_family_history.model_golem_family
-msgid "GOLEM Family Entity"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model,name:golem_family_history.model_golem_family_history
-msgid "GOLEM Family History Management"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.ui.view,arch_db:golem_family_history.golem_family_form_inherit_golem_family_history
-msgid "History"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_family_history_ids
-msgid "History details"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_id
-msgid "ID"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_member_ids
-msgid "Members"
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_season_id
-msgid "Season"
-msgstr ""
-
-#. module: golem_family_history
-#: code:addons/golem_family_history/models/golem_family_history.py:30
-#: sql_constraint:golem.family.history:0
-#, python-format
-msgid "You can only have one history line for each family and season combination."
-msgstr ""
-
-#. module: golem_family_history
-#: model:ir.model.fields,field_description:golem_family_history.field_golem_family_history_zip_code
-msgid "ZIP"
-msgstr ""
-

golem_family_history/models/__init__.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2018 Youssef El Ouahby <youssef@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 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/>.
-
-from . import golem_family_history, golem_family

golem_family_history/models/golem_family.py

@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2018 Youssef El Ouahby <youssef@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 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 Families Adaptations"""
-
-from odoo import models, fields, api
-
-
-class GolemFamily(models.Model):
-    """ GOLEM Family Adaptations """
-    _inherit = 'golem.family'
-
-    family_history_ids = fields.One2many('golem.family.history', 'family_id',
-                                         readonly=True, string='History details')
-
-    @api.constrains('area_id', 'zip', 'city', 'country_id', 'member_ids')
-    def save_family_history(self):
-        """ Saves family history """
-        default_season = self.env['golem.season'].search([('is_default', '=', True)], limit=1)
-        for family in self:
-            history_id = self.env['golem.family.history'].search([
-                ('family_id', '=', family.id),
-                ('season_id', '=', default_season.id)], limit=1)
-            history_data = {
-                'zip_code': family.zip,
-                'area_id': family.area_id.id,
-                'city': family.city,
-                'country_id': family.country_id.id,
-                'member_ids':[(6, False, family.member_ids.ids)]
-            }
-            if history_id:
-                history_id.write(history_data)
-            else:
-                history_data.update({'family_id': family.id,
-                                     'season_id': default_season.id})
-                self.env['golem.family.history'].create(history_data)

golem_family_history/models/golem_family_history.py

@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2018 Youssef El Ouahby <youssef@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 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 Family History Management """
-
-from odoo import models, fields, _
-
-class GolemFamilyHistory(models.Model):
-    """ GOLEM Family History  Management """
-    _name = 'golem.family.history'
-    _description = 'GOLEM Family History Management'
-    _order = 'season_id desc, id desc'
-    _sql_constraints = [('golem_family_history_family_season_uniq',
-                         'UNIQUE (family_id, season_id)',
-                         _('You can only have one history line for each '
-                           'family and season combination.'))]
-
-    family_id = fields.Many2one('golem.family', required=True, auto_join=True,
-                                string='Family', ondelete='cascade')
-    season_id = fields.Many2one('golem.season', required=True, auto_join=True,
-                                string='Season', ondelete='cascade')
-    zip_code = fields.Char(string='ZIP')
-    area_id = fields.Many2one('golem.partner.area', string='Area',
-                              auto_join=True, ondelete='cascade')
-    city = fields.Char()
-    country_id = fields.Many2one('res.country', string='Country')
-    member_ids = fields.Many2many('res.partner', string='Members',
-                                  auto_join=True)

golem_family_history/security/ir.model.access.csv

@@ -1,3 +0,0 @@
-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_family_history/views/golem_family_views.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2018 Youssef El Ouahby <youssef@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
-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_family_form_inherit_golem_family_history">
-      <field name="name">Golem Family form history adaptations</field>
-      <field name="model">golem.family</field>
-      <field name="inherit_id" ref="golem_family.golem_family_form" />
-      <field name="arch" type="xml">
-        <page name="others" position="before">
-          <page name="history" string="History">
-            <field  name="family_history_ids" readonly="1">
-              <tree>
-                <field name="season_id"/>
-                <field name="member_ids"/>
-                <field name="area_id"/>
-                <field name="zip_code"/>
-                <field name="city"/>
-                <field name="country_id"/>
-              </tree>
-            </field>
-          </page>
-        </page>
-      </field>
-    </record>
-
-  </data>
-</odoo>