Skip to content

Commit

Permalink
[MIG] fieldservice_route: Migration to 18.0
Browse files Browse the repository at this point in the history
  • Loading branch information
peluko00 authored and EdgarRetes committed Nov 19, 2024
1 parent 9c867bf commit fb3f588
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 53 deletions.
2 changes: 1 addition & 1 deletion fieldservice/views/fsm_equipment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<field name="person_id" />
<field name="color" />
<templates>
<t t-name="kanban-box">
<t t-name="card">
<div
t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"
>
Expand Down
2 changes: 1 addition & 1 deletion fieldservice/views/fsm_order.xml
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
</div>
</div>
</t>
<t t-name="kanban-box">
<t t-name="card">
<div
t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_global_click"
name="fsm_equipment"
Expand Down
2 changes: 1 addition & 1 deletion fieldservice/views/fsm_team.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<field name="order_need_assign_count" />
<field name="order_need_schedule_count" />
<templates>
<t t-name="kanban-box">
<t t-name="card">
<div
t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"
>
Expand Down
10 changes: 5 additions & 5 deletions fieldservice_route/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ Field Service Route
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github
:target: https://github.com/OCA/field-service/tree/17.0/fieldservice_route
:target: https://github.com/OCA/field-service/tree/18.0/fieldservice_route
:alt: OCA/field-service
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/field-service-17-0/field-service-17-0-fieldservice_route
:target: https://translation.odoo-community.org/projects/field-service-18-0/field-service-18-0-fieldservice_route
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/field-service&target_branch=17.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/field-service&target_branch=18.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
Expand Down Expand Up @@ -69,7 +69,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/field-service/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_route%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_route%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Expand Down Expand Up @@ -120,6 +120,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:

|maintainer-max3903|

