Skip to content

Commit 107b94a

Browse files
committed
[MIG] srm: Migration to 18.0
1 parent 1eea7d2 commit 107b94a

File tree

5 files changed

+35
-42
lines changed

5 files changed

+35
-42
lines changed

srm/__manifest__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{
66
"name": "SRM",
7-
"version": "14.0.1.0.0",
7+
"version": "18.0.1.0.0",
88
"author": "Camptocamp, Odoo Community Association (OCA)",
99
"summary": "Use CRM model for suppliers",
1010
"license": "AGPL-3",
@@ -14,7 +14,6 @@
1414
"crm",
1515
"sale_crm",
1616
"purchase",
17-
"crm_enterprise",
1817
],
1918
"website": "https://github.com/OCA/crm",
2019
"data": [

srm/views/crm_lead_views.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,4 @@
1616
'search_default_assigned_to_me': 1,
1717
}</field>
1818
</record>
19-
20-
<!-- dashboard action -->
21-
<record id="crm_enterprise.crm_lead_action_dashboard" model="ir.actions.act_window">
22-
<field
23-
name="domain"
24-
>['&amp;', ('request_type','in',(False,'customer')), '|', ('active','=',True), ('active','=',False)]</field>
25-
</record>
26-
27-
<record
28-
id="crm_enterprise.crm_opportunity_action_dashboard"
29-
model="ir.actions.act_window"
30-
>
31-
<field name="domain">[('request_type','in',(False,'customer'))]</field>
32-
</record>
3319
</odoo>

srm/views/srm_lead_views.xml

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<field
2525
name="partner_id"
2626
string="Supplier"
27-
attrs="{'invisible': [('request_type','=','customer')]}"
27+
invisible="request_type == 'customer'"
2828
/>
2929
</xpath>
3030
<xpath
@@ -34,7 +34,7 @@
3434
<field
3535
name="partner_id"
3636
string="Customer"
37-
attrs="{'invisible': [('request_type','!=','customer')]}"
37+
invisible="request_type != 'customer'"
3838
/>
3939
</xpath>
4040
<field name="user_id" position="attributes">
@@ -52,8 +52,7 @@
5252
<field name="view_mode">form</field>
5353
<field
5454
name="context"
55-
>{'search_default_partner_id': active_id, 'default_partner_id': active_id}</field>
56-
<field name="groups_id" eval="[(4, ref('purchase.group_purchase_user'))]" />
55+
>{'search_default_partner_id': id, 'default_partner_id': id}</field>
5756
</record>
5857

5958
<record id="crm_case_form_view_oppor" model="ir.ui.view">
@@ -65,34 +64,44 @@
6564
expr="//button[@name='action_sale_quotations_new']"
6665
position="attributes"
6766
>
67+
<!-- addition to `type == 'lead' or probability == 0 and not active` -->
6868
<attribute
69-
name="attrs"
70-
>{'invisible': ['|', ('request_type', '=', 'supplier'), '|', ('type', '=', 'lead'), '&amp;', ('probability', '=', 0), ('active', '=', False)]}</attribute>
69+
name="invisible"
70+
add="request_type == 'supplier'"
71+
separator="or"
72+
/>
7173
</xpath>
7274
<xpath expr="//button[@name='action_set_won_rainbowman']" position="before">
7375
<button
7476
string="New RFQ"
7577
name="action_lead_rfq_new"
7678
type="object"
7779
class="oe_highlight"
78-
attrs="{'invisible': ['|', ('request_type', '!=', 'supplier'), '|', ('type', '=', 'lead'), '&amp;', ('probability', '=', 0), ('active', '=', False)]}"
80+
invisible="request_type != 'supplier' or type == 'lead' or (probability == 0 and not active)"
81+
groups="purchase.group_purchase_user"
7982
/>
8083
</xpath>
8184
<xpath
8285
expr="//button[@name='action_view_sale_quotation']"
8386
position="attributes"
8487
>
88+
<!-- addition to `type == 'lead'` -->
8589
<attribute
86-
name="attrs"
87-
>{'invisible': ['|', ('request_type', '=', 'supplier'), ('type', '=', 'lead')]}</attribute>
90+
name="invisible"
91+
add="request_type == 'supplier'"
92+
separator="or"
93+
/>
8894
</xpath>
8995
<xpath
9096
expr="//button[@name='action_view_sale_order']"
9197
position="attributes"
9298
>
99+
<!-- addition to `sale_order_count == 0 or type == 'lead'` -->
93100
<attribute
94-
name="attrs"
95-
>{'invisible': ['|', '|', ('request_type', '=', 'supplier'), ('sale_order_count', '=', 0), ('type', '=', 'lead')]}</attribute>
101+
name="invisible"
102+
add="request_type == 'supplier'"
103+
separator="or"
104+
/>
96105
</xpath>
97106

