youssef/GOLEM
2
0
Fork 0
forked from Yaltik/golem
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into analysis

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2019-01-21 16:46:37 +01:00
commit a533a6b7f8
4 changed files with 28 additions and 7 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.1', 'version': '10.0.2.7.1',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois, Michel Dessenne', 'author': 'Fabien Bourgeois, Michel Dessenne',
'license': 'AGPL-3', 'license': 'AGPL-3',

8
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 10:53+0000\n" "POT-Creation-Date: 2019-01-21 14:36+0000\n"
"PO-Revision-Date: 2019-01-21 11:54+0100\n" "PO-Revision-Date: 2019-01-21 16:44+0100\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -1257,6 +1257,10 @@ msgstr "Séquence"
msgid "Service User Analysis" msgid "Service User Analysis"
msgstr "Analyse des usagers" msgstr "Analyse des usagers"
#: model:ir.actions.act_window,name:golem_member.action_partner_mass_mail
msgid "Service User Mass Mailing"
msgstr "Mailing aux usagers"
#. module: golem_member #. module: golem_member
#: model:ir.ui.menu,name:golem_member.res_partner_category_menu #: model:ir.ui.menu,name:golem_member.res_partner_category_menu
msgid "Service User Tags" msgid "Service User Tags"

5
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 10:53+0000\n" "POT-Creation-Date: 2019-01-21 14:35+0000\n"
"PO-Revision-Date: 2019-01-21 10:53+0000\n" "PO-Revision-Date: 2019-01-21 14:35+0000\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -1017,7 +1017,6 @@ msgstr ""
#: code:addons/golem_member/models/golem_member.py:132 #: 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:38
#: selection:golem.member.analysis,gender:0 #: selection:golem.member.analysis,gender:0
#, python-format
msgid "Not Disclosed" msgid "Not Disclosed"
msgstr "" msgstr ""

20
golem_member/views/golem_member_views.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright 2017-2018 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
@ -38,6 +38,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<!-- TMP: from mail base addons, urgency before PR42 -->
<record id="email_template_partner" model="mail.template">
<field name="name">Service User Mass Mail</field>
<field name="model_id" ref="golem_member.model_golem_member"/>
<field name="auto_delete" eval="True"/>
<field name="partner_to">${object.partner_id.id}</field>
</record>
<act_window name="Service User Mass Mailing" res_model="mail.compose.message"
src_model="golem.member" view_mode="form" multi="True" target="new"
key2="client_action_multi" id="action_partner_mass_mail"
context="{'default_composition_mode': 'mass_mail',
'default_partner_to': '${object.partner_id.id or \'\'}',
'default_use_template': True,
'default_template_id': ref('email_template_partner')}"/>
<record id="email_template_partner" model="mail.template">
<field name="ref_ir_act_window" ref="action_partner_mass_mail"/>
</record>
<!-- 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>