From 7c294f6388b55d20cdaa607baf381f757bb1003c Mon Sep 17 00:00:00 2001
From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Thu, 19 Dec 2013 09:37:33 +0100
Subject: [PATCH] [VIEW] ~new organisation of bikecoop member form

---
 i18n/bikecoop.pot | 11 +++++++---
 i18n/fr.po        | 16 ++++++++------
 view/bikecoop.xml | 56 +++++++++++++++++++++++++----------------------
 3 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/i18n/bikecoop.pot b/i18n/bikecoop.pot
index 4204e55..eacd871 100644
--- a/i18n/bikecoop.pot
+++ b/i18n/bikecoop.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-17 10:56+0000\n"
-"PO-Revision-Date: 2013-12-17 10:56+0000\n"
+"POT-Creation-Date: 2013-12-19 08:34+0000\n"
+"PO-Revision-Date: 2013-12-19 08:34+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -220,7 +220,7 @@ msgstr ""
 
 #. module: bikecoop
 #: view:res.partner:0
-msgid "Other, Female or Male"
+msgid "Main informations"
 msgstr ""
 
 #. module: bikecoop
@@ -254,6 +254,11 @@ msgstr ""
 msgid "Female"
 msgstr ""
 
+#. module: bikecoop
+#: view:res.partner:0
+msgid "Other, Female or Male"
+msgstr ""
+
 #. module: bikecoop
 #: model:ir.actions.act_window,name:bikecoop.act_open_bikecoop_members_view
 #: view:res.partner:0
diff --git a/i18n/fr.po b/i18n/fr.po
index 8f6e4ec..5ac56a6 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: 2013-12-17 10:56+0000\n"
-"PO-Revision-Date: 2013-12-17 11:57+0100\n"
+"POT-Creation-Date: 2013-12-19 08:34+0000\n"
+"PO-Revision-Date: 2013-12-19 09:35+0100\n"
 "Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -219,8 +219,8 @@ msgstr "Membre de l'atelier"
 
 #. module: bikecoop
 #: view:res.partner:0
-msgid "Other, Female or Male"
-msgstr "Autre, Féminin, Masculin"
+msgid "Main informations"
+msgstr "Informations principales"
 
 #. module: bikecoop
 #: model:ir.actions.act_window,name:bikecoop.act_open_occupation_view
@@ -255,6 +255,11 @@ msgstr ""
 msgid "Female"
 msgstr "Féminin"
 
+#. module: bikecoop
+#: view:res.partner:0
+msgid "Other, Female or Male"
+msgstr "Autre, Féminin, Masculin"
+
 #. module: bikecoop
 #: model:ir.actions.act_window,name:bikecoop.act_open_bikecoop_members_view
 #: view:res.partner:0
@@ -436,9 +441,6 @@ msgstr "Activité principale"
 #~ msgid "President-e"
 #~ msgstr "Président-e"
 
-#~ msgid "Other informations"
-#~ msgstr "Autres informations"
-
 #~ msgid "Studies: Université Pierre Mendès France"
 #~ msgstr "Étudiant-e - Université Pierre Mendès France"
 
diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index 44eeb46..d285681 100644
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -28,32 +28,36 @@
                         <field name="name"/>
                     </h1>
                 </div>
-                <group>
-                    <group>
-                        <label for="street" string="Postal address"/>
-                        <div>
-                            <field name="zip" placeholder="Zip code"/>
-                            <field name="city" placeholder="CITY"/>
-                            <field name="country_id" placeholder="Country"/>
-                            <field name="street" placeholder="Street ..."/>
-                            <field name="street2" placeholder="..."/>
-                            <field name="email" widget="email" placeholder="email"/>
-                            <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
-                        </div>
-                    </group>
-                    <group attrs="{'invisible': [('is_company','=',True)]}">
-                        <field name="year" placeholder="1900" attrs="{'required': [('is_company','=', False)]}"/>
-                        <field name="gender_id" domain="[('domain','=', 'gender')]" placeholder="Other, Female or Male" attrs="{'required': [('is_company','=', False)]}"/>
-                        <field name="nationality_id" placeholder="France" attrs="{'required': [('is_company','=', False)]}"/>
-                        <field name="occupation_id" placeholder="Student/Employee/Other" domain="[('domain','=', 'occupation')]" attrs="{'required': [('is_company','=', False)]}"/>
-                    </group>
-                </group>
-                <notebook name="Volunteer activities">
-                    <page string="Volunteer activities" attrs="{'invisible': [('is_company','=',True)]}">
-                        <label string="Want to be volunteer in ..."/>
-                        <field name="volunteer_ids" domain="[('domain','=', 'volunteer')]" string="Want to be volunteer in ..."/>
-                        <label string="Other volunteer activities and comments"/>
-                        <field name="comment"/>
+                <notebook colspan="4">
+                    <page string="Main informations">
+                        <group>
+                            <group>
+                                <label for="street" string="Postal address"/>
+                                <div>
+                                    <field name="zip" placeholder="Zip code"/>
+                                    <field name="city" placeholder="CITY"/>
+                                    <field name="country_id" placeholder="Country"/>
+                                    <field name="street" placeholder="Street ..."/>
+                                    <field name="street2" placeholder="..."/>
+                                    <field name="email" widget="email" placeholder="email"/>
+                                    <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
+                                </div>
+                            </group>
+                            <group attrs="{'invisible': [('is_company','=',True)]}">
+                                <field name="year" placeholder="1900" attrs="{'required': [('is_company','=', False)]}"/>
+                                <field name="gender_id" domain="[('domain','=', 'gender')]" placeholder="Other, Female or Male" attrs="{'required': [('is_company','=', False)]}"/>
+                                <field name="nationality_id" placeholder="France" attrs="{'required': [('is_company','=', False)]}"/>
+                                <field name="occupation_id" placeholder="Student/Employee/Other" domain="[('domain','=', 'occupation')]" attrs="{'required': [('is_company','=', False)]}"/>
+                            </group>
+                        </group>
+                        <notebook name="Volunteer activities">
+                            <page string="Volunteer activities" attrs="{'invisible': [('is_company','=',True)]}">
+                                <label string="Want to be volunteer in ..."/>
+                                <field name="volunteer_ids" domain="[('domain','=', 'volunteer')]" string="Want to be volunteer in ..."/>
+                                <label string="Other volunteer activities and comments"/>
+                                <field name="comment"/>
+                            </page>
+                        </notebook>
                     </page>
                 </notebook>
             </sheet>
-- 
2.20.1