This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/17.0/fieldservice_route>`_ project on GitHub.
This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/18.0/fieldservice_route>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion fieldservice_route/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"name": "Field Service Route",
"summary": "Organize the routes of each day.",
"version": "17.0.1.0.0",
"version": "18.0.1.0.0",
"category": "Field Service",
"license": "AGPL-3",
"author": "Open Source Integrators, Odoo Community Association (OCA)",
Expand Down
2 changes: 0 additions & 2 deletions fieldservice_route/data/fsm_route_day_data.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<odoo noupdate="1">

<record id="fsm_route_day_0" model="fsm.route.day">
<field name="name">Monday</field>
</record>
Expand Down Expand Up @@ -27,5 +26,4 @@
<record id="fsm_route_day_6" model="fsm.route.day">
<field name="name">Sunday</field>
</record>

</odoo>
2 changes: 0 additions & 2 deletions fieldservice_route/data/fsm_stage_data.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<odoo noupdate="1">

<record id="fsm_stage_route_new" model="fsm.stage">
<field name="name">New</field>
<field name="sequence">10</field>
Expand All @@ -15,5 +14,4 @@
<field name="stage_type">route</field>
<field name="custom_color">#7F8C8D</field>
</record>

</odoo>
2 changes: 0 additions & 2 deletions fieldservice_route/data/ir_sequence.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<odoo noupdate="1">

<!-- Sequence for fsm.route -->
<record id="seq_fsm_route" model="ir.sequence">
<field name="name">FSM Day Route</field>
Expand All @@ -8,5 +7,4 @@
<field name="padding">3</field>
<field name="company_id" eval="False" />
</record>

</odoo>
Binary file modified fieldservice_route/static/description/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions fieldservice_route/static/description/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 10 additions & 7 deletions fieldservice_route/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -274,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -368,7 +369,7 @@ <h1 class="title">Field Service Route</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:4eb3762664d38a5441427c021445f244ea74944abad699e85dcf43512c387cd7
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/field-service/tree/17.0/fieldservice_route"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/field-service-17-0/field-service-17-0-fieldservice_route"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/field-service&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/field-service/tree/18.0/fieldservice_route"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/field-service-18-0/field-service-18-0-fieldservice_route"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/field-service&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>A Field Service route is the sorted list of orders that one
worker/vehicle will perform during a day.</p>
<p>This module allows you to manage your Field Service routes: when
Expand Down Expand Up @@ -417,7 +418,7 @@ <h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/field-service/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_route%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_route%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
Expand Down Expand Up @@ -451,13 +452,15 @@ <h2><a class="toc-backref" href="#toc-entry-7">Other credits</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
<p><a class="reference external image-reference" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a></p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/17.0/fieldservice_route">OCA/field-service</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/18.0/fieldservice_route">OCA/field-service</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
Expand Down
2 changes: 0 additions & 2 deletions fieldservice_route/views/fsm_location.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<odoo>

<record id="fsm_location_form_view_route_inherit" model="ir.ui.view">
<field name="name">fsm.location.form</field>
<field name="model">fsm.location</field>
Expand All @@ -10,5 +9,4 @@
</field>
</field>
</record>

</odoo>
2 changes: 0 additions & 2 deletions fieldservice_route/views/fsm_order.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<odoo>

<record id="fsm_order_form_inherit_route" model="ir.ui.view">
<field name="name">fsm.order.form</field>
<field name="model">fsm.order</field>
Expand All @@ -13,5 +12,4 @@
</field>
</field>
</record>

</odoo>
12 changes: 5 additions & 7 deletions fieldservice_route/views/fsm_route.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<odoo>

<record id="fsm_route_tree" model="ir.ui.view">
<field name="name">fsm.route.tree</field>
<record id="fsm_route_list" model="ir.ui.view">
<field name="name">fsm.route.list</field>
<field name="model">fsm.route</field>
<field name="arch" type="xml">
<tree>
<list>
<field name="name" />
<field name="fsm_person_id" />
<field name="day_ids" />
</tree>
</list>
</field>
</record>

Expand Down Expand Up @@ -52,12 +51,11 @@
<record id="action_fsm_route" model="ir.actions.act_window">
<field name="name">Routes</field>
<field name="res_model">fsm.route</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">list,form</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
Add Routes here.
</p>
</field>
</record>

</odoo>
10 changes: 4 additions & 6 deletions fieldservice_route/views/fsm_route_day.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<odoo>

<record id="fsm_route_day_tree_view" model="ir.ui.view">
<record id="fsm_route_day_list_view" model="ir.ui.view">
<field name="name">Route Day</field>
<field name="model">fsm.route.day</field>
<field name="arch" type="xml">
<tree>
<list>
<field name="name" />
</tree>
</list>
</field>
</record>

Expand All @@ -27,12 +26,11 @@
<record id="action_fsm_route_day" model="ir.actions.act_window">
<field name="name">Route Day</field>
<field name="res_model">fsm.route.day</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">list,form</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
Create a Route Day.
</p>
</field>
</record>

</odoo>
22 changes: 10 additions & 12 deletions fieldservice_route/views/fsm_route_dayroute.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<odoo>

<record id="fsm_route_dayroute_tree" model="ir.ui.view">
<field name="name">fsm.route.dayroute.tree</field>
<record id="fsm_route_dayroute_list" model="ir.ui.view">
<field name="name">fsm.route.dayroute.list</field>
<field name="model">fsm.route.dayroute</field>
<field name="arch" type="xml">
<tree>
<list>
<field name="name" />
<field name="route_id" />
<field name="person_id" />
<field name="date" />
<field name="stage_id" />
</tree>
</list>
</field>
</record>

Expand Down Expand Up @@ -64,7 +63,7 @@
widget="many2many"
domain="[('dayroute_id', '=', False), ('fsm_route_id', '=', route_id)]"
>
<tree>
<list>
<field name="sequence" widget="handle" />
<field name="name" />
<field name="location_id" />
Expand All @@ -75,16 +74,16 @@
string="Complete order"
type="object"
icon="fa-check text-success"
attrs="{'invisible': [('stage_id', 'in', [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d])]}"
invisible="stage_id in [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d]"
/>
<button
name="action_cancel"
string="Cancel order"
type="object"
icon="fa-times-circle text-danger"
attrs="{'invisible': [('stage_id', 'in', [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d])]}"
invisible="stage_id in [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d]"
/>
</tree>
</list>
</field>
</page>
<page string="Planning">
Expand Down Expand Up @@ -112,7 +111,7 @@
<record id="action_fsm_route_dayroute" model="ir.actions.act_window">
<field name="name">Day Routes</field>
<field name="res_model">fsm.route.dayroute</field>
<field name="view_mode">tree,calendar,form</field>
<field name="view_mode">list,calendar,form</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
Add Day Routes here.
Expand Down Expand Up @@ -140,7 +139,7 @@
<record id="action_fsm_route_dayroute_dash" model="ir.actions.act_window">
<field name="name">Day Routes</field>
<field name="res_model">fsm.route.dayroute</field>
<field name="view_mode">calendar,tree,form</field>
<field name="view_mode">calendar,list,form</field>
</record>

<!-- Reporting -->
Expand Down Expand Up @@ -174,5 +173,4 @@
</p>
</field>
</record>

</odoo>
2 changes: 0 additions & 2 deletions fieldservice_route/views/menu.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<odoo>

<!-- Dashboard -->
<menuitem
id="menu_fsm_dash_dayroute"
Expand Down Expand Up @@ -43,5 +42,4 @@
parent="fieldservice.config"
sequence="30"
/>

</odoo>

0 comments on commit fb3f588

Please sign in to comment.