[PYTHON][VIEW][TRANS] -scholarship informations

diff --git a/i18n/fr.po b/i18n/fr.po
index fda823f..bd5c7c9 100644 (file)
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -6,33 +6,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-12 07:32+0000\n"
-"PO-Revision-Date: 2018-10-12 09:39+0200\n"
+"POT-Creation-Date: 2018-10-12 09:37+0000\n"
+"PO-Revision-Date: 2018-10-12 11:39+0200\n"
+"Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>\n"
 "Language-Team: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.1.1\n"
-"Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage."
-"org>\n"
-"Language: fr\n"
-
-#. module: letriseratop
-#: field:res.partner,newsletter:0
-msgid "Do you want to receive our monthly newsletter?"
-msgstr "Voulez-vous recevoir notre lettre d'information mensuelle?"
 
 #. module: letriseratop
-#: field:res.partner,is_student:0
-msgid "Student?"
-msgstr "Étudiant·es?"
+#: view:res.partner:0
+msgid ""
+"This is a special functionnality for Le Tri Sera Top that doesn't use the "
+"point of sale at moment. It's not a permanent functionnality."
+msgstr ""
 
 #. module: letriseratop
 #: model:ir.model,name:letriseratop.model_bikecoop_partner_theme
 msgid "Themes that could be related to a partner"
 msgstr "Thèmes pouvant être liées à un partenaire"
 
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_6
+msgid "Service"
+msgstr ""
+
 #. module: letriseratop
 #: help:res.partner,want_to_be_volunteer:0
 msgid "… in company and its activities: bikecoop, events, …"
@@ -41,13 +42,29 @@ msgstr ""
 "événements, …"
 
 #. module: letriseratop
-#: constraint:res.partner:0
-msgid ""
-"Error: This partner can't be a         scholarship because s·he isn't a "
-"student."
+#: model:product.template,name:letriseratop.product_product_PNSCH_product_template
+msgid "Pneu 700x28 schwalbe"
+msgstr "Pneu 700x28 schwalbe"
+
+#. module: letriseratop
+#: help:bikecoop.partner.theme,type:0
+msgid "An extra field to categorize themes."
+msgstr "Un champs supplémentaire pour catégoriser les thèmes."
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_AT_product_template
+msgid "Adhésion atelier"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_AS_product_template
+msgid "Adhésion soutien"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_1
+msgid "Adhésions"
 msgstr ""
-"Erreur: ce·tte partenaire ne peut pas être boursier·e car ce n'est pas "
-"un·e étudiant·e."
 
 #. module: letriseratop
 #: field:bikecoop.partner.theme,type:0
@@ -55,30 +72,58 @@ msgid "Type"
 msgstr "Type"
 
 #. module: letriseratop
-#: field:res.partner,want_to_be_volunteer:0
-msgid ""
-"Do you want to receive some informations about volunteer             "
-"activities?"
+#: model:product.template,name:letriseratop.product_product_B4_product_template
+msgid "Électroménager"
 msgstr ""
-"Recevoir des informations supplémentaires pour m'impliquer en tant que "
-"bénévole dans la vie de l'association et ces activités (ateliers, "
-"collecte, événements, …)?"
 
 #. module: letriseratop
-#: help:bikecoop.partner.theme,type:0
-msgid "An extra field to categorize themes."
-msgstr "Un champs supplémentaire pour catégoriser les thèmes."
+#: model:product.template,name:letriseratop.product_product_S2_product_template
+msgid "Prestation extérieure"
+msgstr ""
 
 #. module: letriseratop
-#: help:res.partner,is_scholarship:0
-msgid "Is this student a scholarship?"
-msgstr "Cet·te étudiant·e est il·le boursier·es?"
+#: model:product.category,name:letriseratop.product_category_3
+msgid "Matériel neuf"
+msgstr "Matériel neuf"
 
 #. module: letriseratop
-#: view:res.partner:0
-msgid ""
-"This is a special functionnality for Le Tri Sera Top that doesn't use the "
-"point of sale at moment. It's not a permanent functionnality."
+#: model:product.template,name:letriseratop.product_product_ADHC_product_template
+msgid "Adhésion classique"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_B5_product_template
+msgid "Décoration"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_A2_product_template
+msgid "Vélo"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_ADHF_product_template
+msgid "Adhésion famille"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_4
+msgid "Matériel d'occasion"
+msgstr "Matériel d'occasion"
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_A4_product_template
+msgid "Autres vélo"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_0
+msgid "Tous"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_AB_product_template
+msgid "Adhésion boutique"
 msgstr ""
 
 #. module: letriseratop
@@ -86,6 +131,51 @@ msgstr ""
 msgid "Join membership"
 msgstr "Prendre une adhésion"
 
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_ADHPB_product_template
+msgid "Adhésion petit budget"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_B6_product_template
+msgid "Autres boutique"
+msgstr ""
+
+#. module: letriseratop
+#: field:res.partner,newsletter:0
+msgid "Do you want to receive our monthly newsletter?"
+msgstr "Voulez-vous recevoir notre lettre d'information mensuelle?"
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_7
+msgid "Don"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_A3_product_template
+msgid "Consommable / pièce neuve"
+msgstr ""
+
+#. module: letriseratop
+#: 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 dans la vie de l'association et ces activités (ateliers, collecte, "
+"événements, …)?"
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_S1_product_template
+msgid "Atelier bricolage"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_2
+msgid "Matériel"
+msgstr "Matériel"
+
 #. module: letriseratop
 #: model:ir.model,name:letriseratop.model_res_partner
 msgid "Partner"
