[MERGE] forward port of branch saas-3 up to b7f9f4a
This commit is contained in:
commit
ed3065e3c6
|
@ -1312,9 +1312,9 @@ class account_invoice_line(models.Model):
|
||||||
raise except_orm(_('No Partner Defined!'), _("You must first select a partner!"))
|
raise except_orm(_('No Partner Defined!'), _("You must first select a partner!"))
|
||||||
if not product:
|
if not product:
|
||||||
if type in ('in_invoice', 'in_refund'):
|
if type in ('in_invoice', 'in_refund'):
|
||||||
return {'value': {}, 'domain': {'product_uom': []}}
|
return {'value': {}, 'domain': {'uos_id': []}}
|
||||||
else:
|
else:
|
||||||
return {'value': {'price_unit': 0.0}, 'domain': {'product_uom': []}}
|
return {'value': {'price_unit': 0.0}, 'domain': {'uos_id': []}}
|
||||||
|
|
||||||
values = {}
|
values = {}
|
||||||
|
|
||||||
|
|
|
@ -656,18 +656,18 @@ class ir_model(osv.Model):
|
||||||
original_exp_report = openerp.service.report.exp_report
|
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
|
Export Report
|
||||||
"""
|
"""
|
||||||
if object == 'printscreen.list':
|
if object == 'printscreen.list':
|
||||||
original_exp_report(db, uid, object, ids, data, context)
|
original_exp_report(db, uid, object, ids, datas, context)
|
||||||
new_ids = []
|
new_ids = []
|
||||||
for id in ids:
|
for id in ids:
|
||||||
new_ids.append(calendar_id2real_id(id))
|
new_ids.append(calendar_id2real_id(id))
|
||||||
if data.get('id', False):
|
if datas.get('id', False):
|
||||||
data['id'] = calendar_id2real_id(data['id'])
|
datas['id'] = calendar_id2real_id(datas['id'])
|
||||||
return original_exp_report(db, uid, object, new_ids, data, context)
|
return original_exp_report(db, uid, object, new_ids, datas, context)
|
||||||
|
|
||||||
|
|
||||||
openerp.service.report.exp_report = exp_report
|
openerp.service.report.exp_report = exp_report
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
<field name="name">Declarantnum</field>
|
<field name="name">Declarantnum</field>
|
||||||
<field name="code">declarantnum</field>
|
<field name="code">declarantnum</field>
|
||||||
<field name="padding">5</field>
|
<field name="padding">5</field>
|
||||||
|
<field name="company_id" eval="False"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
|
|
|
@ -620,6 +620,11 @@ class PreforkServer(CommonServer):
|
||||||
for pid in self.workers.keys():
|
for pid in self.workers.keys():
|
||||||
self.worker_kill(pid, signal.SIGINT)
|
self.worker_kill(pid, signal.SIGINT)
|
||||||
while self.workers and time.time() < limit:
|
while self.workers and time.time() < limit:
|
||||||
|
try:
|
||||||
|
self.process_signals()
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
_logger.info("Forced shutdown.")
|
||||||
|
break
|
||||||
self.process_zombie()
|
self.process_zombie()
|
||||||
time.sleep(0.1)
|
time.sleep(0.1)
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue