Skip to content

Commit 684ad17

Browse files
brian10048kaynnan
authored andcommitted
[MIG] fieldservice_recurring: Migration to 13.0
1 parent 7dbe063 commit 684ad17

14 files changed

+61
-57
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version='1.0' encoding='utf-8' ?>
2+
<odoo>
3+
<record id="rule_fsm_frequency_multi_company" model="ir.rule">
4+
<field
5+
name="domain_force"
6+
>['|',('company_id','=',False),('company_id','in',company_ids)]</field>
7+
</record>
8+
<record id="rule_fsm_recurring_template_multi_company" model="ir.rule">
9+
<field
10+
name="domain_force"
11+
>['|',('company_id','=',False),('company_id','in',company_ids)]</field>
12+
</record>
13+
<record id="rule_fsm_recurring_multi_company" model="ir.rule">
14+
<field
15+
name="domain_force"
16+
>['|',('company_id','=',False),('company_id','in',company_ids)]</field>
17+
</record>
18+
</odoo>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Copyright 2020 Brian McMaster
2+
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
3+
4+
from openupgradelib import openupgrade # pylint: disable=W7936
5+
6+
7+
@openupgrade.migrate()
8+
def migrate(env, version):
9+
openupgrade.load_data(
10+
env.cr, "fieldservice_recurring", "migrations/13.0.1.0.0/noupdate_changes.xml"
11+
)

fieldservice_recurring/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
1+
# Copyright (C) 2019 Brian McMaster, Open Source Integrators
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
33

44
from . import models

fieldservice_recurring/__manifest__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
1+
# Copyright (C) 2019 Brian McMaster, Open Source Integrators
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
33

