Purchase design
This commit is contained in:
@@ -742,6 +742,10 @@ class Purchase(metaclass=PoolMeta):
|
||||
route_to = getattr(
|
||||
getattr(shipment, 'to_location', None),
|
||||
'rec_name', None)
|
||||
route_from = route_from or getattr(
|
||||
getattr(self, 'from_location', None), 'rec_name', None)
|
||||
route_to = route_to or getattr(
|
||||
getattr(self, 'to_location', None), 'rec_name', None)
|
||||
if route_from or route_to:
|
||||
shipped_routes.append(
|
||||
'%s > %s' % (route_from or '-', route_to or '-'))
|
||||
@@ -765,6 +769,12 @@ class Purchase(metaclass=PoolMeta):
|
||||
route_to = getattr(
|
||||
getattr(shipment, 'to_location', None),
|
||||
'rec_name', None)
|
||||
route_from = route_from or getattr(
|
||||
getattr(self, 'from_location', None),
|
||||
'rec_name', None)
|
||||
route_to = route_to or getattr(
|
||||
getattr(self, 'to_location', None),
|
||||
'rec_name', None)
|
||||
if route_from or route_to:
|
||||
shipped_routes.append(
|
||||
'%s > %s' % (route_from or '-', route_to or '-'))
|
||||
|
||||
@@ -79,18 +79,18 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<group id="purchase_tolerance" string="Tolerance"
|
||||
colspan="1" col="6" panel="card" icon="tryton-switch"
|
||||
xalign="0" yalign="0"
|
||||
col_widths="115px,110px,115px,110px,135px,165px">
|
||||
col_widths="min-content,1fr,min-content,1fr,min-content,200px">
|
||||
<label name="tol_min"/>
|
||||
<field name="tol_min" width="100" xexpand="0" xfill="0"/>
|
||||
<field name="tol_min"/>
|
||||
<label name="tol_max"/>
|
||||
<field name="tol_max" width="100" xexpand="0" xfill="0"/>
|
||||
<field name="tol_max"/>
|
||||
<label name="tolerance_used"/>
|
||||
<field name="tolerance_used" widget="tolerance_gauge"
|
||||
min_field="tolerance_min" max_field="tolerance_max"
|
||||
width="150" xexpand="0" xfill="0"/>
|
||||
<field name="tolerance_min" invisible="1"/>
|
||||
<field name="tolerance_max" invisible="1"/>
|
||||
width="190" xexpand="0" xfill="0"/>
|
||||
</group>
|
||||
<field name="tolerance_min" invisible="1"/>
|
||||
<field name="tolerance_max" invisible="1"/>
|
||||
</group>
|
||||
|
||||
<group id="purchase_header_right" colspan="2" col="1"
|
||||
|
||||
Reference in New Issue
Block a user