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

11
modules/purchase_trade/fee.py
View File

@@ -66,12 +66,13 @@ class Fee(ModelSQL,ModelView):
quantity = fields.Numeric("Qt",digits='unit',states={'readonly': (Eval('mode') != 'ppack') | Bool(Eval('auto_calculation'))}) quantity = fields.Numeric("Qt",digits='unit',states={'readonly': (Eval('mode') != 'ppack') | Bool(Eval('auto_calculation'))})
unit = fields.Many2One('product.uom',"Unit",domain=[ unit = fields.Many2One('product.uom',"Unit",domain=[
If(Eval('mode') == 'ppack', If(Eval('mode') == 'ppack',
('category', '=', 8), ('category', '=', Eval('packing_category')),
()), ()),
], ],
states={ states={
'readonly': Eval('mode') != 'ppack', 'readonly': (Eval('mode') != 'ppack' | Eval('mode') != 'perqt'),
}) })
packing_category = fields.Function(fields.Integer("Packing Category"),'get_packing_category')
inherit_shipment = fields.Boolean("Inh Sh",states={ inherit_shipment = fields.Boolean("Inh Sh",states={
'invisible': (Eval('shipment_in')), 'invisible': (Eval('shipment_in')),
}) })
@@ -109,6 +110,12 @@ class Fee(ModelSQL,ModelView):
if lqt: if lqt:
return lqt[0].id return lqt[0].id
def get_packing_category(self, name):
UnitCategory = Pool().get('product.uom.category')
packing = UnitCategory.search(['name','=','Packing'])
if packing:
return packing[0].id
@fields.depends('line','sale_line','shipment_in','lots','price','unit','auto_calculation','mode','_parent_line.unit','_parent_line.lots','_parent_sale_line.unit','_parent_sale_line.lots') @fields.depends('line','sale_line','shipment_in','lots','price','unit','auto_calculation','mode','_parent_line.unit','_parent_line.lots','_parent_sale_line.unit','_parent_sale_line.lots')
def on_change_with_quantity(self, name=None): def on_change_with_quantity(self, name=None):
qt = None qt = None