44
{
55
"name": "Field Service Recurring Work Orders",
66
"summary": "Manage recurring Field Service orders",
7-
"version": "12.0.1.2.0",
7+
"version": "13.0.1.0.0",
88
"category": "Field Service",
99
"author": "Brian McMaster, "
1010
"Open Source Integrators, "

fieldservice_recurring/models/fsm_frequency.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
1+
# Copyright (C) 2019 Brian McMaster, Open Source Integrators
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
33

44
from dateutil.rrule import MO, TU, WE, TH, FR, SA, SU

fieldservice_recurring/models/fsm_frequency_set.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
1+
# Copyright (C) 2019 Brian McMaster, Open Source Integrators
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
33

44
from dateutil.rrule import rruleset

fieldservice_recurring/models/fsm_order.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
1+
# Copyright (C) 2019 Brian McMaster, Open Source Integrators
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
33

44
from datetime import timedelta
@@ -21,7 +21,6 @@ def _compute_request_late(self):
2121
days_late = rec.fsm_recurring_id.fsm_frequency_set_id.buffer_late
2222
rec.request_late = rec.scheduled_date_start + timedelta(days=days_late)
2323

24-
@api.multi
2524
def action_view_fsm_recurring(self):
2625
action = self.env.ref("fieldservice_recurring.action_fsm_recurring").read()[0]
2726
action["views"] = [

fieldservice_recurring/models/fsm_recurring.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
1+
# Copyright (C) 2019 Brian McMaster, Open Source Integrators
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
33

44
from datetime import datetime
@@ -79,7 +79,6 @@ def _default_team_id(self):
7979
"fsm.person", string="Assigned To", index=True, track_visibility="onchange"
8080
)
8181

82-
@api.multi
8382
@api.depends("fsm_order_ids")
8483
def _compute_order_count(self):
8584
data = self.env["fsm.order"].read_group(
@@ -124,19 +123,16 @@ def create(self, vals):
124123
)
125124
return super(FSMRecurringOrder, self).create(vals)
126125

127-
@api.multi
128126
def action_start(self):
129127
for rec in self:
130128
if not rec.start_date:
131129
rec.start_date = datetime.now()
132130
rec.write({"state": "progress"})
133131
rec._generate_orders()
134132

135-
@api.multi
136133
def action_renew(self):
137134
return self.action_start()
138135

139-
@api.multi
140136
def action_cancel(self):
141137
for order in self.fsm_order_ids.filtered(
142138
lambda o: o.stage_id.is_closed is False
@@ -201,7 +197,6 @@ def _create_order(self, date):
201197
order._onchange_template_id()
202198
return order
203199

204-
@api.multi
205200
def _generate_orders(self):
206201
"""
207202
create field service orders from self

fieldservice_recurring/models/fsm_recurring_template.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
1+
# Copyright (C) 2019 Brian McMaster, Open Source Integrators
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
33

44
from odoo import fields, models

fieldservice_recurring/security/recurring_security.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
<field name="global" eval="True" />
77
<field
88
name="domain_force"
9-
>['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
9+
>['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
1010
</record>
1111
<record id="rule_fsm_recurring_template_multi_company" model="ir.rule">
1212
<field name="name">FSM Recurring Template multi-company</field>
1313
<field name="model_id" ref="model_fsm_recurring_template" />
1414
<field name="global" eval="True" />
1515
<field
1616
name="domain_force"
17-
>['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
17+
>['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
1818
</record>
1919
<record id="rule_fsm_recurring_multi_company" model="ir.rule">
2020
<field name="name">FSM Recurring Order multi-company</field>
2121
<field name="model_id" ref="model_fsm_recurring" />
2222
<field name="global" eval="True" />
2323
<field
2424
name="domain_force"
25-
>['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
25+
>['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
2626
</record>
2727
</odoo>

fieldservice_recurring/views/fsm_frequency.xml

+7-13
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,21 @@
2020
<form string="Frequency">
2121
<sheet>
2222
<div class="oe_button_box" name="button_box">
23-
<button
24-
name="toggle_active"
25-
type="object"
26-
class="oe_stat_button"
27-
icon="fa-archive"
28-
>
29-
<field
30-
name="active"
31-
widget="boolean_button"
32-
options='{"terminology": "archive"}'
33-
/>
34-
</button>
3523
</div>
24+
<widget
25+
name="web_ribbon"
26+
text="Archived"
27+
bg_color="bg-danger"
28+
attrs="{'invisible': [('active', '=', True)]}"
29+
/>
3630
<div class="oe_title">
3731
<h1>
3832
<field name="name" placeholder="Frequency Name" />
3933
</h1>
4034
</div>
4135
<group>
4236
<group>
37+
<field name="active" invisible="1" />
4338
<label for="interval" />
4439
<div class="o_row">
4540
<field name="interval" />
@@ -124,7 +119,6 @@
124119
<record id="action_fsm_frequency" model="ir.actions.act_window">
125120
<field name="name">Field Service Frequencies</field>
126121
<field name="res_model">fsm.frequency</field>
127-
<field name="view_type">form</field>
128122
<field name="view_mode">tree,form</field>
129123
<field name="help" type="html">
130124
<p class="o_view_nocontent_smiling_face">

fieldservice_recurring/views/fsm_frequency_set.xml

+7-13
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,21 @@
1717
<form string="Frequency Rule Set">
1818
<sheet>
1919
<div class="oe_button_box" name="button_box">
20-
<button
21-
name="toggle_active"
22-
type="object"
23-
class="oe_stat_button"
24-
icon="fa-archive"
25-
>
26-
<field
27-
name="active"
28-
widget="boolean_button"
29-
options='{"terminology": "archive"}'
30-
/>
31-
</button>
3220
</div>
21+
<widget
22+
name="web_ribbon"
23+
text="Archived"
24+
bg_color="bg-danger"
25+
attrs="{'invisible': [('active', '=', True)]}"
26+
/>
3327
<div class="oe_title">
3428
<h1>
3529
<field name="name" placeholder="Frequency Rule Set Name" />
3630
</h1>
3731
</div>
3832
<group>
3933
<group>
34+
<field name="active" invisible="1" />
4035
<field name="schedule_days" />
4136
<field name="buffer_early" />
4237
<field name="buffer_late" />
@@ -60,7 +55,6 @@
6055
<record id="action_fsm_frequency_set" model="ir.actions.act_window">
6156
<field name="name">Field Service Frequency Rule Sets</field>
6257
<field name="res_model">fsm.frequency.set</field>
63-
<field name="view_type">form</field>
6458
<field name="view_mode">tree,form</field>
6559
<field name="help" type="html">
6660
<p class="o_view_nocontent_smiling_face">

fieldservice_recurring/views/fsm_recurring.xml

-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
<record id="action_fsm_recurring" model="ir.actions.act_window">
119119
<field name="name">Field Service Recurring Orders</field>
120120
<field name="res_model">fsm.recurring</field>
121-
<field name="view_type">form</field>
122121
<field name="view_mode">tree,form</field>
123122
<field name="help" type="html">
124123
<p class="o_view_nocontent_smiling_face">

fieldservice_recurring/views/fsm_recurring_template.xml

+7-13
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,21 @@
1818
<form string="Recurring Template">
1919
<sheet>
2020
<div class="oe_button_box" name="button_box">
21-
<button
22-
name="toggle_active"
23-
type="object"
24-
class="oe_stat_button"
25-
icon="fa-archive"
26-
>
27-
<field
28-
name="active"
29-
widget="boolean_button"
30-
options='{"terminology": "archive"}'
31-
/>
32-
</button>
3321
</div>
22+
<widget
23+
name="web_ribbon"
24+
text="Archived"
25+
bg_color="bg-danger"
26+
attrs="{'invisible': [('active', '=', True)]}"
27+
/>
3428
<div class="oe_title">
3529
<h1>
3630
<field name="name" placeholder="Template Name" />
3731
</h1>
3832
</div>
3933
<group>
4034
<group>
35+
<field name="active" invsible="1" />
4136
<field name="fsm_frequency_set_id" />
4237
<field name="max_orders" />
4338
</group>
@@ -64,7 +59,6 @@
6459
<record id="action_fsm_recurring_template" model="ir.actions.act_window">
6560
<field name="name">Field Service Recurring Templates</field>
6661
<field name="res_model">fsm.recurring.template</field>
67-
<field name="view_type">form</field>
6862
<field name="view_mode">tree,form</field>
6963
<field name="help" type="html">
7064
<p class="o_view_nocontent_smiling_face">

0 commit comments

Comments
 (0)