OLD 8.0 2015 06 17

Conflict:

--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@@ -159,7 -159,8 +159,12 @@@
              <field name="priority">50</field>
              <field name="arch" type="xml">
                  <search string="Membership Partners">
++<<<<<<< HEAD
 +                    <field name="name" filter_domain="['|','|',('display_name','ilike',self),('ref','=',self),('email','ilike',self)]"/>
++=======
+                     <field name="name"
+                        filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"/>
++>>>>>>> odoo/8.0
                      <field name="membership_start" invisible="1"/>
                      <field name="membership_stop" string="End Membership Date"/>
                      <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>

Resolved by taking odoo/8.0 version, as it is a different but similar bugfix for https://github.com/odoo/odoo/issues/6703 replacing https://github.com/OCA/OCB/commit/72a6edf891b3f97e7f360649c5259a0d2fcc66c1 by upstream https://github.com/odoo/odoo/commit/d566558a6cec082d4b191e4446741a28ec4b5bfb

Committed as https://github.com/OCA/OCB/commit/a6c919ed7b981fe7233f86006e5ada2cf27b5e38 by @stefanrijnhart