From d895203d1af9edcea7a526c0fdd9ea74b4abc05e Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Mon, 21 Jan 2019 11:55:19 +0100 Subject: [PATCH] [REF]GOLEM Member : small refactoring on analysis --- golem_member/__manifest__.py | 2 +- golem_member/i18n/fr.po | 13 ++++++++++--- golem_member/i18n/golem_member.pot | 13 ++++++++++--- golem_member/wizard/golem_member_analysis_wizard.py | 2 +- .../wizard/golem_member_analysis_wizard_views.xml | 2 +- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/golem_member/__manifest__.py b/golem_member/__manifest__.py index b550ace..ad26733 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.6.0', + 'version': '10.0.2.6.1', '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 9953ddb..c611693 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 09:40+0000\n" -"PO-Revision-Date: 2019-01-21 10:48+0100\n" +"POT-Creation-Date: 2019-01-21 10:53+0000\n" +"PO-Revision-Date: 2019-01-21 11:54+0100\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -230,6 +230,11 @@ msgstr "Par ville" msgid "By family quotient and area" msgstr "Par quotient familial et territoire" +#. module: golem_member +#: selection:golem.member.analysis.wizard,analyse_type:0 +msgid "By family quotient slice and area" +msgstr "Par tranche de quotient familial et territoire" + #. module: golem_member #: selection:golem.member.analysis.wizard,analyse_type:0 #: model:ir.ui.view,arch_db:golem_member.golem_member_search @@ -924,7 +929,6 @@ msgstr "Usager" #. module: golem_member #: code:addons/golem_member/wizard/golem_member_analysis_wizard.py:99 -#: model:ir.ui.view,arch_db:golem_member.golem_member_analysis_wizard_view_form #, python-format msgid "Member Analysis" msgstr "Analyse des usagers" @@ -1245,8 +1249,11 @@ 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" diff --git a/golem_member/i18n/golem_member.pot b/golem_member/i18n/golem_member.pot index 648a65b..c4f23e6 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 09:39+0000\n" -"PO-Revision-Date: 2019-01-21 09:39+0000\n" +"POT-Creation-Date: 2019-01-21 10:53+0000\n" +"PO-Revision-Date: 2019-01-21 10:53+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -230,6 +230,11 @@ msgstr "" msgid "By family quotient and area" msgstr "" +#. module: golem_member +#: selection:golem.member.analysis.wizard,analyse_type:0 +msgid "By family quotient slice and area" +msgstr "" + #. module: golem_member #: selection:golem.member.analysis.wizard,analyse_type:0 #: model:ir.ui.view,arch_db:golem_member.golem_member_search @@ -918,7 +923,6 @@ msgstr "" #. module: golem_member #: code:addons/golem_member/wizard/golem_member_analysis_wizard.py:99 -#: model:ir.ui.view,arch_db:golem_member.golem_member_analysis_wizard_view_form #, python-format msgid "Member Analysis" msgstr "" @@ -1237,8 +1241,11 @@ 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 "" diff --git a/golem_member/wizard/golem_member_analysis_wizard.py b/golem_member/wizard/golem_member_analysis_wizard.py index 0469ece..1106592 100644 --- a/golem_member/wizard/golem_member_analysis_wizard.py +++ b/golem_member/wizard/golem_member_analysis_wizard.py @@ -33,7 +33,7 @@ class GolemMemberAnalysis(models.TransientModel): domain = [('is_default', '=', True)] return self.env['golem.season'].search(domain, limit=1) - name = fields.Char(default='Service User Analysis') + name = fields.Char(default=_('Service User Analysis')) season_id = fields.Many2one('golem.season', 'Season', required=True, default=default_season, ondelete='cascade') season_start = fields.Date(related='season_id.date_start') diff --git a/golem_member/wizard/golem_member_analysis_wizard_views.xml b/golem_member/wizard/golem_member_analysis_wizard_views.xml index 462eea0..93a35d5 100644 --- a/golem_member/wizard/golem_member_analysis_wizard_views.xml +++ b/golem_member/wizard/golem_member_analysis_wizard_views.xml @@ -25,7 +25,7 @@ along with this program. If not, see . GOLEM Member Analysis Wizard Form golem.member.analysis.wizard -
+