parent
6697c7028c
commit
8765bd97f8
15
load.py
15
load.py
|
@ -823,10 +823,12 @@ class CreateLoadDataMixin(object):
|
|||
states={'required': ~Eval('load_order'),
|
||||
'invisible': Bool(Eval('load_order'))},
|
||||
depends=['warehouse', 'load_order'])
|
||||
carrier = fields.Many2One('carrier', 'Carrier', required=True,
|
||||
states={'required': ~Eval('load_order'),
|
||||
'invisible': Bool(Eval('load_order'))},
|
||||
depends=['load_order'])
|
||||
carrier = fields.Many2One('carrier', 'Carrier',
|
||||
states={
|
||||
'required': ~Eval('load_order') & Bool(Eval('load_purchasable')),
|
||||
'invisible': Bool(Eval('load_order'))
|
||||
},
|
||||
depends=['load_order', 'load_purchasable'])
|
||||
vehicle_number = fields.Char('Vehicle reg. number', required=True,
|
||||
states={
|
||||
'required': ~Eval('load_order'),
|
||||
|
@ -850,6 +852,11 @@ class CreateLoadDataMixin(object):
|
|||
'required': Bool(Eval('driver')),
|
||||
'invisible': Bool(Eval('load_order'))},
|
||||
depends=['driver', 'load_order'])
|
||||
carrier_info = fields.Text('Carrier information',
|
||||
states={
|
||||
'invisible': Bool(Eval('load_purchasable')) | Bool(Eval('carrier'))
|
||||
},
|
||||
depends=['load_purchasable', 'carrier'])
|
||||
|
||||
@classmethod
|
||||
def default_load_purchasable(cls):
|
||||
|
|
|
@ -693,7 +693,7 @@
|
|||
<text:p text:style-name="P20"><text:placeholder text:placeholder-type="text"><format_date(load.date, load.company.party.lang)></text:placeholder></text:p>
|
||||
</table:table-cell>
|
||||
<table:table-cell table:style-name="Table3.C2" office:value-type="string">
|
||||
<text:p text:style-name="P20"><text:placeholder text:placeholder-type="text"><load.carrier.rec_name></text:placeholder></text:p>
|
||||
<text:p text:style-name="P20"><text:placeholder text:placeholder-type="text"><load.get_carrier_name()></text:placeholder></text:p>
|
||||
</table:table-cell>
|
||||
<table:table-cell table:style-name="Table3.D2" office:value-type="string">
|
||||
<text:p text:style-name="P20"><text:placeholder text:placeholder-type="text"><load.get_registration_numbers()></text:placeholder></text:p>
|
||||
|
|
|
@ -126,6 +126,10 @@ msgctxt "field:carrier.load.create_from_sale,carrier:"
|
|||
msgid "Carrier"
|
||||
msgstr "Transportista"
|
||||
|
||||
msgctxt "field:carrier.load.create_from_sale,carrier_info:"
|
||||
msgid "Carrier information"
|
||||
msgstr "Información transportista"
|
||||
|
||||
msgctxt "field:carrier.load.create_from_sale,dock:"
|
||||
msgid "Dock"
|
||||
msgstr "Muelle"
|
||||
|
|
1
sale.py
1
sale.py
|
@ -310,6 +310,7 @@ class CreateLoad(Wizard):
|
|||
Transaction().context['active_model']])
|
||||
_load = Load()
|
||||
_load.carrier = _data_state.carrier
|
||||
_load.carrier_info = _data_state.carrier_info
|
||||
_load.vehicle_number = _data_state.vehicle_number
|
||||
_load.trailer_number = _data_state.trailer_number
|
||||
_load.warehouse = _data_state.warehouse
|
||||
|
|
|
@ -25,5 +25,9 @@
|
|||
<page id="lines" string="Lines">
|
||||
<field name="lines" colspan="4"/>
|
||||
</page>
|
||||
<page name="carrier_info">
|
||||
<separator name="carrier_info" colspan="4"/>
|
||||
<field name="carrier_info" colspan="4"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
|
|
Loading…
Reference in New Issue