Allow to configure required registration numbers.
This commit refs #10269
This commit is contained in:
parent
2fcf102b54
commit
f5e0fe41fb
13
load.py
13
load.py
|
@ -875,17 +875,20 @@ class CreateLoadDataMixin(object):
|
|||
'invisible': Bool(Eval('load_order'))
|
||||
},
|
||||
depends=['load_order', 'load_purchasable'])
|
||||
vehicle_number = fields.Char('Vehicle reg. number', required=True,
|
||||
vehicle_number = fields.Char('Vehicle reg. number',
|
||||
states={
|
||||
'required': ~Eval('load_order'),
|
||||
'required': ~Eval('load_order') & Bool(Eval('vehicle_required')),
|
||||
'invisible': Bool(Eval('load_order'))
|
||||
},
|
||||
depends=['load_order'])
|
||||
depends=['load_order', 'vehicle_required'])
|
||||
vehicle_required = fields.Boolean('Vehicle required')
|
||||
trailer_number = fields.Char('Trailer reg. number',
|
||||
states={
|
||||
'invisible': Bool(Eval('load_order'))
|
||||
'invisible': Bool(Eval('load_order')),
|
||||
'required': ~Eval('load_order') & Bool(Eval('trailer_required')),
|
||||
},
|
||||
depends=['load_order'])
|
||||
depends=['load_order', 'trailer_required'])
|
||||
trailer_required = fields.Boolean('Trailer required')
|
||||
load_purchasable = fields.Boolean('Load purchasable',
|
||||
states={'invisible': Bool(Eval('load_order'))},
|
||||
depends=['load_order'])
|
||||
|
|
8
sale.py
8
sale.py
|
@ -237,8 +237,14 @@ class CreateLoad(Wizard):
|
|||
def default_sale_data(self, fields):
|
||||
pool = Pool()
|
||||
Sale = pool.get('sale.sale')
|
||||
Conf = pool.get('carrier.configuration')
|
||||
|
||||
res = {'lines': []}
|
||||
conf = Conf(1)
|
||||
res = {
|
||||
'vehicle_required': conf.vehicle_required,
|
||||
'trailer_required': conf.trailer_required,
|
||||
'lines': []
|
||||
}
|
||||
sale = Sale(Transaction().context.get('active_id'))
|
||||
if sale.ul_quantity_to_load <= 0:
|
||||
self.raise_user_error('nothing_load')
|
||||
|
|
Loading…
Reference in New Issue