Fix problem with multiselection field

This commit refs #1277
This commit is contained in:
Sergio Morillo 2016-08-26 14:41:39 +02:00
parent 67aa5debbe
commit c2a19ded22
2 changed files with 11 additions and 5 deletions

11
load.py
View File

@ -445,10 +445,12 @@ class LoadUnitLoadData(ModelView):
uls_to_load = fields.One2Many('stock.unit_load', None, 'ULs to load',
domain=[('state', '=', 'done'),
('available', '=', True)])
uls_loaded = fields.One2Many('stock.unit_load', None, 'Loaded ULs',
domain=[('load_order', '=', Eval('load_order'))],
uls_loaded = fields.Many2Many('stock.unit_load', None, None,
'Loaded ULs',
domain=[('id', 'in', Eval('uls_loaded_domain'))],
context={'ul_loading': True},
depends=['load_order'])
depends=['load_order', 'uls_loaded_domain'])
uls_loaded_domain = fields.One2Many('stock.unit_load', None, 'ULs loaded Domain')
loaded_uls = fields.Float('Loaded ULs', digits=(16, 0),
readonly=True)
@ -456,7 +458,7 @@ class LoadUnitLoadData(ModelView):
class LoadUnitLoad(Wizard):
"""Carrier load unit load"""
__name__ = 'carrier.load_uls'
start = StateTransition()
order = StateView('carrier.load_uls.order',
'carrier_load_ul.load_uls_order_view_form',
@ -499,6 +501,7 @@ class LoadUnitLoad(Wizard):
res = {'load_order': order.id,
'loaded_uls': 0,
'standalone': standalone,
'uls_loaded_domain': map(int, order.unit_loads) or [],
'order_state': order.state}
if order.unit_loads:
res['loaded_uls'] = len(order.unit_loads)

View File

@ -49,7 +49,10 @@ class UnitLoad:
@classmethod
def search_load_order(cls, name, clause):
return [('load_line.order', ) + tuple(clause[1:])]
_name = 'load_line.order'
if '.' in name:
_name = '%s.%s' % (_name, name[11:])
return [(_name, ) + tuple(clause[1:])]
@classmethod
@ModelView.button