diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 80542329858..f9055a8b9f8 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1507,9 +1507,9 @@ class account_invoice_line(osv.osv):
             raise osv.except_osv(_('No Partner Defined!'),_("You must first select a partner!") )
         if not product:
             if type in ('in_invoice', 'in_refund'):
-                return {'value': {}, 'domain':{'product_uom':[]}}
+                return {'value': {}, 'domain':{'uos_id':[]}}
             else:
-                return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
+                return {'value': {'price_unit': 0.0}, 'domain':{'uos_id':[]}}
         part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         product_uom_obj = self.pool.get('product.uom')
         fpos_obj = self.pool.get('account.fiscal.position')
diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index 870b9b7900b..67d018702da 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -653,18 +653,18 @@ class ir_model(osv.Model):
 original_exp_report = openerp.service.report.exp_report
 
 
-def exp_report(db, uid, object, ids, data=None, context=None):
+def exp_report(db, uid, object, ids, datas=None, context=None):
     """
     Export Report
     """
     if object == 'printscreen.list':
-        original_exp_report(db, uid, object, ids, data, context)
+        original_exp_report(db, uid, object, ids, datas, context)
     new_ids = []
     for id in ids:
         new_ids.append(calendar_id2real_id(id))
-    if data.get('id', False):
-        data['id'] = calendar_id2real_id(data['id'])
-    return original_exp_report(db, uid, object, new_ids, data, context)
+    if datas.get('id', False):
+        datas['id'] = calendar_id2real_id(datas['id'])
+    return original_exp_report(db, uid, object, new_ids, datas, context)
 
 
 openerp.service.report.exp_report = exp_report
diff --git a/addons/l10n_be/l10n_be_sequence.xml b/addons/l10n_be/l10n_be_sequence.xml
index 1c11d5b48af..6210d362774 100644
--- a/addons/l10n_be/l10n_be_sequence.xml
+++ b/addons/l10n_be/l10n_be_sequence.xml
@@ -14,6 +14,7 @@
         <field name="name">Declarantnum</field>
         <field name="code">declarantnum</field>
         <field name="padding">5</field>
+        <field name="company_id" eval="False"/>
     </record>
 
     </data>
diff --git a/openerp/service/server.py b/openerp/service/server.py
index a6fdad2f1ad..7cd1cdd82e8 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -572,6 +572,11 @@ class PreforkServer(CommonServer):
             for pid in self.workers.keys():
                 self.worker_kill(pid, signal.SIGINT)
             while self.workers and time.time() < limit:
+                try:
+                    self.process_signals()
+                except KeyboardInterrupt:
+                    _logger.info("Forced shutdown.")
+                    break
                 self.process_zombie()
                 time.sleep(0.1)
         else: