Merge branch 'julm'

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..0d20b64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc

diff --git a/data/base.xml b/data/base.xml
index 4aeb767..0b16f4f 100644 (file)
--- a/data/base.xml
+++ b/data/base.xml
@@ -17,8 +17,7 @@
             <field name="name">L'Heureux Cyclage</field>
             <field name="partner_id" ref="base.main_partner"/>
             <field name="rml_header1">Le réseau des ateliers participatifs et solidaires</field>
-            <field name="rml_footer1">N° SIRET : 528 073 398 000 18 - Code NAF : 9499Z</field>
-            <field name="rml_footer2"></field>
+            <field name="rml_footer">N° SIRET : 528 073 398 000 18 - Code NAF : 9499Z</field>
             <field name="currency_id" ref="base.EUR"/>
         </record>
     </data>

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index c47dd93..c91a6ef 100644 (file)
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -3,7 +3,6 @@
         <record id="view_bikecoop_members_tree" model="ir.ui.view">
             <field name="name">res.partner.tree</field>
             <field name="model">res.partner</field>
-            <field name="type">tree</field>
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
             <tree string="Bikecoop Members">
@@ -15,7 +14,6 @@
         <record id="view_bikecoop_members_form" model="ir.ui.view">
             <field name="name">res.partner.form</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
             <form string="Bikecoop Member" version="7.0">
@@ -66,7 +64,6 @@
         <record id="view_bikecoop_members_search" model="ir.ui.view">
             <field name="name">res.partner.search</field>
             <field name="model">res.partner</field>
-            <field name="type">search</field>
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
             <search string="Bikecoop Members">