Skip to content

Commit e825975

Browse files
OCA-git-botOCA-git-bot
committed
[BOT] post-merge updates
1 parent 6844951 commit e825975

File tree

10 files changed

+77
-77
lines changed

10 files changed

+77
-77
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ addon | version | maintainers | summary
2323
--- | --- | --- | ---
2424
[base_territory](base_territory/) | 18.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.
2525
[fieldservice](fieldservice/) | 18.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
26-
[fieldservice_account](fieldservice_account/) | 18.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
26+
[fieldservice_account](fieldservice_account/) | 18.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
2727
[fieldservice_activity](fieldservice_activity/) | 18.0.1.0.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
2828
[fieldservice_calendar](fieldservice_calendar/) | 18.0.1.0.0 | [![hparfr](https://github.com/hparfr.png?size=30px)](https://github.com/hparfr) | Add calendar to FSM Orders
2929
[fieldservice_crm](fieldservice_crm/) | 18.0.1.0.0 | [![patrickrwilson](https://github.com/patrickrwilson.png?size=30px)](https://github.com/patrickrwilson) | Create Field Service orders from the CRM
3030
[fieldservice_project](fieldservice_project/) | 18.0.1.0.0 | | Create field service orders from a project or project task
3131
[fieldservice_recurring](fieldservice_recurring/) | 18.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) | Manage recurring Field Service orders
3232
[fieldservice_route](fieldservice_route/) | 18.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Organize the routes of each day.
33-
[fieldservice_sale](fieldservice_sale/) | 18.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.
34-
[fieldservice_sale_recurring](fieldservice_sale_recurring/) | 18.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 recurring field services.
33+
[fieldservice_sale](fieldservice_sale/) | 18.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.
34+
[fieldservice_sale_recurring](fieldservice_sale_recurring/) | 18.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.
3535
[fieldservice_size](fieldservice_size/) | 18.0.1.0.0 | [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | Manage Sizes for Field Service Locations and Orders
3636
[fieldservice_stage_server_action](fieldservice_stage_server_action/) | 18.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) [![osi-scampbell](https://github.com/osi-scampbell.png?size=30px)](https://github.com/osi-scampbell) | Execute server actions when reaching a Field Service stage
3737
[fieldservice_stock](fieldservice_stock/) | 18.0.1.0.0 | [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![smangukiya](https://github.com/smangukiya.png?size=30px)](https://github.com/smangukiya) | Integrate the logistics operations with Field Service

‎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:3fa3351ebcc09ea5cfc7ea3224123d975938cb1b27c8d5dc45c055a26e03af5b
10+
!! source digest: sha256:0d9ec580c9cb97efde5e11faf1b37fad3aacdab726fce299eb7582c45ce241b7
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": "18.0.1.0.0",
7+
"version": "18.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

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Accounting</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:3fa3351ebcc09ea5cfc7ea3224123d975938cb1b27c8d5dc45c055a26e03af5b
370+
!! source digest: sha256:0d9ec580c9cb97efde5e11faf1b37fad3aacdab726fce299eb7582c45ce241b7
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372372
<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_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-18-0/field-service-18-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=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
373373
<p>This module adds the ability to link field service orders to invoices.</p>

‎fieldservice_sale/README.rst

+38-38
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Field Service - Sales
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:85a5f9ae96f5849fc91846cd0eb90412670a42063a94ddc3b05cfe6fb907ccab
10+
!! source digest: sha256:3ec8c427c55e25329ff64bda8ffe4fc3d913b027072cc0452418a62989faa28a
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -57,53 +57,53 @@ service order if the product is sold via sale order.
5757
To configure a product that generates a unique field service order on
5858
each sale order line:
5959

60-
- Go to Sales > Catalog > Products
61-
- Create or select a product
62-
- Set the Field Service Tracking to 'One FSM Order per Sale Order Line'
63-
- Select the FSM Order Template that will be used for creating FSM
64-
Orders when a Sale Order is confirmed with this product
60+
- Go to Sales > Catalog > Products
61+
- Create or select a product
62+
- Set the Field Service Tracking to 'One FSM Order per Sale Order Line'
63+
- Select the FSM Order Template that will be used for creating FSM
64+
Orders when a Sale Order is confirmed with this product
6565

6666
To configure a product that generates a unique field service order for
6767
an individual sale order:
6868

69-
- Go to Sales > Catalog > Products
70-
- Create or select a product
71-
- Set the Field Service Tracking to 'One FSM Order per Sale Order'
72-
- Select the FSM Order Template that will be used for creating FSM
73-
Orders when a Sale Order is confirmed with this product
69+
- Go to Sales > Catalog > Products
70+
- Create or select a product
71+
- Set the Field Service Tracking to 'One FSM Order per Sale Order'
72+
- Select the FSM Order Template that will be used for creating FSM
73+
Orders when a Sale Order is confirmed with this product
7474

7575
To setup a sales territory:
7676

77-
- Go to Field Service > Master Data > Locations
78-
- Create or select a location
79-
- Go to the Sales tab and select the sales territory
77+
- Go to Field Service > Master Data > Locations
78+
- Create or select a location
79+
- Go to the Sales tab and select the sales territory
8080

8181
Usage
8282
=====
8383

84-
- Go to Sales
84+
- Go to Sales
8585

86-
- Create a new Quotation/Sale Order
86+
- Create a new Quotation/Sale Order
8787

88-
- Set the FSM Location to be used
88+
- Set the FSM Location to be used
8989

90-
- On a Sale Order Line, select a product configured for field service
91-
orders
90+
- On a Sale Order Line, select a product configured for field service
91+
orders
9292

93-
- Confirm the Sale Order
93+
- Confirm the Sale Order
9494

95-
- Field Service orders linked to SO lines are created
95+
- Field Service orders linked to SO lines are created
9696

97-
- | When a Field Service order is completed, the quantity delivered for
98-
its
99-
| linked sale order line will be updated to the quantity ordered,
100-
indicating this line is ready for invoicing.
97+
- | When a Field Service order is completed, the quantity delivered for
98+
its
99+
| linked sale order line will be updated to the quantity ordered,
100+
indicating this line is ready for invoicing.
101101
102102
Known issues / Roadmap
103103
======================
104104

105-
- Provide a mapping between an address and the branch and use it to set
106-
the pricelist of a new partner
105+
- Provide a mapping between an address and the branch and use it to set
106+
the pricelist of a new partner
107107

108108
Bug Tracker
109109
===========
@@ -126,20 +126,20 @@ Authors
126126
Contributors
127127
------------
128128

129-
- Open Source Integrators <https://opensourceintegrators.com>
129+
- Open Source Integrators <https://opensourceintegrators.com>
130130

131-
- Steve Campbell <scampbell@opensourceintegrators.com>
132-
- Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
133-
- Wolfgang Hall <whall@opensourceintegrators.com>
134-
- Raphael Lee <rlee@opensourceintegrators.com>
131+
- Steve Campbell <scampbell@opensourceintegrators.com>
132+
- Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
133+
- Wolfgang Hall <whall@opensourceintegrators.com>
134+
- Raphael Lee <rlee@opensourceintegrators.com>
135135

136-
- Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
137-
- Brian McMaster <brian@mcmpest.com>
138-
- Rapha??l Reverdy <raphael.reverdy@akretion.com>
139-
- Cl??ment Mombereau <clement.mombereau@akretion.com>
140-
- `Tecnativa <https://www.tecnativa.com>`__:
136+
- Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
137+
- Brian McMaster <brian@mcmpest.com>
138+
- Rapha??l Reverdy <raphael.reverdy@akretion.com>
139+
- Cl??ment Mombereau <clement.mombereau@akretion.com>
140+
- `Tecnativa <https://www.tecnativa.com>`__:
141141

142-
- Stefan Ungureanu
142+
- Stefan Ungureanu
143143

144144
Maintainers
145145
-----------

‎fieldservice_sale/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
33
{
44
"name": "Field Service - Sales",
5-
"version": "18.0.1.0.0",
5+
"version": "18.0.1.1.0",
66
"summary": "Sell field services.",
77
"category": "Field Service",
88
"author": "Open Source Integrators, Odoo Community Association (OCA)",

‎fieldservice_sale/static/description/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Sales</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:85a5f9ae96f5849fc91846cd0eb90412670a42063a94ddc3b05cfe6fb907ccab
370+
!! source digest: sha256:3ec8c427c55e25329ff64bda8ffe4fc3d913b027072cc0452418a62989faa28a
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372372
<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_sale"><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_sale"><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>
373373
<p>The module integrates the Field Service application with the Sales one

‎fieldservice_sale_recurring/README.rst

+24-24
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Field Service - Sales - Recurring
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:3bbf12326d5e055efaf38fbe2d00fb0975cbfda5b52be429ed5d7c921c070593
10+
!! source digest: sha256:e3bb0ee202c1bdb070bd757f5892b617489146373cfa422120ed800e4a2b8311
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -40,29 +40,29 @@ Configuration
4040

4141
To setup a product for quoting and selling field service orders:
4242

43-
- Go to Sales > Catalog > Products
43+
- Go to Sales > Catalog > Products
4444

45-
- Create or select a product
45+
- Create or select a product
4646

47-
- Set the Product Type to 'Service' under General Information tab
47+
- Set the Product Type to 'Service' under General Information tab
4848

49-
- Under Invoicing tab, set the Field Service Tracking option
49+
- Under Invoicing tab, set the Field Service Tracking option
5050

51-
- | Select the FSM Order Template that will be used for creating FSM
52-
Orders when
53-
| a Sale Order is confirmed with this product
51+
- | Select the FSM Order Template that will be used for creating FSM
52+
Orders when
53+
| a Sale Order is confirmed with this product
5454
5555
Usage
5656
=====
5757

58-
- Go to Sales
59-
- Create a new Quotation/Sale Order
60-
- Set the FSM Location to be used
61-
- On a Sale Order Line, select a product configured for field service
62-
orders
63-
- Confirm the Sale Order
64-
- Field Service Recurring Orders are generated and linked with sale
65-
order line
58+
- Go to Sales
59+
- Create a new Quotation/Sale Order
60+
- Set the FSM Location to be used
61+
- On a Sale Order Line, select a product configured for field service
62+
orders
63+
- Confirm the Sale Order
64+
- Field Service Recurring Orders are generated and linked with sale
65+
order line
6666

6767
Known issues / Roadmap
6868
======================
@@ -91,16 +91,16 @@ Authors
9191
Contributors
9292
------------
9393

94-
- Open Source Integrators <https://www.opensourceintegrators.com>
94+
- Open Source Integrators <https://www.opensourceintegrators.com>
9595

96-
- Steve Campbell <scampbell@opensourceintegrators.com>
97-
- Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
98-
- Wolfgang Hall <whall@opensourceintegrators.com>
96+
- Steve Campbell <scampbell@opensourceintegrators.com>
97+
- Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
98+
- Wolfgang Hall <whall@opensourceintegrators.com>
9999

100-
- Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
101-
- Brian McMaster <brian@mcmpest.com>
102-
- Raphaël Reverdy <raphael.reverdy@akretion.com>
103-
- Italo LOPES <italo.lopes@camptocamp.com>
100+
- Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
101+
- Brian McMaster <brian@mcmpest.com>
102+
- Raphaël Reverdy <raphael.reverdy@akretion.com>
103+
- Italo LOPES <italo.lopes@camptocamp.com>
104104

105105
Maintainers
106106
-----------

‎fieldservice_sale_recurring/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{
55
"name": "Field Service - Sales - Recurring",
6-
"version": "18.0.1.0.0",
6+
"version": "18.0.1.1.0",
77
"summary": "Sell recurring field services.",
88
"category": "Field Service",
99
"author": "Open Source Integrators, Odoo Community Association (OCA)",

‎fieldservice_sale_recurring/static/description/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Sales - Recurring</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:3bbf12326d5e055efaf38fbe2d00fb0975cbfda5b52be429ed5d7c921c070593
370+
!! source digest: sha256:e3bb0ee202c1bdb070bd757f5892b617489146373cfa422120ed800e4a2b8311
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372372
<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_sale_recurring"><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_sale_recurring"><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>
373373
<p>This module allows you to sell recurring field services.</p>

0 commit comments

Comments
 (0)