Skip to content

[18] commission modules #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: 18.0
Choose a base branch
from
Draft

[18] commission modules #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6af8aac
[MIG] sale_agent to v18
florian-dacosta Sep 2, 2025
a19ec0d
[MIG] commission_simple to 18
florian-dacosta Sep 2, 2025
46e1194
[MIG] commission_simple_agent : technical migration to 18
florian-dacosta Sep 2, 2025
0a260e0
mig report
bguillot Sep 2, 2025
4d52d54
fix missing import
bguillot Sep 2, 2025
5ca18e6
[MIG] commission_simple_agent_purchase to 18
florian-dacosta Sep 9, 2025
47197eb
[FIX] chatter in commission result view + add action name for all com…
florian-dacosta Sep 9, 2025
3f133ab
[IMP] Add default agent boolean when creating an agent from the commi…
florian-dacosta Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions commission_simple/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{
'name': 'Commission Simple',
'version': '16.0.1.0.0',
'version': '18.0.1.0.0',
'category': 'Sales',
'license': 'AGPL-3',
'summary': 'Compute commissions for salesman',
Expand Down Expand Up @@ -44,5 +44,5 @@
'views/res_config_settings.xml',
'wizards/commission_compute_view.xml',
],
'installable': False,
'installable': True,
}
2 changes: 1 addition & 1 deletion commission_simple/views/account_move_line.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<field name="inherit_id" ref="account.view_move_line_form"/>
<field name="arch" type="xml">
<notebook position="inside">
<page name="commission" string="Commission" attrs="{'invisible': [('display_type', '!=', 'product')]}">
<page name="commission" string="Commission" invisible="display_type != 'product'">
<group name="commission_grp">
<field name="commission_base"/>
<label for="commission_rate"/>
Expand Down
206 changes: 0 additions & 206 deletions commission_simple/views/commission.xml
View file
Open in desktop

This file was deleted.

19 changes: 10 additions & 9 deletions commission_simple/views/commission_profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<field name="arch" type="xml">
<form>
<sheet>
<widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
<widget name="web_ribbon" title="Archived" bg_color="bg-danger" invisible="active"/>
<group name="main">
<group name="main-left">
<field name="name"/>
Expand All @@ -31,12 +31,12 @@
<notebook>
<page name="assignments" string="Assignments">
<field name="assign_ids">
<tree editable="bottom">
<list editable="bottom">
<field name="assign_type"/>
<field name="user_id" attrs="{'required': [('assign_type', '=', 'user')], 'readonly': [('assign_type', '!=', 'user')]}"/>
<field name="user_id" required="assign_type == 'user'" readonly="assign_type != 'user'"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="company_id" invisible="1"/>
</tree>
</list>
</field>
</page>
<page name="rules" string="Rules">
Expand All @@ -48,23 +48,24 @@
</field>
</record>

<record id="commission_profile_tree" model="ir.ui.view">
<field name="name">commission.profile.tree</field>
<record id="commission_profile_list" model="ir.ui.view">
<field name="name">commission.profile.list</field>
<field name="model">commission.profile</field>
<field name="arch" type="xml">
<tree>
<list>
<field name="sequence" widget="handle"/>
<field name="name" decoration-bf="1"/>
<field name="trigger_type" optional="show"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree>
</list>
</field>
</record>

<record id="commission_profile_action" model="ir.actions.act_window">
<field name="name">Commission Profiles</field>
<field name="path">commission-profile</field>
<field name="res_model">commission.profile</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">list,form</field>
</record>

<menuitem id="commission_profile_menu" action="commission_profile_action" parent="commission_config_root" sequence="18"/>
Expand Down
25 changes: 11 additions & 14 deletions commission_simple/views/commission_result.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<field name="arch" type="xml">
<form>
<header>
<button name="draft2done" type="object" states="draft" string="Confirm" class="btn-primary"/>
<button name="backtodraft" type="object" states="done" string="Back to Draft" confirm="Are you sure you want to go back to draft?"/>
<button name="draft2done" type="object" invisible="state != 'draft'" string="Confirm" class="btn-primary"/>
<button name="backtodraft" type="object" invisible="state != 'done'" string="Back to Draft" confirm="Are you sure you want to go back to draft?"/>
<field name="state" widget="statusbar"/>
</header>
<group name="main">
Expand All @@ -35,7 +35,7 @@
</group>
<group name="lines" string="Commission Lines">
<field nolabel="1" name="line_ids" colspan="2">
<tree>
<list>
<field name="move_id"/>
<field name="date" optional="hide"/>
<field name="partner_id"/>
Expand All @@ -49,23 +49,19 @@
<field name="commission_rule_id" optional="hide"/>
<field name="company_currency_id" invisible="1"/>
<field name="currency_id" invisible="1"/>
</tree>
</list>
</field>
</group>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
<field name="activity_ids" widget="mail_activity"/>
<field name="message_ids" widget="mail_thread"/>
</div>
<chatter />
</form>
</field>
</record>

<record id="commission_result_tree" model="ir.ui.view">
<field name="name">commission.result.tree</field>
<record id="commission_result_list" model="ir.ui.view">
<field name="name">commission.result.list</field>
<field name="model">commission.result</field>
<field name="arch" type="xml">
<tree>
<list>
<field name="date_range_id" optional="show"/>
<field name="date_start" optional="hide"/>
<field name="date_end" optional="hide"/>
Expand All @@ -76,7 +72,7 @@
<field name="company_id" groups="base.group_multi_company"/>
<field name="amount_total" sum="1" optional="show"/>
<field name="state" decoration-info="state == 'draft'" decoration-success="state == 'done'" widget="badge"/>
</tree>
</list>
</field>
</record>

Expand All @@ -103,8 +99,9 @@

<record id="commission_result_action" model="ir.actions.act_window">
<field name="name">Commissions</field>
<field name="path">commission-result</field>
<field name="res_model">commission.result</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">list,form</field>
</record>

<menuitem id="commission_result_menu" action="commission_result_action" parent="commission_root" sequence="10"/>
Expand Down
Loading