From e3f7a6c62604815cb13f8b58db16753c2b88773d Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Mon, 21 Jan 2019 17:06:27 +0100 Subject: [PATCH] [IMP]GOLEM Analysis : pivot axes, by tag and area.. --- .../__manifest__.py | 2 +- .../wizard/golem_member_analysis_views.xml | 4 +-- golem_member/__manifest__.py | 2 +- golem_member/i18n/fr.po | 24 ++++++++++------- golem_member/i18n/golem_member.pot | 27 ++++++++++++------- .../wizard/golem_member_analysis_views.xml | 3 +++ .../wizard/golem_member_analysis_wizard.py | 2 +- .../wizard/golem_member_analysis_views.xml | 4 +-- 8 files changed, 42 insertions(+), 26 deletions(-) diff --git a/golem_activity_registration_custom_price/__manifest__.py b/golem_activity_registration_custom_price/__manifest__.py index fc5ac2d..7812e6a 100644 --- a/golem_activity_registration_custom_price/__manifest__.py +++ b/golem_activity_registration_custom_price/__manifest__.py @@ -24,7 +24,7 @@ - allow set price per area and slice ; - computes automatically applicable price ; - anticipate ruleset to be implemented for computing.''', - 'version': '10.0.0.3.0', + 'version': '10.0.0.3.1', 'category': 'GOLEM', 'author': 'Fabien Bourgeois', 'license': 'AGPL-3', diff --git a/golem_activity_registration_custom_price/wizard/golem_member_analysis_views.xml b/golem_activity_registration_custom_price/wizard/golem_member_analysis_views.xml index 0557413..c8bcaa5 100644 --- a/golem_activity_registration_custom_price/wizard/golem_member_analysis_views.xml +++ b/golem_activity_registration_custom_price/wizard/golem_member_analysis_views.xml @@ -27,8 +27,8 @@ along with this program. If not, see . golem.member.analysis - - + + diff --git a/golem_member/__manifest__.py b/golem_member/__manifest__.py index 43bd205..32e4374 100644 --- a/golem_member/__manifest__.py +++ b/golem_member/__manifest__.py @@ -21,7 +21,7 @@ 'name': 'GOLEM non-profit members', 'summary': 'Extends Odoo contacts for MJC', 'description': 'Extends Odoo contacts for MJC', - 'version': '10.0.2.7.2', + 'version': '10.0.2.7.3', 'category': 'GOLEM', 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', diff --git a/golem_member/i18n/fr.po b/golem_member/i18n/fr.po index 18afb5c..49ce118 100644 --- a/golem_member/i18n/fr.po +++ b/golem_member/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 14:36+0000\n" -"PO-Revision-Date: 2019-01-21 16:44+0100\n" +"POT-Creation-Date: 2019-01-21 16:01+0000\n" +"PO-Revision-Date: 2019-01-21 17:05+0100\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -243,8 +243,8 @@ msgstr "Par genre" #. module: golem_member #: selection:golem.member.analysis.wizard,analyse_type:0 -msgid "By tag" -msgstr "Par catégorie" +msgid "By tag and area" +msgstr "Par catégorie et territoire" #. module: golem_member #: model:ir.ui.view,arch_db:golem_member.golem_member_numberconfig_form @@ -533,7 +533,7 @@ msgstr "Fax" #. module: golem_member #: code:addons/golem_member/models/golem_member.py:131 -#: code:addons/golem_member/wizard/golem_member_analysis.py:37 +#: code:addons/golem_member/wizard/golem_member_analysis.py:38 #: selection:golem.member.analysis,gender:0 #, python-format msgid "Female" @@ -896,7 +896,7 @@ msgstr "Une trancge d'âge est en conflit avec une autre tranche existante." #. module: golem_member #: code:addons/golem_member/models/golem_member.py:130 -#: code:addons/golem_member/wizard/golem_member_analysis.py:36 +#: code:addons/golem_member/wizard/golem_member_analysis.py:37 #: selection:golem.member.analysis,gender:0 #, python-format msgid "Male" @@ -928,11 +928,16 @@ msgid "Member" msgstr "Usager" #. module: golem_member -#: code:addons/golem_member/wizard/golem_member_analysis_wizard.py:99 +#: code:addons/golem_member/wizard/golem_member_analysis_wizard.py:110 #, python-format msgid "Member Analysis" msgstr "Analyse des usagers" +#. module: golem_member +#: model:ir.model.fields,field_description:golem_member.field_golem_member_analysis_member_analysis_id +msgid "Member analysis id" +msgstr "Analyses usagers" + #. module: golem_member #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name msgid "Member computed name" @@ -1021,7 +1026,7 @@ msgstr "Non" #. module: golem_member #: code:addons/golem_member/models/golem_member.py:132 -#: code:addons/golem_member/wizard/golem_member_analysis.py:38 +#: code:addons/golem_member/wizard/golem_member_analysis.py:39 #: selection:golem.member.analysis,gender:0 #, python-format msgid "Not Disclosed" @@ -1249,14 +1254,13 @@ msgid "Sequence" msgstr "Séquence" #. module: golem_member -#: code:addons/golem_member/wizard/golem_member_analysis_wizard.py:36 #: model:ir.actions.act_window,name:golem_member.golem_analysis_action #: model:ir.ui.menu,name:golem_member.golem_analysis_menu #: model:ir.ui.view,arch_db:golem_member.golem_member_analysis_wizard_view_form -#, python-format msgid "Service User Analysis" msgstr "Analyse des usagers" +#. module: golem_member #: model:ir.actions.act_window,name:golem_member.action_partner_mass_mail msgid "Service User Mass Mailing" msgstr "Mailing aux usagers" diff --git a/golem_member/i18n/golem_member.pot b/golem_member/i18n/golem_member.pot index 7388e6e..b5a477f 100644 --- a/golem_member/i18n/golem_member.pot +++ b/golem_member/i18n/golem_member.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 14:35+0000\n" -"PO-Revision-Date: 2019-01-21 14:35+0000\n" +"POT-Creation-Date: 2019-01-21 16:01+0000\n" +"PO-Revision-Date: 2019-01-21 16:01+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -243,7 +243,7 @@ msgstr "" #. module: golem_member #: selection:golem.member.analysis.wizard,analyse_type:0 -msgid "By tag" +msgid "By tag and area" msgstr "" #. module: golem_member @@ -533,7 +533,7 @@ msgstr "" #. module: golem_member #: code:addons/golem_member/models/golem_member.py:131 -#: code:addons/golem_member/wizard/golem_member_analysis.py:37 +#: code:addons/golem_member/wizard/golem_member_analysis.py:38 #: selection:golem.member.analysis,gender:0 #, python-format msgid "Female" @@ -890,7 +890,7 @@ msgstr "" #. module: golem_member #: code:addons/golem_member/models/golem_member.py:130 -#: code:addons/golem_member/wizard/golem_member_analysis.py:36 +#: code:addons/golem_member/wizard/golem_member_analysis.py:37 #: selection:golem.member.analysis,gender:0 #, python-format msgid "Male" @@ -922,11 +922,16 @@ msgid "Member" msgstr "" #. module: golem_member -#: code:addons/golem_member/wizard/golem_member_analysis_wizard.py:99 +#: code:addons/golem_member/wizard/golem_member_analysis_wizard.py:110 #, python-format msgid "Member Analysis" msgstr "" +#. module: golem_member +#: model:ir.model.fields,field_description:golem_member.field_golem_member_analysis_member_analysis_id +msgid "Member analysis id" +msgstr "" + #. module: golem_member #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name msgid "Member computed name" @@ -1015,8 +1020,9 @@ msgstr "" #. module: golem_member #: code:addons/golem_member/models/golem_member.py:132 -#: code:addons/golem_member/wizard/golem_member_analysis.py:38 +#: code:addons/golem_member/wizard/golem_member_analysis.py:39 #: selection:golem.member.analysis,gender:0 +#, python-format msgid "Not Disclosed" msgstr "" @@ -1240,14 +1246,17 @@ msgid "Sequence" msgstr "" #. module: golem_member -#: code:addons/golem_member/wizard/golem_member_analysis_wizard.py:36 #: model:ir.actions.act_window,name:golem_member.golem_analysis_action #: model:ir.ui.menu,name:golem_member.golem_analysis_menu #: model:ir.ui.view,arch_db:golem_member.golem_member_analysis_wizard_view_form -#, python-format msgid "Service User Analysis" msgstr "" +#. module: golem_member +#: model:ir.actions.act_window,name:golem_member.action_partner_mass_mail +msgid "Service User Mass Mailing" +msgstr "" + #. module: golem_member #: model:ir.ui.menu,name:golem_member.res_partner_category_menu msgid "Service User Tags" diff --git a/golem_member/wizard/golem_member_analysis_views.xml b/golem_member/wizard/golem_member_analysis_views.xml index 070f6ab..ff4137a 100644 --- a/golem_member/wizard/golem_member_analysis_views.xml +++ b/golem_member/wizard/golem_member_analysis_views.xml @@ -106,6 +106,7 @@ along with this program. If not, see . + @@ -116,6 +117,7 @@ along with this program. If not, see . + @@ -126,6 +128,7 @@ along with this program. If not, see . + diff --git a/golem_member/wizard/golem_member_analysis_wizard.py b/golem_member/wizard/golem_member_analysis_wizard.py index 124843d..8acc82e 100644 --- a/golem_member/wizard/golem_member_analysis_wizard.py +++ b/golem_member/wizard/golem_member_analysis_wizard.py @@ -39,7 +39,7 @@ class GolemMemberAnalysis(models.TransientModel): season_start = fields.Date(related='season_id.date_start') season_end = fields.Date(related='season_id.date_end') analyse_type = fields.Selection([('gender', 'By gender'), ('area', 'By area'), - ('tag', 'By tag')], required=True, + ('tag', 'By tag and area')], required=True, default='gender') age_computing = fields.Selection([('season_start', 'At season start'), ('season_end', 'At season stop'), diff --git a/golem_member_familyquotient/wizard/golem_member_analysis_views.xml b/golem_member_familyquotient/wizard/golem_member_analysis_views.xml index 06cfa98..8070e7f 100644 --- a/golem_member_familyquotient/wizard/golem_member_analysis_views.xml +++ b/golem_member_familyquotient/wizard/golem_member_analysis_views.xml @@ -27,8 +27,8 @@ along with this program. If not, see . golem.member.analysis - - + +