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

4
modules/purchase_trade/fee.py
View File

@@ -59,7 +59,7 @@ class Fee(ModelSQL,ModelView):
('pcost', '% cost price'), ('pcost', '% cost price'),
('ppack', 'Per packing'), ('ppack', 'Per packing'),
], 'Mode', required=True) ], 'Mode', required=True)
auto_calculation = fields.Boolean("Auto Calc.",states={'readonly': (Eval('mode') != 'ppack')}) auto_calculation = fields.Boolean("Auto",states={'readonly': (Eval('mode') != 'ppack')})
inherit_qt = fields.Boolean("Inh Qt",states={'readonly': Eval('mode') != 'ppack'}) inherit_qt = fields.Boolean("Inh Qt",states={'readonly': Eval('mode') != 'ppack'})
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=[
@@ -118,7 +118,7 @@ class Fee(ModelSQL,ModelView):
return qt return qt
else: else:
if self.auto_calculation: if self.auto_calculation:
return Decimal(int(qt/self.unit.factor)) return Decimal(int(qt/Decimal(self.unit.factor)))
@fields.depends('mode','_parent_line.lots','_parent_sale_line.lots') @fields.depends('mode','_parent_line.lots','_parent_sale_line.lots')
def on_change_with_unit(self, name=None): def on_change_with_unit(self, name=None):

4
modules/purchase_trade/view/fee_tree_sequence.xml
View File

@@ -7,12 +7,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="supplier"/> <field name="supplier"/>
<field name="mode"/> <field name="mode"/>
<field name="unit"/> <field name="unit"/>
<field name="auto_calculation"/> <field name="auto_calculation" width="60"/>
<field name="price"/> <field name="price"/>
<field name="currency"/> <field name="currency"/>
<field name="weight_type"/> <field name="weight_type"/>
<field name="p_r"/> <field name="p_r"/>
<field name="quantity" symbol="unit"/> <field name="quantity"/>
<field name="amount"/> <field name="amount"/>
<field name="qt_state"/> <field name="qt_state"/>
<field name="inherit_shipment"/> <field name="inherit_shipment"/>

4
modules/purchase_trade/view/fee_tree_sequence2.xml
View File

@@ -7,12 +7,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="supplier"/> <field name="supplier"/>
<field name="mode"/> <field name="mode"/>
<field name="unit"/> <field name="unit"/>
<field name="auto_calculation"/> <field name="auto_calculation" width="60"/>
<field name="price"/> <field name="price"/>
<field name="currency"/> <field name="currency"/>
<field name="weight_type"/> <field name="weight_type"/>
<field name="p_r"/> <field name="p_r"/>
<field name="quantity" symbol="unit"/> <field name="quantity"/>
<field name="amount"/> <field name="amount"/>
<field name="qt_state"/> <field name="qt_state"/>
<!-- <field name="purchase"/> --> <!-- <field name="purchase"/> -->