From 8651f9de5a751ec2aa623e3ee1552e5356c8cda5 Mon Sep 17 00:00:00 2001 From: Ludovic CHEVALIER Date: Mon, 10 Sep 2012 13:58:09 +0200 Subject: [PATCH 1/1] [Ticket 15] [Members] Sexe-->Genre --- bikecoop.py | 4 ++-- data/res_partner.xml | 6 +++--- i18n/bikecoop.pot | 20 ++++++++++---------- i18n/fr.po | 25 ++++++++++++++----------- view/bikecoop_membership.xml | 2 +- 5 files changed, 30 insertions(+), 27 deletions(-) diff --git a/bikecoop.py b/bikecoop.py index f632dfc..2271969 100644 --- a/bikecoop.py +++ b/bikecoop.py @@ -8,7 +8,7 @@ class Theme(osv.osv): _columns = { 'code': fields.char('Code', size=8, help='Code of the occupation'), 'name': fields.char('Name', size=128, help='Name of the job or studies', required=True, translate=True), - 'domain': fields.selection([('sex', 'Sex'), ('occupation', 'Occupation'), ('volunteer', 'Volunteer')], 'Domain', required=True, size=24), + 'domain': fields.selection([('gender', 'Gender'), ('occupation', 'Occupation'), ('volunteer', 'Volunteer')], 'Domain', required=True, size=24), 'active': fields.boolean('Active', help='If check, this object is always available'), } @@ -27,7 +27,7 @@ class Partner(osv.osv): 'nationality_id': fields.many2one('res.country', 'Nationality', help='Partner\'s nationality if he is a person'), 'occupation_id': fields.many2one('bikecoop.partner.theme', 'Occupation', help='Main occupation of this partner'), 'volunteer_ids': fields.many2many('bikecoop.partner.theme', 'res_partner_bikecoop_theme_rel', 'partner_id', 'theme_id', 'Want to be volunteer?', help='What kind of volunteer activities you want to do with us?'), - 'sex_id': fields.many2one('bikecoop.partner.theme', 'Sex'), + 'gender_id': fields.many2one('bikecoop.partner.theme', 'Gender'), } Partner() diff --git a/data/res_partner.xml b/data/res_partner.xml index 77b353e..ec9090f 100644 --- a/data/res_partner.xml +++ b/data/res_partner.xml @@ -4,17 +4,17 @@ F Female - sex + gender O Other - sex + gender M Male - sex + gender Information mailing list diff --git a/i18n/bikecoop.pot b/i18n/bikecoop.pot index a7bfddd..9442e51 100644 --- a/i18n/bikecoop.pot +++ b/i18n/bikecoop.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 6.1-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-10 09:47+0000\n" -"PO-Revision-Date: 2012-09-10 09:47+0000\n" +"POT-Creation-Date: 2012-09-10 11:25+0000\n" +"PO-Revision-Date: 2012-09-10 11:25+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -238,8 +238,9 @@ msgid "Main occupation of this partner" msgstr "" #. module: bikecoop -#: model:res.partner.category,name:bikecoop.res_partner_category_12 -msgid "Presitent-e adjoint-e" +#: selection:bikecoop.partner.theme,domain:0 +#: field:res.partner,gender_id:0 +msgid "Gender" msgstr "" #. module: bikecoop @@ -355,6 +356,11 @@ msgstr "" msgid "Error ! You cannot create recursive associated members." msgstr "" +#. module: bikecoop +#: model:res.partner.category,name:bikecoop.res_partner_category_12 +msgid "Presitent-e adjoint-e" +msgstr "" + #. module: bikecoop #: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_theme_other_studies msgid "Studies: Other studies, university that is not mentionned" @@ -380,12 +386,6 @@ msgstr "" msgid "All bikecoop members" msgstr "" -#. module: bikecoop -#: selection:bikecoop.partner.theme,domain:0 -#: field:res.partner,sex_id:0 -msgid "Sex" -msgstr "" - #. module: bikecoop #: model:product.template,name:bikecoop.product_training_meca_hour_external_product_template msgid "External mecanical training for one hour" diff --git a/i18n/fr.po b/i18n/fr.po index 98c6a52..bd2f17c 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 6.1-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-10 09:47+0000\n" -"PO-Revision-Date: 2012-09-10 11:49+0100\n" +"POT-Creation-Date: 2012-09-10 11:25+0000\n" +"PO-Revision-Date: 2012-09-10 13:25+0100\n" "Last-Translator: Ludovic CHEVALIER \n" "Language-Team: \n" "Language: \n" @@ -239,9 +239,10 @@ msgid "Main occupation of this partner" msgstr "Activité principale de ce partenaire" #. module: bikecoop -#: model:res.partner.category,name:bikecoop.res_partner_category_12 -msgid "Presitent-e adjoint-e" -msgstr "Presitent-e adjoint-e" +#: selection:bikecoop.partner.theme,domain:0 +#: field:res.partner,gender_id:0 +msgid "Gender" +msgstr "Genre" #. module: bikecoop #: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_theme_inpg @@ -356,6 +357,11 @@ msgstr "Adresse postale" msgid "Error ! You cannot create recursive associated members." msgstr "Erreur! Vous ne pouvez pas associer des membres de façon récursive." +#. module: bikecoop +#: model:res.partner.category,name:bikecoop.res_partner_category_12 +msgid "Presitent-e adjoint-e" +msgstr "Presitent-e adjoint-e" + #. module: bikecoop #: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_theme_other_studies msgid "Studies: Other studies, university that is not mentionned" @@ -381,12 +387,6 @@ msgstr "Commission atelier" msgid "All bikecoop members" msgstr "Tous les membres de l'atelier" -#. module: bikecoop -#: selection:bikecoop.partner.theme,domain:0 -#: field:res.partner,sex_id:0 -msgid "Sex" -msgstr "Sexe" - #. module: bikecoop #: model:product.template,name:bikecoop.product_training_meca_hour_external_product_template msgid "External mecanical training for one hour" @@ -443,6 +443,9 @@ msgstr "Étudiant-e - Université Stendhal" msgid "Half day" msgstr "Demi-journée" +#~ msgid "Sex" +#~ msgstr "Sexe" + #~ msgid "Domain for filtering results" #~ msgstr "Domaine pour filrer les résultats" diff --git a/view/bikecoop_membership.xml b/view/bikecoop_membership.xml index 746af6e..da38354 100644 --- a/view/bikecoop_membership.xml +++ b/view/bikecoop_membership.xml @@ -47,7 +47,7 @@ - + -- 2.20.1