Skip to content

Commit

Permalink
[MIG] sale_commission_product_criteria: Migration to 17.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jbernausVunkers committed Nov 4, 2024
1 parent 75641b6 commit 2fcef5b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 37 deletions.
2 changes: 1 addition & 1 deletion sale_commission_product_criteria/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"name": "Sale Commission Product Criteria",
"summary": "Advanced commissions rules",
"version": "16.0.1.0.0",
"version": "17.0.1.0.0",
"author": "Ilyas, Ooops404, Odoo Community Association (OCA)",
"maintainers": ["ilyasProgrammer"],
"website": "https://github.com/OCA/commission",
Expand Down
22 changes: 6 additions & 16 deletions sale_commission_product_criteria/models/commission.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,22 +171,12 @@ def _compute_commission_item_name_value(self):
decimal_places = self.env["decimal.precision"].precision_get(
"Product Price"
)
value = float_repr(item.fixed_amount, decimal_places)
symbol = item.currency_id.symbol or ""
if item.currency_id.position == "after":
item.commission_value = "%s %s" % (
float_repr(
item.fixed_amount,
decimal_places,
),
item.currency_id.symbol or "",
)
item.commission_value = f"{value} {symbol}"
else:
item.commission_value = "%s %s" % (
item.currency_id.symbol or "",
float_repr(
item.fixed_amount,
decimal_places,
),
)
item.commission_value = f"{symbol} {value}"
elif item.commission_type == "percentage":
item.commission_value = str(item.percent_amount) + " %"

Expand Down Expand Up @@ -242,11 +232,11 @@ def create(self, values_list):
for values in values_list:
values = self.validate_values(values)
new_values_list.append(values)
return super(CommissionItem, self).create(new_values_list)
return super().create(new_values_list)

def write(self, values):
values = self.validate_values(values)
res = super(CommissionItem, self).write(values)
res = super().write(values)
return res

def validate_values(self, values):
Expand Down
33 changes: 13 additions & 20 deletions sale_commission_product_criteria/views/views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
name="button_edit_agents"
title="Edit agents"
icon="fa-users"
attrs="{'invisible': [('commission_free', '=', True)]}"
invisible="commission_free"
type="object"
/>
</button>
Expand All @@ -34,15 +34,13 @@
<field name="inherit_id" ref="commission.commission_form" />
<field name="arch" type="xml">
<xpath expr="//field[@name='section_ids']/.." position="attributes">
<attribute
name="attrs"
>{'invisible': [('commission_type', '=', 'product')]}</attribute>
<attribute name="invisible">commission_type == 'product'</attribute>
</xpath>
<sheet position="inside">
<group
string="Rules"
name="rules_group"
attrs="{'invisible': [('commission_type', '!=', 'product')]}"
invisible="commission_type != 'product'"
>
<field
name="item_ids"
Expand Down Expand Up @@ -108,23 +106,20 @@
<field name="based_on" invisible="1" />
<field
name="categ_id"
attrs="{
'invisible':[('applied_on', '!=', '2_product_category')],
'required':[('applied_on', '=', '2_product_category')]}"
invisible="applied_on != '2_product_category'"
required="applied_on == '2_product_category'"
options="{'no_create':1}"
/>
<field
name="product_tmpl_id"
attrs="{
'invisible':[('applied_on', '!=', '1_product')],
'required':[('applied_on', '=', '1_product')]}"
invisible="applied_on != '1_product'"
required="applied_on == '1_product'"
options="{'no_create':1}"
/>
<field
name="product_id"
attrs="{
'invisible':[('applied_on', '!=', '0_product_variant')],
'required':[('applied_on', '=', '0_product_variant')]}"
invisible="applied_on != '0_product_variant'"
required="applied_on == '0_product_variant'"
options="{'no_create':1}"
/>
</group>
Expand All @@ -144,19 +139,17 @@
<group name="commission_rule_base">
<field
name="fixed_amount"
attrs="{'invisible':[('commission_type', '!=', 'fixed')]}"
invisible="commission_type != 'fixed'"
/>
<label
for="percent_amount"
attrs="{'invisible':[('commission_type', '!=', 'percentage')]}"
invisible="commission_type != 'percentage'"
/>
<div
attrs="{'invisible':[('commission_type', '!=', 'percentage')]}"
>
<div invisible="commission_type != 'percentage'">
<field
name="percent_amount"
class="oe_inline"
attrs="{'invisible':[('commission_type', '!=', 'percentage')]}"
invisible="commission_type != 'percentage'"
/>
%%
</div>
Expand Down

0 comments on commit 2fcef5b

Please sign in to comment.