[VIEW] ~menus volonteer activities and occupation in settings menu

diff --git a/i18n/bikecoop.pot b/i18n/bikecoop.pot
index ee0e30d..4204e55 100644 (file)
--- 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-09-05 10:26+0000\n"
-"PO-Revision-Date: 2013-09-05 10:26+0000\n"
+"POT-Creation-Date: 2013-12-17 10:56+0000\n"
+"PO-Revision-Date: 2013-12-17 10:56+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -60,11 +60,6 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#. module: bikecoop
-#: view:res.partner:0
-msgid "Volunteer activity"
-msgstr ""
-
 #. module: bikecoop
 #: help:bikecoop.partner.theme,name:0
 msgid "Name of the job or studies"
@@ -112,8 +107,8 @@ msgid "Nationality"
 msgstr ""
 
 #. module: bikecoop
-#: model:ir.ui.menu,name:bikecoop.menu_configuration
-msgid "Configuration"
+#: view:res.partner:0
+msgid "Volunteer activity"
 msgstr ""
 
 #. module: bikecoop
@@ -198,11 +193,6 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
-#. module: bikecoop
-#: model:ir.ui.menu,name:bikecoop.menu_bikecoop_members
-msgid "Bikecoop members"
-msgstr ""
-
 #. module: bikecoop
 #: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_theme_male
 msgid "Male"
@@ -266,7 +256,6 @@ msgstr ""
 
 #. module: bikecoop
 #: model:ir.actions.act_window,name:bikecoop.act_open_bikecoop_members_view
-#: model:ir.ui.menu,name:bikecoop.menu_bikecoop_members_tree
 #: view:res.partner:0
 msgid "Bikecoop Members"
 msgstr ""

diff --git a/i18n/fr.po b/i18n/fr.po
index 8086a09..8f6e4ec 100644 (file)
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-05 10:26+0000\n"
-"PO-Revision-Date: 2013-09-05 12:37+0100\n"
+"POT-Creation-Date: 2013-12-17 10:56+0000\n"
+"PO-Revision-Date: 2013-12-17 11:57+0100\n"
 "Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>\n"
 "Language-Team: \n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.4\n"
-"Language: fr_FR\n"
 
 #. module: bikecoop
 #: model:ir.model,name:bikecoop.model_bikecoop_partner_theme
@@ -61,11 +61,6 @@ msgstr "Liste d'information"
 msgid "at"
 msgstr "chez"
 
-#. module: bikecoop
-#: view:res.partner:0
-msgid "Volunteer activity"
-msgstr "Activité bénévole"
-
 #. module: bikecoop
 #: help:bikecoop.partner.theme,name:0
 msgid "Name of the job or studies"
@@ -112,9 +107,9 @@ msgid "Nationality"
 msgstr "Nationalité"
 
 #. module: bikecoop
-#: model:ir.ui.menu,name:bikecoop.menu_configuration
-msgid "Configuration"
-msgstr "Confirguration"
+#: view:res.partner:0
+msgid "Volunteer activity"
+msgstr "Activité bénévole"
 
 #. module: bikecoop
 #: view:res.partner:0
@@ -197,11 +192,6 @@ msgstr "Code de l'activité principale"
 msgid "Partner"
 msgstr "Partenaire"
 
-#. module: bikecoop
-#: model:ir.ui.menu,name:bikecoop.menu_bikecoop_members
-msgid "Bikecoop members"
-msgstr "Membres de l'atelier"
-
 #. module: bikecoop
 #: model:bikecoop.partner.theme,name:bikecoop.bikecoop_partner_theme_male
 msgid "Male"
@@ -267,7 +257,6 @@ msgstr "Féminin"
 
 #. module: bikecoop
 #: model:ir.actions.act_window,name:bikecoop.act_open_bikecoop_members_view
-#: model:ir.ui.menu,name:bikecoop.menu_bikecoop_members_tree
 #: view:res.partner:0
 msgid "Bikecoop Members"
 msgstr "Membres de l'atelier"
@@ -282,6 +271,12 @@ msgstr "Adresse postale"
 msgid "Occupation"
 msgstr "Activité principale"
 
+#~ msgid "Configuration"
+#~ msgstr "Confirguration"
+
+#~ msgid "Bikecoop members"
+#~ msgstr "Membres de l'atelier"
+
 #~ msgid ")"
 #~ msgstr ")"
 

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index 649567d..44eeb46 100644 (file)
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -226,13 +226,18 @@
             <field name="context">{'default_domain': 'occupation'}</field>
         </record>
 
+        <menuitem id="menu_bikecoop" 
+            name="Bikecoop"
+            parent="base.menu_config"
+            sequence="20"/>
+
         <menuitem id="menu_volunteer_ids"
-            parent="base.menu_marketing_config_association"
-            sequence="20"
+            parent="menu_bikecoop"
+            sequence="10"
             action="act_open_volunteer_ids_view"/>
 
         <menuitem id="menu_occupation"
-            parent="base.menu_marketing_config_association"
+            parent="menu_bikecoop"
             sequence="20"
             action="act_open_occupation_view"/>
     </data>

diff --git a/view/point_of_sale.xml b/view/point_of_sale.xml
index fdd7739..ffbe722 100644 (file)
--- a/view/point_of_sale.xml
+++ b/view/point_of_sale.xml
@@ -6,9 +6,6 @@
             <field name="model">pos.order</field>
             <field name="inherit_id" ref="point_of_sale.view_pos_pos_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//button[@name='action_invoice']" position="attributes">
-                    <attribute name="invisible">1</attribute>
-                </xpath>
                 <xpath expr="//field[@name='partner_id']" position="replace">
                     <field name="partner_id" on_change="onchange_partner_id(partner_id, context)" context="{'search_default_customer': 1, 'form_view_ref': 'bikecoop.view_bikecoop_members_form'}" attrs="{'readonly': [('state','=', 'invoiced')]}"/>
                 </xpath>