@@ -96,12 +186,70 @@ msgstr "Partenaire"
 msgid "Studies"
 msgstr "Études"
 
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_ATR_product_template
+msgid "Adhésion atelier tarif réduit"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_A1_product_template
+msgid "Pièce vélo"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_D_product_template
+msgid "Dons"
+msgstr ""
+
+#. module: letriseratop
+#: field:res.partner,is_student:0
+msgid "Student?"
+msgstr "Étudiant·es?"
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_AP_product_template
+msgid "Autre produit"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_5
+msgid "Autre"
+msgstr "Autre"
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_B2_product_template
+msgid "Mobilier"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_S3_product_template
+msgid "Autre service"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_B3_product_template
+msgid "Vaisselle"
+msgstr ""
+
 #. module: letriseratop
 #: view:res.partner:0
 msgid "Invoice membership"
 msgstr "Facturer une cotisation"
 
 #. module: letriseratop
-#: field:res.partner,is_scholarship:0
-msgid "Scholarship"
-msgstr "Boursier·e?"
+#: model:product.template,name:letriseratop.product_product_B1_product_template
+msgid "Textiles"
+msgstr ""
+
+#~ msgid ""
+#~ "Error: This partner can't be a         scholarship because s·he isn't a "
+#~ "student."
+#~ msgstr ""
+#~ "Erreur: ce·tte partenaire ne peut pas être boursier·e car ce n'est pas "
+#~ "un·e étudiant·e."
+
+#~ msgid "Is this student a scholarship?"
+#~ msgstr "Cet·te étudiant·e est il·le boursier·es?"
+
+#~ msgid "Scholarship"
+#~ msgstr "Boursier·e?"

diff --git a/i18n/letriseratop.pot b/i18n/letriseratop.pot
index e31ac0d..d4285f0 100644 (file)
--- a/i18n/letriseratop.pot
+++ b/i18n/letriseratop.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-12 07:32+0000\n"
-"PO-Revision-Date: 2018-10-12 07:32+0000\n"
+"POT-Creation-Date: 2018-10-12 09:37+0000\n"
+"PO-Revision-Date: 2018-10-12 09:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,18 +16,18 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: letriseratop
-#: field:res.partner,newsletter:0
-msgid "Do you want to receive our monthly newsletter?"
+#: view:res.partner:0
+msgid "This is a special functionnality for Le Tri Sera Top that doesn't use the point of sale at moment. It's not a permanent functionnality."
 msgstr ""
 
 #. module: letriseratop
-#: field:res.partner,is_student:0
-msgid "Student?"
+#: model:ir.model,name:letriseratop.model_bikecoop_partner_theme
+msgid "Themes that could be related to a partner"
 msgstr ""
 
 #. module: letriseratop
-#: model:ir.model,name:letriseratop.model_bikecoop_partner_theme
-msgid "Themes that could be related to a partner"
+#: model:product.category,name:letriseratop.product_category_6
+msgid "Service"
 msgstr ""
 
 #. module: letriseratop
@@ -36,8 +36,28 @@ msgid "… in company and its activities: bikecoop, events, …"
 msgstr ""
 
 #. module: letriseratop
-#: constraint:res.partner:0
-msgid "Error: This partner can't be a         scholarship because s·he isn't a student."
+#: model:product.template,name:letriseratop.product_product_PNSCH_product_template
+msgid "Pneu 700x28 schwalbe"
+msgstr ""
+
+#. module: letriseratop
+#: help:bikecoop.partner.theme,type:0
+msgid "An extra field to categorize themes."
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_AT_product_template
+msgid "Adhésion atelier"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_AS_product_template
+msgid "Adhésion soutien"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_1
+msgid "Adhésions"
 msgstr ""
 
 #. module: letriseratop
@@ -46,23 +66,58 @@ msgid "Type"
 msgstr ""
 
 #. module: letriseratop
-#: field:res.partner,want_to_be_volunteer:0
-msgid "Do you want to receive some informations about volunteer             activities?"
+#: model:product.template,name:letriseratop.product_product_B4_product_template
+msgid "Électroménager"
 msgstr ""
 
 #. module: letriseratop
-#: help:bikecoop.partner.theme,type:0
-msgid "An extra field to categorize themes."
+#: model:product.template,name:letriseratop.product_product_S2_product_template
+msgid "Prestation extérieure"
 msgstr ""
 
 #. module: letriseratop
-#: help:res.partner,is_scholarship:0
-msgid "Is this student a scholarship?"
+#: model:product.category,name:letriseratop.product_category_3
+msgid "Matériel neuf"
 msgstr ""
 
 #. module: letriseratop
