admin/tradon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main #7

Merged
admin merged 620 commits from main into dev 2026-03-29 13:03:25 +00:00
Conversation 0 Commits 620 Files Changed 155 +4 -4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 56f2c3a4a6 - Show all commits

2
modules/purchase_trade/fee.py
View File

@@ -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

6
modules/purchase_trade/stock.py
View File

@@ -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
} }