Skip to content

Commit 3aad9e8

Browse files
committed
[BOT] post-merge updates
1 parent d30c834 commit 3aad9e8

File tree

4 files changed

+33
-8
lines changed

4 files changed

+33
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Available addons
3131
addon | version | maintainers | summary
3232
--- | --- | --- | ---
3333
[base_territory](base_territory/) | 17.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | This module allows you to define territories, branches, districts and regions to be used for Field Service operations or Sales.
34-
[fieldservice](fieldservice/) | 17.0.1.2.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | Manage Field Service Locations, Workers and Orders
34+
[fieldservice](fieldservice/) | 17.0.1.2.1 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | Manage Field Service Locations, Workers and Orders
3535
[fieldservice_account](fieldservice_account/) | 17.0.1.0.0 | [![osimallen](https://github.com/osimallen.png?size=30px)](https://github.com/osimallen) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) | Track invoices linked to Field Service orders
3636
[fieldservice_account_analytic](fieldservice_account_analytic/) | 17.0.1.0.0 | [![osimallen](https://github.com/osimallen.png?size=30px)](https://github.com/osimallen) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) | Track analytic accounts on Field Service locations and orders
3737
[fieldservice_activity](fieldservice_activity/) | 17.0.1.0.1 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![osi-scampbell](https://github.com/osi-scampbell.png?size=30px)](https://github.com/osi-scampbell) | Field Service Activities are a set of actions that need to be performed on a service order

fieldservice/README.rst

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Field Service
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:6dab6445b1c6fcb5d5db979501fefb12597c270a914d89918eb91f895168776c
10+
!! source digest: sha256:7869e5750944f41473740f37b38a60bbdd65a6f0caa38b6d79d4717e49209801
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -30,6 +30,17 @@ Field Service
3030

3131
This module is the base of the Field Service application in Odoo.
3232

33+
Videos from OCA Days:
34+
35+
- 2024: `Field Service
36+
Management <https://www.youtube.com/watch?v=zBCa3e9rLHU>`__
37+
- 2022: `Field Service - New features and
38+
roadmap <https://www.youtube.com/watch?v=MH8agrNE88A>`__
39+
- 2021: `Job and Service Management for Install and
40+
Construction <https://www.youtube.com/watch?v=b7iivgfzPoo>`__
41+
- 2020: `Advanced Field Service
42+
Management <https://www.youtube.com/watch?v=7bq3cwMFeME>`__
43+
3344
**Table of contents**
3445

3546
.. contents::

fieldservice/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Field Service",
55
"summary": "Manage Field Service Locations, Workers and Orders",
6-
"version": "17.0.1.2.0",
6+
"version": "17.0.1.2.1",
77
"license": "AGPL-3",
88
"category": "Field Service",
99
"author": "Open Source Integrators, Odoo Community Association (OCA)",

fieldservice/static/description/index.html

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
/*
1010
:Author: David Goodger ([email protected])
11-
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
11+
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
1212
:Copyright: This stylesheet has been placed in the public domain.
1313
1414
Default cascading style sheet for the HTML output of Docutils.
15+
Despite the name, some widely supported CSS2 features are used.
1516
1617
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1718
customize this style sheet.
@@ -274,7 +275,7 @@
274275
margin-left: 2em ;
275276
margin-right: 2em }
276277

277-
pre.code .ln { color: grey; } /* line numbers */
278+
pre.code .ln { color: gray; } /* line numbers */
278279
pre.code, code { background-color: #eeeeee }
279280
pre.code .comment, code .comment { color: #5C6576 }
280281
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
300301
span.pre {
301302
white-space: pre }
302303

303-
span.problematic {
304+
span.problematic, pre.problematic {
304305
color: red }
305306

306307
span.section-subtitle {
@@ -366,10 +367,21 @@ <h1 class="title">Field Service</h1>
366367
!! This file is generated by oca-gen-addon-readme !!
367368
!! changes will be overwritten. !!
368369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
369-
!! source digest: sha256:6dab6445b1c6fcb5d5db979501fefb12597c270a914d89918eb91f895168776c
370+
!! source digest: sha256:7869e5750944f41473740f37b38a60bbdd65a6f0caa38b6d79d4717e49209801
370371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
371372
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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"><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"><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>
372373
<p>This module is the base of the Field Service application in Odoo.</p>
374+
<p>Videos from OCA Days:</p>
375+
<ul class="simple">
376+
<li>2024: <a class="reference external" href="https://www.youtube.com/watch?v=zBCa3e9rLHU">Field Service
377+
Management</a></li>
378+
<li>2022: <a class="reference external" href="https://www.youtube.com/watch?v=MH8agrNE88A">Field Service - New features and
379+
roadmap</a></li>
380+
<li>2021: <a class="reference external" href="https://www.youtube.com/watch?v=b7iivgfzPoo">Job and Service Management for Install and
381+
Construction</a></li>
382+
<li>2020: <a class="reference external" href="https://www.youtube.com/watch?v=7bq3cwMFeME">Advanced Field Service
383+
Management</a></li>
384+
</ul>
373385
<p><strong>Table of contents</strong></p>
374386
<div class="contents local topic" id="contents">
375387
<ul class="simple">
@@ -597,7 +609,9 @@ <h2><a class="toc-backref" href="#toc-entry-20">Other credits</a></h2>
597609
<div class="section" id="maintainers">
598610
<h2><a class="toc-backref" href="#toc-entry-21">Maintainers</a></h2>
599611
<p>This module is maintained by the OCA.</p>
600-
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
612+
<a class="reference external image-reference" href="https://odoo-community.org">
613+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
614+
</a>
601615
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
602616
mission is to support the collaborative development of Odoo features and
603617
promote its widespread use.</p>

0 commit comments

Comments
 (0)