From e17844c946879cdc3d4569da8a1e52ebeb8f8963 Mon Sep 17 00:00:00 2001
From: "Laurent Mignon (ACSONE)" <laurent.mignon@acsone.eu>
Date: Tue, 9 Jun 2015 10:06:55 +0200
Subject: [PATCH 1/2] [FIX] server: graceful shutdown must send SIGINT instead
 of SIGTERM to workers

Workers do not specifically handle SIGTERM so it can be used to
force quit them, but the graceful shutdown is triggered by SIGINT.

Closes #6998
---
 openerp/service/workers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/service/workers.py b/openerp/service/workers.py
index db64b626245..9264ef12996 100644
--- a/openerp/service/workers.py
+++ b/openerp/service/workers.py
@@ -184,7 +184,7 @@ class Multicorn(object):
             _logger.info("Stopping gracefully")
             limit = time.time() + self.timeout
             for pid in self.workers.keys():
-                self.worker_kill(pid, signal.SIGTERM)
+                self.worker_kill(pid, signal.SIGINT)
             while self.workers and time.time() < limit:
                 self.process_zombie()
                 time.sleep(0.1)

From d566558a6cec082d4b191e4446741a28ec4b5bfb Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 15 Jun 2015 15:25:41 +0200
Subject: [PATCH 2/2] [FIX] membership: missing name field in search view.

Which leaded to the inability to search on the partner name

opw-642301
fixes #6703
---
 addons/membership/membership_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 96552f9b850..266866c6466 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -161,6 +161,8 @@
             <field name="priority">50</field>
             <field name="arch" type="xml">
                 <search string="Membership Partners">
+                    <field name="name"
+                       filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"/>
                     <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"/>