odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch 7.0 up to d566558

This commit is contained in:
Christophe Simonis 2015-06-15 16:24:11 +02:00
parent ed76b2a782 d566558a6c
commit 885565968f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/membership/membership_view.xml
View File

@ -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"/>

2
openerp/service/server.py
View File

@ -570,7 +570,7 @@ class PreforkServer(CommonServer):
_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)