Compare commits

..

No commits in common. "master" and "Compte_CA_acces_en_lecture" have entirely different histories.

43 changed files with 97 additions and 355 deletions

View File

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

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com> 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 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 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 --> <!-- Actions -->
<act_window id="golem_activity_action" name="GOLEM Activities" <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" <act_window id="golem_activity_type_action" name="GOLEM Activity Types"
res_model="golem.activity.type" view_mode="tree" /> res_model="golem.activity.type" view_mode="tree" />
<act_window id="golem_activity_audience_action" name="GOLEM Activity Audiences" <act_window id="golem_activity_audience_action" name="GOLEM Activity Audiences"

View File

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

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright 2017-2020 Fabien Bourgeois <fabien@yaltik.com> Copyright 2017-2019 Fabien Bourgeois <fabien@yaltik.com>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU Affero General Public License as published by

View File

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

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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 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 it under the terms of the GNU Affero General Public License as published by

View File

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

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?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 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 it under the terms of the GNU Affero General Public License as published by

View File

@ -1,7 +1,6 @@
# -*- coding: utf-8 -*- # -*- 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 # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -19,7 +18,7 @@
{ {
'name': 'GOLEM base module for global dependencies', 'name': 'GOLEM base module for global dependencies',
'summary': 'GOLEM base installs base and shared dependencies for GOLEM', 'summary': 'GOLEM base installs base and shared dependencies for GOLEM',
'version': '10.0.1.1.2', 'version': '10.0.1.0.5',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois', 'author': 'Fabien Bourgeois',
'license': 'AGPL-3', 'license': 'AGPL-3',

View File

@ -6,19 +6,15 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 10.0\n" "Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \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" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \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 #. module: golem_base
#: model:res.groups,name:golem_base.group_golem_manager #: model:res.groups,name:golem_base.group_golem_manager
@ -35,11 +31,6 @@ msgstr "Utilisateur"
msgid "Membership Products" msgid "Membership Products"
msgstr "Types d'adhésions" 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 #. module: base
#: model:ir.actions.act_window,name:base.action_res_company_form #: model:ir.actions.act_window,name:base.action_res_company_form
#: model:ir.actions.act_window,name:base.company_normal_action_tree #: model:ir.actions.act_window,name:base.company_normal_action_tree

View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 10.0\n" "Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \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" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -15,11 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: \n" "Content-Transfer-Encoding: \n"
"Plural-Forms: \n" "Plural-Forms: \n"
#. module: golem_base
#: model:res.groups,name:golem_base.group_golem_auditor
msgid "GOLEM Auditor"
msgstr ""
#. module: golem_base #. module: golem_base
#: model:res.groups,name:golem_base.group_golem_manager #: model:res.groups,name:golem_base.group_golem_manager
msgid "GOLEM Manager" msgid "GOLEM Manager"
@ -35,8 +30,3 @@ msgstr ""
msgid "Membership Products" msgid "Membership Products"
msgstr "" msgstr ""
#. module: golem_base
#: model:ir.model,name:golem_base.model_ir_mail_server
msgid "ir.mail_server"
msgstr ""

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- 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 # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # 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): class IrMailServer(models.Model):
""" IR Mail Server adaptations """ """IR Mail Server fix for >64 characters pass """
_inherit = 'ir.mail_server' _inherit = 'ir.mail_server'
# IR Mail Server fix for >64 characters pass
smtp_user = fields.Char(size=100) smtp_user = fields.Char(size=100)
smtp_pass = 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

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?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 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 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> <odoo>
<data noupdate="0"> <data noupdate="0">
<!-- Groups --> <!-- 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"> <record id="group_golem_user" model="res.groups">
<field name="name">GOLEM user</field> <field name="name">GOLEM user</field>
<field name="category_id" <field name="category_id"
@ -37,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<record id="group_golem_auditor" model="res.groups"> <record id="group_golem_auditor" model="res.groups">
<field name="name">GOLEM Auditor</field> <field name="name">GOLEM Auditor</field>
<field name="category_id" ref="base.module_category_golem"/> <field name="category_id" ref="base.module_category_golem"/>
<field name="implied_ids" eval="[(4, ref('base.group_portal'))]"/>
</record> </record>
<record id="group_golem_manager" model="res.groups"> <record id="group_golem_manager" model="res.groups">

View File

@ -1,11 +1,7 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink 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_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_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_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_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_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 access_account_account_tag_auditor,Access Account Account Tax Auditor,account.model_account_account_tag,group_golem_auditor,1,0,0,0

1 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
2 access_account_invoice_tax_auditor Access Account Invoice Tax Auditor account.model_account_invoice_tax group_golem_auditor 1 0 0 0
3 access_account_invoice_line_auditor Access Account Invoice Line Auditor account.model_account_invoice_line group_golem_auditor 1 0 0 0
4 access_account_move_line_auditor Access Account Move Line Auditor account.model_account_move_line group_golem_auditor 1 0 0 0
5 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
6 access_account_voucher_line_auditor Access Account Voucher Line Auditor account_voucher.model_account_voucher_line group_golem_auditor 1 0 0 0
7 access_account_account_tag_auditor Access Account Account Tax Auditor account.model_account_account_tag group_golem_auditor 1 0 0 0

View File

@ -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/>.

View File

@ -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']
}

View File

@ -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"

View File

@ -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 ""

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -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>

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2017-2021 Fabien Bourgeois <fabien@yaltik.com> # Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
# Copyright 2018 Youssef El Ouahby <youssef@yaltik.com> # Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
@ -42,16 +42,6 @@ class ResPartner(models.Model):
index=True) index=True)
family_count = fields.Integer(related='family_id.count') 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 @api.multi
def button_family_members(self): def button_family_members(self):
""" Go to family view, from partner """ """ Go to family view, from partner """

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright 2017-2020 Fabien Bourgeois <fabien@yaltik.com> Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
Copyright 2018-2020 Youssef El Ouahby <youssef@yaltik.com> Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU Affero General Public License as published by

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?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 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 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="arch" type="xml">
<field name="name" position="after"> <field name="name" position="after">
<field name="family_id" /> <field name="family_id" />
<field name="family_member_names" />
</field> </field>
</field> </field>
</record> </record>

