diff --git a/modules/purchase_trade/fee.py b/modules/purchase_trade/fee.py
index 8c82553..6561764 100755
--- a/modules/purchase_trade/fee.py
+++ b/modules/purchase_trade/fee.py
@@ -109,7 +109,7 @@ class Fee(ModelSQL,ModelView):
         if lqt:
             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):
         qt = None
         unit = None
diff --git a/modules/purchase_trade/stock.py b/modules/purchase_trade/stock.py
index 61f96a1..f918411 100755
--- a/modules/purchase_trade/stock.py
+++ b/modules/purchase_trade/stock.py
@@ -796,10 +796,10 @@ class ShipmentIn(metaclass=PoolMeta):
                             "Point1PlaceKey": sh.from_location.get_places(),
                             "Point2PlaceKey": sh.to_location.get_places(),
                             "OrderReference": sh.reference,
-                            "FeeTotalCost": fee.amount,
-                            "FeeUnitPrice": fee.price,
+                            "FeeTotalCost": float(fee.amount),
+                            "FeeUnitPrice": float(fee.price),
                             "ContractNumbers": sh.number,
-                            "OrderQuantityGW": fee.quantity,
+                            "OrderQuantityGW": float(fee.quantity) if fee.quantity else float(1),
                             "NumberOfPackingBales": 1
                         }