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

8
modules/purchase_trade/fee.py
View File

@@ -144,7 +144,7 @@ class Fee(ModelSQL,ModelView):
if self.auto_calculation:
return (qt * Decimal(unit.factor) / Decimal(self.unit.factor)).to_integral_value(rounding=ROUND_UP)
@fields.depends('mode','_parent_line.lots','_parent_sale_line.lots')
@fields.depends('price','mode','_parent_line.lots','_parent_sale_line.lots')
def on_change_with_unit(self, name=None):
if self.mode != 'ppack':
line = self.line
@@ -156,6 +156,12 @@ class Fee(ModelSQL,ModelView):
return line.lots[0].lot_unit_line
else:
return line.lots[1].lot_unit_line
if self.shipment_in:
Lot = Pool().get('lot.lot')
lots = Lot.search([('lot_shipment_in','=',self.shipment_in.id)])
logger.info("ON_CHANGE_WITH_UNIT:%s",lots)
if lots:
return lots[0].lot_unit_line
else:
return None