View File

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

View File

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

View File

@ -11,3 +11,5 @@ access_ir_config_parameter_manager,Access IR Config Parameter Manager,base.model
access_golem_age_range_manager,Access Golem Age Range Manager,model_golem_member_age_range,golem_base.group_golem_manager,1,1,1,1 access_golem_age_range_manager,Access Golem Age Range Manager,model_golem_member_age_range,golem_base.group_golem_manager,1,1,1,1
access_golem_age_range_auditor,Access Golem Age Range Auditor,model_golem_member_age_range,golem_base.group_golem_auditor,1,0,0,0 access_golem_age_range_auditor,Access Golem Age Range Auditor,model_golem_member_age_range,golem_base.group_golem_auditor,1,0,0,0
access_golem_age_range_user,Access Golem Age Range User,model_golem_member_age_range,golem_base.group_golem_user,1,0,0,0 access_golem_age_range_user,Access Golem Age Range User,model_golem_member_age_range,golem_base.group_golem_user,1,0,0,0
access_product_template_auditor,Access Product Template Auditor,product.model_product_template,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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
11 access_golem_age_range_manager Access Golem Age Range Manager model_golem_member_age_range golem_base.group_golem_manager 1 1 1 1
12 access_golem_age_range_auditor Access Golem Age Range Auditor model_golem_member_age_range golem_base.group_golem_auditor 1 0 0 0
13 access_golem_age_range_user Access Golem Age Range User model_golem_member_age_range golem_base.group_golem_user 1 0 0 0
14 access_product_template_auditor Access Product Template Auditor product.model_product_template golem_base.group_golem_auditor 1 0 0 0
15 access_res_partner_category_auditor Access Res Partner Category Auditor base.model_res_partner_category golem_base.group_golem_auditor 1 0 0 0

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright 2017-2020 Fabien Bourgeois <fabien@yaltik.com> Copyright 2017-2019 Fabien Bourgeois <fabien@yaltik.com>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU Affero General Public License as published by
@ -55,7 +55,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<record id="email_template_partner" model="mail.template"> <record id="email_template_partner" model="mail.template">
<field name="ref_ir_act_window" ref="action_partner_mass_mail"/> <field name="ref_ir_act_window" ref="action_partner_mass_mail"/>
</record> </record>
0
<!-- Forms --> <!-- Forms -->
<record id="golem_member_form" model="ir.ui.view"> <record id="golem_member_form" model="ir.ui.view">
<field name="name">GOLEM Member Form</field> <field name="name">GOLEM Member Form</field>
@ -217,8 +217,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="city" /> <field name="city" />
<field name="country_id" /> <field name="country_id" />
<field name="number" /> <field name="number" />
<field name="number_manual" />
<field name="is_number_manual" />
<field name="season_ids" /> <field name="season_ids" />
<field name="category_id"/> <field name="category_id"/>
<templates> <templates>
@ -237,8 +235,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<div class="oe_kanban_details"> <div class="oe_kanban_details">
<h4 class="oe_partner_heading"> <h4 class="oe_partner_heading">
<a type="open"><field name="display_name" /></a> <a type="open"><field name="display_name" /></a>
<t t-if="record.is_number_manual == False and record.number.raw_value != ''">(N° <field name="number" />)</t> <t t-if="record.number.raw_value != ''">(N° <field name="number" />)</t>
<t t-if="record.is_number_manual and record.number_manual.raw_value != ''">(N° <field name="number_manual" />)</t>
</h4> </h4>
<div class="oe_kanban_partner_categories" /> <div class="oe_kanban_partner_categories" />
<div class="oe_kanban_partner_links" /> <div class="oe_kanban_partner_links" />
@ -283,7 +280,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<tree string="GOLEM Members"> <tree string="GOLEM Members">
<field name="season_ids" options="{'no_create': True}" /> <field name="season_ids" options="{'no_create': True}" />
<field name="number" /> <field name="number" />
<field name="number_manual" string="Member number" />
<field name="name" /> <field name="name" />
<field name="contact_address" /> <field name="contact_address" />
<field name="phone" /> <field name="phone" />
@ -299,8 +295,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="model">golem.member</field> <field name="model">golem.member</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search> <search>
<field name="number" <field name="number" />
filter_domain="['|', ('number', 'ilike', self), ('number_manual', 'ilike', self)]" />
<field name="name" /> <field name="name" />
<field name="season_ids" widget="many2one" /> <field name="season_ids" widget="many2one" />
<field name="area_id" /> <field name="area_id" />

