24.02.26
This commit is contained in:
@@ -109,7 +109,7 @@ class Fee(ModelSQL,ModelView):
|
|||||||
if lqt:
|
if lqt:
|
||||||
return lqt[0].id
|
return lqt[0].id
|
||||||
|
|
||||||
@fields.depends('unit','auto_calculation','mode','_parent_line.unit','_parent_line.lots','_parent_sale_line.unit','_parent_sale_line.lots','_parent_shipment_in.id')
|
@fields.depends('price','unit','auto_calculation','mode','_parent_line.unit','_parent_line.lots','_parent_sale_line.unit','_parent_sale_line.lots','_parent_shipment_in.id')
|
||||||
def on_change_with_quantity(self, name=None):
|
def on_change_with_quantity(self, name=None):
|
||||||
qt = None
|
qt = None
|
||||||
unit = None
|
unit = None
|
||||||
|
|||||||
@@ -796,10 +796,10 @@ class ShipmentIn(metaclass=PoolMeta):
|
|||||||
"Point1PlaceKey": sh.from_location.get_places(),
|
"Point1PlaceKey": sh.from_location.get_places(),
|
||||||
"Point2PlaceKey": sh.to_location.get_places(),
|
"Point2PlaceKey": sh.to_location.get_places(),
|
||||||
"OrderReference": sh.reference,
|
"OrderReference": sh.reference,
|
||||||
"FeeTotalCost": fee.amount,
|
"FeeTotalCost": float(fee.amount),
|
||||||
"FeeUnitPrice": fee.price,
|
"FeeUnitPrice": float(fee.price),
|
||||||
"ContractNumbers": sh.number,
|
"ContractNumbers": sh.number,
|
||||||
"OrderQuantityGW": fee.quantity,
|
"OrderQuantityGW": float(fee.quantity) if fee.quantity else float(1),
|
||||||
"NumberOfPackingBales": 1
|
"NumberOfPackingBales": 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user