Yaltik/golem
1
0
Fork 2
Code Issues Pull Requests 4 Releases Activity

[REF]GOLEM Member : small refactoring on analysis

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2019-01-21 11:55:19 +01:00
parent 9bc6ffd6bb
commit d895203d1a
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_member/__manifest__.py
View File

@ -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.6.0', 'version': '10.0.2.6.1',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne', 'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3', 'license': 'AGPL-3',

13
golem_member/i18n/fr.po
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: 2019-01-21 09:40+0000\n" "POT-Creation-Date: 2019-01-21 10:53+0000\n"
"PO-Revision-Date: 2019-01-21 10:48+0100\n" "PO-Revision-Date: 2019-01-21 11:54+0100\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -230,6 +230,11 @@ msgstr "Par ville"
msgid "By family quotient and area" msgid "By family quotient and area"
msgstr "Par quotient familial et territoire" 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 #. module: golem_member
#: selection:golem.member.analysis.wizard,analyse_type:0 #: selection:golem.member.analysis.wizard,analyse_type:0
#: model:ir.ui.view,arch_db:golem_member.golem_member_search #: model:ir.ui.view,arch_db:golem_member.golem_member_search
@ -924,7 +929,6 @@ msgstr "Usager"
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/wizard/golem_member_analysis_wizard.py:99 #: 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 #, python-format
msgid "Member Analysis" msgid "Member Analysis"
msgstr "Analyse des usagers" msgstr "Analyse des usagers"
@ -1245,8 +1249,11 @@ msgid "Sequence"
msgstr "Séquence" msgstr "Séquence"
#. module: golem_member #. 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.actions.act_window,name:golem_member.golem_analysis_action
#: model:ir.ui.menu,name:golem_member.golem_analysis_menu #: 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" msgid "Service User Analysis"
msgstr "Analyse des usagers" msgstr "Analyse des usagers"

13
golem_member/i18n/golem_member.pot
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: 2019-01-21 09:39+0000\n" "POT-Creation-Date: 2019-01-21 10:53+0000\n"
"PO-Revision-Date: 2019-01-21 09:39+0000\n" "PO-Revision-Date: 2019-01-21 10:53+0000\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -230,6 +230,11 @@ msgstr ""
msgid "By family quotient and area" msgid "By family quotient and area"
msgstr "" msgstr ""
#. module: golem_member
#: selection:golem.member.analysis.wizard,analyse_type:0
msgid "By family quotient slice and area"
msgstr ""
#. module: golem_member #. module: golem_member
#: selection:golem.member.analysis.wizard,analyse_type:0 #: selection:golem.member.analysis.wizard,analyse_type:0
#: model:ir.ui.view,arch_db:golem_member.golem_member_search #: model:ir.ui.view,arch_db:golem_member.golem_member_search
@ -918,7 +923,6 @@ msgstr ""
#. module: golem_member #. module: golem_member
#: code:addons/golem_member/wizard/golem_member_analysis_wizard.py:99 #: 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 #, python-format
msgid "Member Analysis" msgid "Member Analysis"
msgstr "" msgstr ""
@ -1237,8 +1241,11 @@ msgid "Sequence"
msgstr "" msgstr ""
#. module: golem_member #. 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.actions.act_window,name:golem_member.golem_analysis_action
#: model:ir.ui.menu,name:golem_member.golem_analysis_menu #: 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" msgid "Service User Analysis"
msgstr "" msgstr ""

2
golem_member/wizard/golem_member_analysis_wizard.py
View File

@ -33,7 +33,7 @@ class GolemMemberAnalysis(models.TransientModel):
domain = [('is_default', '=', True)] domain = [('is_default', '=', True)]
return self.env['golem.season'].search(domain, limit=1) 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, season_id = fields.Many2one('golem.season', 'Season', required=True,
default=default_season, ondelete='cascade') default=default_season, ondelete='cascade')
season_start = fields.Date(related='season_id.date_start') season_start = fields.Date(related='season_id.date_start')

2
golem_member/wizard/golem_member_analysis_wizard_views.xml
View File

@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="name">GOLEM Member Analysis Wizard Form</field> <field name="name">GOLEM Member Analysis Wizard Form</field>
<field name="model">golem.member.analysis.wizard</field> <field name="model">golem.member.analysis.wizard</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Member Analysis"> <form string="Service User Analysis">
<sheet> <sheet>
<group> <group>
<group> <group>