[DATABASE] +"newsletter" and "want_to_be_volunteer" fields

[VIEW] +replace volunteer activities by "newsletter" and
"want_to_be_volunteer" fields

diff --git a/__init__.py b/__init__.py
index 6477737..73c846d 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -21,4 +21,6 @@
 #
 ##############################################################################
 
+import eturecup
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/eturecup.py b/eturecup.py
new file mode 100644 (file)
index 0000000..3648b47
--- /dev/null
+++ b/eturecup.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    eturecup module for OpenERP, Custom module for Étu'Récup
+#    Copyright (C) 2014-2015 Étu'Récup (<http://www.eturecup.org/>)
+#
+#    This file is a part of eturecup
+#
+#    eturecup is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    eturecup is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv
+from openerp.osv import orm
+from openerp.osv import fields
+
+
+class Partner(orm.Model):
+    _inherit = 'res.partner'
+
+    _columns = {
+        'newsletter': fields.boolean('Do you want to receive our monthly newsletter?'),
+        'want_to_be_volunteer': fields.boolean(
+            'Do you want to receive some informations about volunteer activities?',
+            help='… in company and its activities: bikecoop, events, …'),
+    }
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/i18n/eturecup.pot b/i18n/eturecup.pot
index 8529fbc..642476a 100644 (file)
--- a/i18n/eturecup.pot
+++ b/i18n/eturecup.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-10 10:57+0000\n"
-"PO-Revision-Date: 2014-12-10 10:57+0000\n"
+"POT-Creation-Date: 2015-11-23 07:07+0000\n"
+"PO-Revision-Date: 2015-11-23 07:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: eturecup
+#: field:res.partner,newsletter:0
+msgid "Do you want to receive our monthly newsletter?"
+msgstr ""
+
+#. module: eturecup
+#: help:res.partner,want_to_be_volunteer:0
+msgid "… in company and its activities: bikecoop, events, …"
+msgstr ""
+
+#. module: eturecup
+#: field:res.partner,parent_name:0
+msgid "Parent name"
+msgstr ""
+
 #. module: eturecup
 #: view:res.partner:0
 msgid "This is a special functionnality for Étu'Récup that doesn't use the point of sale at moment. It's not a permanent functionnality."
@@ -22,11 +37,21 @@ msgstr ""
 
 #. module: eturecup
 #: view:res.partner:0
-msgid "Invoice membership"
+msgid "Join membership"
+msgstr ""
+
+#. module: eturecup
+#: model:ir.model,name:eturecup.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: eturecup
 #: view:res.partner:0
-msgid "Join membership"
+msgid "Invoice membership"
+msgstr ""
+
+#. module: eturecup
+#: field:res.partner,want_to_be_volunteer:0
+msgid "Do you want to receive some informations about volunteer activities?"
 msgstr ""
 

diff --git a/i18n/fr.po b/i18n/fr.po
index a83f260..fd4cc5f 100644 (file)
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-10 10:57+0000\n"
-"PO-Revision-Date: 2014-12-10 11:58+0100\n"
+"POT-Creation-Date: 2015-11-23 08:07+0100\n"
+"PO-Revision-Date: 2015-11-23 08:07+0100\n"
 "Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -15,7 +15,25 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.6\n"
+
+#. module: eturecup
+#: field:res.partner,newsletter:0
+msgid "Do you want to receive our monthly newsletter?"
+msgstr "Recevoir la newsletter mensuelle d'Etu'Récup?"
+
+#. module: eturecup
+#: help:res.partner,want_to_be_volunteer:0
+#, fuzzy
+msgid "… in company and its activities: bikecoop, events, …"
+msgstr ""
+"… dans la vie de l'association et ses activités: ateliers, collecte, "
+"événements, ..."
+
+#. module: eturecup
+#: field:res.partner,parent_name:0
+msgid "Parent name"
+msgstr "Partenaire parent"
 
 #. module: eturecup
 #: view:res.partner:0
@@ -26,12 +44,25 @@ msgstr ""
 "Ceci est une fonctionnalité pour Étu'Récup qui n'utilise pas le point de "
 "vente pour le moment. Ce n'est pas une fonctionnalité permanente."
 
+#. module: eturecup
+#: view:res.partner:0
+msgid "Join membership"
+msgstr "Prendre une adhésion"
+
+#. module: eturecup
+#: model:ir.model,name:eturecup.model_res_partner
+#, fuzzy
+msgid "Partner"
+msgstr "Partenaire"
+
 #. module: eturecup
 #: view:res.partner:0
 msgid "Invoice membership"
 msgstr "Facturer une cotisation"
 
 #. module: eturecup
-#: view:res.partner:0
-msgid "Join membership"
-msgstr "Prendre une adhésion"
+#: field:res.partner,want_to_be_volunteer:0
+msgid "Do you want to receive some informations about volunteer activities?"
+msgstr ""
+"Recevoir des informations supplémentaires pour m'impliquer en tant que "
+"bénévole?"

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index 4ec3683..7b2e158 100644 (file)
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -14,5 +14,20 @@
                 </xpath>
             </field>
         </record>
+        <record id="view_bikecoop_members_form" model="ir.ui.view">
+            <field name="name">res.partner.form</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="bikecoop.view_bikecoop_members_form"/>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[@name='Volunteer activities']" position="replace">
+                    <group colspan="4">
+                        <field name="newsletter"/>
+                        <field name="want_to_be_volunteer"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+            
     </data>
 </openerp>