From 60c8fa26dcfa6e38c6dada55cf629d72c79d61f9 Mon Sep 17 00:00:00 2001 From: Ludovic CHEVALIER Date: Mon, 10 Sep 2012 11:52:29 +0200 Subject: [PATCH] [Ticket 15] [Members] +Sexe --- bikecoop.py | 3 +- data/res_partner.xml | 18 ++++++------ i18n/bikecoop.pot | 45 ++++++++++++++++++++--------- i18n/fr.po | 55 +++++++++++++++++++++++++----------- view/bikecoop_membership.xml | 2 +- 5 files changed, 82 insertions(+), 41 deletions(-) diff --git a/bikecoop.py b/bikecoop.py index 63016b8..f632dfc 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.char('Domain', size=64, help='Domain for filtering results'), + 'domain': fields.selection([('sex', 'Sex'), ('occupation', 'Occupation'), ('volunteer', 'Volunteer')], 'Domain', required=True, size=24), 'active': fields.boolean('Active', help='If check, this object is always available'), } @@ -27,6 +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'), } Partner() diff --git a/data/res_partner.xml b/data/res_partner.xml index 53a6c41..77b353e 100644 --- a/data/res_partner.xml +++ b/data/res_partner.xml @@ -1,23 +1,23 @@ - + + F Female - F + sex - + + O Other - O + sex - + + M Male - M + sex Information mailing list - - Studies - diff --git a/i18n/bikecoop.pot b/i18n/bikecoop.pot index 5c3e034..a7bfddd 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-07 10:50+0000\n" -"PO-Revision-Date: 2012-09-07 10:50+0000\n" +"POT-Creation-Date: 2012-09-10 09:47+0000\n" +"PO-Revision-Date: 2012-09-10 09:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -71,6 +71,11 @@ msgstr "" msgid "New wheel" msgstr "" +#. module: bikecoop +#: selection:bikecoop.partner.theme,domain:0 +msgid "Volunteer" +msgstr "" + #. module: bikecoop #: model:pos.category,name:bikecoop.pos_equipment #: model:product.category,name:bikecoop.product_category_equipment @@ -112,6 +117,11 @@ msgstr "" msgid "Name of the job or studies" msgstr "" +#. module: bikecoop +#: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_title_other +msgid "Other" +msgstr "" + #. module: bikecoop #: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_occupation_other msgid "An other type of occupation that is not mentionned" @@ -138,13 +148,13 @@ msgid "Studies: Université Joseph Fourrier" msgstr "" #. module: bikecoop -#: field:res.partner,volunteer_ids:0 -msgid "Want to be volunteer?" +#: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_title_male +msgid "Male" msgstr "" #. module: bikecoop -#: help:bikecoop.partner.theme,domain:0 -msgid "Domain for filtering results" +#: field:res.partner,volunteer_ids:0 +msgid "Want to be volunteer?" msgstr "" #. module: bikecoop @@ -162,11 +172,6 @@ msgstr "" msgid "Bikecoop member" msgstr "" -#. module: bikecoop -#: model:res.partner.category,name:bikecoop.res_partner_category_studies -msgid "Studies" -msgstr "" - #. module: bikecoop #: view:res.partner:0 msgid "Address" @@ -320,6 +325,11 @@ msgstr "" msgid "Secretaire" msgstr "" +#. module: bikecoop +#: view:res.partner:0 +msgid "Other volunteer activities" +msgstr "" + #. module: bikecoop #: model:product.template,name:bikecoop.product_reduce_member_product_template msgid "Reduce member" @@ -360,13 +370,19 @@ msgstr "" msgid "Organisations" msgstr "" +#. module: bikecoop +#: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_theme_wks_com +msgid "Worshop committee" +msgstr "" + #. module: bikecoop #: view:res.partner:0 msgid "All bikecoop members" msgstr "" #. module: bikecoop -#: view:res.partner:0 +#: selection:bikecoop.partner.theme,domain:0 +#: field:res.partner,sex_id:0 msgid "Sex" msgstr "" @@ -391,8 +407,8 @@ msgid "What kind of volunteer activities you want to do with us?" msgstr "" #. module: bikecoop -#: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_theme_wks_com -msgid "Worshop committee" +#: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_theme_female +msgid "Female" msgstr "" #. module: bikecoop @@ -411,6 +427,7 @@ msgid "Studies: Université Pierre Mendès France" msgstr "" #. module: bikecoop +#: selection:bikecoop.partner.theme,domain:0 #: field:res.partner,occupation_id:0 msgid "Occupation" msgstr "" diff --git a/i18n/fr.po b/i18n/fr.po index 40bb558..98c6a52 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-07 10:50+0000\n" -"PO-Revision-Date: 2012-09-07 12:56+0100\n" +"POT-Creation-Date: 2012-09-10 09:47+0000\n" +"PO-Revision-Date: 2012-09-10 11:49+0100\n" "Last-Translator: Ludovic CHEVALIER \n" "Language-Team: \n" "Language: \n" @@ -72,6 +72,11 @@ msgstr "Commission communication" msgid "New wheel" msgstr "Roue neuve" +#. module: bikecoop +#: selection:bikecoop.partner.theme,domain:0 +msgid "Volunteer" +msgstr "Bénévolat" + #. module: bikecoop #: model:pos.category,name:bikecoop.pos_equipment #: model:product.category,name:bikecoop.product_category_equipment @@ -113,6 +118,11 @@ msgstr "Vélo-École - 1 journée" msgid "Name of the job or studies" msgstr "Nom des études ou du métier" +#. module: bikecoop +#: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_title_other +msgid "Other" +msgstr "Autre" + #. module: bikecoop #: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_occupation_other msgid "An other type of occupation that is not mentionned" @@ -138,16 +148,16 @@ msgstr "Associations" msgid "Studies: Université Joseph Fourrier" msgstr "Étudiant-e - Université Joseph Fourrier" +#. module: bikecoop +#: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_title_male +msgid "Male" +msgstr "Masculin" + #. module: bikecoop #: field:res.partner,volunteer_ids:0 msgid "Want to be volunteer?" msgstr "Vous voulez être bénévole?" -#. module: bikecoop -#: help:bikecoop.partner.theme,domain:0 -msgid "Domain for filtering results" -msgstr "Domaine pour filrer les résultats" - #. module: bikecoop #: model:res.partner.category,name:bikecoop.res_partner_category_10 msgid "Tresorier adjoint" @@ -163,11 +173,6 @@ msgstr "Nationalité du partenaire, si c'est une personne" msgid "Bikecoop member" msgstr "Membre de l'atelier" -#. module: bikecoop -#: model:res.partner.category,name:bikecoop.res_partner_category_studies -msgid "Studies" -msgstr "Études" - #. module: bikecoop #: view:res.partner:0 msgid "Address" @@ -321,6 +326,11 @@ msgstr "Identifiant" msgid "Secretaire" msgstr "Secrétaire" +#. module: bikecoop +#: view:res.partner:0 +msgid "Other volunteer activities" +msgstr "Autres activités bénévoles" + #. module: bikecoop #: model:product.template,name:bikecoop.product_reduce_member_product_template msgid "Reduce member" @@ -361,13 +371,19 @@ msgstr "Secrétaire adjoint-e" msgid "Organisations" msgstr "Organisations/Structures" +#. module: bikecoop +#: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_theme_wks_com +msgid "Worshop committee" +msgstr "Commission atelier" + #. module: bikecoop #: view:res.partner:0 msgid "All bikecoop members" msgstr "Tous les membres de l'atelier" #. module: bikecoop -#: view:res.partner:0 +#: selection:bikecoop.partner.theme,domain:0 +#: field:res.partner,sex_id:0 msgid "Sex" msgstr "Sexe" @@ -392,9 +408,9 @@ msgid "What kind of volunteer activities you want to do with us?" msgstr "Dans quelle(s) activités bénévoles souhaitez-vous vous investir dans l'association?" #. module: bikecoop -#: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_theme_wks_com -msgid "Worshop committee" -msgstr "Commission atelier" +#: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_theme_female +msgid "Female" +msgstr "Féminin" #. module: bikecoop #: model:res.partner.category,name:bikecoop.res_partner_category_11 @@ -412,6 +428,7 @@ msgid "Studies: Université Pierre Mendès France" msgstr "Étudiant-e - Université Pierre Mendès France" #. module: bikecoop +#: selection:bikecoop.partner.theme,domain:0 #: field:res.partner,occupation_id:0 msgid "Occupation" msgstr "Activité principale" @@ -426,6 +443,12 @@ msgstr "Étudiant-e - Université Stendhal" msgid "Half day" msgstr "Demi-journée" +#~ msgid "Domain for filtering results" +#~ msgstr "Domaine pour filrer les résultats" + +#~ msgid "Studies" +#~ msgstr "Études" + #~ msgid "Liste d'information" #~ msgstr "Liste d'information" diff --git a/view/bikecoop_membership.xml b/view/bikecoop_membership.xml index 9210594..746af6e 100644 --- a/view/bikecoop_membership.xml +++ b/view/bikecoop_membership.xml @@ -47,7 +47,7 @@ - + -- 2.20.1