-#: view:res.partner:0
-msgid "This is a special functionnality for Le Tri Sera Top that doesn't use the point of sale at moment. It's not a permanent functionnality."
+#: model:product.template,name:letriseratop.product_product_ADHC_product_template
+msgid "Adhésion classique"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_B5_product_template
+msgid "Décoration"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_A2_product_template
+msgid "Vélo"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_ADHF_product_template
+msgid "Adhésion famille"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_4
+msgid "Matériel d'occasion"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_A4_product_template
+msgid "Autres vélo"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_0
+msgid "Tous"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_AB_product_template
+msgid "Adhésion boutique"
 msgstr ""
 
 #. module: letriseratop
@@ -70,6 +125,46 @@ msgstr ""
 msgid "Join membership"
 msgstr ""
 
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_ADHPB_product_template
+msgid "Adhésion petit budget"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_B6_product_template
+msgid "Autres boutique"
+msgstr ""
+
+#. module: letriseratop
+#: field:res.partner,newsletter:0
+msgid "Do you want to receive our monthly newsletter?"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_7
+msgid "Don"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_A3_product_template
+msgid "Consommable / pièce neuve"
+msgstr ""
+
+#. module: letriseratop
+#: field:res.partner,want_to_be_volunteer:0
+msgid "Do you want to receive some informations about volunteer             activities?"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_S1_product_template
+msgid "Atelier bricolage"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_2
+msgid "Matériel"
+msgstr ""
+
 #. module: letriseratop
 #: model:ir.model,name:letriseratop.model_res_partner
 msgid "Partner"
@@ -80,13 +175,58 @@ msgstr ""
 msgid "Studies"
 msgstr ""
 
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_ATR_product_template
+msgid "Adhésion atelier tarif réduit"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_A1_product_template
+msgid "Pièce vélo"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_D_product_template
+msgid "Dons"
+msgstr ""
+
+#. module: letriseratop
+#: field:res.partner,is_student:0
+msgid "Student?"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_AP_product_template
+msgid "Autre produit"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.category,name:letriseratop.product_category_5
+msgid "Autre"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_B2_product_template
+msgid "Mobilier"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_S3_product_template
+msgid "Autre service"
+msgstr ""
+
+#. module: letriseratop
+#: model:product.template,name:letriseratop.product_product_B3_product_template
+msgid "Vaisselle"
+msgstr ""
+
 #. module: letriseratop
 #: view:res.partner:0
 msgid "Invoice membership"
 msgstr ""
 
 #. module: letriseratop
-#: field:res.partner,is_scholarship:0
-msgid "Scholarship"
+#: model:product.template,name:letriseratop.product_product_B1_product_template
+msgid "Textiles"
 msgstr ""
 

diff --git a/letriseratop.py b/letriseratop.py
index d4abae6..107fbed 100644 (file)
--- a/letriseratop.py
+++ b/letriseratop.py
@@ -41,14 +41,12 @@ class Partner(orm.Model):
     def onchange_occupation_id(self, cr, uid, ids, occupation_id):
         """Define if a partner is a student based on his/her occupation type"""
         v = {}
-        partners = self.browse(cr, uid, ids)
         occupations = self.pool.get('bikecoop.partner.theme')
         occupation = occupations.browse(cr, uid, occupation_id)
         if occupation.type == 'studies':
                 v['is_student'] = True
         else:
             v['is_student'] = False
-            v['is_scholarship'] = False
 
         return {'value': v}
 
@@ -60,29 +58,12 @@ class Partner(orm.Model):
                                       string='Student?',
                                       type='boolean',
                                       store=True),
-        'is_scholarship': fields.boolean('Scholarship',
-                                         help='Is this student a scholarship?'),
         'want_to_be_volunteer': fields.boolean(
             'Do you want to receive some informations about volunteer \
             activities?',
             help='… in company and its activities: bikecoop, events, …'),
     }
 
-    def _check_occupation_is_not_studies(self, cr, uid, ids, context=None):
-        """Check if partners are students. If not, they can't be
-        scholarships."""
-        partners = self.browse(cr, uid, ids, context=context)
-        for partner in partners:
-            if partner.occupation_id.type != 'studies':
-                if partner.is_scholarship:
-                    return False
-        return True
-
-    _constraints = [
-        (_check_occupation_is_not_studies, 'Error: This partner can\'t be a\
-         scholarship because s·he isn\'t a student.', ['is_scholarship']),
-    ]
-
 
 class Theme(orm.Model):
     _inherit = 'bikecoop.partner.theme'

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index 953aeb1..38af5f3 100644 (file)
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -40,7 +40,6 @@
                 <xpath expr="//field[@name='occupation_id']" position="replace">
                     <field name="occupation_id" on_change="onchange_occupation_id(occupation_id)" domain="[('domain','=', 'occupation')]" attrs="{'required': [('is_company','=', False)]}" widget="selection"/>
                     <field name="is_student"/>
-                    <field name="is_scholarship" attrs="{'invisible': [('is_student','=', False)]}"/>
                 </xpath>
             </field>
         </record>