Merge remote-tracking branch 'origin/julm' into membership_grouped

diff --git a/view/partner.xml b/view/partner.xml
index 09344b6..4455763 100644 (file)
--- a/view/partner.xml
+++ b/view/partner.xml
@@ -13,6 +13,10 @@
                 <xpath expr="//field[@name='associate_member']" position="replace">
                     <field name="associate_members" widget="many2many"/>
                 </xpath>
+                <xpath expr="//field/tree/field[@name='date']" position="replace">
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                </xpath>
             </field>
         </record>
         <record id="view_remembership_members_simple_tree" model="ir.ui.view">