View File

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

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?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 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 it under the terms of the GNU Affero General Public License as published by

View File

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

View File

@ -5,6 +5,9 @@ access_golem_payment_schedule_manager,Access GOLEM Payment Schedule Manager,mode
access_golem_payment_schedule_day_auditor,Access GOLEM Payment Schedule Day Auditor,model_golem_payment_schedule_day,golem_base.group_golem_auditor,1,0,0,0 access_golem_payment_schedule_day_auditor,Access GOLEM Payment Schedule Day Auditor,model_golem_payment_schedule_day,golem_base.group_golem_auditor,1,0,0,0
access_golem_payment_schedule_day_user,Access GOLEM Payment Schedule Day User,model_golem_payment_schedule_day,golem_base.group_golem_user,1,0,0,0 access_golem_payment_schedule_day_user,Access GOLEM Payment Schedule Day User,model_golem_payment_schedule_day,golem_base.group_golem_user,1,0,0,0
access_golem_payment_schedule_day_manager,Access GOLEM Payment Schedule Day Manager,model_golem_payment_schedule_day,golem_base.group_golem_manager,1,1,1,1 access_golem_payment_schedule_day_manager,Access GOLEM Payment Schedule Day Manager,model_golem_payment_schedule_day,golem_base.group_golem_manager,1,1,1,1
access_account_invoice_auditor,Access Account Invoice Auditor,account.model_account_invoice,golem_base.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_res_partner_auditor,Access Res Partner Auditor,base.model_res_partner,golem_base.group_golem_auditor,1,0,0,0
access_product_template_auditor,Access Product Template Auditor,product.model_product_template,golem_base.group_golem_auditor,1,0,0,0 access_product_template_auditor,Access Product Template Auditor,product.model_product_template,golem_base.group_golem_auditor,1,0,0,0
access_account_payment_auditor,Access Account Payment Auditor,account.model_account_payment,golem_base.group_golem_auditor,1,0,0,0 access_account_payment_auditor,Access Account Payment Auditor,account.model_account_payment,golem_base.group_golem_auditor,1,0,0,0
access_payment_acquirer_auditor,Access Payment Acquirer Auditor,payment.model_payment_acquirer,golem_base.group_golem_auditor,1,0,0,0 access_payment_acquirer_auditor,Access Payment Acquirer Auditor,payment.model_payment_acquirer,golem_base.group_golem_auditor,1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
5 access_golem_payment_schedule_day_auditor Access GOLEM Payment Schedule Day Auditor model_golem_payment_schedule_day golem_base.group_golem_auditor 1 0 0 0
6 access_golem_payment_schedule_day_user Access GOLEM Payment Schedule Day User model_golem_payment_schedule_day golem_base.group_golem_user 1 0 0 0
7 access_golem_payment_schedule_day_manager Access GOLEM Payment Schedule Day Manager model_golem_payment_schedule_day golem_base.group_golem_manager 1 1 1 1
8 access_account_invoice_auditor Access Account Invoice Auditor account.model_account_invoice golem_base.group_golem_auditor 1 0 0 0
9 access_account_voucher_auditor Access Account Voucher Auditor account_voucher.model_account_voucher golem_base.group_golem_auditor 1 0 0 0
10 access_res_partner_auditor Access Res Partner Auditor base.model_res_partner golem_base.group_golem_auditor 1 0 0 0
11 access_product_template_auditor Access Product Template Auditor product.model_product_template golem_base.group_golem_auditor 1 0 0 0
12 access_account_payment_auditor Access Account Payment Auditor account.model_account_payment golem_base.group_golem_auditor 1 0 0 0
13 access_payment_acquirer_auditor Access Payment Acquirer Auditor payment.model_payment_acquirer golem_base.group_golem_auditor 1 0 0 0

View File

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

View File

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

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright 2018-2020 Youssef El Ouahby <youssef@yaltik.com> Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
Copyright 2018-2020 Fabien Bourgeois <fabien@yaltik.com> Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU Affero General Public License as published by

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright 2016-2022 Fabien Bourgeois <fabien@yaltik.com> Copyright 2016-2018 Fabien Bourgeois <fabien@yaltik.com>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU Affero General Public License as published by
@ -42,7 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
attrs="{'required': [('date_end', '!=', False)]}" /> attrs="{'required': [('date_end', '!=', False)]}" />
<field name="date_end" <field name="date_end"
attrs="{'required': [('date_start', '!=', False)]}" /> attrs="{'required': [('date_start', '!=', False)]}" />
<field name="active" />
</group> </group>
</sheet> </sheet>
</form> </form>
@ -72,9 +71,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="name" /> <field name="name" />
<filter name="default_season" string="Default season" <filter name="default_season" string="Default season"
domain="[('is_default', '=', True)]" /> domain="[('is_default', '=', True)]" />
<separator />
<filter name="inactive" string="Inactive"
domain="[('active', '=', False)]" />
</search> </search>
</field> </field>
</record> </record>