98107
<button name="action_schedule_meeting" position="after">
@@ -101,7 +110,7 @@
101110
type="object"
102111
name="action_view_sale_quotation"
103112
icon="fa-pencil-square-o"
104-
attrs="{'invisible': [('type', '=', 'lead')]}"
113+
invisible="type == 'lead'"
105114
>
106115
<field
107116
name="request_for_quotation_count"
@@ -112,7 +121,7 @@
112121
<button
113122
class="oe_stat_button"
114123
type="object"
115-
attrs="{'invisible': ['|', ('purchase_amount_total', '=', 0), ('type', '=', 'lead')]}"
124+
invisible="purchase_amount_total == 0 or type == 'lead'"
116125
name="action_view_sale_order"
117126
icon="fa-usd"
118127
>
@@ -146,7 +155,7 @@
146155
<record id="srm_lead_action_pipeline" model="ir.actions.act_window">
147156
<field name="name">Srm: Pipeline</field>
148157
<field name="res_model">crm.lead</field>
149-
<field name="view_mode">kanban,tree,graph,pivot,form,calendar,activity</field>
158+
<field name="view_mode">kanban,list,graph,pivot,form,calendar,activity</field>
150159
<field
151160
name="domain"
152161
>[('type','=','opportunity'), ('request_type','=', 'supplier')]</field>
@@ -162,7 +171,6 @@
162171
<field name="name">Srm: My Pipeline</field>
163172
<field name="model_id" ref="crm.model_crm_team" />
164173
<field name="state">code</field>
165-
<field name="groups_id" eval="[(4, ref('base.group_user'))]" />
166174
<field
167175
name="code"
168176
>action = model.with_context(request_type='supplier').action_your_pipeline()</field>
@@ -172,7 +180,7 @@
172180
<record id="srm_lead_all_leads" model="ir.actions.act_window">
173181
<field name="name">Leads</field>
174182
<field name="res_model">crm.lead</field>
175-
<field name="view_mode">tree,kanban,graph,pivot,calendar,form,activity</field>
183+
<field name="view_mode">list,kanban,graph,pivot,calendar,form,activity</field>
176184
<field
177185
name="domain"
178186
>['&amp;','|', ('type','=','lead'), ('type','=',False), ('request_type', '=', 'supplier')]</field>
@@ -190,7 +198,7 @@
190198
<record id="srm_lead_action_dashboard" model="ir.actions.act_window">
191199
<field name="name">Srm Leads Analysis</field>
192200
<field name="res_model">crm.lead</field>
193-
<field name="view_mode">dashboard,pivot,graph,tree</field>
201+
<field name="view_mode">pivot,graph,list</field>
194202
<field
195203
name="domain"
196204
>['&amp;', ('request_type','=', 'supplier'), '|', ('active','=',True), ('active','=',False)]</field>
@@ -201,17 +209,17 @@
201209
<record id="srm_opportunity_action_dashboard" model="ir.actions.act_window">
202210
<field name="name">Pipeline Analysis</field>
203211
<field name="res_model">crm.lead</field>
204-
<field name="view_mode">dashboard,pivot,graph,tree,form,cohort</field>
212+
<field name="view_mode">pivot,graph,list,form,cohort</field>
205213
<field name="domain">[('request_type','=', 'supplier')]</field>
206214
<field
207215
name="context"
208216
eval="{
209-
'tree_view_ref': 'crm.crm_case_tree_view_oppor',
217+
'list_view_ref': 'crm.crm_case_tree_view_oppor',
210218
'default_type': 'opportunity',
211219
'search_default_opportunity': True,
212220
'search_default_filter_create_date': 1}"
213221
/>
214-
<field name="search_view_id" ref="crm_enterprise.crm_opportunity_view_search" />
222+
<field name="search_view_id" ref="crm.crm_opportunity_report_view_search" />
215223
</record>
216224

217225
<!-- menuitem -->
@@ -233,5 +241,6 @@
233241

234242
<record id="menu_srm_opportunities" model="ir.ui.menu">
235243
<field name="action" ref="srm.action_your_pipeline" />
244+
<field name="groups_id" eval="[Command.link(ref('base.group_user'))]" />
236245
</record>
237246
</odoo>

srm/wizard/srm_opportunity_to_rfq.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 Camptocamp SA
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
33

4-
from odoo import _, api, fields, models
4+
from odoo import api, fields, models
55
from odoo.exceptions import UserError
66

77

@@ -15,7 +15,7 @@ def default_get(self, fields):
1515

1616
active_model = self._context.get("active_model")
1717
if active_model != "crm.lead":
18-
raise UserError(_("You can only apply this action from a lead."))
18+
raise UserError(self.env._("You can only apply this action from a lead."))
1919

2020
lead = False
2121
if result.get("lead_id"):

srm/wizard/srm_opportunity_to_rfq_views.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@
1111
<field name="lead_id" invisible="1" />
1212
</group>
1313
</group>
14-
<group
15-
attrs="{'invisible': [('action','!=','exist')], 'required':[('action', '=','exist')]}"
16-
>
14+
<group invisible="action != 'exist'" required="action == 'exist'">
1715
<group>
1816
<field
1917
name="partner_id"
20-
attrs="{'invisible': [('action','!=','exist')], 'required':[('action', '=','exist')]}"
18+
invisible="action != 'exist'"
19+
required="action == 'exist'"
2120
context="{'res_partner_search_mode': 'supplier'}"
2221
/>
2322
</group>

0 commit comments

Comments
 (0)