Browse Source

[IMP]GOLEM Analysis : pivot axes, by tag and area..

master
Fabien BOURGEOIS 1 year ago
parent
commit
e3f7a6c626
8 changed files with 42 additions and 26 deletions
  1. +1
    -1
      golem_activity_registration_custom_price/__manifest__.py
  2. +2
    -2
      golem_activity_registration_custom_price/wizard/golem_member_analysis_views.xml
  3. +1
    -1
      golem_member/__manifest__.py
  4. +14
    -10
      golem_member/i18n/fr.po
  5. +18
    -9
      golem_member/i18n/golem_member.pot
  6. +3
    -0
      golem_member/wizard/golem_member_analysis_views.xml
  7. +1
    -1
      golem_member/wizard/golem_member_analysis_wizard.py
  8. +2
    -2
      golem_member_familyquotient/wizard/golem_member_analysis_views.xml

+ 1
- 1
golem_activity_registration_custom_price/__manifest__.py View File

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


+ 2
- 2
golem_activity_registration_custom_price/wizard/golem_member_analysis_views.xml View File

@@ -27,8 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="model">golem.member.analysis</field>
<field name="arch" type="xml">
<pivot string="Service User Analysis">
<field name="area_id" type="row"/>
<field name="family_quotient_slice_id" type="col"/>
<field name="area_id" type="col"/>
<field name="family_quotient_slice_id" type="row"/>
</pivot>
</field>
</record>


+ 1
- 1
golem_member/__manifest__.py View File

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


+ 14
- 10
golem_member/i18n/fr.po View File

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


+ 18
- 9
golem_member/i18n/golem_member.pot View File

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


+ 3
- 0
golem_member/wizard/golem_member_analysis_views.xml View File

@@ -106,6 +106,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<pivot string="Service user Analysis">
<field name="age_range_start_season" type="col"/>
<field name="category_id" type="row"/>
<field name="area_id" type="row"/>
</pivot>
</field>
</record>
@@ -116,6 +117,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<pivot string="Service user Analysis">
<field name="age_range_end_season" type="col"/>
<field name="category_id" type="row"/>
<field name="area_id" type="row"/>
</pivot>
</field>
</record>
@@ -126,6 +128,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<pivot string="Service user Analysis">
<field name="age_range_now" type="col"/>
<field name="category_id" type="row"/>
<field name="area_id" type="row"/>
</pivot>
</field>
</record>


+ 1
- 1
golem_member/wizard/golem_member_analysis_wizard.py View File

@@ -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'),


+ 2
- 2
golem_member_familyquotient/wizard/golem_member_analysis_views.xml View File

@@ -27,8 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="model">golem.member.analysis</field>
<field name="arch" type="xml">
<pivot string="Service User Analysis">
<field name="area_id" type="row"/>
<field name="family_quotient" type="col"/>
<field name="area_id" type="col"/>
<field name="family_quotient" type="row"/>
</pivot>
</field>
</record>


Loading…
Cancel
Save