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 +10 -10
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 814071e4c1 - Show all commits

20
modules/purchase_trade/fee.py
View File

@@ -355,16 +355,16 @@ class Fee(ModelSQL,ModelView):
return round(factor * self.sale_line.unit_price * (self.quantity if self.quantity else 0) * sign,2) return round(factor * self.sale_line.unit_price * (self.quantity if self.quantity else 0) * sign,2)
elif self.mode == 'perqt': elif self.mode == 'perqt':
if self.shipment_in: # if self.shipment_in:
StockMove = Pool().get('stock.move') # StockMove = Pool().get('stock.move')
sm = StockMove.search(['shipment','=','stock.shipment.in,'+str(self.shipment_in.id)]) # sm = StockMove.search(['shipment','=','stock.shipment.in,'+str(self.shipment_in.id)])
if sm: # if sm:
unique_lots = {e.lot for e in sm if e.lot} # unique_lots = {e.lot for e in sm if e.lot}
return round(self.price * Decimal(sum([e.get_current_quantity_converted() for e in unique_lots])) * sign,2) # return round(self.price * Decimal(sum([e.get_current_quantity_converted() for e in unique_lots])) * sign,2)
LotQt = Pool().get('lot.qt') # LotQt = Pool().get('lot.qt')
lqts = LotQt.search(['lot_shipment_in','=',self.shipment_in.id]) # lqts = LotQt.search(['lot_shipment_in','=',self.shipment_in.id])
if lqts: # if lqts:
return round(self.price * Decimal(lqts[0].lot_quantity) * sign,2) # return round(self.price * Decimal(lqts[0].lot_quantity) * sign,2)
return round((self.quantity if self.quantity else 0) * self.price * sign,2) return round((self.quantity if self.quantity else 0) * self.price * sign,2)
elif self.mode == 'pprice': elif self.mode == 'pprice':