Skip to content

Commit b7da43e

Browse files
committed
[BOT] post-merge updates
1 parent d793ad8 commit b7da43e

File tree

13 files changed

+88
-79
lines changed

13 files changed

+88
-79
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ 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.
3434
[fieldservice](fieldservice/) | 17.0.1.6.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
35-
[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
36-
[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
35+
[fieldservice_account](fieldservice_account/) | 17.0.1.1.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
36+
[fieldservice_account_analytic](fieldservice_account_analytic/) | 17.0.1.1.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.1.0 | [![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
3838
[fieldservice_agreement](fieldservice_agreement/) | 17.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) [![smangukiya](https://github.com/smangukiya.png?size=30px)](https://github.com/smangukiya) [![osi-scampbell](https://github.com/osi-scampbell.png?size=30px)](https://github.com/osi-scampbell) [![patrickrwilson](https://github.com/patrickrwilson.png?size=30px)](https://github.com/patrickrwilson) | Manage Field Service agreements and contracts
3939
[fieldservice_calendar](fieldservice_calendar/) | 17.0.1.0.0 | [![hparfr](https://github.com/hparfr.png?size=30px)](https://github.com/hparfr) | Add calendar to FSM Orders
@@ -47,10 +47,10 @@ addon | version | maintainers | summary
4747
[fieldservice_repair](fieldservice_repair/) | 17.0.1.0.1 | [![smangukiya](https://github.com/smangukiya.png?size=30px)](https://github.com/smangukiya) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Integrate Field Service orders with MRP repair orders
4848
[fieldservice_repair_order_template](fieldservice_repair_order_template/) | 17.0.1.0.0 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Use Repair Order Templates when creating a repair orders
4949
[fieldservice_route](fieldservice_route/) | 17.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Organize the routes of each day.
50-
[fieldservice_sale](fieldservice_sale/) | 17.0.1.0.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | Sell field services.
50+
[fieldservice_sale](fieldservice_sale/) | 17.0.1.1.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | Sell field services.
5151
[fieldservice_sale_agreement](fieldservice_sale_agreement/) | 17.0.1.0.0 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Integrate Field Service with Sale Agreements
5252
[fieldservice_sale_agreement_equipment_stock](fieldservice_sale_agreement_equipment_stock/) | 17.0.1.0.0 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Integrate Field Service with Sale Agreements and Stock Equipment
53-
[fieldservice_sale_recurring](fieldservice_sale_recurring/) | 17.0.1.0.1 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | Sell recurring field services.
53+
[fieldservice_sale_recurring](fieldservice_sale_recurring/) | 17.0.1.1.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | Sell recurring field services.
5454
[fieldservice_sale_stock](fieldservice_sale_stock/) | 17.0.1.0.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | Sell stockable items linked to field service orders.
5555
[fieldservice_size](fieldservice_size/) | 17.0.1.0.0 | [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | Manage Sizes for Field Service Locations and Orders
5656
[fieldservice_stage_server_action](fieldservice_stage_server_action/) | 17.0.1.3.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![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) | Execute server actions when reaching a Field Service stage

fieldservice_account/README.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Field Service - Accounting
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:871e41f9e24b82f1eadefeac6077a0289abcd57e8f735c35029f3168471c63c0
10+
!! source digest: sha256:054c95828e09d7ea42508e0d91021e45dc150f36584250866b8b9a84fb91b82d
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -71,17 +71,17 @@ Authors
7171
Contributors
7272
------------
7373

74-
- Michael Allen <mallen@opensourceintegrators.com>
75-
- Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
76-
- Raphaël Reverdy <raphael.reverdy@akretion.com>
77-
- Brian McMaster <brian@mcmpest.com>
74+
- Michael Allen <mallen@opensourceintegrators.com>
75+
- Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
76+
- Raphaël Reverdy <raphael.reverdy@akretion.com>
77+
- Brian McMaster <brian@mcmpest.com>
7878

7979
Other credits
8080
-------------
8181

8282
The development of this module has been financially supported by:
8383

84-
- Open Source Integrators <https://opensourceintegrators.com>
84+
- Open Source Integrators <https://opensourceintegrators.com>
8585

8686
Maintainers
8787
-----------

fieldservice_account/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"name": "Field Service - Accounting",
66
"summary": "Track invoices linked to Field Service orders",
7-
"version": "17.0.1.0.0",
7+
"version": "17.0.1.1.0",
88
"category": "Field Service",
99
"author": "Open Source Integrators, Odoo Community Association (OCA)",
1010
"website": "https://github.com/OCA/field-service",

fieldservice_account/static/description/index.html

+8-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
/*
1010
:Author: David Goodger (goodger@python.org)
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,7 +367,7 @@ <h1 class="title">Field Service - Accounting</h1>
366367
!! This file is generated by oca-gen-addon-readme !!
367368
!! changes will be overwritten. !!
368369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
369-
!! source digest: sha256:871e41f9e24b82f1eadefeac6077a0289abcd57e8f735c35029f3168471c63c0
370+
!! source digest: sha256:054c95828e09d7ea42508e0d91021e45dc150f36584250866b8b9a84fb91b82d
370371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
371372
<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_account"><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_account"><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 adds the ability to link field service orders to invoices.</p>
@@ -433,7 +434,9 @@ <h2><a class="toc-backref" href="#toc-entry-8">Other credits</a></h2>
433434
<div class="section" id="maintainers">
434435
<h2><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h2>
435436
<p>This module is maintained by the OCA.</p>
436-
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
437+
<a class="reference external image-reference" href="https://odoo-community.org">
438+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
439+
</a>
437440
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
438441
mission is to support the collaborative development of Odoo features and
439442
promote its widespread use.</p>

fieldservice_account_analytic/README.rst

+10-10
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Field Service - Analytic Accounting
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:187502c73f589c1c69cf504b3bb83cd50ca38eee87433bde51306e12d8cad645
10+
!! source digest: sha256:9d32962343cbed558fe228310b786a728ae8c21dabeab9bb2cc2abc976aa3bfc
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -47,8 +47,8 @@ Configuration
4747

4848
To configure this module, you need to:
4949

50-
- Go to Field Service > Master Data > Locations
51-
- Create or select a location and set their analytic account
50+
- Go to Field Service > Master Data > Locations
51+
- Create or select a location and set their analytic account
5252

5353
Usage
5454
=====
@@ -76,20 +76,20 @@ Authors
7676
Contributors
7777
------------
7878

79-
- Michael Allen <mallen@opensourceintegrators.com>
80-
- Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
81-
- Brian McMaster <brian@mcmpest.com>
82-
- Freni Patel <fpatel@opensourceintegrators.com>
83-
- `APSL <https://apsl.tech>`__:
79+
- Michael Allen <mallen@opensourceintegrators.com>
80+
- Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
81+
- Brian McMaster <brian@mcmpest.com>
82+
- Freni Patel <fpatel@opensourceintegrators.com>
83+
- `APSL <https://apsl.tech>`__:
8484

85-
- Antoni Marroig <amarroig@apsl.net>
85+
- Antoni Marroig <amarroig@apsl.net>
8686

8787
Other credits
8888
-------------
8989

9090
The development of this module has been financially supported by:
9191

92-
- Open Source Integrators <https://opensourceintegrators.com>
92+
- Open Source Integrators <https://opensourceintegrators.com>
9393

9494
Maintainers
9595
-----------

fieldservice_account_analytic/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"name": "Field Service - Analytic Accounting",
66
"summary": """Track analytic accounts on Field Service locations
77
and orders""",
8-
"version": "17.0.1.0.0",
8+
"version": "17.0.1.1.0",
99
"category": "Field Service",
1010
"author": "Open Source Integrators, Odoo Community Association (OCA)",
1111
"website": "https://github.com/OCA/field-service",

fieldservice_account_analytic/static/description/index.html

+8-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
/*
1010
:Author: David Goodger (goodger@python.org)
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,7 +367,7 @@ <h1 class="title">Field Service - Analytic Accounting</h1>
366367
!! This file is generated by oca-gen-addon-readme !!
367368
!! changes will be overwritten. !!
368369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
369-
!! source digest: sha256:187502c73f589c1c69cf504b3bb83cd50ca38eee87433bde51306e12d8cad645
370+
!! source digest: sha256:9d32962343cbed558fe228310b786a728ae8c21dabeab9bb2cc2abc976aa3bfc
370371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
371372
<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_account_analytic"><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_account_analytic"><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 adds the ability to track your analytic accounts on field
@@ -442,7 +443,9 @@ <h2><a class="toc-backref" href="#toc-entry-8">Other credits</a></h2>
442443
<div class="section" id="maintainers">
443444
<h2><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h2>
444445
<p>This module is maintained by the OCA.</p>
445-
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
446+
<a class="reference external image-reference" href="https://odoo-community.org">
447+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
448+
</a>
446449
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
447450
mission is to support the collaborative development of Odoo features and
448451
promote its widespread use.</p>

0 commit comments

Comments
 (0)