Skip to content

Commit

Permalink
[MIG] commission: Migration to 18.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mb-andema committed Nov 12, 2024
1 parent e659aee commit 7cf9d94
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 24 deletions.
2 changes: 1 addition & 1 deletion commission/i18n/commission.pot
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 17.0\n"
"Project-Id-Version: Odoo Server 18.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down
2 changes: 1 addition & 1 deletion commission/i18n/tr.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 17.0\n"
"Project-Id-Version: Odoo Server 18.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2024-08-26 11:06+0000\n"
"Last-Translator: Metin GÜLSOY <[email protected]>\n"
Expand Down
22 changes: 9 additions & 13 deletions commission/views/commission_settlement_views.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record model="ir.ui.view" id="view_settlement_tree">
<field name="name">Settlements tree</field>
<field name="name">Settlements list</field>
<field name="model">commission.settlement</field>
<field name="arch" type="xml">
<tree decoration-danger="state == 'cancel'">
<list decoration-danger="state == 'cancel'">
<field name="agent_id" />
<field name="company_id" groups="base.group_multi_company" />
<field name="date_from" />
Expand All @@ -18,7 +18,7 @@
/>
<field name="state" />
<field name="currency_id" column_invisible="1" />
</tree>
</list>
</field>
</record>
<record id="view_settlement_search" model="ir.ui.view">
Expand Down Expand Up @@ -96,11 +96,11 @@
readonly="not can_edit"
colspan="2"
>
<tree editable="top">
<list editable="top">
<field name="date" />
<field name="commission_id" />
<field name="settled_amount" />
</tree>
</list>
</field>
</group>
<group>
Expand All @@ -114,24 +114,20 @@
</group>
</group>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" />
<field name="activity_ids" />
<field name="message_ids" />
</div>
<chatter />
</form>
</field>
</record>
<record model="ir.ui.view" id="view_settlement_line_tree">
<field name="name">Settlement lines</field>
<field name="model">commission.settlement.line</field>
<field name="arch" type="xml">
<tree create="false">
<list create="false">
<field name="date" />
<field name="agent_id" />
<field name="commission_id" />
<field name="settled_amount" sum="Settled total" />
</tree>
</list>
</field>
</record>
<record id="view_settlement_line_search" model="ir.ui.view">
Expand Down Expand Up @@ -178,7 +174,7 @@
<field name="name">Settlements</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">commission.settlement</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">list,form</field>
</record>
<menuitem
name="Settlements"
Expand Down
12 changes: 6 additions & 6 deletions commission/views/commission_views.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record model="ir.ui.view" id="commission_tree">
<field name="name">commissions tree</field>
<field name="name">commissions list</field>
<field name="model">commission</field>
<field name="arch" type="xml">
<tree>
<list>
<field name="name" />
<field name="commission_type" />
<field name="settlement_type" />
<field name="amount_base_type" />
</tree>
</list>
</field>
</record>
<record model="ir.ui.view" id="commission_form">
Expand Down Expand Up @@ -49,11 +49,11 @@
nolabel="1"
invisible="(commission_type != 'section')"
>
<tree editable="bottom">
<list editable="bottom">
<field name="amount_from" />
<field name="amount_to" />
<field name="percent" />
</tree>
</list>
</field>
</group>
</sheet>
Expand All @@ -64,7 +64,7 @@
<field name="name">Commission types</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">commission</field>
<field name="binding_view_types">form,tree</field>
<field name="binding_view_types">form,list</field>
</record>
<menuitem
name="Commission types"
Expand Down
6 changes: 3 additions & 3 deletions commission/views/res_partner_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
invisible="not settlement_ids"
>
<field colspan="2" name="settlement_ids" nolabel="1">
<tree
<list
decoration-danger="state == 'cancel'"
decoration-success="state == 'invoiced'"
>
<field name="date_from" />
<field name="date_to" />
<field name="total" sum="Settled total" />
<field name="state" />
</tree>
</list>
</field>
</group>
</group>
Expand Down Expand Up @@ -74,7 +74,7 @@
<field name="name">Agents</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.partner</field>
<field name="view_mode">kanban,form,tree</field>
<field name="view_mode">kanban,form,list</field>
<field name="context">{"search_default_agent": 1, 'default_agent': 1}</field>
<field name="search_view_id" ref="res_partner_view_search" />
</record>
Expand Down

0 comments on commit 7cf9d94

Please sign in to comment.