From fe8b543bfc136c8fc63644acef2e8708de01b48d Mon Sep 17 00:00:00 2001
From: osi-scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 19 Dec 2018 15:50:26 -0700
Subject: [PATCH 01/77] [ADD] fieldservice_sale

---
 fieldservice_sale/README.rst                  | 121 +++++
 fieldservice_sale/__init__.py                 |   4 +
 fieldservice_sale/__manifest__.py             |  25 +
 fieldservice_sale/models/__init__.py          |   4 +
 fieldservice_sale/models/fsm_sale.py          |  13 +
 fieldservice_sale/readme/CONFIGURE.rst        |   5 +
 fieldservice_sale/readme/CONTRIBUTORS.rst     |   3 +
 fieldservice_sale/readme/CREDITS.rst          |   3 +
 fieldservice_sale/readme/DESCRIPTION.rst      |   1 +
 fieldservice_sale/readme/INSTALL.rst          |   4 +
 fieldservice_sale/readme/ROADMAP.rst          |   2 +
 fieldservice_sale/readme/USAGE.rst            |   1 +
 .../static/description/description/icon.png   | Bin 0 -> 17808 bytes
 .../static/description/description/index.html | 464 ++++++++++++++++++
 .../static/description/index.html             | 459 +++++++++++++++++
 fieldservice_sale/views/fsm_location.xml      |  19 +
 16 files changed, 1128 insertions(+)
 create mode 100644 fieldservice_sale/README.rst
 create mode 100644 fieldservice_sale/__init__.py
 create mode 100644 fieldservice_sale/__manifest__.py
 create mode 100644 fieldservice_sale/models/__init__.py
 create mode 100644 fieldservice_sale/models/fsm_sale.py
 create mode 100644 fieldservice_sale/readme/CONFIGURE.rst
 create mode 100644 fieldservice_sale/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_sale/readme/CREDITS.rst
 create mode 100644 fieldservice_sale/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_sale/readme/INSTALL.rst
 create mode 100644 fieldservice_sale/readme/ROADMAP.rst
 create mode 100644 fieldservice_sale/readme/USAGE.rst
 create mode 100644 fieldservice_sale/static/description/description/icon.png
 create mode 100644 fieldservice_sale/static/description/description/index.html
 create mode 100644 fieldservice_sale/static/description/index.html
 create mode 100644 fieldservice_sale/views/fsm_location.xml

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
new file mode 100644
index 0000000000..e86745c429
--- /dev/null
+++ b/fieldservice_sale/README.rst
@@ -0,0 +1,121 @@
+=====================
+Field Service - Sales
+=====================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :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/11.0/fieldservice_sale
+    :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-11-0/field-service-11-0-fieldservice_sale
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/264/11.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+The module integrate the field service application with the sales one.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Installation
+============
+
+To install Field Service and have the mapping features, you need to install GeoEngine.
+
+Please refer to the installation instructions available at:
+https://github.com/OCA/geospatial/tree/11.0/base_geoengine
+
+Configuration
+=============
+
+To use this module, you need to:
+
+* Go to Field Service > Master Data > Locations
+* Create or select a location
+* Go to the Sales tab and select the sales territory
+
+Usage
+=====
+
+Coming soon...
+
+Known issues / Roadmap
+======================
+
+The roadmap of the Field Service application is documented on
+`Github <https://github.com/OCA/field-service/issues/1>`_.
+
+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 smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2011.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+
+Contributors
+~~~~~~~~~~~~
+
+* Steve Campbell <scampbell@opensourceintegrators.com>
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Wolfgang Hall <whall@opensourceintegrators.com>
+
+Other credits
+~~~~~~~~~~~~~
+
+The development of this module has been financially supported by:
+
+* Open Source Integrators <https://opensourceintegrators.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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.
+
+.. |maintainer-wolfhall| image:: https://github.com/wolfhall.png?size=40px
+    :target: https://github.com/wolfhall
+    :alt: wolfhall
+.. |maintainer-max3903| image:: https://github.com/max3903.png?size=40px
+    :target: https://github.com/max3903
+    :alt: max3903
+
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-wolfhall| |maintainer-max3903| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_sale>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_sale/__init__.py b/fieldservice_sale/__init__.py
new file mode 100644
index 0000000000..631bd4893a
--- /dev/null
+++ b/fieldservice_sale/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
new file mode 100644
index 0000000000..8e8741f7c8
--- /dev/null
+++ b/fieldservice_sale/__manifest__.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - Sales',
+    'summary': 'Sales',
+    'version': '11.0.0.0.1',
+    'category': 'Field Service',
+    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice',
+        'sale',
+    ],
+    'data': [
+        'views/fsm_location.xml'
+    ],
+    'application': True,
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'wolfhall',
+        'max3903',
+    ],
+}
diff --git a/fieldservice_sale/models/__init__.py b/fieldservice_sale/models/__init__.py
new file mode 100644
index 0000000000..61d98a615d
--- /dev/null
+++ b/fieldservice_sale/models/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import fsm_location
diff --git a/fieldservice_sale/models/fsm_sale.py b/fieldservice_sale/models/fsm_sale.py
new file mode 100644
index 0000000000..65416a8a7a
--- /dev/null
+++ b/fieldservice_sale/models/fsm_sale.py
@@ -0,0 +1,13 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields
+
+from odoo.addons.base_geoengine import geo_model
+
+
+class FSMLocation(geo_model.GeoModel):
+    _inherit = 'fsm.location'
+
+    sales_territory_id = fields.Many2one('fsm.territory',
+                                         string='Sales Territory')
diff --git a/fieldservice_sale/readme/CONFIGURE.rst b/fieldservice_sale/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..f2731c6102
--- /dev/null
+++ b/fieldservice_sale/readme/CONFIGURE.rst
@@ -0,0 +1,5 @@
+To use this module, you need to:
+
+* Go to Field Service > Master Data > Locations
+* Create or select a location
+* Go to the Sales tab and select the sales territory
diff --git a/fieldservice_sale/readme/CONTRIBUTORS.rst b/fieldservice_sale/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..1b9bde1401
--- /dev/null
+++ b/fieldservice_sale/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* Steve Campbell <scampbell@opensourceintegrators.com>
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Wolfgang Hall <whall@opensourceintegrators.com>
diff --git a/fieldservice_sale/readme/CREDITS.rst b/fieldservice_sale/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_sale/readme/CREDITS.rst
@@ -0,0 +1,3 @@
+The development of this module has been financially supported by:
+
+* Open Source Integrators <https://opensourceintegrators.com>
diff --git a/fieldservice_sale/readme/DESCRIPTION.rst b/fieldservice_sale/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..b81fa62ffb
--- /dev/null
+++ b/fieldservice_sale/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+The module integrate the field service application with the sales one.
diff --git a/fieldservice_sale/readme/INSTALL.rst b/fieldservice_sale/readme/INSTALL.rst
new file mode 100644
index 0000000000..c010f8f6a2
--- /dev/null
+++ b/fieldservice_sale/readme/INSTALL.rst
@@ -0,0 +1,4 @@
+To install Field Service and have the mapping features, you need to install GeoEngine.
+
+Please refer to the installation instructions available at:
+https://github.com/OCA/geospatial/tree/11.0/base_geoengine
diff --git a/fieldservice_sale/readme/ROADMAP.rst b/fieldservice_sale/readme/ROADMAP.rst
new file mode 100644
index 0000000000..f607015959
--- /dev/null
+++ b/fieldservice_sale/readme/ROADMAP.rst
@@ -0,0 +1,2 @@
+The roadmap of the Field Service application is documented on
+`Github <https://github.com/OCA/field-service/issues/1>`_.
diff --git a/fieldservice_sale/readme/USAGE.rst b/fieldservice_sale/readme/USAGE.rst
new file mode 100644
index 0000000000..684e27f7d7
--- /dev/null
+++ b/fieldservice_sale/readme/USAGE.rst
@@ -0,0 +1 @@
+Coming soon...
diff --git a/fieldservice_sale/static/description/description/icon.png b/fieldservice_sale/static/description/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..955674d8f0b8c47de3ffa9db25cb109fbe4a1091
GIT binary patch
literal 17808
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

literal 0
HcmV?d00001

diff --git a/fieldservice_sale/static/description/description/index.html b/fieldservice_sale/static/description/description/index.html
new file mode 100644
index 0000000000..734a351843
--- /dev/null
+++ b/fieldservice_sale/static/description/description/index.html
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<title>Field Service</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* 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 }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="field-service">
+<h1 class="title">Field Service</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/11.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" href="https://translation.odoo-community.org/projects/field-service-11-0/field-service-11-0-fieldservice"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/264/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module is the base of the Field Service application in Odoo.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
+<li><a class="reference internal" href="#configuration" id="id2">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id3">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id4">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id5">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id6">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id7">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id8">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id9">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id10">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="installation">
+<h1><a class="toc-backref" href="#id1">Installation</a></h1>
+<p>To install Field Service and have the mapping features, you need to install GeoEngine.</p>
+<p>Please refer to the installation instructions available at:
+<a class="reference external" href="https://github.com/OCA/geospatial/tree/11.0/base_geoengine">https://github.com/OCA/geospatial/tree/11.0/base_geoengine</a></p>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id2">Configuration</a></h1>
+<p>To configure this module, you need to:</p>
+<ul class="simple">
+<li>Go to Field Service &gt; Configuration &gt; Settings</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id3">Usage</a></h1>
+<p>To use this module, you need to:</p>
+<ul class="simple">
+<li>Go to Field Service</li>
+<li>Create or select an order</li>
+<li>Follow the process</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
+<p>The roadmap of the Field Service application is documented on
+<a class="reference external" href="https://github.com/OCA/field-service/issues/1">Github</a>.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice%0Aversion:%2011.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">
+<h1><a class="toc-backref" href="#id6">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id7">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id8">Contributors</a></h2>
+<ul class="simple">
+<li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Steve Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Michael Allen &lt;<a class="reference external" href="mailto:mallen&#64;opensourceintegrators.com">mallen&#64;opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id9">Other credits</a></h2>
+<p>The development of this module has been financially supported by:</p>
+<ul class="simple">
+<li>Open Source Integrators &lt;<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id10">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>
+<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">maintainers</a>:</p>
+<p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" 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/11.0/fieldservice">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>
+</div>
+</body>
+</html>
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
new file mode 100644
index 0000000000..6d777250e3
--- /dev/null
+++ b/fieldservice_sale/static/description/index.html
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<title>Field Service - Sales</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* 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 }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="field-service-sales">
+<h1 class="title">Field Service - Sales</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/11.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" href="https://translation.odoo-community.org/projects/field-service-11-0/field-service-11-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" href="https://runbot.odoo-community.org/runbot/264/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>The module integrate the field service application with the sales one.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
+<li><a class="reference internal" href="#configuration" id="id2">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id3">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id4">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id5">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id6">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id7">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id8">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id9">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id10">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="installation">
+<h1><a class="toc-backref" href="#id1">Installation</a></h1>
+<p>To install Field Service and have the mapping features, you need to install GeoEngine.</p>
+<p>Please refer to the installation instructions available at:
+<a class="reference external" href="https://github.com/OCA/geospatial/tree/11.0/base_geoengine">https://github.com/OCA/geospatial/tree/11.0/base_geoengine</a></p>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id2">Configuration</a></h1>
+<p>To use this module, you need to:</p>
+<ul class="simple">
+<li>Go to Field Service &gt; Master Data &gt; Locations</li>
+<li>Create or select a location</li>
+<li>Go to the Sales tab and select the sales territory</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id3">Usage</a></h1>
+<p>Coming soon???</p>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
+<p>The roadmap of the Field Service application is documented on
+<a class="reference external" href="https://github.com/OCA/field-service/issues/1">Github</a>.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2011.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">
+<h1><a class="toc-backref" href="#id6">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id7">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id8">Contributors</a></h2>
+<ul class="simple">
+<li>Steve Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id9">Other credits</a></h2>
+<p>The development of this module has been financially supported by:</p>
+<ul class="simple">
+<li>Open Source Integrators &lt;<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id10">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>
+<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">maintainers</a>:</p>
+<p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" 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/11.0/fieldservice_sale">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>
+</div>
+</body>
+</html>
diff --git a/fieldservice_sale/views/fsm_location.xml b/fieldservice_sale/views/fsm_location.xml
new file mode 100644
index 0000000000..886f431298
--- /dev/null
+++ b/fieldservice_sale/views/fsm_location.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Field Service Location Form View-->
+    <record id="fsm_location_form_view" model="ir.ui.view">
+        <field name="name">fsm.location.form</field>
+        <field name="model">fsm.location</field>
+        <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
+        <field name="arch" type="xml">
+            <page name="others-page" position="before">
+                <page string="Sales">
+                    <group>
+                        <field name="sales_territory_id"/>
+                    </group>
+                </page>                        
+            </page>
+        </field>
+    </record>
+</odoo>

From a01e0721d7a5f4b734d139e8e5d6108fee5c76ee Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 20 Dec 2018 11:27:24 -0600
Subject: [PATCH 02/77] [REN] fsm_location.py

---
 fieldservice_sale/models/{fsm_sale.py => fsm_location.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename fieldservice_sale/models/{fsm_sale.py => fsm_location.py} (100%)

diff --git a/fieldservice_sale/models/fsm_sale.py b/fieldservice_sale/models/fsm_location.py
similarity index 100%
rename from fieldservice_sale/models/fsm_sale.py
rename to fieldservice_sale/models/fsm_location.py

From c889775a5d8d59e9787988e7097faf46fa728c19 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 20 Dec 2018 17:40:55 -0600
Subject: [PATCH 03/77] [FIX] View + icon

---
 fieldservice_sale/__manifest__.py             |   1 -
 fieldservice_sale/static/description/icon.png | Bin 0 -> 17808 bytes
 fieldservice_sale/views/fsm_location.xml      |   8 +++++---
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 fieldservice_sale/static/description/icon.png

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 8e8741f7c8..ada52ef64b 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -15,7 +15,6 @@
     'data': [
         'views/fsm_location.xml'
     ],
-    'application': True,
     'license': 'AGPL-3',
     'development_status': 'Beta',
     'maintainers': [
diff --git a/fieldservice_sale/static/description/icon.png b/fieldservice_sale/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..955674d8f0b8c47de3ffa9db25cb109fbe4a1091
GIT binary patch
literal 17808
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

literal 0
HcmV?d00001

diff --git a/fieldservice_sale/views/fsm_location.xml b/fieldservice_sale/views/fsm_location.xml
index 886f431298..b9be2f2f87 100644
--- a/fieldservice_sale/views/fsm_location.xml
+++ b/fieldservice_sale/views/fsm_location.xml
@@ -7,12 +7,14 @@
         <field name="model">fsm.location</field>
         <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
         <field name="arch" type="xml">
-            <page name="others-page" position="before">
+            <page id="others-page" position="before">
                 <page string="Sales">
                     <group>
-                        <field name="sales_territory_id"/>
+                        <group>
+                            <field name="sales_territory_id"/>
+                        </group>
                     </group>
-                </page>                        
+                </page>
             </page>
         </field>
     </record>

From c2dd43d7b28cdacdd0049089451f748a54c392d0 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Wed, 3 Apr 2019 20:53:20 +0530
Subject: [PATCH 04/77] [MIG][WIP][12.0] fieldservice_sale

---
 fieldservice_sale/README.rst                  |  13 +-
 fieldservice_sale/__manifest__.py             |   3 +-
 fieldservice_sale/models/fsm_location.py      |   6 +-
 fieldservice_sale/readme/CONTRIBUTORS.rst     |   1 +
 fieldservice_sale/readme/INSTALL.rst          |   2 +-
 .../static/description/description/icon.png   | Bin 17808 -> 0 bytes
 .../static/description/description/index.html | 464 ------------------
 .../static/description/index.html             |   9 +-
 8 files changed, 18 insertions(+), 480 deletions(-)
 delete mode 100644 fieldservice_sale/static/description/description/icon.png
 delete mode 100644 fieldservice_sale/static/description/description/index.html

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index e86745c429..755ff8d4eb 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -14,13 +14,13 @@ Field Service - Sales
     :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/11.0/fieldservice_sale
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_sale
     :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-11-0/field-service-11-0-fieldservice_sale
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_sale
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/264/11.0
+    :target: https://runbot.odoo-community.org/runbot/264/12.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -38,7 +38,7 @@ Installation
 To install Field Service and have the mapping features, you need to install GeoEngine.
 
 Please refer to the installation instructions available at:
-https://github.com/OCA/geospatial/tree/11.0/base_geoengine
+https://github.com/OCA/geospatial/tree/12.0/base_geoengine
 
 Configuration
 =============
@@ -66,7 +66,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 smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2011.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_sale%0Aversion:%2012.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.
 
@@ -84,6 +84,7 @@ Contributors
 * Steve Campbell <scampbell@opensourceintegrators.com>
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Wolfgang Hall <whall@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -116,6 +117,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-wolfhall| |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_sale>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_sale>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index ada52ef64b..c06567201e 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Sales',
     'summary': 'Sales',
-    'version': '11.0.0.0.1',
+    'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
@@ -21,4 +21,5 @@
         'wolfhall',
         'max3903',
     ],
+    'installable': True,
 }
diff --git a/fieldservice_sale/models/fsm_location.py b/fieldservice_sale/models/fsm_location.py
index 65416a8a7a..601c2408b2 100644
--- a/fieldservice_sale/models/fsm_location.py
+++ b/fieldservice_sale/models/fsm_location.py
@@ -1,12 +1,10 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields
+from odoo import fields, models
 
-from odoo.addons.base_geoengine import geo_model
 
-
-class FSMLocation(geo_model.GeoModel):
+class FSMLocation(models.Model):
     _inherit = 'fsm.location'
 
     sales_territory_id = fields.Many2one('fsm.territory',
diff --git a/fieldservice_sale/readme/CONTRIBUTORS.rst b/fieldservice_sale/readme/CONTRIBUTORS.rst
index 1b9bde1401..c6a834aaa4 100644
--- a/fieldservice_sale/readme/CONTRIBUTORS.rst
+++ b/fieldservice_sale/readme/CONTRIBUTORS.rst
@@ -1,3 +1,4 @@
 * Steve Campbell <scampbell@opensourceintegrators.com>
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Wolfgang Hall <whall@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_sale/readme/INSTALL.rst b/fieldservice_sale/readme/INSTALL.rst
index c010f8f6a2..8571f65376 100644
--- a/fieldservice_sale/readme/INSTALL.rst
+++ b/fieldservice_sale/readme/INSTALL.rst
@@ -1,4 +1,4 @@
 To install Field Service and have the mapping features, you need to install GeoEngine.
 
 Please refer to the installation instructions available at:
-https://github.com/OCA/geospatial/tree/11.0/base_geoengine
+https://github.com/OCA/geospatial/tree/12.0/base_geoengine
diff --git a/fieldservice_sale/static/description/description/icon.png b/fieldservice_sale/static/description/description/icon.png
deleted file mode 100644
index 955674d8f0b8c47de3ffa9db25cb109fbe4a1091..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17808
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

diff --git a/fieldservice_sale/static/description/description/index.html b/fieldservice_sale/static/description/description/index.html
deleted file mode 100644
index 734a351843..0000000000
--- a/fieldservice_sale/static/description/description/index.html
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
-<title>Field Service</title>
-<style type="text/css">
-
-/*
-:Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
-:Copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
-customize this style sheet.
-*/
-
-/* used to remove borders from tables and images */
-.borderless, table.borderless td, table.borderless th {
-  border: 0 }
-
-table.borderless td, table.borderless th {
-  /* Override padding for "table.docutils td" with "! important".
-     The right padding separates the table cells. */
-  padding: 0 0.5em 0 0 ! important }
-
-.first {
-  /* Override more specific margin styles with "! important". */
-  margin-top: 0 ! important }
-
-.last, .with-subtitle {
-  margin-bottom: 0 ! important }
-
-.hidden {
-  display: none }
-
-.subscript {
-  vertical-align: sub;
-  font-size: smaller }
-
-.superscript {
-  vertical-align: super;
-  font-size: smaller }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-blockquote.epigraph {
-  margin: 2em 5em ; }
-
-dl.docutils dd {
-  margin-bottom: 0.5em }
-
-object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
-  overflow: hidden;
-}
-
-/* Uncomment (and remove this text!) to get bold-faced definition list terms
-dl.docutils dt {
-  font-weight: bold }
-*/
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.admonition p.admonition-title, div.hint p.admonition-title,
-div.important p.admonition-title, div.note p.admonition-title,
-div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title, .code .error {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-/* Uncomment (and remove this text!) to get reduced vertical space in
-   compound paragraphs.
-div.compound .compound-first, div.compound .compound-middle {
-  margin-bottom: 0.5em }
-
-div.compound .compound-last, div.compound .compound-middle {
-  margin-top: 0.5em }
-*/
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-div.footer, div.header {
-  clear: both;
-  font-size: smaller }
-
-div.line-block {
-  display: block ;
-  margin-top: 1em ;
-  margin-bottom: 1em }
-
-div.line-block div.line-block {
-  margin-top: 0 ;
-  margin-bottom: 0 ;
-  margin-left: 1.5em }
-
-div.sidebar {
-  margin: 0 0 0.5em 1em ;
-  border: medium outset ;
-  padding: 1em ;
-  background-color: #ffffee ;
-  width: 40% ;
-  float: right ;
-  clear: right }
-
-div.sidebar p.rubric {
-  font-family: sans-serif ;
-  font-size: medium }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
-  margin-top: 0.4em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr.docutils {
-  width: 75% }
-
-img.align-left, .figure.align-left, object.align-left, table.align-left {
-  clear: left ;
-  float: left ;
-  margin-right: 1em }
-
-img.align-right, .figure.align-right, object.align-right, table.align-right {
-  clear: right ;
-  float: right ;
-  margin-left: 1em }
-
-img.align-center, .figure.align-center, object.align-center {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-table.align-center {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.align-left {
-  text-align: left }
-
-.align-center {
-  clear: both ;
-  text-align: center }
-
-.align-right {
-  text-align: right }
-
-/* reset inner alignment in figures */
-div.align-right {
-  text-align: inherit }
-
-/* div.align-center * { */
-/*   text-align: left } */
-
-.align-top    {
-  vertical-align: top }
-
-.align-middle {
-  vertical-align: middle }
-
-.align-bottom {
-  vertical-align: bottom }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.attribution {
-  text-align: right ;
-  margin-left: 50% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.rubric {
-  font-weight: bold ;
-  font-size: larger ;
-  color: maroon ;
-  text-align: center }
-
-p.sidebar-title {
-  font-family: sans-serif ;
-  font-weight: bold ;
-  font-size: larger }
-
-p.sidebar-subtitle {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font: inherit }
-
-pre.literal-block, pre.doctest-block, pre.math, pre.code {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-pre.code .ln { color: grey; } /* 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 }
-pre.code .literal.string, code .literal.string { color: #0C5404 }
-pre.code .name.builtin, code .name.builtin { color: #352B84 }
-pre.code .deleted, code .deleted { background-color: #DEB0A1}
-pre.code .inserted, code .inserted { background-color: #A3D289}
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-span.section-subtitle {
-  /* font-size relative to parent (h1..h6 element) */
-  font-size: 80% }
-
-table.citation {
-  border-left: solid 1px gray;
-  margin-left: 1px }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.docutils {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.footnote {
-  border-left: solid 1px black;
-  margin-left: 1px }
-
-table.docutils td, table.docutils th,
-table.docinfo td, table.docinfo th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-table.docutils th.field-name, table.docinfo th.docinfo-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap ;
-  padding-left: 0 }
-
-/* "booktabs" style (no vertical lines) */
-table.docutils.booktabs {
-  border: 0px;
-  border-top: 2px solid;
-  border-bottom: 2px solid;
-  border-collapse: collapse;
-}
-table.docutils.booktabs * {
-  border: 0px;
-}
-table.docutils.booktabs th {
-  border-bottom: thin solid;
-  text-align: left;
-}
-
-h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
-h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
-  font-size: 100% }
-
-ul.auto-toc {
-  list-style-type: none }
-
-</style>
-</head>
-<body>
-<div class="document" id="field-service">
-<h1 class="title">Field Service</h1>
-
-<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! This file is generated by oca-gen-addon-readme !!
-!! changes will be overwritten.                   !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/11.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" href="https://translation.odoo-community.org/projects/field-service-11-0/field-service-11-0-fieldservice"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/264/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
-<p>This module is the base of the Field Service application in Odoo.</p>
-<p><strong>Table of contents</strong></p>
-<div class="contents local topic" id="contents">
-<ul class="simple">
-<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
-<li><a class="reference internal" href="#configuration" id="id2">Configuration</a></li>
-<li><a class="reference internal" href="#usage" id="id3">Usage</a></li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="id4">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id5">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id6">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id7">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id8">Contributors</a></li>
-<li><a class="reference internal" href="#other-credits" id="id9">Other credits</a></li>
-<li><a class="reference internal" href="#maintainers" id="id10">Maintainers</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="installation">
-<h1><a class="toc-backref" href="#id1">Installation</a></h1>
-<p>To install Field Service and have the mapping features, you need to install GeoEngine.</p>
-<p>Please refer to the installation instructions available at:
-<a class="reference external" href="https://github.com/OCA/geospatial/tree/11.0/base_geoengine">https://github.com/OCA/geospatial/tree/11.0/base_geoengine</a></p>
-</div>
-<div class="section" id="configuration">
-<h1><a class="toc-backref" href="#id2">Configuration</a></h1>
-<p>To configure this module, you need to:</p>
-<ul class="simple">
-<li>Go to Field Service &gt; Configuration &gt; Settings</li>
-</ul>
-</div>
-<div class="section" id="usage">
-<h1><a class="toc-backref" href="#id3">Usage</a></h1>
-<p>To use this module, you need to:</p>
-<ul class="simple">
-<li>Go to Field Service</li>
-<li>Create or select an order</li>
-<li>Follow the process</li>
-</ul>
-</div>
-<div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
-<p>The roadmap of the Field Service application is documented on
-<a class="reference external" href="https://github.com/OCA/field-service/issues/1">Github</a>.</p>
-</div>
-<div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice%0Aversion:%2011.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">
-<h1><a class="toc-backref" href="#id6">Credits</a></h1>
-<div class="section" id="authors">
-<h2><a class="toc-backref" href="#id7">Authors</a></h2>
-<ul class="simple">
-<li>Open Source Integrators</li>
-</ul>
-</div>
-<div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id8">Contributors</a></h2>
-<ul class="simple">
-<li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
-<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
-<li>Steve Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#64;opensourceintegrators.com</a>&gt;</li>
-<li>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
-<li>Michael Allen &lt;<a class="reference external" href="mailto:mallen&#64;opensourceintegrators.com">mallen&#64;opensourceintegrators.com</a>&gt;</li>
-</ul>
-</div>
-<div class="section" id="other-credits">
-<h2><a class="toc-backref" href="#id9">Other credits</a></h2>
-<p>The development of this module has been financially supported by:</p>
-<ul class="simple">
-<li>Open Source Integrators &lt;<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>&gt;</li>
-</ul>
-</div>
-<div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id10">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>
-<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">maintainers</a>:</p>
-<p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" 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/11.0/fieldservice">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>
-</div>
-</body>
-</html>
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index 6d777250e3..23490becee 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Sales</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/11.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" href="https://translation.odoo-community.org/projects/field-service-11-0/field-service-11-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" href="https://runbot.odoo-community.org/runbot/264/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/12.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" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-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" href="https://runbot.odoo-community.org/runbot/264/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>The module integrate the field service application with the sales one.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -390,7 +390,7 @@ <h1 class="title">Field Service - Sales</h1>
 <h1><a class="toc-backref" href="#id1">Installation</a></h1>
 <p>To install Field Service and have the mapping features, you need to install GeoEngine.</p>
 <p>Please refer to the installation instructions available at:
-<a class="reference external" href="https://github.com/OCA/geospatial/tree/11.0/base_geoengine">https://github.com/OCA/geospatial/tree/11.0/base_geoengine</a></p>
+<a class="reference external" href="https://github.com/OCA/geospatial/tree/12.0/base_geoengine">https://github.com/OCA/geospatial/tree/12.0/base_geoengine</a></p>
 </div>
 <div class="section" id="configuration">
 <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
@@ -415,7 +415,7 @@ <h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2011.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_sale%0Aversion:%2012.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">
@@ -432,6 +432,7 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <li>Steve Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -450,7 +451,7 @@ <h2><a class="toc-backref" href="#id10">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
 <p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" 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/11.0/fieldservice_sale">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/12.0/fieldservice_sale">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>

From bc402d47618dfdb9f09fe1f367f2c8c36a47a6dc Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 26 Jun 2019 09:43:27 -0700
Subject: [PATCH 05/77] [IMP] FSM Sale Update

[IMP] Remove Duplicate Field
---
 fieldservice_sale/views/fsm_location.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fieldservice_sale/views/fsm_location.xml b/fieldservice_sale/views/fsm_location.xml
index b9be2f2f87..88ae128d9c 100644
--- a/fieldservice_sale/views/fsm_location.xml
+++ b/fieldservice_sale/views/fsm_location.xml
@@ -12,6 +12,7 @@
                     <group>
                         <group>
                             <field name="sales_territory_id"/>
+                            <field name="user_id"/>
                         </group>
                     </group>
                 </page>

From df215d9717a9f4372a644613a8cc55b85f90e343 Mon Sep 17 00:00:00 2001
From: osi-scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 19 Dec 2018 15:50:26 -0700
Subject: [PATCH 06/77] [ADD] fieldservice_sale

---
 fieldservice_sale/README.rst                  |   4 +
 fieldservice_sale/__manifest__.py             |   1 +
 fieldservice_sale/models/fsm_sale.py          |  13 +
 .../static/description/description/icon.png   | Bin 0 -> 17808 bytes
 .../static/description/description/index.html | 464 ++++++++++++++++++
 5 files changed, 482 insertions(+)
 create mode 100644 fieldservice_sale/models/fsm_sale.py
 create mode 100644 fieldservice_sale/static/description/description/icon.png
 create mode 100644 fieldservice_sale/static/description/description/index.html

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index 755ff8d4eb..39d9b32177 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -38,7 +38,11 @@ Installation
 To install Field Service and have the mapping features, you need to install GeoEngine.
 
 Please refer to the installation instructions available at:
+<<<<<<< HEAD
 https://github.com/OCA/geospatial/tree/12.0/base_geoengine
+=======
+https://github.com/OCA/geospatial/tree/11.0/base_geoengine
+>>>>>>> [UPD] README.rst
 
 Configuration
 =============
diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index c06567201e..9e9b1127a8 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -15,6 +15,7 @@
     'data': [
         'views/fsm_location.xml'
     ],
+    'application': True,
     'license': 'AGPL-3',
     'development_status': 'Beta',
     'maintainers': [
diff --git a/fieldservice_sale/models/fsm_sale.py b/fieldservice_sale/models/fsm_sale.py
new file mode 100644
index 0000000000..65416a8a7a
--- /dev/null
+++ b/fieldservice_sale/models/fsm_sale.py
@@ -0,0 +1,13 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields
+
+from odoo.addons.base_geoengine import geo_model
+
+
+class FSMLocation(geo_model.GeoModel):
+    _inherit = 'fsm.location'
+
+    sales_territory_id = fields.Many2one('fsm.territory',
+                                         string='Sales Territory')
diff --git a/fieldservice_sale/static/description/description/icon.png b/fieldservice_sale/static/description/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..955674d8f0b8c47de3ffa9db25cb109fbe4a1091
GIT binary patch
literal 17808
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

literal 0
HcmV?d00001

diff --git a/fieldservice_sale/static/description/description/index.html b/fieldservice_sale/static/description/description/index.html
new file mode 100644
index 0000000000..734a351843
--- /dev/null
+++ b/fieldservice_sale/static/description/description/index.html
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<title>Field Service</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* 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 }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="field-service">
+<h1 class="title">Field Service</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/11.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" href="https://translation.odoo-community.org/projects/field-service-11-0/field-service-11-0-fieldservice"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/264/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module is the base of the Field Service application in Odoo.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
+<li><a class="reference internal" href="#configuration" id="id2">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id3">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id4">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id5">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id6">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id7">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id8">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id9">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id10">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="installation">
+<h1><a class="toc-backref" href="#id1">Installation</a></h1>
+<p>To install Field Service and have the mapping features, you need to install GeoEngine.</p>
+<p>Please refer to the installation instructions available at:
+<a class="reference external" href="https://github.com/OCA/geospatial/tree/11.0/base_geoengine">https://github.com/OCA/geospatial/tree/11.0/base_geoengine</a></p>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id2">Configuration</a></h1>
+<p>To configure this module, you need to:</p>
+<ul class="simple">
+<li>Go to Field Service &gt; Configuration &gt; Settings</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id3">Usage</a></h1>
+<p>To use this module, you need to:</p>
+<ul class="simple">
+<li>Go to Field Service</li>
+<li>Create or select an order</li>
+<li>Follow the process</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
+<p>The roadmap of the Field Service application is documented on
+<a class="reference external" href="https://github.com/OCA/field-service/issues/1">Github</a>.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice%0Aversion:%2011.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">
+<h1><a class="toc-backref" href="#id6">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id7">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id8">Contributors</a></h2>
+<ul class="simple">
+<li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Steve Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Michael Allen &lt;<a class="reference external" href="mailto:mallen&#64;opensourceintegrators.com">mallen&#64;opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id9">Other credits</a></h2>
+<p>The development of this module has been financially supported by:</p>
+<ul class="simple">
+<li>Open Source Integrators &lt;<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id10">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>
+<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">maintainers</a>:</p>
+<p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" 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/11.0/fieldservice">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>
+</div>
+</body>
+</html>

From eb955396025ec5a84be4d6e73609039b8e049fce Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 20 Dec 2018 17:40:55 -0600
Subject: [PATCH 07/77] [FIX] View + icon

---
 fieldservice_sale/__manifest__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 9e9b1127a8..c06567201e 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -15,7 +15,6 @@
     'data': [
         'views/fsm_location.xml'
     ],
-    'application': True,
     'license': 'AGPL-3',
     'development_status': 'Beta',
     'maintainers': [

From 98bc149b811e2fcf4ea9e88190bbf5beaf391b50 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 11 May 2019 17:54:52 -0400
Subject: [PATCH 08/77] [IMP] fieldservice_sale

Added ability to link a product with FSM order template and create FSM
orders upon sale order confirmation
Added option to install fieldservice_sale module
---
 fieldservice_sale/__manifest__.py         |  12 +-
 fieldservice_sale/models/__init__.py      |   3 +
 fieldservice_sale/models/fsm_order.py     |  23 ++++
 fieldservice_sale/models/product.py       |  26 ++++
 fieldservice_sale/models/sale_order.py    | 157 ++++++++++++++++++++++
 fieldservice_sale/readme/CONFIGURE.rst    |  12 +-
 fieldservice_sale/readme/CONTRIBUTORS.rst |   1 +
 fieldservice_sale/readme/USAGE.rst        |   7 +-
 fieldservice_sale/views/fsm_order.xml     |  19 +++
 fieldservice_sale/views/product.xml       |  16 +++
 fieldservice_sale/views/sale_order.xml    |  23 ++++
 11 files changed, 293 insertions(+), 6 deletions(-)
 create mode 100644 fieldservice_sale/models/fsm_order.py
 create mode 100644 fieldservice_sale/models/product.py
 create mode 100644 fieldservice_sale/models/sale_order.py
 create mode 100644 fieldservice_sale/views/fsm_order.xml
 create mode 100644 fieldservice_sale/views/product.xml
 create mode 100644 fieldservice_sale/views/sale_order.xml

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index c06567201e..8dee4eb29d 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -3,23 +3,27 @@
 
 {
     'name': 'Field Service - Sales',
-    'summary': 'Sales',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.0.1',
+    'summary': 'Sales integration for Field Service',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice',
-        'sale',
+        'sale_management',
     ],
     'data': [
-        'views/fsm_location.xml'
+        'views/fsm_location.xml',
+        'views/fsm_order.xml',
+        'views/product.xml',
+        'views/sale_order.xml',
     ],
     'license': 'AGPL-3',
     'development_status': 'Beta',
     'maintainers': [
         'wolfhall',
         'max3903',
+        'brian10048',
     ],
     'installable': True,
 }
diff --git a/fieldservice_sale/models/__init__.py b/fieldservice_sale/models/__init__.py
index 61d98a615d..360a690640 100644
--- a/fieldservice_sale/models/__init__.py
+++ b/fieldservice_sale/models/__init__.py
@@ -2,3 +2,6 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import fsm_location
+from . import product
+from . import sale_order
+from . import fsm_order
diff --git a/fieldservice_sale/models/fsm_order.py b/fieldservice_sale/models/fsm_order.py
new file mode 100644
index 0000000000..4798b725a1
--- /dev/null
+++ b/fieldservice_sale/models/fsm_order.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, _
+
+from odoo.addons.base_geoengine import geo_model
+
+
+class FSMOrder(geo_model.GeoModel):
+    _inherit = 'fsm.order'
+
+    sale_line_id = fields.Many2one('sale.order.line')
+
+    def action_view_sales(self):
+        self.ensure_one()
+        return {
+            "type": "ir.actions.act_window",
+            "res_model": "sale.order",
+            "views": [[False, "form"]],
+            "res_id": self.sale_line_id.order_id.id,
+            "context": {"create": False},
+            "name": _("Sales Orders"),
+        }
diff --git a/fieldservice_sale/models/product.py b/fieldservice_sale/models/product.py
new file mode 100644
index 0000000000..9655b7dc2b
--- /dev/null
+++ b/fieldservice_sale/models/product.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    service_type = fields.Selection(selection_add=[
+        ('field', 'Field Service Orders'),
+    ])
+    field_service_tracking = fields.Selection([
+        ('no', 'Don\'t create order'),
+        ('order', 'Create a single order'),
+    ], string="Field Service Tracking", default="no",
+        help="""On Sales order confirmation, this product can generate a field
+                service order.""")
+    fsm_order_template_id = fields.Many2one(
+        'fsm.template', 'Field Service Order Template',
+        help="Select the field service order template to be created")
+
+    @api.onchange('field_service_tracking')
+    def _onchange_field_service_tracking(self):
+        if self.field_service_tracking != 'order':
+            self.fsm_order_template_id = False
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
new file mode 100644
index 0000000000..46395a3967
--- /dev/null
+++ b/fieldservice_sale/models/sale_order.py
@@ -0,0 +1,157 @@
+# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models, _
+
+
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    fsm_location_id = fields.Many2one(
+        'fsm.location', string='Service Location',
+        help="SO Lines generating a FSM order will be for this location")
+    fsm_order_ids = fields.Many2many(
+        'fsm.order', compute='_compute_fsm_order_ids',
+        string='Field Service orders associated to this sale')
+    fsm_order_count = fields.Float(
+        string='Field Service Orders', compute='_compute_fsm_order_ids')
+
+    @api.multi
+    @api.depends('order_line.product_id')
+    def _compute_fsm_order_ids(self):
+        for order in self:
+            order.fsm_order_ids = self.env['fsm.order'].search([
+                ('sale_line_id', 'in', order.order_line.ids)])
+            order.fsm_order_count = len(order.fsm_order_ids)
+
+    @api.multi
+    def action_confirm(self):
+        """ On SO confirmation, some lines generate field service orders. """
+        result = super(SaleOrder, self).action_confirm()
+        self.order_line._field_service_generation()
+        return result
+
+    @api.multi
+    def action_view_fsm_order(self):
+        fsm_orders = self.mapped('fsm_order_ids')
+        action = self.env.ref('fieldservice.action_fsm_dash_order').read()[0]
+        if len(fsm_orders) > 1:
+            action['domain'] = [('id', 'in', fsm_orders.ids)]
+        elif len(fsm_orders) == 1:
+            action['views'] = [(self.env.
+                                ref('fieldservice.fsm_order_form').id,
+                                'form')]
+            action['res_id'] = fsm_orders.id
+        else:
+            action = {'type': 'ir.actions.act_window_close'}
+        return action
+
+
+class SaleOrderLine(models.Model):
+    _inherit = "sale.order.line"
+
+    fsm_order_id = fields.Many2one(
+        'fsm.order', 'Order', index=True,
+        help="Field Service Order generated by the sales order item")
+    is_field_service = fields.Boolean(
+        "Is a Field Service", compute='_compute_is_field_service',
+        store=True,
+        help="""Sales Order item should generate an Order and/or
+                Order Recurrence, depending on the product settings.""")
+
+    @api.multi
+    @api.depends('product_id.type')
+    def _compute_is_field_service(self):
+        for so_line in self:
+            so_line.is_field_service = so_line.product_id.type == 'service'
+
+    @api.depends('product_id.type')
+    def _compute_product_updatable(self):
+        for line in self:
+            if line.product_id.type == 'service' and line.state == 'sale':
+                line.product_updatable = False
+            else:
+                super(SaleOrderLine, line)._compute_product_updatable()
+
+    @api.model
+    def create(self, values):
+        line = super(SaleOrderLine, self).create(values)
+        if line.state == 'sale':
+            line._field_service_generation()
+        return line
+
+    def _field_create_fsm_order_prepare_values(self):
+        self.ensure_one()
+        return {
+            'customer_id': self.order_id.partner_id.id,
+            'location_id': self.order_id.fsm_location_id.id,
+            # 'request_early': ,
+            # 'scheduled_date_start': ,
+            'description': self.name,
+            'template_id': self.product_id.fsm_order_template_id.id,
+            'sale_line_id': self.id,
+            'company_id': self.company_id.id,
+        }
+
+    @api.multi
+    def _field_create_fsm_order(self):
+        """ Generate fsm_order for the given so line, and link it.
+            :return a mapping with the so line id and its linked fsm_order
+            :rtype dict
+        """
+        result = {}
+        for so_line in self:
+            # create fsm_order
+            values = so_line._field_create_fsm_order_prepare_values()
+            fsm_order = self.env['fsm.order'].sudo().create(values)
+            so_line.write({'fsm_order_id': fsm_order.id})
+            # post message on SO
+            msg_body = _(
+                """Field Service Order Created (%s): <a href=
+                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>
+                """) % (so_line.product_id.name, fsm_order.id, fsm_order.name)
+            so_line.order_id.message_post(body=msg_body)
+            # post message on fsm_order
+            fsm_order_msg = _(
+                """This order has been created from: <a href=
+                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)
+                """) % (so_line.order_id.id, so_line.order_id.name,
+                        so_line.product_id.name)
+            fsm_order.message_post(body=fsm_order_msg)
+
+            result[so_line.id] = fsm_order
+        return result
+
+    @api.multi
+    def _field_find_fsm_order(self):
+        """ Find the fsm_order generated by the so lines. If no fsm_order
+            linked, it will be created automatically.
+            :return a mapping with the so line id and its linked fsm_order
+            :rtype dict
+        """
+        # one search for all so lines
+        fsm_orders = self.env['fsm.order'].search([
+            ('sale_line_id', 'in', self.ids)])
+        fsm_order_sol_mapping = {
+            fsm_order.sale_line_id.id: fsm_order for fsm_order in fsm_orders}
+
+        result = {}
+        for so_line in self:
+            # If the SO was confirmed, cancelled, set to draft then confirmed,
+            # avoid creating a new fsm_order.
+            fsm_order = fsm_order_sol_mapping.get(so_line.id)
+            # If not found, create one fsm_order for the so line
+            if not fsm_order:
+                fsm_order = so_line._field_create_fsm_order()[so_line.id]
+            result[so_line.id] = fsm_order
+        return result
+
+    @api.multi
+    def _field_service_generation(self):
+        """ For service lines, create the field service order. If it already
+            exists, it simply links the existing one to the line.
+        """
+        for so_line in self.filtered(lambda sol: sol.is_field_service):
+            # create order
+            if so_line.product_id.field_service_tracking == 'order':
+                so_line._field_find_fsm_order()
diff --git a/fieldservice_sale/readme/CONFIGURE.rst b/fieldservice_sale/readme/CONFIGURE.rst
index f2731c6102..f9e33986f8 100644
--- a/fieldservice_sale/readme/CONFIGURE.rst
+++ b/fieldservice_sale/readme/CONFIGURE.rst
@@ -1,4 +1,14 @@
-To use this module, you need to:
+To setup a product for quoting and selling field service orders:
+
+* Go to Sales > Catalog > Products
+* Create or select a product
+* Set the Product Type to 'Service' under General Information tab
+* Under Invoicing tab, set the Field Service Tracking option
+* Select the FSM Order Template that will be used for creating FSM Orders when
+    a Sale Order is confirmed with this product
+
+
+To setup a sales territory, you need to:
 
 * Go to Field Service > Master Data > Locations
 * Create or select a location
diff --git a/fieldservice_sale/readme/CONTRIBUTORS.rst b/fieldservice_sale/readme/CONTRIBUTORS.rst
index c6a834aaa4..997a52c353 100644
--- a/fieldservice_sale/readme/CONTRIBUTORS.rst
+++ b/fieldservice_sale/readme/CONTRIBUTORS.rst
@@ -2,3 +2,4 @@
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Wolfgang Hall <whall@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_sale/readme/USAGE.rst b/fieldservice_sale/readme/USAGE.rst
index 684e27f7d7..21658803b6 100644
--- a/fieldservice_sale/readme/USAGE.rst
+++ b/fieldservice_sale/readme/USAGE.rst
@@ -1 +1,6 @@
-Coming soon...
+* Go to Sales app
+* Create a new Quotation/Sale Order
+* Set the FSM Location to be used
+* On a Sale Order Line, select a product configured for field service orders
+* Confirm the Sale Order
+* Field Service Orders linked to SO lines are created
diff --git a/fieldservice_sale/views/fsm_order.xml b/fieldservice_sale/views/fsm_order.xml
new file mode 100644
index 0000000000..4a0de01ae0
--- /dev/null
+++ b/fieldservice_sale/views/fsm_order.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_fsm_order_form_inherit_sale" model="ir.ui.view">
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+                <button type="object"
+                        name="action_view_sales"
+                        class="oe_stat_button"
+                        icon="fa-credit-card"
+                        attrs="{'invisible': [('sale_line_id', '=', False)]}">
+                    <span class="o_stat_text">Sale Orders</span>
+                    <field name="sale_line_id" attrs="{'invisible': 1}"/>
+                </button>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_sale/views/product.xml b/fieldservice_sale/views/product.xml
new file mode 100644
index 0000000000..d6fd0cea69
--- /dev/null
+++ b/fieldservice_sale/views/product.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_product_fieldservice_form" model="ir.ui.view">
+        <field name="name">product.template.fieldservice.form</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='service_type']" position="after">
+                <field name="field_service_tracking" widget="radio"
+                       attrs="{'invisible': [('type','!=','service')]}"/>
+                <field name="fsm_order_template_id" 
+                       attrs="{'invisible':[('field_service_tracking','not in',['order'])]}"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_sale/views/sale_order.xml b/fieldservice_sale/views/sale_order.xml
new file mode 100644
index 0000000000..a23ed15b96
--- /dev/null
+++ b/fieldservice_sale/views/sale_order.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_order_form_inherit_sale_fieldservice" model="ir.ui.view">
+        <field name="name">sale.order.form.sale.fieldservice</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='action_view_invoice']" position="before">
+                <button type="object"
+                        name="action_view_fsm_order"
+                        class="oe_stat_button"
+                        icon="fa-tasks"
+                        attrs="{'invisible': [('fsm_order_count', '=', 0)]}"
+                        groups="fieldservice.group_fsm_user">
+                    <field name="fsm_order_count" widget="statinfo" string="FSM Orders"/>
+                </button>
+            </xpath>
+            <xpath expr="//field[@name='partner_shipping_id']" position="after">
+                <field name="fsm_location_id"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

From e8b3830f8e1e23636b7c40daf153b81f36c393e9 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 13 May 2019 19:19:11 -0400
Subject: [PATCH 09/77] [IMP] fieldservice_sale

Added support for selling recurring orders
---
 fieldservice_sale/__manifest__.py         |   2 +
 fieldservice_sale/models/__init__.py      |   1 +
 fieldservice_sale/models/fsm_recurring.py |  21 ++++
 fieldservice_sale/models/product.py       |   8 +-
 fieldservice_sale/models/sale_order.py    | 115 +++++++++++++++++++++-
 fieldservice_sale/views/fsm_recurring.xml |  19 ++++
 fieldservice_sale/views/product.xml       |   2 +
 fieldservice_sale/views/sale_order.xml    |  13 +++
 8 files changed, 177 insertions(+), 4 deletions(-)
 create mode 100644 fieldservice_sale/models/fsm_recurring.py
 create mode 100644 fieldservice_sale/views/fsm_recurring.xml

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 8dee4eb29d..8b03f285ec 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -10,11 +10,13 @@
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice',
+        'fieldservice_recurring',
         'sale_management',
     ],
     'data': [
         'views/fsm_location.xml',
         'views/fsm_order.xml',
+        'views/fsm_recurring.xml',
         'views/product.xml',
         'views/sale_order.xml',
     ],
diff --git a/fieldservice_sale/models/__init__.py b/fieldservice_sale/models/__init__.py
index 360a690640..af7c9764a8 100644
--- a/fieldservice_sale/models/__init__.py
+++ b/fieldservice_sale/models/__init__.py
@@ -5,3 +5,4 @@
 from . import product
 from . import sale_order
 from . import fsm_order
+from . import fsm_recurring
diff --git a/fieldservice_sale/models/fsm_recurring.py b/fieldservice_sale/models/fsm_recurring.py
new file mode 100644
index 0000000000..30bca2240d
--- /dev/null
+++ b/fieldservice_sale/models/fsm_recurring.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models, _
+
+
+class FSMRecurring(models.Model):
+    _inherit = 'fsm.recurring'
+
+    sale_line_id = fields.Many2one('sale.order.line')
+
+    def action_view_sales(self):
+        self.ensure_one()
+        return {
+            "type": "ir.actions.act_window",
+            "res_model": "sale.order",
+            "views": [[False, "form"]],
+            "res_id": self.sale_line_id.order_id.id,
+            "context": {"create": False},
+            "name": _("Sales Orders"),
+        }
diff --git a/fieldservice_sale/models/product.py b/fieldservice_sale/models/product.py
index 9655b7dc2b..241a3d153c 100644
--- a/fieldservice_sale/models/product.py
+++ b/fieldservice_sale/models/product.py
@@ -13,14 +13,20 @@ class ProductTemplate(models.Model):
     field_service_tracking = fields.Selection([
         ('no', 'Don\'t create order'),
         ('order', 'Create a single order'),
+        ('recurring', 'Create a recurring order')
     ], string="Field Service Tracking", default="no",
         help="""On Sales order confirmation, this product can generate a field
-                service order.""")
+                service order or field service recurring order.""")
     fsm_order_template_id = fields.Many2one(
         'fsm.template', 'Field Service Order Template',
         help="Select the field service order template to be created")
+    fsm_recurring_template_id = fields.Many2one(
+        'fsm.recurring', 'Field Service Recurring Template',
+        help="Select a field service recurring order template to be created")
 
     @api.onchange('field_service_tracking')
     def _onchange_field_service_tracking(self):
         if self.field_service_tracking != 'order':
             self.fsm_order_template_id = False
+        elif self.field_service_tracking != 'recurring':
+            self.fsm_recurring_template_id = False
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 46395a3967..a3e37f09d0 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -10,11 +10,20 @@ class SaleOrder(models.Model):
     fsm_location_id = fields.Many2one(
         'fsm.location', string='Service Location',
         help="SO Lines generating a FSM order will be for this location")
+    date_fsm_request = fields.Datetime(
+        string='Requested Service Date', readonly=True,
+        states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
+        copy=False, default=fields.Datetime.now)
     fsm_order_ids = fields.Many2many(
         'fsm.order', compute='_compute_fsm_order_ids',
         string='Field Service orders associated to this sale')
     fsm_order_count = fields.Float(
         string='Field Service Orders', compute='_compute_fsm_order_ids')
+    fsm_recurring_ids = fields.Many2many(
+        'fsm.recurring', compute='_compute_fsm_recurring_ids',
+        string='Field Service Recurring orders associated to this sale')
+    fsm_recurring_count = fields.Float(
+        string='FSM Recurring Orders', compute='_compute_fsm_recurring_ids')
 
     @api.multi
     @api.depends('order_line.product_id')
@@ -24,6 +33,14 @@ def _compute_fsm_order_ids(self):
                 ('sale_line_id', 'in', order.order_line.ids)])
             order.fsm_order_count = len(order.fsm_order_ids)
 
+    @api.multi
+    @api.depends('order_line.product_id')
+    def _compute_fsm_recurring_ids(self):
+        for order in self:
+            order.fsm_recurring_ids = self.env['fsm.recurring'].search([
+                ('sale_line_id', 'in', order.order_line.ids)])
+            order.fsm_recurring_count = len(order.fsm_recurring_ids)
+
     @api.multi
     def action_confirm(self):
         """ On SO confirmation, some lines generate field service orders. """
@@ -46,6 +63,21 @@ def action_view_fsm_order(self):
             action = {'type': 'ir.actions.act_window_close'}
         return action
 
+    @api.multi
+    def action_view_fsm_recurring(self):
+        fsm_recurrings = self.mapped('fsm_recurring_ids')
+        action = self.env.ref('fieldservice.action_fsm_recurring').read()[0]
+        if len(fsm_recurrings) > 1:
+            action['domain'] = [('id', 'in', fsm_recurrings.ids)]
+        elif len(fsm_recurrings) == 1:
+            action['views'] = [(self.env.ref(
+                                    'fieldservice.fsm_recurring_form_view').id,
+                                'form')]
+            action['res_id'] = fsm_recurrings.id
+        else:
+            action = {'type': 'ir.actions.act_window_close'}
+        return action
+
 
 class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
@@ -53,6 +85,9 @@ class SaleOrderLine(models.Model):
     fsm_order_id = fields.Many2one(
         'fsm.order', 'Order', index=True,
         help="Field Service Order generated by the sales order item")
+    fsm_recurring_id = fields.Many2one(
+        'fsm.recurring', 'Recurring Order', index=True,
+        help="Field Service Recurring Order generated by the sale order line")
     is_field_service = fields.Boolean(
         "Is a Field Service", compute='_compute_is_field_service',
         store=True,
@@ -86,13 +121,29 @@ def _field_create_fsm_order_prepare_values(self):
             'customer_id': self.order_id.partner_id.id,
             'location_id': self.order_id.fsm_location_id.id,
             # 'request_early': ,
-            # 'scheduled_date_start': ,
+            'scheduled_date_start': self.order_id.date_fsm_request,
             'description': self.name,
             'template_id': self.product_id.fsm_order_template_id.id,
             'sale_line_id': self.id,
             'company_id': self.company_id.id,
         }
 
+    def _field_create_fsm_recurring_prepare_values(self):
+        self.ensure_one()
+        template = self.product_id.fsm_recurring_template_id
+        return {
+            'customer_id': self.order_id.partner_id.id,
+            'location_id': self.order_id.fsm_location_id.id,
+            'start_date': self.order_id.date_fsm_request,
+            'fsm_recurring_template_id': template.id,
+            'description': self.name + '\n ' + template.description,
+            'max_orders': template.max_orders,
+            'fsm_frequency_set_id': template.fsm_frequency_set_id,
+            'fsm_order_template_id': template.fsm_order_template_id,
+            'sale_line_id': self.id,
+            'company_id': self.company_id.id,
+        }
+
     @api.multi
     def _field_create_fsm_order(self):
         """ Generate fsm_order for the given so line, and link it.
@@ -118,10 +169,40 @@ def _field_create_fsm_order(self):
                 """) % (so_line.order_id.id, so_line.order_id.name,
                         so_line.product_id.name)
             fsm_order.message_post(body=fsm_order_msg)
-
             result[so_line.id] = fsm_order
         return result
 
+    @api.multi
+    def _field_create_fsm_recurring(self):
+        """ Generate fsm_recurring for the given so line, and link it.
+            :return a mapping with the so line id and its linked fsm_recurring
+            :rtype dict
+        """
+        result = {}
+        for so_line in self:
+            # create fsm_recurring
+            values = so_line._field_create_fsm_recurring_prepare_values()
+            fsm_recurring = self.env['fsm.recurring'].sudo().create(values)
+            fsm_recurring.action_start()
+            so_line.write({'fsm_recurring_id': fsm_recurring.id})
+            # post message on SO
+            msg_body = _(
+                """Field Service recurring Created (%s): <a href=
+                   # data-oe-model=fsm.recurring data-oe-id=%d>%s</a>
+                """) % (so_line.product_id.name,
+                        fsm_recurring.id,
+                        fsm_recurring.name)
+            so_line.order_id.message_post(body=msg_body)
+            # post message on fsm_recurring
+            fsm_recurring_msg = _(
+                """This recurring has been created from: <a href=
+                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)
+                """) % (so_line.order_id.id, so_line.order_id.name,
+                        so_line.product_id.name)
+            fsm_recurring.message_post(body=fsm_recurring_msg)
+            result[so_line.id] = fsm_recurring
+        return result
+
     @api.multi
     def _field_find_fsm_order(self):
         """ Find the fsm_order generated by the so lines. If no fsm_order
@@ -134,7 +215,6 @@ def _field_find_fsm_order(self):
             ('sale_line_id', 'in', self.ids)])
         fsm_order_sol_mapping = {
             fsm_order.sale_line_id.id: fsm_order for fsm_order in fsm_orders}
-
         result = {}
         for so_line in self:
             # If the SO was confirmed, cancelled, set to draft then confirmed,
@@ -146,6 +226,32 @@ def _field_find_fsm_order(self):
             result[so_line.id] = fsm_order
         return result
 
+    @api.multi
+    def _field_find_fsm_recurring(self):
+        """ Find the fsm_recurring generated by the so lines. If no
+            fsm_recurring linked, it will be created automatically.
+            :return a mapping with the so line id and its linked
+            fsm_recurring
+            :rtype dict
+        """
+        # one search for all so lines
+        fsm_recurrings = self.env['fsm.recurring'].search([
+            ('sale_line_id', 'in', self.ids)])
+        fsm_recurring_sol_mapping = {
+            fsm_recurring.sale_line_id.id:
+                fsm_recurring for fsm_recurring in fsm_recurrings}
+        result = {}
+        for so_line in self:
+            # If the SO was confirmed, cancelled, set to draft then confirmed,
+            # avoid creating a new fsm_recurring.
+            fsm_recurring = fsm_recurring_sol_mapping.get(so_line.id)
+            # If not found, create one fsm_recurring for the so line
+            if not fsm_recurring:
+                fsm_recurring = so_line._field_create_fsm_recurring(
+                    )[so_line.id]
+            result[so_line.id] = fsm_recurring
+        return result
+
     @api.multi
     def _field_service_generation(self):
         """ For service lines, create the field service order. If it already
@@ -155,3 +261,6 @@ def _field_service_generation(self):
             # create order
             if so_line.product_id.field_service_tracking == 'order':
                 so_line._field_find_fsm_order()
+            # create recurring order
+            elif so_line.product_id.field_service_tracking == 'recurring':
+                so_line._field_find_fsm_recurring()
diff --git a/fieldservice_sale/views/fsm_recurring.xml b/fieldservice_sale/views/fsm_recurring.xml
new file mode 100644
index 0000000000..aedaeb3826
--- /dev/null
+++ b/fieldservice_sale/views/fsm_recurring.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="fsm_recurring_form_view_inherit_sale" model="ir.ui.view">
+        <field name="model">fsm.recurring</field>
+        <field name="inherit_id" ref="fieldservice_recurring.fsm_recurring_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+                <button type="object"
+                        name="action_view_sales"
+                        class="oe_stat_button"
+                        icon="fa-credit-card"
+                        attrs="{'invisible': [('sale_line_id', '=', False)]}">
+                    <span class="o_stat_text">Sale Orders</span>
+                    <field name="sale_line_id" attrs="{'invisible': 1}"/>
+                </button>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_sale/views/product.xml b/fieldservice_sale/views/product.xml
index d6fd0cea69..1553a6a8fb 100644
--- a/fieldservice_sale/views/product.xml
+++ b/fieldservice_sale/views/product.xml
@@ -10,6 +10,8 @@
                        attrs="{'invisible': [('type','!=','service')]}"/>
                 <field name="fsm_order_template_id" 
                        attrs="{'invisible':[('field_service_tracking','not in',['order'])]}"/>
+                <field name="fsm_recurring_template_id" 
+                       attrs="{'invisible':[('field_service_tracking','not in',['recurring'])]}"/>
             </xpath>
         </field>
     </record>
diff --git a/fieldservice_sale/views/sale_order.xml b/fieldservice_sale/views/sale_order.xml
index a23ed15b96..fa3538f07e 100644
--- a/fieldservice_sale/views/sale_order.xml
+++ b/fieldservice_sale/views/sale_order.xml
@@ -14,10 +14,23 @@
                         groups="fieldservice.group_fsm_user">
                     <field name="fsm_order_count" widget="statinfo" string="FSM Orders"/>
                 </button>
+                <button type="object"
+                        name="action_view_fsm_recurring"
+                        class="oe_stat_button"
+                        icon="fa-calendar-alt"
+                        attrs="{'invisible': [('fsm_recurring_count', '=', 0)]}"
+                        groups="fieldservice.group_fsm_user">
+                    <field name="fsm_recurring_count" widget="statinfo" string="FSM Recurring Orders"/>
+                </button>
             </xpath>
             <xpath expr="//field[@name='partner_shipping_id']" position="after">
                 <field name="fsm_location_id"/>
             </xpath>
+            <xpath expr="//group[@name='technical']" position="after">
+                <group string="Field Service Information" name="sale_fsm">
+                    <field name="date_fsm_request"/>
+                </group>
+            </xpath>
         </field>
     </record>
 </odoo>

From 4392e0c0b77bb66f451e1311e178dabb139a9b28 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Wed, 22 May 2019 18:35:48 -0400
Subject: [PATCH 10/77] [FIX] fieldservice_sale errors

Travis
Typo, wrong model relationship
Improved values prepation method for recurring
Updated errors on SO smart button for recurring
---
 fieldservice_sale/README.rst                  | 30 ++++++++++++++-----
 fieldservice_sale/models/product.py           |  2 +-
 fieldservice_sale/models/sale_order.py        | 19 +++++++-----
 .../static/description/index.html             | 26 ++++++++++++++--
 fieldservice_sale/views/sale_order.xml        |  2 +-
 5 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index 39d9b32177..69e0db232a 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -38,16 +38,22 @@ Installation
 To install Field Service and have the mapping features, you need to install GeoEngine.
 
 Please refer to the installation instructions available at:
-<<<<<<< HEAD
 https://github.com/OCA/geospatial/tree/12.0/base_geoengine
-=======
-https://github.com/OCA/geospatial/tree/11.0/base_geoengine
->>>>>>> [UPD] README.rst
 
 Configuration
 =============
 
-To use this module, you need to:
+To setup a product for quoting and selling field service orders:
+
+* Go to Sales > Catalog > Products
+* Create or select a product
+* Set the Product Type to 'Service' under General Information tab
+* Under Invoicing tab, set the Field Service Tracking option
+* Select the FSM Order Template that will be used for creating FSM Orders when
+    a Sale Order is confirmed with this product
+
+
+To setup a sales territory, you need to:
 
 * Go to Field Service > Master Data > Locations
 * Create or select a location
@@ -56,7 +62,12 @@ To use this module, you need to:
 Usage
 =====
 
-Coming soon...
+* Go to Sales app
+* Create a new Quotation/Sale Order
+* Set the FSM Location to be used
+* On a Sale Order Line, select a product configured for field service orders
+* Confirm the Sale Order
+* Field Service Orders linked to SO lines are created
 
 Known issues / Roadmap
 ======================
@@ -89,6 +100,8 @@ Contributors
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Wolfgang Hall <whall@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Brian McMaster <brian@mcmpest.com>
+
 
 Other credits
 ~~~~~~~~~~~~~
@@ -116,10 +129,13 @@ promote its widespread use.
 .. |maintainer-max3903| image:: https://github.com/max3903.png?size=40px
     :target: https://github.com/max3903
     :alt: max3903
+.. |maintainer-brian10048| image:: https://github.com/brian10048.png?size=40px
+    :target: https://github.com/brian10048
+    :alt: brian10048
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-wolfhall| |maintainer-max3903| 
+|maintainer-wolfhall| |maintainer-max3903| |maintainer-brian10048| 
 
 This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_sale>`_ project on GitHub.
 
diff --git a/fieldservice_sale/models/product.py b/fieldservice_sale/models/product.py
index 241a3d153c..e96a2fbdd7 100644
--- a/fieldservice_sale/models/product.py
+++ b/fieldservice_sale/models/product.py
@@ -21,7 +21,7 @@ class ProductTemplate(models.Model):
         'fsm.template', 'Field Service Order Template',
         help="Select the field service order template to be created")
     fsm_recurring_template_id = fields.Many2one(
-        'fsm.recurring', 'Field Service Recurring Template',
+        'fsm.recurring.template', 'Field Service Recurring Template',
         help="Select a field service recurring order template to be created")
 
     @api.onchange('field_service_tracking')
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index a3e37f09d0..0262d65d0c 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -66,13 +66,15 @@ def action_view_fsm_order(self):
     @api.multi
     def action_view_fsm_recurring(self):
         fsm_recurrings = self.mapped('fsm_recurring_ids')
-        action = self.env.ref('fieldservice.action_fsm_recurring').read()[0]
+        action = self.env.ref(
+            'fieldservice_recurring.action_fsm_recurring').read()[0]
         if len(fsm_recurrings) > 1:
             action['domain'] = [('id', 'in', fsm_recurrings.ids)]
         elif len(fsm_recurrings) == 1:
-            action['views'] = [(self.env.ref(
-                                    'fieldservice.fsm_recurring_form_view').id,
-                                'form')]
+            action['views'] = [
+                (self.env.ref(
+                    'fieldservice_recurring.fsm_recurring_form_view').id,
+                    'form')]
             action['res_id'] = fsm_recurrings.id
         else:
             action = {'type': 'ir.actions.act_window_close'}
@@ -131,15 +133,18 @@ def _field_create_fsm_order_prepare_values(self):
     def _field_create_fsm_recurring_prepare_values(self):
         self.ensure_one()
         template = self.product_id.fsm_recurring_template_id
+        note = self.name
+        if template.description:
+            note += '\n ' + template.description
         return {
             'customer_id': self.order_id.partner_id.id,
             'location_id': self.order_id.fsm_location_id.id,
             'start_date': self.order_id.date_fsm_request,
             'fsm_recurring_template_id': template.id,
-            'description': self.name + '\n ' + template.description,
+            'description': note,
             'max_orders': template.max_orders,
-            'fsm_frequency_set_id': template.fsm_frequency_set_id,
-            'fsm_order_template_id': template.fsm_order_template_id,
+            'fsm_frequency_set_id': template.fsm_frequency_set_id.id,
+            'fsm_order_template_id': template.fsm_order_template_id.id,
             'sale_line_id': self.id,
             'company_id': self.company_id.id,
         }
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index 23490becee..1daf759a46 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -394,7 +394,19 @@ <h1><a class="toc-backref" href="#id1">Installation</a></h1>
 </div>
 <div class="section" id="configuration">
 <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
-<p>To use this module, you need to:</p>
+<p>To setup a product for quoting and selling field service orders:</p>
+<ul class="simple">
+<li>Go to Sales &gt; Catalog &gt; Products</li>
+<li>Create or select a product</li>
+<li>Set the Product Type to ???Service??? under General Information tab</li>
+<li>Under Invoicing tab, set the Field Service Tracking option</li>
+<li><dl class="first docutils">
+<dt>Select the FSM Order Template that will be used for creating FSM Orders when</dt>
+<dd>a Sale Order is confirmed with this product</dd>
+</dl>
+</li>
+</ul>
+<p>To setup a sales territory, you need to:</p>
 <ul class="simple">
 <li>Go to Field Service &gt; Master Data &gt; Locations</li>
 <li>Create or select a location</li>
@@ -403,7 +415,14 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#id3">Usage</a></h1>
-<p>Coming soon???</p>
+<ul class="simple">
+<li>Go to Sales app</li>
+<li>Create a new Quotation/Sale Order</li>
+<li>Set the FSM Location to be used</li>
+<li>On a Sale Order Line, select a product configured for field service orders</li>
+<li>Confirm the Sale Order</li>
+<li>Field Service Orders linked to SO lines are created</li>
+</ul>
 </div>
 <div class="section" id="known-issues-roadmap">
 <h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
@@ -433,6 +452,7 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
+<li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -450,8 +470,10 @@ <h2><a class="toc-backref" href="#id10">Maintainers</a></h2>
 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">maintainers</a>:</p>
+<<<<<<< HEAD
 <p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" 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/12.0/fieldservice_sale">OCA/field-service</a> project on GitHub.</p>
+<p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a></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>
diff --git a/fieldservice_sale/views/sale_order.xml b/fieldservice_sale/views/sale_order.xml
index fa3538f07e..16d5f6699f 100644
--- a/fieldservice_sale/views/sale_order.xml
+++ b/fieldservice_sale/views/sale_order.xml
@@ -17,7 +17,7 @@
                 <button type="object"
                         name="action_view_fsm_recurring"
                         class="oe_stat_button"
-                        icon="fa-calendar-alt"
+                        icon="fa-calendar"
                         attrs="{'invisible': [('fsm_recurring_count', '=', 0)]}"
                         groups="fieldservice.group_fsm_user">
                     <field name="fsm_recurring_count" widget="statinfo" string="FSM Recurring Orders"/>

From d04369943421703fda27d089352ec51a8a170fbf Mon Sep 17 00:00:00 2001
From: hparfr <raph@hpar.fr>
Date: Mon, 15 Jul 2019 16:38:28 +0200
Subject: [PATCH 11/77] Finish migration to v12 (forward port from v11)

---
 fieldservice_sale/README.rst                    |  2 +-
 fieldservice_sale/models/fsm_order.py           |  6 ++----
 fieldservice_sale/models/fsm_sale.py            | 13 -------------
 fieldservice_sale/readme/CONTRIBUTORS.rst       |  1 +
 fieldservice_sale/static/description/index.html |  7 +++----
 5 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 fieldservice_sale/models/fsm_sale.py

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index 69e0db232a..9a8d358102 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -101,7 +101,7 @@ Contributors
 * Wolfgang Hall <whall@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
-
+* Rapha??l Reverdy <raphael.reverdy@akretion.com>
 
 Other credits
 ~~~~~~~~~~~~~
diff --git a/fieldservice_sale/models/fsm_order.py b/fieldservice_sale/models/fsm_order.py
index 4798b725a1..7a3d2187f3 100644
--- a/fieldservice_sale/models/fsm_order.py
+++ b/fieldservice_sale/models/fsm_order.py
@@ -1,12 +1,10 @@
 # Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, _
+from odoo import fields, models, _
 
-from odoo.addons.base_geoengine import geo_model
 
-
-class FSMOrder(geo_model.GeoModel):
+class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
     sale_line_id = fields.Many2one('sale.order.line')
diff --git a/fieldservice_sale/models/fsm_sale.py b/fieldservice_sale/models/fsm_sale.py
deleted file mode 100644
index 65416a8a7a..0000000000
--- a/fieldservice_sale/models/fsm_sale.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import fields
-
-from odoo.addons.base_geoengine import geo_model
-
-
-class FSMLocation(geo_model.GeoModel):
-    _inherit = 'fsm.location'
-
-    sales_territory_id = fields.Many2one('fsm.territory',
-                                         string='Sales Territory')
diff --git a/fieldservice_sale/readme/CONTRIBUTORS.rst b/fieldservice_sale/readme/CONTRIBUTORS.rst
index 997a52c353..ca62cafbde 100644
--- a/fieldservice_sale/readme/CONTRIBUTORS.rst
+++ b/fieldservice_sale/readme/CONTRIBUTORS.rst
@@ -3,3 +3,4 @@
 * Wolfgang Hall <whall@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
+* Rapha??l Reverdy <raphael.reverdy@akretion.com>
\ No newline at end of file
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index 1daf759a46..56be539646 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Field Service - Sales</title>
 <style type="text/css">
 
@@ -453,6 +453,7 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
+<li>Rapha??l Reverdy &lt;<a class="reference external" href="mailto:raphael.reverdy&#64;akretion.com">raphael.reverdy&#64;akretion.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -470,10 +471,8 @@ <h2><a class="toc-backref" href="#id10">Maintainers</a></h2>
 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">maintainers</a>:</p>
-<<<<<<< HEAD
-<p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" 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/12.0/fieldservice_sale">OCA/field-service</a> project on GitHub.</p>
 <p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/12.0/fieldservice_sale">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>

From b0171d49a6856b14e1a51fe2bdc8e9f9d68a1875 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 9 Oct 2019 21:31:58 -0500
Subject: [PATCH 12/77] [FIX] fieldservice_sale

---
 fieldservice_sale/readme/CONTRIBUTORS.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_sale/readme/CONTRIBUTORS.rst b/fieldservice_sale/readme/CONTRIBUTORS.rst
index ca62cafbde..b4f5cd1d16 100644
--- a/fieldservice_sale/readme/CONTRIBUTORS.rst
+++ b/fieldservice_sale/readme/CONTRIBUTORS.rst
@@ -3,4 +3,4 @@
 * Wolfgang Hall <whall@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
-* Rapha??l Reverdy <raphael.reverdy@akretion.com>
\ No newline at end of file
+* Rapha??l Reverdy <raphael.reverdy@akretion.com>

From 8ae8b091389e927c678708c8a28f25c4eb5badc5 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 16 Oct 2019 08:48:31 -0500
Subject: [PATCH 13/77] [IMP] fieldservice_sale: Remove the recurring part

---
 fieldservice_sale/README.rst                  |  28 +--
 fieldservice_sale/__init__.py                 |   2 +-
 fieldservice_sale/__manifest__.py             |  10 +-
 fieldservice_sale/i18n/fieldservice_sale.pot  | 203 ++++++++++++++++
 fieldservice_sale/models/__init__.py          |  14 +-
 fieldservice_sale/models/fsm_location.py      |   2 +-
 fieldservice_sale/models/fsm_order.py         |   3 +-
 fieldservice_sale/models/fsm_recurring.py     |  21 --
 .../{product.py => product_template.py}       |  11 +-
 fieldservice_sale/models/sale_order.py        | 225 +-----------------
 fieldservice_sale/models/sale_order_line.py   | 113 +++++++++
 fieldservice_sale/readme/CONFIGURE.rst        |   5 +-
 fieldservice_sale/readme/CONTRIBUTORS.rst     |   9 +-
 fieldservice_sale/readme/CREDITS.rst          |   3 -
 fieldservice_sale/readme/DESCRIPTION.rst      |   3 +-
 fieldservice_sale/readme/USAGE.rst            |   4 +-
 .../static/description/index.html             |  31 +--
 fieldservice_sale/views/fsm_location.xml      |   1 -
 fieldservice_sale/views/fsm_order.xml         |   1 -
 fieldservice_sale/views/fsm_recurring.xml     |  19 --
 .../{product.xml => product_template.xml}     |   3 -
 fieldservice_sale/views/sale_order.xml        |   9 -
 22 files changed, 374 insertions(+), 346 deletions(-)
 create mode 100644 fieldservice_sale/i18n/fieldservice_sale.pot
 delete mode 100644 fieldservice_sale/models/fsm_recurring.py
 rename fieldservice_sale/models/{product.py => product_template.py} (66%)
 create mode 100644 fieldservice_sale/models/sale_order_line.py
 delete mode 100644 fieldservice_sale/readme/CREDITS.rst
 delete mode 100644 fieldservice_sale/views/fsm_recurring.xml
 rename fieldservice_sale/views/{product.xml => product_template.xml} (79%)

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index 9a8d358102..0e2cdce62c 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -25,7 +25,8 @@ Field Service - Sales
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
-The module integrate the field service application with the sales one.
+The module integrates the Field Service application with the Sales one and
+allows you to sell field service products.
 
 **Table of contents**
 
@@ -50,10 +51,9 @@ To setup a product for quoting and selling field service orders:
 * Set the Product Type to 'Service' under General Information tab
 * Under Invoicing tab, set the Field Service Tracking option
 * Select the FSM Order Template that will be used for creating FSM Orders when
-    a Sale Order is confirmed with this product
+  a Sale Order is confirmed with this product
 
-
-To setup a sales territory, you need to:
+To setup a sales territory:
 
 * Go to Field Service > Master Data > Locations
 * Create or select a location
@@ -62,12 +62,12 @@ To setup a sales territory, you need to:
 Usage
 =====
 
-* Go to Sales app
+* Go to Sales
 * Create a new Quotation/Sale Order
 * Set the FSM Location to be used
 * On a Sale Order Line, select a product configured for field service orders
 * Confirm the Sale Order
-* Field Service Orders linked to SO lines are created
+* Field Service orders linked to SO lines are created
 
 Known issues / Roadmap
 ======================
@@ -96,20 +96,16 @@ Authors
 Contributors
 ~~~~~~~~~~~~
 
-* Steve Campbell <scampbell@opensourceintegrators.com>
-* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
-* Wolfgang Hall <whall@opensourceintegrators.com>
+* Open Source Integrators <https://opensourceintegrators.com>
+
+  * Steve Campbell <scampbell@opensourceintegrators.com>
+  * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+  * Wolfgang Hall <whall@opensourceintegrators.com>
+
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
 * Rapha??l Reverdy <raphael.reverdy@akretion.com>
 
-Other credits
-~~~~~~~~~~~~~
-
-The development of this module has been financially supported by:
-
-* Open Source Integrators <https://opensourceintegrators.com>
-
 Maintainers
 ~~~~~~~~~~~
 
diff --git a/fieldservice_sale/__init__.py b/fieldservice_sale/__init__.py
index 631bd4893a..66ca882fcc 100644
--- a/fieldservice_sale/__init__.py
+++ b/fieldservice_sale/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2018 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 8b03f285ec..9743ad392e 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -1,23 +1,21 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2018 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     'name': 'Field Service - Sales',
-    'version': '12.0.1.0.1',
-    'summary': 'Sales integration for Field Service',
+    'version': '12.0.1.1.0',
+    'summary': 'Sell field services.',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice',
-        'fieldservice_recurring',
         'sale_management',
     ],
     'data': [
         'views/fsm_location.xml',
         'views/fsm_order.xml',
-        'views/fsm_recurring.xml',
-        'views/product.xml',
+        'views/product_template.xml',
         'views/sale_order.xml',
     ],
     'license': 'AGPL-3',
diff --git a/fieldservice_sale/i18n/fieldservice_sale.pot b/fieldservice_sale/i18n/fieldservice_sale.pot
new file mode 100644
index 0000000000..268274f8e1
--- /dev/null
+++ b/fieldservice_sale/i18n/fieldservice_sale.pot
@@ -0,0 +1,203 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
+msgid "<span class=\"o_stat_text\">Sale Orders</span>"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create a recurring order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create a single order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Don't create order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
+msgid "FSM Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
+msgid "Field Service Information"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:67
+#, python-format
+msgid "Field Service Order Created (%s): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Field Service Order generated by the sales order item"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
+#: selection:product.template,service_type:0
+msgid "Field Service Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__field_service_tracking
+msgid "Field Service Tracking"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_ids
+msgid "Field Service orders associated to this sale"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__is_field_service
+msgid "Is a Field Service"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Manually set quantities on order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
+msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
+msgid "On Sales order confirmation, this product can generate a field\n"
+"                service order or field service recurring order."
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__date_fsm_request
+msgid "Requested Service Date"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "SO Lines generating a FSM order will be for this location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
+msgid "Sale Line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sale Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
+msgid "Sales"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__is_field_service
+msgid "Sales Order item should generate an Order and/or\n"
+"                Order Recurrence, depending on the product settings."
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/fsm_order.py:21
+#, python-format
+msgid "Sales Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
+msgid "Sales Territory"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Select the field service order template to be created"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "Service Location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:73
+#, python-format
+msgid "This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Timesheets on project (one fare per SO/Project)"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
+msgid "Track Service"
+msgstr ""
+
diff --git a/fieldservice_sale/models/__init__.py b/fieldservice_sale/models/__init__.py
index af7c9764a8..e7ed8ef14c 100644
--- a/fieldservice_sale/models/__init__.py
+++ b/fieldservice_sale/models/__init__.py
@@ -1,8 +1,10 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2018 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import fsm_location
-from . import product
-from . import sale_order
-from . import fsm_order
-from . import fsm_recurring
+from . import (
+    fsm_location,
+    product_template,
+    sale_order,
+    sale_order_line,
+    fsm_order
+)
diff --git a/fieldservice_sale/models/fsm_location.py b/fieldservice_sale/models/fsm_location.py
index 601c2408b2..d7f24ba0ef 100644
--- a/fieldservice_sale/models/fsm_location.py
+++ b/fieldservice_sale/models/fsm_location.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2018 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models
diff --git a/fieldservice_sale/models/fsm_order.py b/fieldservice_sale/models/fsm_order.py
index 7a3d2187f3..8d829493b3 100644
--- a/fieldservice_sale/models/fsm_order.py
+++ b/fieldservice_sale/models/fsm_order.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
+# Copyright (C) 2019 Brian McMaster
+# Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models, _
diff --git a/fieldservice_sale/models/fsm_recurring.py b/fieldservice_sale/models/fsm_recurring.py
deleted file mode 100644
index 30bca2240d..0000000000
--- a/fieldservice_sale/models/fsm_recurring.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import fields, models, _
-
-
-class FSMRecurring(models.Model):
-    _inherit = 'fsm.recurring'
-
-    sale_line_id = fields.Many2one('sale.order.line')
-
-    def action_view_sales(self):
-        self.ensure_one()
-        return {
-            "type": "ir.actions.act_window",
-            "res_model": "sale.order",
-            "views": [[False, "form"]],
-            "res_id": self.sale_line_id.order_id.id,
-            "context": {"create": False},
-            "name": _("Sales Orders"),
-        }
diff --git a/fieldservice_sale/models/product.py b/fieldservice_sale/models/product_template.py
similarity index 66%
rename from fieldservice_sale/models/product.py
rename to fieldservice_sale/models/product_template.py
index e96a2fbdd7..f1ea46796e 100644
--- a/fieldservice_sale/models/product.py
+++ b/fieldservice_sale/models/product_template.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
+# Copyright (C) 2019 Brian McMaster
+# Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models
@@ -12,21 +13,15 @@ class ProductTemplate(models.Model):
     ])
     field_service_tracking = fields.Selection([
         ('no', 'Don\'t create order'),
-        ('order', 'Create a single order'),
-        ('recurring', 'Create a recurring order')
+        ('order', 'Create a single order')
     ], string="Field Service Tracking", default="no",
         help="""On Sales order confirmation, this product can generate a field
                 service order or field service recurring order.""")
     fsm_order_template_id = fields.Many2one(
         'fsm.template', 'Field Service Order Template',
         help="Select the field service order template to be created")
-    fsm_recurring_template_id = fields.Many2one(
-        'fsm.recurring.template', 'Field Service Recurring Template',
-        help="Select a field service recurring order template to be created")
 
     @api.onchange('field_service_tracking')
     def _onchange_field_service_tracking(self):
         if self.field_service_tracking != 'order':
             self.fsm_order_template_id = False
-        elif self.field_service_tracking != 'recurring':
-            self.fsm_recurring_template_id = False
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 0262d65d0c..61e3d49382 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -1,7 +1,8 @@
-# Copyright (C) 2019 - TODAY, Brian McMaster, Open Source Integrators
+# Copyright (C) 2019 Brian McMaster
+# Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models, _
+from odoo import api, fields, models
 
 
 class SaleOrder(models.Model):
@@ -19,11 +20,6 @@ class SaleOrder(models.Model):
         string='Field Service orders associated to this sale')
     fsm_order_count = fields.Float(
         string='Field Service Orders', compute='_compute_fsm_order_ids')
-    fsm_recurring_ids = fields.Many2many(
-        'fsm.recurring', compute='_compute_fsm_recurring_ids',
-        string='Field Service Recurring orders associated to this sale')
-    fsm_recurring_count = fields.Float(
-        string='FSM Recurring Orders', compute='_compute_fsm_recurring_ids')
 
     @api.multi
     @api.depends('order_line.product_id')
@@ -33,14 +29,6 @@ def _compute_fsm_order_ids(self):
                 ('sale_line_id', 'in', order.order_line.ids)])
             order.fsm_order_count = len(order.fsm_order_ids)
 
-    @api.multi
-    @api.depends('order_line.product_id')
-    def _compute_fsm_recurring_ids(self):
-        for order in self:
-            order.fsm_recurring_ids = self.env['fsm.recurring'].search([
-                ('sale_line_id', 'in', order.order_line.ids)])
-            order.fsm_recurring_count = len(order.fsm_recurring_ids)
-
     @api.multi
     def action_confirm(self):
         """ On SO confirmation, some lines generate field service orders. """
@@ -62,210 +50,3 @@ def action_view_fsm_order(self):
         else:
             action = {'type': 'ir.actions.act_window_close'}
         return action
-
-    @api.multi
-    def action_view_fsm_recurring(self):
-        fsm_recurrings = self.mapped('fsm_recurring_ids')
-        action = self.env.ref(
-            'fieldservice_recurring.action_fsm_recurring').read()[0]
-        if len(fsm_recurrings) > 1:
-            action['domain'] = [('id', 'in', fsm_recurrings.ids)]
-        elif len(fsm_recurrings) == 1:
-            action['views'] = [
-                (self.env.ref(
-                    'fieldservice_recurring.fsm_recurring_form_view').id,
-                    'form')]
-            action['res_id'] = fsm_recurrings.id
-        else:
-            action = {'type': 'ir.actions.act_window_close'}
-        return action
-
-
-class SaleOrderLine(models.Model):
-    _inherit = "sale.order.line"
-
-    fsm_order_id = fields.Many2one(
-        'fsm.order', 'Order', index=True,
-        help="Field Service Order generated by the sales order item")
-    fsm_recurring_id = fields.Many2one(
-        'fsm.recurring', 'Recurring Order', index=True,
-        help="Field Service Recurring Order generated by the sale order line")
-    is_field_service = fields.Boolean(
-        "Is a Field Service", compute='_compute_is_field_service',
-        store=True,
-        help="""Sales Order item should generate an Order and/or
-                Order Recurrence, depending on the product settings.""")
-
-    @api.multi
-    @api.depends('product_id.type')
-    def _compute_is_field_service(self):
-        for so_line in self:
-            so_line.is_field_service = so_line.product_id.type == 'service'
-
-    @api.depends('product_id.type')
-    def _compute_product_updatable(self):
-        for line in self:
-            if line.product_id.type == 'service' and line.state == 'sale':
-                line.product_updatable = False
-            else:
-                super(SaleOrderLine, line)._compute_product_updatable()
-
-    @api.model
-    def create(self, values):
-        line = super(SaleOrderLine, self).create(values)
-        if line.state == 'sale':
-            line._field_service_generation()
-        return line
-
-    def _field_create_fsm_order_prepare_values(self):
-        self.ensure_one()
-        return {
-            'customer_id': self.order_id.partner_id.id,
-            'location_id': self.order_id.fsm_location_id.id,
-            # 'request_early': ,
-            'scheduled_date_start': self.order_id.date_fsm_request,
-            'description': self.name,
-            'template_id': self.product_id.fsm_order_template_id.id,
-            'sale_line_id': self.id,
-            'company_id': self.company_id.id,
-        }
-
-    def _field_create_fsm_recurring_prepare_values(self):
-        self.ensure_one()
-        template = self.product_id.fsm_recurring_template_id
-        note = self.name
-        if template.description:
-            note += '\n ' + template.description
-        return {
-            'customer_id': self.order_id.partner_id.id,
-            'location_id': self.order_id.fsm_location_id.id,
-            'start_date': self.order_id.date_fsm_request,
-            'fsm_recurring_template_id': template.id,
-            'description': note,
-            'max_orders': template.max_orders,
-            'fsm_frequency_set_id': template.fsm_frequency_set_id.id,
-            'fsm_order_template_id': template.fsm_order_template_id.id,
-            'sale_line_id': self.id,
-            'company_id': self.company_id.id,
-        }
-
-    @api.multi
-    def _field_create_fsm_order(self):
-        """ Generate fsm_order for the given so line, and link it.
-            :return a mapping with the so line id and its linked fsm_order
-            :rtype dict
-        """
-        result = {}
-        for so_line in self:
-            # create fsm_order
-            values = so_line._field_create_fsm_order_prepare_values()
-            fsm_order = self.env['fsm.order'].sudo().create(values)
-            so_line.write({'fsm_order_id': fsm_order.id})
-            # post message on SO
-            msg_body = _(
-                """Field Service Order Created (%s): <a href=
-                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>
-                """) % (so_line.product_id.name, fsm_order.id, fsm_order.name)
-            so_line.order_id.message_post(body=msg_body)
-            # post message on fsm_order
-            fsm_order_msg = _(
-                """This order has been created from: <a href=
-                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)
-                """) % (so_line.order_id.id, so_line.order_id.name,
-                        so_line.product_id.name)
-            fsm_order.message_post(body=fsm_order_msg)
-            result[so_line.id] = fsm_order
-        return result
-
-    @api.multi
-    def _field_create_fsm_recurring(self):
-        """ Generate fsm_recurring for the given so line, and link it.
-            :return a mapping with the so line id and its linked fsm_recurring
-            :rtype dict
-        """
-        result = {}
-        for so_line in self:
-            # create fsm_recurring
-            values = so_line._field_create_fsm_recurring_prepare_values()
-            fsm_recurring = self.env['fsm.recurring'].sudo().create(values)
-            fsm_recurring.action_start()
-            so_line.write({'fsm_recurring_id': fsm_recurring.id})
-            # post message on SO
-            msg_body = _(
-                """Field Service recurring Created (%s): <a href=
-                   # data-oe-model=fsm.recurring data-oe-id=%d>%s</a>
-                """) % (so_line.product_id.name,
-                        fsm_recurring.id,
-                        fsm_recurring.name)
-            so_line.order_id.message_post(body=msg_body)
-            # post message on fsm_recurring
-            fsm_recurring_msg = _(
-                """This recurring has been created from: <a href=
-                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)
-                """) % (so_line.order_id.id, so_line.order_id.name,
-                        so_line.product_id.name)
-            fsm_recurring.message_post(body=fsm_recurring_msg)
-            result[so_line.id] = fsm_recurring
-        return result
-
-    @api.multi
-    def _field_find_fsm_order(self):
-        """ Find the fsm_order generated by the so lines. If no fsm_order
-            linked, it will be created automatically.
-            :return a mapping with the so line id and its linked fsm_order
-            :rtype dict
-        """
-        # one search for all so lines
-        fsm_orders = self.env['fsm.order'].search([
-            ('sale_line_id', 'in', self.ids)])
-        fsm_order_sol_mapping = {
-            fsm_order.sale_line_id.id: fsm_order for fsm_order in fsm_orders}
-        result = {}
-        for so_line in self:
-            # If the SO was confirmed, cancelled, set to draft then confirmed,
-            # avoid creating a new fsm_order.
-            fsm_order = fsm_order_sol_mapping.get(so_line.id)
-            # If not found, create one fsm_order for the so line
-            if not fsm_order:
-                fsm_order = so_line._field_create_fsm_order()[so_line.id]
-            result[so_line.id] = fsm_order
-        return result
-
-    @api.multi
-    def _field_find_fsm_recurring(self):
-        """ Find the fsm_recurring generated by the so lines. If no
-            fsm_recurring linked, it will be created automatically.
-            :return a mapping with the so line id and its linked
-            fsm_recurring
-            :rtype dict
-        """
-        # one search for all so lines
-        fsm_recurrings = self.env['fsm.recurring'].search([
-            ('sale_line_id', 'in', self.ids)])
-        fsm_recurring_sol_mapping = {
-            fsm_recurring.sale_line_id.id:
-                fsm_recurring for fsm_recurring in fsm_recurrings}
-        result = {}
-        for so_line in self:
-            # If the SO was confirmed, cancelled, set to draft then confirmed,
-            # avoid creating a new fsm_recurring.
-            fsm_recurring = fsm_recurring_sol_mapping.get(so_line.id)
-            # If not found, create one fsm_recurring for the so line
-            if not fsm_recurring:
-                fsm_recurring = so_line._field_create_fsm_recurring(
-                    )[so_line.id]
-            result[so_line.id] = fsm_recurring
-        return result
-
-    @api.multi
-    def _field_service_generation(self):
-        """ For service lines, create the field service order. If it already
-            exists, it simply links the existing one to the line.
-        """
-        for so_line in self.filtered(lambda sol: sol.is_field_service):
-            # create order
-            if so_line.product_id.field_service_tracking == 'order':
-                so_line._field_find_fsm_order()
-            # create recurring order
-            elif so_line.product_id.field_service_tracking == 'recurring':
-                so_line._field_find_fsm_recurring()
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
new file mode 100644
index 0000000000..624e66deae
--- /dev/null
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -0,0 +1,113 @@
+# Copyright (C) 2019 Brian McMaster
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models, _
+
+
+class SaleOrderLine(models.Model):
+    _inherit = "sale.order.line"
+
+    fsm_order_id = fields.Many2one(
+        'fsm.order', 'Order', index=True,
+        help="Field Service Order generated by the sales order item")
+    is_field_service = fields.Boolean(
+        "Is a Field Service", compute='_compute_is_field_service',
+        store=True,
+        help="""Sales Order item should generate an Order and/or
+                Order Recurrence, depending on the product settings.""")
+
+    @api.multi
+    @api.depends('product_id.type')
+    def _compute_is_field_service(self):
+        for so_line in self:
+            so_line.is_field_service = so_line.product_id.type == 'service'
+
+    @api.depends('product_id.type')
+    def _compute_product_updatable(self):
+        for line in self:
+            if line.product_id.type == 'service' and line.state == 'sale':
+                line.product_updatable = False
+            else:
+                super(SaleOrderLine, line)._compute_product_updatable()
+
+    @api.model
+    def create(self, values):
+        line = super(SaleOrderLine, self).create(values)
+        if line.state == 'sale':
+            line._field_service_generation()
+        return line
+
+    def _field_create_fsm_order_prepare_values(self):
+        self.ensure_one()
+        return {
+            'customer_id': self.order_id.partner_id.id,
+            'location_id': self.order_id.fsm_location_id.id,
+            # 'request_early': ,
+            'scheduled_date_start': self.order_id.date_fsm_request,
+            'description': self.name,
+            'template_id': self.product_id.fsm_order_template_id.id,
+            'sale_line_id': self.id,
+            'company_id': self.company_id.id,
+        }
+
+    @api.multi
+    def _field_create_fsm_order(self):
+        """ Generate fsm_order for the given so line, and link it.
+            :return a mapping with the so line id and its linked fsm_order
+            :rtype dict
+        """
+        result = {}
+        for so_line in self:
+            # create fsm_order
+            values = so_line._field_create_fsm_order_prepare_values()
+            fsm_order = self.env['fsm.order'].sudo().create(values)
+            so_line.write({'fsm_order_id': fsm_order.id})
+            # post message on SO
+            msg_body = _(
+                """Field Service Order Created (%s): <a href=
+                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>
+                """) % (so_line.product_id.name, fsm_order.id, fsm_order.name)
+            so_line.order_id.message_post(body=msg_body)
+            # post message on fsm_order
+            fsm_order_msg = _(
+                """This order has been created from: <a href=
+                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)
+                """) % (so_line.order_id.id, so_line.order_id.name,
+                        so_line.product_id.name)
+            fsm_order.message_post(body=fsm_order_msg)
+            result[so_line.id] = fsm_order
+        return result
+
+    @api.multi
+    def _field_find_fsm_order(self):
+        """ Find the fsm_order generated by the so lines. If no fsm_order
+            linked, it will be created automatically.
+            :return a mapping with the so line id and its linked fsm_order
+            :rtype dict
+        """
+        # one search for all so lines
+        fsm_orders = self.env['fsm.order'].search([
+            ('sale_line_id', 'in', self.ids)])
+        fsm_order_sol_mapping = {
+            fsm_order.sale_line_id.id: fsm_order for fsm_order in fsm_orders}
+        result = {}
+        for so_line in self:
+            # If the SO was confirmed, cancelled, set to draft then confirmed,
+            # avoid creating a new fsm_order.
+            fsm_order = fsm_order_sol_mapping.get(so_line.id)
+            # If not found, create one fsm_order for the so line
+            if not fsm_order:
+                fsm_order = so_line._field_create_fsm_order()[so_line.id]
+            result[so_line.id] = fsm_order
+        return result
+
+    @api.multi
+    def _field_service_generation(self):
+        """ For service lines, create the field service order. If it already
+            exists, it simply links the existing one to the line.
+        """
+        for so_line in self.filtered(lambda sol: sol.is_field_service):
+            # create order
+            if so_line.product_id.field_service_tracking == 'order':
+                so_line._field_find_fsm_order()
diff --git a/fieldservice_sale/readme/CONFIGURE.rst b/fieldservice_sale/readme/CONFIGURE.rst
index f9e33986f8..6751d6e618 100644
--- a/fieldservice_sale/readme/CONFIGURE.rst
+++ b/fieldservice_sale/readme/CONFIGURE.rst
@@ -5,10 +5,9 @@ To setup a product for quoting and selling field service orders:
 * Set the Product Type to 'Service' under General Information tab
 * Under Invoicing tab, set the Field Service Tracking option
 * Select the FSM Order Template that will be used for creating FSM Orders when
-    a Sale Order is confirmed with this product
+  a Sale Order is confirmed with this product
 
-
-To setup a sales territory, you need to:
+To setup a sales territory:
 
 * Go to Field Service > Master Data > Locations
 * Create or select a location
diff --git a/fieldservice_sale/readme/CONTRIBUTORS.rst b/fieldservice_sale/readme/CONTRIBUTORS.rst
index b4f5cd1d16..b57af2abdc 100644
--- a/fieldservice_sale/readme/CONTRIBUTORS.rst
+++ b/fieldservice_sale/readme/CONTRIBUTORS.rst
@@ -1,6 +1,9 @@
-* Steve Campbell <scampbell@opensourceintegrators.com>
-* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
-* Wolfgang Hall <whall@opensourceintegrators.com>
+* Open Source Integrators <https://opensourceintegrators.com>
+
+  * Steve Campbell <scampbell@opensourceintegrators.com>
+  * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+  * Wolfgang Hall <whall@opensourceintegrators.com>
+
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
 * Rapha??l Reverdy <raphael.reverdy@akretion.com>
diff --git a/fieldservice_sale/readme/CREDITS.rst b/fieldservice_sale/readme/CREDITS.rst
deleted file mode 100644
index 0eff0acf4e..0000000000
--- a/fieldservice_sale/readme/CREDITS.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-The development of this module has been financially supported by:
-
-* Open Source Integrators <https://opensourceintegrators.com>
diff --git a/fieldservice_sale/readme/DESCRIPTION.rst b/fieldservice_sale/readme/DESCRIPTION.rst
index b81fa62ffb..c3b3ab00ea 100644
--- a/fieldservice_sale/readme/DESCRIPTION.rst
+++ b/fieldservice_sale/readme/DESCRIPTION.rst
@@ -1 +1,2 @@
-The module integrate the field service application with the sales one.
+The module integrates the Field Service application with the Sales one and
+allows you to sell field service products.
diff --git a/fieldservice_sale/readme/USAGE.rst b/fieldservice_sale/readme/USAGE.rst
index 21658803b6..234f080dfb 100644
--- a/fieldservice_sale/readme/USAGE.rst
+++ b/fieldservice_sale/readme/USAGE.rst
@@ -1,6 +1,6 @@
-* Go to Sales app
+* Go to Sales
 * Create a new Quotation/Sale Order
 * Set the FSM Location to be used
 * On a Sale Order Line, select a product configured for field service orders
 * Confirm the Sale Order
-* Field Service Orders linked to SO lines are created
+* Field Service orders linked to SO lines are created
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index 56be539646..24b7a8efc3 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -368,7 +368,8 @@ <h1 class="title">Field Service - Sales</h1>
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/12.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" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-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" href="https://runbot.odoo-community.org/runbot/264/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
-<p>The module integrate the field service application with the sales one.</p>
+<p>The module integrates the Field Service application with the Sales one and
+allows you to sell field service products.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -380,8 +381,7 @@ <h1 class="title">Field Service - Sales</h1>
 <li><a class="reference internal" href="#credits" id="id6">Credits</a><ul>
 <li><a class="reference internal" href="#authors" id="id7">Authors</a></li>
 <li><a class="reference internal" href="#contributors" id="id8">Contributors</a></li>
-<li><a class="reference internal" href="#other-credits" id="id9">Other credits</a></li>
-<li><a class="reference internal" href="#maintainers" id="id10">Maintainers</a></li>
+<li><a class="reference internal" href="#maintainers" id="id9">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -400,13 +400,10 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
 <li>Create or select a product</li>
 <li>Set the Product Type to ???Service??? under General Information tab</li>
 <li>Under Invoicing tab, set the Field Service Tracking option</li>
-<li><dl class="first docutils">
-<dt>Select the FSM Order Template that will be used for creating FSM Orders when</dt>
-<dd>a Sale Order is confirmed with this product</dd>
-</dl>
-</li>
+<li>Select the FSM Order Template that will be used for creating FSM Orders when
+a Sale Order is confirmed with this product</li>
 </ul>
-<p>To setup a sales territory, you need to:</p>
+<p>To setup a sales territory:</p>
 <ul class="simple">
 <li>Go to Field Service &gt; Master Data &gt; Locations</li>
 <li>Create or select a location</li>
@@ -416,12 +413,12 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#id3">Usage</a></h1>
 <ul class="simple">
-<li>Go to Sales app</li>
+<li>Go to Sales</li>
 <li>Create a new Quotation/Sale Order</li>
 <li>Set the FSM Location to be used</li>
 <li>On a Sale Order Line, select a product configured for field service orders</li>
 <li>Confirm the Sale Order</li>
-<li>Field Service Orders linked to SO lines are created</li>
+<li>Field Service orders linked to SO lines are created</li>
 </ul>
 </div>
 <div class="section" id="known-issues-roadmap">
@@ -448,23 +445,19 @@ <h2><a class="toc-backref" href="#id7">Authors</a></h2>
 <div class="section" id="contributors">
 <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
+<li>Open Source Integrators &lt;<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>&gt;<ul>
 <li>Steve Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
+</ul>
+</li>
 <li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
 <li>Rapha??l Reverdy &lt;<a class="reference external" href="mailto:raphael.reverdy&#64;akretion.com">raphael.reverdy&#64;akretion.com</a>&gt;</li>
 </ul>
 </div>
-<div class="section" id="other-credits">
-<h2><a class="toc-backref" href="#id9">Other credits</a></h2>
-<p>The development of this module has been financially supported by:</p>
-<ul class="simple">
-<li>Open Source Integrators &lt;<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>&gt;</li>
-</ul>
-</div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id10">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id9">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>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
diff --git a/fieldservice_sale/views/fsm_location.xml b/fieldservice_sale/views/fsm_location.xml
index 88ae128d9c..2e5941b96d 100644
--- a/fieldservice_sale/views/fsm_location.xml
+++ b/fieldservice_sale/views/fsm_location.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <!-- Field Service Location Form View-->
diff --git a/fieldservice_sale/views/fsm_order.xml b/fieldservice_sale/views/fsm_order.xml
index 4a0de01ae0..74e1c207b1 100644
--- a/fieldservice_sale/views/fsm_order.xml
+++ b/fieldservice_sale/views/fsm_order.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <record id="view_fsm_order_form_inherit_sale" model="ir.ui.view">
         <field name="model">fsm.order</field>
diff --git a/fieldservice_sale/views/fsm_recurring.xml b/fieldservice_sale/views/fsm_recurring.xml
deleted file mode 100644
index aedaeb3826..0000000000
--- a/fieldservice_sale/views/fsm_recurring.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="fsm_recurring_form_view_inherit_sale" model="ir.ui.view">
-        <field name="model">fsm.recurring</field>
-        <field name="inherit_id" ref="fieldservice_recurring.fsm_recurring_form_view"/>
-        <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
-                <button type="object"
-                        name="action_view_sales"
-                        class="oe_stat_button"
-                        icon="fa-credit-card"
-                        attrs="{'invisible': [('sale_line_id', '=', False)]}">
-                    <span class="o_stat_text">Sale Orders</span>
-                    <field name="sale_line_id" attrs="{'invisible': 1}"/>
-                </button>
-            </xpath>
-        </field>
-    </record>
-</odoo>
diff --git a/fieldservice_sale/views/product.xml b/fieldservice_sale/views/product_template.xml
similarity index 79%
rename from fieldservice_sale/views/product.xml
rename to fieldservice_sale/views/product_template.xml
index 1553a6a8fb..9e813bb107 100644
--- a/fieldservice_sale/views/product.xml
+++ b/fieldservice_sale/views/product_template.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <record id="view_product_fieldservice_form" model="ir.ui.view">
         <field name="name">product.template.fieldservice.form</field>
@@ -10,8 +9,6 @@
                        attrs="{'invisible': [('type','!=','service')]}"/>
                 <field name="fsm_order_template_id" 
                        attrs="{'invisible':[('field_service_tracking','not in',['order'])]}"/>
-                <field name="fsm_recurring_template_id" 
-                       attrs="{'invisible':[('field_service_tracking','not in',['recurring'])]}"/>
             </xpath>
         </field>
     </record>
diff --git a/fieldservice_sale/views/sale_order.xml b/fieldservice_sale/views/sale_order.xml
index 16d5f6699f..13aec13d5a 100644
--- a/fieldservice_sale/views/sale_order.xml
+++ b/fieldservice_sale/views/sale_order.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <record id="view_order_form_inherit_sale_fieldservice" model="ir.ui.view">
         <field name="name">sale.order.form.sale.fieldservice</field>
@@ -14,14 +13,6 @@
                         groups="fieldservice.group_fsm_user">
                     <field name="fsm_order_count" widget="statinfo" string="FSM Orders"/>
                 </button>
-                <button type="object"
-                        name="action_view_fsm_recurring"
-                        class="oe_stat_button"
-                        icon="fa-calendar"
-                        attrs="{'invisible': [('fsm_recurring_count', '=', 0)]}"
-                        groups="fieldservice.group_fsm_user">
-                    <field name="fsm_recurring_count" widget="statinfo" string="FSM Recurring Orders"/>
-                </button>
             </xpath>
             <xpath expr="//field[@name='partner_shipping_id']" position="after">
                 <field name="fsm_location_id"/>

From 6f0f5e7f83545f882d74eac89eaadbb7ba140c82 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sun, 10 Nov 2019 10:49:26 -0500
Subject: [PATCH 14/77] [IMP] fieldservice_sale: Compute qty_delivered

- Completed field service orders will now update the qty_delivered field on linked SO line
---
 fieldservice_sale/__manifest__.py           |  2 +-
 fieldservice_sale/models/sale_order_line.py | 22 +++++++++++++++++++++
 fieldservice_sale/readme/USAGE.rst          |  3 +++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 9743ad392e..102135b70c 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sales',
-    'version': '12.0.1.1.0',
+    'version': '12.0.1.2.0',
     'summary': 'Sell field services.',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 624e66deae..cc28a3e28c 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -8,6 +8,8 @@
 class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
 
+    qty_delivered_method = fields.Selection(
+        selection_add=[('field', 'Field Service Order')])
     fsm_order_id = fields.Many2one(
         'fsm.order', 'Order', index=True,
         help="Field Service Order generated by the sales order item")
@@ -31,6 +33,26 @@ def _compute_product_updatable(self):
             else:
                 super(SaleOrderLine, line)._compute_product_updatable()
 
+    @api.multi
+    @api.depends('product_id')
+    def _compute_qty_delivered_method(self):
+        super(SaleOrderLine, self)._compute_qty_delivered_method()
+        for line in self:
+            if not line.is_expense and line.product_id.type == 'service' \
+               and line.product_id.field_service_tracking == 'order':
+                line.qty_delivered_method = 'field'
+
+    @api.multi
+    @api.depends('fsm_order_id.stage_id')
+    def _compute_qty_delivered(self):
+        super(SaleOrderLine, self)._compute_qty_delivered()
+        lines_by_fsm = self.filtered(lambda sol:
+                                     sol.qty_delivered_method == 'field')
+        complete = self.env.ref('fieldservice.fsm_stage_completed')
+        for line in lines_by_fsm:
+            if line.fsm_order_id.stage_id == complete:
+                line.qty_delivered = line.product_uom_qty
+
     @api.model
     def create(self, values):
         line = super(SaleOrderLine, self).create(values)
diff --git a/fieldservice_sale/readme/USAGE.rst b/fieldservice_sale/readme/USAGE.rst
index 234f080dfb..c7cb6c41e5 100644
--- a/fieldservice_sale/readme/USAGE.rst
+++ b/fieldservice_sale/readme/USAGE.rst
@@ -4,3 +4,6 @@
 * On a Sale Order Line, select a product configured for field service orders
 * Confirm the Sale Order
 * Field Service orders linked to SO lines are created
+* When a Field Service order is completed, the quantity delivered for its
+   linked sale order line will be updated to the quantity ordered, indicating
+   this line is ready for invoicing.

From 1f617521ea2fc23d77065184ff518d51dd937f4f Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 18 Nov 2019 20:12:56 -0500
Subject: [PATCH 15/77] [IMP] fieldservice_sale: Compute qty_delivered

-  suggestions from reviewer comments
---
 fieldservice_sale/README.rst                  |   3 +
 fieldservice_sale/i18n/de.po                  | 239 ++++++++++++++++++
 fieldservice_sale/i18n/fieldservice_sale.pot  |  40 ++-
 fieldservice_sale/models/sale_order_line.py   |  14 +-
 .../static/description/index.html             |   6 +
 5 files changed, 295 insertions(+), 7 deletions(-)
 create mode 100644 fieldservice_sale/i18n/de.po

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index 0e2cdce62c..00615acfd7 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -68,6 +68,9 @@ Usage
 * On a Sale Order Line, select a product configured for field service orders
 * Confirm the Sale Order
 * Field Service orders linked to SO lines are created
+* When a Field Service order is completed, the quantity delivered for its
+   linked sale order line will be updated to the quantity ordered, indicating
+   this line is ready for invoicing.
 
 Known issues / Roadmap
 ======================
diff --git a/fieldservice_sale/i18n/de.po b/fieldservice_sale/i18n/de.po
new file mode 100644
index 0000000000..69e27881a7
--- /dev/null
+++ b/fieldservice_sale/i18n/de.po
@@ -0,0 +1,239 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
+msgid "<span class=\"o_stat_text\">Sale Orders</span>"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid "According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+"  - Manual: the quantity is set manually on the line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+"  - Stock Moves: the quantity comes from confirmed pickings\n"
+""
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Analytic From Expenses"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create a recurring order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create a single order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Don't create order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
+msgid "FSM Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
+msgid "Field Service Information"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_order
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:93
+#, python-format
+msgid "Field Service Order Created (%s): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Field Service Order generated by the sales order item"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
+#: selection:product.template,service_type:0
+msgid "Field Service Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__field_service_tracking
+msgid "Field Service Tracking"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_ids
+msgid "Field Service orders associated to this sale"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__is_field_service
+msgid "Is a Field Service"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Manually set quantities on order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
+msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid "Method to update delivered qty"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
+msgid "On Sales order confirmation, this product can generate a field\n"
+"                service order or field service recurring order."
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__date_fsm_request
+msgid "Requested Service Date"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "SO Lines generating a FSM order will be for this location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
+msgid "Sale Line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sale Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
+msgid "Sales"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__is_field_service
+msgid "Sales Order item should generate an Order and/or\n"
+"                Order Recurrence, depending on the product settings."
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/fsm_order.py:21
+#, python-format
+msgid "Sales Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
+msgid "Sales Territory"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Select the field service order template to be created"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "Service Location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:99
+#, python-format
+msgid "This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Timesheets"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Timesheets on project (one fare per SO/Project)"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
+msgid "Track Service"
+msgstr ""
diff --git a/fieldservice_sale/i18n/fieldservice_sale.pot b/fieldservice_sale/i18n/fieldservice_sale.pot
index 268274f8e1..e347637e66 100644
--- a/fieldservice_sale/i18n/fieldservice_sale.pot
+++ b/fieldservice_sale/i18n/fieldservice_sale.pot
@@ -18,6 +18,21 @@ msgstr ""
 msgid "<span class=\"o_stat_text\">Sale Orders</span>"
 msgstr ""
 
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid "According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+"  - Manual: the quantity is set manually on the line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+"  - Stock Moves: the quantity comes from confirmed pickings\n"
+""
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Analytic From Expenses"
+msgstr ""
+
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
 msgid "Create a recurring order"
@@ -50,11 +65,12 @@ msgstr ""
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_order
+#: selection:sale.order.line,qty_delivered_method:0
 msgid "Field Service Order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:67
+#: code:addons/fieldservice_sale/models/sale_order_line.py:93
 #, python-format
 msgid "Field Service Order Created (%s): <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
@@ -94,6 +110,11 @@ msgstr ""
 msgid "Is a Field Service"
 msgstr ""
 
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Manual"
+msgstr ""
+
 #. module: fieldservice_sale
 #: selection:product.template,service_type:0
 msgid "Manually set quantities on order"
@@ -107,6 +128,11 @@ msgid "Manually set quantities on order: Invoice based on the manually entered q
 "Create a task and track hours: Create a task on the sales order validation and track the work hours."
 msgstr ""
 
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid "Method to update delivered qty"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
@@ -183,13 +209,23 @@ msgid "Service Location"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:73
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:99
 #, python-format
 msgid "This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
 "                "
 msgstr ""
 
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Timesheets"
+msgstr ""
+
 #. module: fieldservice_sale
 #: selection:product.template,service_type:0
 msgid "Timesheets on project (one fare per SO/Project)"
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index cc28a3e28c..38cebce07a 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -9,7 +9,7 @@ class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
 
     qty_delivered_method = fields.Selection(
-        selection_add=[('field', 'Field Service Order')])
+        selection_add=[('field_service', 'Field Service Order')])
     fsm_order_id = fields.Many2one(
         'fsm.order', 'Order', index=True,
         help="Field Service Order generated by the sales order item")
@@ -40,18 +40,22 @@ def _compute_qty_delivered_method(self):
         for line in self:
             if not line.is_expense and line.product_id.type == 'service' \
                and line.product_id.field_service_tracking == 'order':
-                line.qty_delivered_method = 'field'
+                line.qty_delivered_method = 'field_service'
 
     @api.multi
     @api.depends('fsm_order_id.stage_id')
     def _compute_qty_delivered(self):
         super(SaleOrderLine, self)._compute_qty_delivered()
-        lines_by_fsm = self.filtered(lambda sol:
-                                     sol.qty_delivered_method == 'field')
+        lines_by_fsm = self.filtered(
+            lambda sol:
+                sol.qty_delivered_method == 'field_service'
+        )
         complete = self.env.ref('fieldservice.fsm_stage_completed')
         for line in lines_by_fsm:
+            qty = 0
             if line.fsm_order_id.stage_id == complete:
-                line.qty_delivered = line.product_uom_qty
+                qty = line.product_uom_qty
+                line.qty_delivered = qty
 
     @api.model
     def create(self, values):
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index 24b7a8efc3..c68d8fe898 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -419,6 +419,12 @@ <h1><a class="toc-backref" href="#id3">Usage</a></h1>
 <li>On a Sale Order Line, select a product configured for field service orders</li>
 <li>Confirm the Sale Order</li>
 <li>Field Service orders linked to SO lines are created</li>
+<li><dl class="first docutils">
+<dt>When a Field Service order is completed, the quantity delivered for its</dt>
+<dd>linked sale order line will be updated to the quantity ordered, indicating
+this line is ready for invoicing.</dd>
+</dl>
+</li>
 </ul>
 </div>
 <div class="section" id="known-issues-roadmap">

From 54c5d73cabe5ff3dd0f78bcd553af5649511931b Mon Sep 17 00:00:00 2001
From: clementmbr <clement.mombereau@akretion.com.br>
Date: Fri, 22 Nov 2019 17:40:10 -0300
Subject: [PATCH 16/77] Autofill the FS location in Sale Orders

---
 fieldservice_sale/i18n/de.po           | 40 ++++++++++++++------------
 fieldservice_sale/models/sale_order.py | 21 ++++++++++++++
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/fieldservice_sale/i18n/de.po b/fieldservice_sale/i18n/de.po
index 69e27881a7..a3d969c242 100644
--- a/fieldservice_sale/i18n/de.po
+++ b/fieldservice_sale/i18n/de.po
@@ -6,18 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2019-11-26 14:27+0000\n"
+"Last-Translator: Maria Sparenberg <maria.sparenberg@gmx.net>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.8\n"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
 msgid "<span class=\"o_stat_text\">Sale Orders</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\">Verkaufsauftr??ge</span>"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
@@ -37,12 +39,12 @@ msgstr ""
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
 msgid "Create a recurring order"
-msgstr ""
+msgstr "Wiederkehrenden Auftrag erstellen"
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
 msgid "Create a single order"
-msgstr ""
+msgstr "Auftrag erstellen"
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
@@ -52,23 +54,23 @@ msgstr ""
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
 msgid "FSM Orders"
-msgstr ""
+msgstr "Field-Service-Auftr??ge"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
 msgid "Field Service Information"
-msgstr ""
+msgstr "Field-Service-Informationen"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_location
 msgid "Field Service Location"
-msgstr ""
+msgstr "Field-Service-Ort"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_order
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Field Service Order"
-msgstr ""
+msgstr "Field-Service-Auftrag"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:93
@@ -82,7 +84,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
 msgid "Field Service Order Template"
-msgstr ""
+msgstr "Field-Service-Auftragsvorlage"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
@@ -93,7 +95,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: selection:product.template,service_type:0
 msgid "Field Service Orders"
-msgstr ""
+msgstr "Field-Service-Auftr??ge"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
@@ -144,17 +146,17 @@ msgstr ""
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Order"
-msgstr ""
+msgstr "Auftrag"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Produktvorlage"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__date_fsm_request
 msgid "Requested Service Date"
-msgstr ""
+msgstr "Gew??nschter Service-Termin"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
@@ -164,12 +166,12 @@ msgstr ""
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
 msgid "Sale Line"
-msgstr ""
+msgstr "Auftragszeile"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Verkaufsauftrag"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
@@ -179,7 +181,7 @@ msgstr ""
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Auftragszeile"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__is_field_service
@@ -191,7 +193,7 @@ msgstr ""
 #: code:addons/fieldservice_sale/models/fsm_order.py:21
 #, python-format
 msgid "Sales Orders"
-msgstr ""
+msgstr "Verkaufsauftr??ge"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
@@ -207,12 +209,12 @@ msgstr ""
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "Service Location"
-msgstr ""
+msgstr "Service-Ort"
 
 #. module: fieldservice_sale
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Lagerbewegungen"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:99
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 61e3d49382..6509679d15 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -29,6 +29,27 @@ def _compute_fsm_order_ids(self):
                 ('sale_line_id', 'in', order.order_line.ids)])
             order.fsm_order_count = len(order.fsm_order_ids)
 
+    @api.onchange('partner_id')
+    def onchange_partner_id(self):
+        """
+        Fill the Sale Order's FS location. Read the FS location from
+        the shipping address if it is linked to a FS location, else try from
+        the commercial_partner address
+        """
+        res = super(SaleOrder, self).onchange_partner_id()
+
+        shipping_location = self.env['fsm.location'].search(
+            [('partner_id', '=', self.partner_shipping_id.id)])
+        commercial_partner_location = self.env['fsm.location'].search(
+            [('partner_id', '=', self.partner_id.commercial_partner_id.id)])
+
+        if shipping_location:
+            self.fsm_location_id = shipping_location
+        elif commercial_partner_location:
+            self.fsm_location_id = commercial_partner_location
+
+        return res
+
     @api.multi
     def action_confirm(self):
         """ On SO confirmation, some lines generate field service orders. """

From 05e99a84c2b68bf3b75242eb165fd65c02c49df4 Mon Sep 17 00:00:00 2001
From: clementmbr <clement.mombereau@akretion.com.br>
Date: Tue, 26 Nov 2019 17:17:49 -0300
Subject: [PATCH 17/77] Refactor autofill SO's FS location and add tests

---
 fieldservice_sale/models/__init__.py          |  4 +-
 fieldservice_sale/models/sale_order.py        | 19 ++--
 fieldservice_sale/readme/CONTRIBUTORS.rst     |  1 +
 fieldservice_sale/tests/__init__.py           |  4 +
 .../tests/test_fsm_sale_onchange_partner.py   | 89 +++++++++++++++++++
 5 files changed, 103 insertions(+), 14 deletions(-)
 create mode 100644 fieldservice_sale/tests/__init__.py
 create mode 100644 fieldservice_sale/tests/test_fsm_sale_onchange_partner.py

diff --git a/fieldservice_sale/models/__init__.py b/fieldservice_sale/models/__init__.py
index e7ed8ef14c..09f9ccf083 100644
--- a/fieldservice_sale/models/__init__.py
+++ b/fieldservice_sale/models/__init__.py
@@ -3,8 +3,8 @@
 
 from . import (
     fsm_location,
+    fsm_order,
     product_template,
-    sale_order,
     sale_order_line,
-    fsm_order
+    sale_order,
 )
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 6509679d15..1a0bc78968 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -32,21 +32,16 @@ def _compute_fsm_order_ids(self):
     @api.onchange('partner_id')
     def onchange_partner_id(self):
         """
-        Fill the Sale Order's FS location. Read the FS location from
-        the shipping address if it is linked to a FS location, else try from
-        the commercial_partner address
+        Autofill the Sale Order's FS location with the partner_id,
+        the partner_shipping_id or the partner_id.commercial_partner_id if
+        they are FS locations.
         """
         res = super(SaleOrder, self).onchange_partner_id()
 
-        shipping_location = self.env['fsm.location'].search(
-            [('partner_id', '=', self.partner_shipping_id.id)])
-        commercial_partner_location = self.env['fsm.location'].search(
-            [('partner_id', '=', self.partner_id.commercial_partner_id.id)])
-
-        if shipping_location:
-            self.fsm_location_id = shipping_location
-        elif commercial_partner_location:
-            self.fsm_location_id = commercial_partner_location
+        self.fsm_location_id = self.env['fsm.location'].search(
+            ['|', '|', ('partner_id', '=', self.partner_id.id),
+             ('partner_id', '=', self.partner_shipping_id.id),
+             ('partner_id', '=', self.partner_id.commercial_partner_id.id)])
 
         return res
 
diff --git a/fieldservice_sale/readme/CONTRIBUTORS.rst b/fieldservice_sale/readme/CONTRIBUTORS.rst
index b57af2abdc..44ba2fbfcb 100644
--- a/fieldservice_sale/readme/CONTRIBUTORS.rst
+++ b/fieldservice_sale/readme/CONTRIBUTORS.rst
@@ -7,3 +7,4 @@
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
 * Rapha??l Reverdy <raphael.reverdy@akretion.com>
+* Cl??ment Mombereau <clement.mombereau@akretion.com>
diff --git a/fieldservice_sale/tests/__init__.py b/fieldservice_sale/tests/__init__.py
new file mode 100644
index 0000000000..ec7c49d603
--- /dev/null
+++ b/fieldservice_sale/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2019 Cl??ment Mombereau (Akretion)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from . import test_fsm_sale_onchange_partner
diff --git a/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py b/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
new file mode 100644
index 0000000000..8ccbb6c819
--- /dev/null
+++ b/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
@@ -0,0 +1,89 @@
+# Copyright (C) 2019 Cl??ment Mombereau (Akretion)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+from odoo.tests.common import TransactionCase
+
+
+class FSMSale(TransactionCase):
+
+    def setUp(self):
+        """Create 3 related partners : a parent company, a child partner and
+        a child shipping partner.
+
+        For each test, a different partner is a fsm_location.
+        A SO is created with the child partner as customer. The test run
+        the SO's onchange_partner_id and check if the fsm_location_id
+        is the expected one.
+        """
+        super(FSMSale, self).setUp()
+        # create a parent company
+        self.commercial_partner = self.env['res.partner'].create({
+            'name': 'Company Commercial Partner',
+            'is_company': True,
+        })
+        # create a child partner
+        self.partner = self.env['res.partner'].create({
+            'name': 'Child Partner',
+            'parent_id': self.commercial_partner.id,
+        })
+        # create a child partner shipping address
+        self.shipping_partner = self.env['res.partner'].create({
+            'name': 'Shipping Partner',
+            'parent_id': self.commercial_partner.id,
+            'type': 'delivery'
+        })
+        # Demo FS location
+        self.location = self.env.ref('fieldservice.location_1')
+
+    def test_1_autofill_so_fsm_location(self):
+        """ First case :
+        - commercial_partner IS NOT a fsm_location
+        - partner IS a fsm_location
+        - shipping_partner IS NOT a fsm_location
+        Test if the SO's fsm_location_id is autofilled with the expected
+        partner_location.
+        """
+        # Link demo FS location to self.partner
+        self.location.partner_id = self.partner.id
+        # create a Sale Order and run onchange_partner_id
+        self.so = self.env['sale.order'].create(
+            {'partner_id': self.partner.id})
+        self.so.onchange_partner_id()
+        self.assertEqual(
+            self.so.fsm_location_id.id,
+            self.location.id)
+
+    def test_2_autofill_so_fsm_location(self):
+        """ Second case :
+        - commercial_partner IS NOT a fsm_location
+        - partner IS NOT a fsm_location
+        - shipping_partner IS a fsm_location
+        Test if the SO's fsm_location_id is autofilled with the expected
+        shipping_partner_location.
+        """
+        # Link demo FS location to self.shipping_partner
+        self.location.partner_id = self.shipping_partner.id
+        # create a Sale Order and run onchange_partner_id
+        self.so = self.env['sale.order'].create(
+            {'partner_id': self.partner.id})
+        self.so.onchange_partner_id()
+        self.assertEqual(
+            self.so.fsm_location_id.id,
+            self.location.id)
+
+    def test_3_autofill_so_fsm_location(self):
+        """ Third case :
+        - commercial_partner IS a fsm_location
+        - partner IS NOT a fsm_location
+        - shipping_partner IS NOT a fsm_location
+        Test if the SO's fsm_location_id is autofilled with the expected
+        commercial_partner_location.
+        """
+        # Link demo FS location to self.commercial_partner
+        self.location.partner_id = self.commercial_partner.id
+        # create a Sale Order and run onchange_partner_id
+        self.so = self.env['sale.order'].create(
+            {'partner_id': self.partner.id})
+        self.so.onchange_partner_id()
+        self.assertEqual(
+            self.so.fsm_location_id.id,
+            self.location.id)

From 849d86b2007093cc7e3175cb6b3e11f7eda1889d Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Thu, 14 Nov 2019 12:01:05 -0500
Subject: [PATCH 18/77] [IMP] fieldservice_sale: Add service policy

- This change will allow to create an FSM order for each sales order and link it to the delivery order and invoice
---
 fieldservice_sale/models/fsm_order.py        |   1 +
 fieldservice_sale/models/product_template.py |  11 ++
 fieldservice_sale/models/sale_order.py       | 132 ++++++++++++++-----
 fieldservice_sale/models/sale_order_line.py  |   9 +-
 fieldservice_sale/readme/CONFIGURE.rst       |  17 ++-
 fieldservice_sale/readme/DESCRIPTION.rst     |   2 +-
 fieldservice_sale/views/product_template.xml |   1 +
 7 files changed, 136 insertions(+), 37 deletions(-)

diff --git a/fieldservice_sale/models/fsm_order.py b/fieldservice_sale/models/fsm_order.py
index 8d829493b3..e8329b4493 100644
--- a/fieldservice_sale/models/fsm_order.py
+++ b/fieldservice_sale/models/fsm_order.py
@@ -8,6 +8,7 @@
 class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
+    sale_id = fields.Many2one('sale.order')
     sale_line_id = fields.Many2one('sale.order.line')
 
     def action_view_sales(self):
diff --git a/fieldservice_sale/models/product_template.py b/fieldservice_sale/models/product_template.py
index f1ea46796e..5e83bfe15f 100644
--- a/fieldservice_sale/models/product_template.py
+++ b/fieldservice_sale/models/product_template.py
@@ -20,6 +20,17 @@ class ProductTemplate(models.Model):
     fsm_order_template_id = fields.Many2one(
         'fsm.template', 'Field Service Order Template',
         help="Select the field service order template to be created")
+    fsm_policy = fields.Selection(selection=[
+        ('no', 'None'),
+        ('sale', 'Per Sale Order'),
+        ('line', 'Per Sale Order Line'),
+    ], string='Field Service Policy', default='no',
+        help="""The field service policy determines what happens upon sale
+                order confirmation.
+                - None: nothing additional, default behavior.
+                - Per Sale Order: One FSM Order will be created for the sale.
+                - Per Sale Order Line: One FSM Order for each sale order line
+                will be created.""")
 
     @api.onchange('field_service_tracking')
     def _onchange_field_service_tracking(self):
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 1a0bc78968..405c823c8b 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -2,48 +2,114 @@
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import api, fields, models, _
 
 
 class SaleOrder(models.Model):
-    _inherit = 'sale.order'
+    _inherit = "sale.order"
 
     fsm_location_id = fields.Many2one(
-        'fsm.location', string='Service Location',
-        help="SO Lines generating a FSM order will be for this location")
+        "fsm.location",
+        string="Service Location",
+        help="SO Lines generating a FSM order will be for this location",
+    )
     date_fsm_request = fields.Datetime(
-        string='Requested Service Date', readonly=True,
-        states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
-        copy=False, default=fields.Datetime.now)
+        string="Requested Service Date",
+        readonly=True,
+        states={"draft": [("readonly", False)], "sent": [("readonly", False)]},
+        copy=False,
+        default=fields.Datetime.now,
+    )
     fsm_order_ids = fields.Many2many(
-        'fsm.order', compute='_compute_fsm_order_ids',
-        string='Field Service orders associated to this sale')
+        "fsm.order",
+        compute="_compute_fsm_order_ids",
+        string="Field Service orders associated to this sale",
+    )
     fsm_order_count = fields.Float(
-        string='Field Service Orders', compute='_compute_fsm_order_ids')
+        string="Field Service Orders", compute="_compute_fsm_order_ids"
+    )
 
     @api.multi
-    @api.depends('order_line.product_id')
+    @api.depends("order_line.product_id")
     def _compute_fsm_order_ids(self):
         for order in self:
-            order.fsm_order_ids = self.env['fsm.order'].search([
-                ('sale_line_id', 'in', order.order_line.ids)])
+            orders = self.env["fsm.order"]
+            orders += self.env["fsm.order"].search(
+                [("sale_line_id", "in", order.order_line.ids)]
+            )
+            orders += self.env["fsm.order"].search([("sale_id", "=", order.id)])
+            order.fsm_order_ids = orders
             order.fsm_order_count = len(order.fsm_order_ids)
 
-    @api.onchange('partner_id')
-    def onchange_partner_id(self):
-        """
-        Autofill the Sale Order's FS location with the partner_id,
-        the partner_shipping_id or the partner_id.commercial_partner_id if
-        they are FS locations.
-        """
-        res = super(SaleOrder, self).onchange_partner_id()
+    def _field_create_fsm_order_prepare_values(self):
+        self.ensure_one()
+        return {
+            "customer_id": self.partner_id.id,
+            "location_id": self.fsm_location_id.id,
+            # 'request_early': ,
+            "scheduled_date_start": self.date_fsm_request,
+            "description": self.name,
+            # 'template_id': self.product_id.fsm_order_template_id.id,
+            "sale_id": self.id,
+            "company_id": self.company_id.id,
+        }
 
-        self.fsm_location_id = self.env['fsm.location'].search(
-            ['|', '|', ('partner_id', '=', self.partner_id.id),
-             ('partner_id', '=', self.partner_shipping_id.id),
-             ('partner_id', '=', self.partner_id.commercial_partner_id.id)])
+    @api.multi
+    def _field_create_fsm_order(self):
+        """ Generate fsm_order for the given Sale Order, and link it.
+            :return a mapping with the sale order id and its linked fsm_order
+            :rtype dict
+        """
+        result = {}
+        for so in self:
+            # create fsm_order
+            values = so._field_create_fsm_order_prepare_values()
+            fsm_order = self.env["fsm.order"].sudo().create(values)
+            # post message on SO
+            msg_body = (
+                _(
+                    """Field Service Order Created: <a href=
+                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>
+                """
+                )
+                % (fsm_order.id, fsm_order.name)
+            )
+            so.message_post(body=msg_body)
+            # post message on fsm_order
+            fsm_order_msg = (
+                _(
+                    """This order has been created from: <a href=
+                   # data-oe-model=sale.order data-oe-id=%d>%s</a>
+                """
+                )
+                % (so.id, so.name)
+            )
+            fsm_order.message_post(body=fsm_order_msg)
+            result[so.id] = fsm_order
+        return result
 
-        return res
+    @api.multi
+    def _field_find_fsm_order(self):
+        """ Find the fsm_order generated by the Sale Order. If no fsm_order
+            linked, it will be created automatically.
+            :return a mapping with the so line id and its linked fsm_order
+            :rtype dict
+        """
+        # one search for all Sale Orders
+        fsm_orders = self.env["fsm.order"].search([("sale_id", "in", self.ids)])
+        fsm_order_mapping = {
+            fsm_order.sale_id.id: fsm_order for fsm_order in fsm_orders
+        }
+        result = {}
+        for so in self:
+            # If the SO was confirmed, cancelled, set to draft then confirmed,
+            # avoid creating a new fsm_order.
+            fsm_order = fsm_order_mapping.get(so.id)
+            # If not found, create one fsm_order for the so
+            if not fsm_order:
+                fsm_order = so._field_create_fsm_order()[so.id]
+            result[so.id] = fsm_order
+        return result
 
     @api.multi
     def action_confirm(self):
@@ -54,15 +120,13 @@ def action_confirm(self):
 
     @api.multi
     def action_view_fsm_order(self):
-        fsm_orders = self.mapped('fsm_order_ids')
-        action = self.env.ref('fieldservice.action_fsm_dash_order').read()[0]
+        fsm_orders = self.mapped("fsm_order_ids")
+        action = self.env.ref("fieldservice.action_fsm_dash_order").read()[0]
         if len(fsm_orders) > 1:
-            action['domain'] = [('id', 'in', fsm_orders.ids)]
+            action["domain"] = [("id", "in", fsm_orders.ids)]
         elif len(fsm_orders) == 1:
-            action['views'] = [(self.env.
-                                ref('fieldservice.fsm_order_form').id,
-                                'form')]
-            action['res_id'] = fsm_orders.id
+            action["views"] = [(self.env.ref("fieldservice.fsm_order_form").id, "form")]
+            action["res_id"] = fsm_orders.id
         else:
-            action = {'type': 'ir.actions.act_window_close'}
+            action = {"type": "ir.actions.act_window_close"}
         return action
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 38cebce07a..56d72eda69 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -133,7 +133,14 @@ def _field_service_generation(self):
         """ For service lines, create the field service order. If it already
             exists, it simply links the existing one to the line.
         """
-        for so_line in self.filtered(lambda sol: sol.is_field_service):
+        if any(sol.product_id.fsm_policy == 'sale' for sol in self):
+            sales = self.env['sale.order'].search([
+                ('order_line', 'in', self.ids)])
+            sales._field_find_fsm_order()
+
+        for so_line in self.filtered(
+            lambda sol: sol.product_id.fsm_policy == 'line'
+        ):
             # create order
             if so_line.product_id.field_service_tracking == 'order':
                 so_line._field_find_fsm_order()
diff --git a/fieldservice_sale/readme/CONFIGURE.rst b/fieldservice_sale/readme/CONFIGURE.rst
index 6751d6e618..26c1087ac5 100644
--- a/fieldservice_sale/readme/CONFIGURE.rst
+++ b/fieldservice_sale/readme/CONFIGURE.rst
@@ -1,12 +1,27 @@
-To setup a product for quoting and selling field service orders:
+Products must be configured properly in order to create field service
+orders upon sale order confirmation.
+
+The field service policy of a product defines how it generates a field service
+order if the product is sold via sale order.
+
+To configure a product that generates a unique field service order on each
+sale order line:
 
 * Go to Sales > Catalog > Products
 * Create or select a product
 * Set the Product Type to 'Service' under General Information tab
+* Set the Field Service Policy to 'Per Sale Order Line'
 * Under Invoicing tab, set the Field Service Tracking option
 * Select the FSM Order Template that will be used for creating FSM Orders when
   a Sale Order is confirmed with this product
 
+To configure a product that generates a unique field service order for
+an individual sale order:
+
+* Go to Sales > Catalog > Products
+* Create or select a product
+* Set the Field Service Policy to 'Per Sale Order'
+
 To setup a sales territory:
 
 * Go to Field Service > Master Data > Locations
diff --git a/fieldservice_sale/readme/DESCRIPTION.rst b/fieldservice_sale/readme/DESCRIPTION.rst
index c3b3ab00ea..4028d3f860 100644
--- a/fieldservice_sale/readme/DESCRIPTION.rst
+++ b/fieldservice_sale/readme/DESCRIPTION.rst
@@ -1,2 +1,2 @@
 The module integrates the Field Service application with the Sales one and
-allows you to sell field service products.
+allows you to sell products that generate field service orders.
diff --git a/fieldservice_sale/views/product_template.xml b/fieldservice_sale/views/product_template.xml
index 9e813bb107..2dbee78ac1 100644
--- a/fieldservice_sale/views/product_template.xml
+++ b/fieldservice_sale/views/product_template.xml
@@ -5,6 +5,7 @@
         <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='service_type']" position="after">
+                <field name="fsm_policy"/>
                 <field name="field_service_tracking" widget="radio"
                        attrs="{'invisible': [('type','!=','service')]}"/>
                 <field name="fsm_order_template_id" 

From fb2308b79ad3e9fb0609c732341029ebebd8eb95 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Fri, 22 Nov 2019 11:45:26 -0500
Subject: [PATCH 19/77] [IMP] fieldservice_sale: Link invoices to FS order

---
 fieldservice_sale/__manifest__.py           |  1 +
 fieldservice_sale/models/sale_order.py      | 52 ++++++++++++++++++++-
 fieldservice_sale/models/sale_order_line.py |  8 ++++
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 102135b70c..bf3189ea9b 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -11,6 +11,7 @@
     'depends': [
         'fieldservice',
         'sale_management',
+        'fieldservice_account',
     ],
     'data': [
         'views/fsm_location.xml',
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 405c823c8b..6d574a99fc 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -34,10 +34,10 @@ class SaleOrder(models.Model):
     def _compute_fsm_order_ids(self):
         for order in self:
             orders = self.env["fsm.order"]
-            orders += self.env["fsm.order"].search(
+            orders |= self.env["fsm.order"].search(
                 [("sale_line_id", "in", order.order_line.ids)]
             )
-            orders += self.env["fsm.order"].search([("sale_id", "=", order.id)])
+            orders |= self.env["fsm.order"].search([("sale_id", "=", order.id)])
             order.fsm_order_ids = orders
             order.fsm_order_count = len(order.fsm_order_ids)
 
@@ -118,6 +118,54 @@ def action_confirm(self):
         self.order_line._field_service_generation()
         return result
 
+    @api.multi
+    def action_invoice_create(self, grouped=False, final=False):
+        invoice_ids = super().action_invoice_create(grouped, final)
+        result = []
+        result.append(invoice_ids)
+
+        for invoice_id in invoice_ids:
+            invoice = self.env["account.invoice"].browse(invoice_id)
+            # check for invoice lines with product fsm policy = lines
+            lines_by_line = self.env["account.invoice.line"].search(
+                [
+                    ("invoice_id", "=", invoice_id),
+                    ("product_id.fsm_policy", "=", "line"),
+                ]
+            )
+            if len(lines_by_line) > 0:
+                line_count = len(invoice.invoice_line_ids)
+                for i in range(len(lines_by_line)):
+                    duplicate = True
+                    if ((i + 1) == len(lines_by_line)) and ((i + 1) == line_count):
+                        duplicate = False
+                    inv = invoice
+                    if duplicate:
+                        inv = invoice.copy()
+                        inv.write({"invoice_line_ids": [(6, 0, [])]})
+                        lines_by_line[i].invoice_id = inv.id
+                    inv.fsm_order_id = lines_by_line[i].fsm_order_id.id
+                    result.append(inv.id)
+
+            # check for invoice lines with product fsm policy = sale
+            lines_by_sale = self.env["account.invoice.line"].search(
+                [
+                    ("invoice_id", "=", invoice_id),
+                    ("product_id.fsm_policy", "=", "sale"),
+                ]
+            )
+            if len(lines_by_sale) > 0:
+                fsm_order = self.env["fsm.order"].search([("sale_id", "=", self.id)])
+                if len(lines_by_sale) == len(invoice.invoice_line_ids):
+                    invoice.fsm_order_id = fsm_order.id
+                elif len(invoice.invoice_line_ids) > len(lines_by_sale):
+                    new = invoice.copy()
+                    new.write({"invoice_line_ids": [(6, 0, [])]})
+                    lines_by_sale.invoice_id = new.id
+                    new.fsm_order_id = fsm_order.id
+                    result.append(new.id)
+        return result
+
     @api.multi
     def action_view_fsm_order(self):
         fsm_orders = self.mapped("fsm_order_ids")
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 56d72eda69..35f1beccd2 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -144,3 +144,11 @@ def _field_service_generation(self):
             # create order
             if so_line.product_id.field_service_tracking == 'order':
                 so_line._field_find_fsm_order()
+
+    @api.multi
+    def _prepare_invoice_line(self, qty):
+        res = super()._prepare_invoice_line(qty)
+        res.update({
+            'fsm_order_id': self.fsm_order_id,
+        })
+        return res

From 083af4e16a513fef7ea6042b60ebdde3da1e5f86 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 25 Nov 2019 11:29:53 -0600
Subject: [PATCH 20/77] [IMP] fieldservice_sale: Merge and reuse fields

---
 fieldservice_sale/models/product_template.py | 25 +++++++-------------
 fieldservice_sale/models/sale_order.py       | 22 +++++++----------
 fieldservice_sale/models/sale_order_line.py  | 15 ++++++------
 fieldservice_sale/readme/CONFIGURE.rst       |  6 ++---
 fieldservice_sale/views/product_template.xml |  8 +++----
 fieldservice_sale/views/sale_order.xml       |  5 ----
 6 files changed, 30 insertions(+), 51 deletions(-)

diff --git a/fieldservice_sale/models/product_template.py b/fieldservice_sale/models/product_template.py
index 5e83bfe15f..e2b10a041f 100644
--- a/fieldservice_sale/models/product_template.py
+++ b/fieldservice_sale/models/product_template.py
@@ -12,27 +12,20 @@ class ProductTemplate(models.Model):
         ('field', 'Field Service Orders'),
     ])
     field_service_tracking = fields.Selection([
-        ('no', 'Don\'t create order'),
-        ('order', 'Create a single order')
-    ], string="Field Service Tracking", default="no",
-        help="""On Sales order confirmation, this product can generate a field
-                service order or field service recurring order.""")
-    fsm_order_template_id = fields.Many2one(
-        'fsm.template', 'Field Service Order Template',
-        help="Select the field service order template to be created")
-    fsm_policy = fields.Selection(selection=[
-        ('no', 'None'),
-        ('sale', 'Per Sale Order'),
-        ('line', 'Per Sale Order Line'),
-    ], string='Field Service Policy', default='no',
-        help="""The field service policy determines what happens upon sale
-                order confirmation.
+        ('no', 'Don\'t create FSM order'),
+        ('sale', 'Create one FSM order per sale order'),
+        ('line', 'Create one FSM order per sale order line'),
+    ], string='Field Service Tracking', default='no',
+        help="""Determines what happens upon sale order confirmation:
                 - None: nothing additional, default behavior.
                 - Per Sale Order: One FSM Order will be created for the sale.
                 - Per Sale Order Line: One FSM Order for each sale order line
                 will be created.""")
+    fsm_order_template_id = fields.Many2one(
+        'fsm.template', 'Field Service Order Template',
+        help="Select the field service order template to be created")
 
     @api.onchange('field_service_tracking')
     def _onchange_field_service_tracking(self):
-        if self.field_service_tracking != 'order':
+        if self.field_service_tracking == 'no':
             self.fsm_order_template_id = False
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 6d574a99fc..f7f5d9f852 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -13,13 +13,6 @@ class SaleOrder(models.Model):
         string="Service Location",
         help="SO Lines generating a FSM order will be for this location",
     )
-    date_fsm_request = fields.Datetime(
-        string="Requested Service Date",
-        readonly=True,
-        states={"draft": [("readonly", False)], "sent": [("readonly", False)]},
-        copy=False,
-        default=fields.Datetime.now,
-    )
     fsm_order_ids = fields.Many2many(
         "fsm.order",
         compute="_compute_fsm_order_ids",
@@ -46,10 +39,9 @@ def _field_create_fsm_order_prepare_values(self):
         return {
             "customer_id": self.partner_id.id,
             "location_id": self.fsm_location_id.id,
-            # 'request_early': ,
-            "scheduled_date_start": self.date_fsm_request,
+            "request_early": self.expected_date,
+            "scheduled_date_start": self.expected_date,
             "description": self.name,
-            # 'template_id': self.product_id.fsm_order_template_id.id,
             "sale_id": self.id,
             "company_id": self.company_id.id,
         }
@@ -126,11 +118,12 @@ def action_invoice_create(self, grouped=False, final=False):
 
         for invoice_id in invoice_ids:
             invoice = self.env["account.invoice"].browse(invoice_id)
-            # check for invoice lines with product fsm policy = lines
+            # check for invoice lines with product
+            # field_service_tracking = line
             lines_by_line = self.env["account.invoice.line"].search(
                 [
                     ("invoice_id", "=", invoice_id),
-                    ("product_id.fsm_policy", "=", "line"),
+                    ("product_id.field_service_tracking", "=", "line"),
                 ]
             )
             if len(lines_by_line) > 0:
@@ -147,11 +140,12 @@ def action_invoice_create(self, grouped=False, final=False):
                     inv.fsm_order_id = lines_by_line[i].fsm_order_id.id
                     result.append(inv.id)
 
-            # check for invoice lines with product fsm policy = sale
+            # check for invoice lines with product
+            # field_service_tracking = sale
             lines_by_sale = self.env["account.invoice.line"].search(
                 [
                     ("invoice_id", "=", invoice_id),
-                    ("product_id.fsm_policy", "=", "sale"),
+                    ("product_id.field_service_tracking", "=", "sale"),
                 ]
             )
             if len(lines_by_sale) > 0:
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 35f1beccd2..45e8d17f4f 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -39,7 +39,7 @@ def _compute_qty_delivered_method(self):
         super(SaleOrderLine, self)._compute_qty_delivered_method()
         for line in self:
             if not line.is_expense and line.product_id.type == 'service' \
-               and line.product_id.field_service_tracking == 'order':
+               and line.product_id.field_service_tracking == 'sale':
                 line.qty_delivered_method = 'field_service'
 
     @api.multi
@@ -69,10 +69,11 @@ def _field_create_fsm_order_prepare_values(self):
         return {
             'customer_id': self.order_id.partner_id.id,
             'location_id': self.order_id.fsm_location_id.id,
-            # 'request_early': ,
-            'scheduled_date_start': self.order_id.date_fsm_request,
+            'request_early': self.order_id.expected_date,
+            'scheduled_date_start': self.order_id.expected_date,
             'description': self.name,
             'template_id': self.product_id.fsm_order_template_id.id,
+            'sale_id': self.order_id.id,
             'sale_line_id': self.id,
             'company_id': self.company_id.id,
         }
@@ -133,17 +134,15 @@ def _field_service_generation(self):
         """ For service lines, create the field service order. If it already
             exists, it simply links the existing one to the line.
         """
-        if any(sol.product_id.fsm_policy == 'sale' for sol in self):
+        if any(sol.product_id.field_service_tracking == 'sale' for sol in self):
             sales = self.env['sale.order'].search([
                 ('order_line', 'in', self.ids)])
             sales._field_find_fsm_order()
 
         for so_line in self.filtered(
-            lambda sol: sol.product_id.fsm_policy == 'line'
+            lambda sol: sol.product_id.field_service_tracking == 'line'
         ):
-            # create order
-            if so_line.product_id.field_service_tracking == 'order':
-                so_line._field_find_fsm_order()
+            so_line._field_find_fsm_order()
 
     @api.multi
     def _prepare_invoice_line(self, qty):
diff --git a/fieldservice_sale/readme/CONFIGURE.rst b/fieldservice_sale/readme/CONFIGURE.rst
index 26c1087ac5..1db06193f3 100644
--- a/fieldservice_sale/readme/CONFIGURE.rst
+++ b/fieldservice_sale/readme/CONFIGURE.rst
@@ -1,7 +1,7 @@
 Products must be configured properly in order to create field service
 orders upon sale order confirmation.
 
-The field service policy of a product defines how it generates a field service
+The field service tracking of a product defines how it generates a field service
 order if the product is sold via sale order.
 
 To configure a product that generates a unique field service order on each
@@ -10,7 +10,7 @@ sale order line:
 * Go to Sales > Catalog > Products
 * Create or select a product
 * Set the Product Type to 'Service' under General Information tab
-* Set the Field Service Policy to 'Per Sale Order Line'
+* Set the Field Service Tracking to 'One FSM Order per Sale Order Line'
 * Under Invoicing tab, set the Field Service Tracking option
 * Select the FSM Order Template that will be used for creating FSM Orders when
   a Sale Order is confirmed with this product
@@ -20,7 +20,7 @@ an individual sale order:
 
 * Go to Sales > Catalog > Products
 * Create or select a product
-* Set the Field Service Policy to 'Per Sale Order'
+* Set the Field Service Tracking to 'One FSM Order per Sale Order'
 
 To setup a sales territory:
 
diff --git a/fieldservice_sale/views/product_template.xml b/fieldservice_sale/views/product_template.xml
index 2dbee78ac1..f7e5e51307 100644
--- a/fieldservice_sale/views/product_template.xml
+++ b/fieldservice_sale/views/product_template.xml
@@ -5,11 +5,9 @@
         <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='service_type']" position="after">
-                <field name="fsm_policy"/>
-                <field name="field_service_tracking" widget="radio"
-                       attrs="{'invisible': [('type','!=','service')]}"/>
-                <field name="fsm_order_template_id" 
-                       attrs="{'invisible':[('field_service_tracking','not in',['order'])]}"/>
+                <field name="field_service_tracking" widget="radio"/>
+                <field name="fsm_order_template_id"
+                       attrs="{'invisible': [('field_service_tracking', '=', 'no')], 'required': [('field_service_tracking', '!=', 'no')]}"/>
             </xpath>
         </field>
     </record>
diff --git a/fieldservice_sale/views/sale_order.xml b/fieldservice_sale/views/sale_order.xml
index 13aec13d5a..6c711745eb 100644
--- a/fieldservice_sale/views/sale_order.xml
+++ b/fieldservice_sale/views/sale_order.xml
@@ -17,11 +17,6 @@
             <xpath expr="//field[@name='partner_shipping_id']" position="after">
                 <field name="fsm_location_id"/>
             </xpath>
-            <xpath expr="//group[@name='technical']" position="after">
-                <group string="Field Service Information" name="sale_fsm">
-                    <field name="date_fsm_request"/>
-                </group>
-            </xpath>
         </field>
     </record>
 </odoo>

From 84a1fcbed71dfbd804df0d050f690cd768bdfb9f Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 26 Nov 2019 08:53:11 -0500
Subject: [PATCH 21/77] [IMP] fieldservice_sale

- Combine field service template info from sale order lines and add it to field service order
---
 fieldservice_sale/models/sale_order.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index f7f5d9f852..8c946229d0 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -36,12 +36,25 @@ def _compute_fsm_order_ids(self):
 
     def _field_create_fsm_order_prepare_values(self):
         self.ensure_one()
+        lines = self.order_line.filtered(
+            lambda sol: sol.product_id.field_service_tracking == "sale"
+        )
+        templates = lines.mapped("product_id.fsm_order_template_id")
+        note = ""
+        hours = 0.0
+        categories = self.env["fsm.category"]
+        for template in templates:
+            note += template.instructions
+            hours += template.hours
+            categories |= template.category_ids
         return {
             "customer_id": self.partner_id.id,
             "location_id": self.fsm_location_id.id,
             "request_early": self.expected_date,
             "scheduled_date_start": self.expected_date,
-            "description": self.name,
+            "todo": note,
+            "category_ids": [(6, 0, categories.ids)],
+            "scheduled_duration": hours,
             "sale_id": self.id,
             "company_id": self.company_id.id,
         }

From fd80f82f4a72e7b5cd5fc4299e618d3cd2cd85e4 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Fri, 6 Dec 2019 09:59:24 -0500
Subject: [PATCH 22/77] [FIX] fieldservice_sale

Consumable and Storable product types were not generating field services
---
 fieldservice_sale/models/sale_order.py | 6 +++---
 fieldservice_sale/readme/CONFIGURE.rst | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 8c946229d0..9f4e062560 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -23,7 +23,7 @@ class SaleOrder(models.Model):
     )
 
     @api.multi
-    @api.depends("order_line.product_id")
+    @api.depends("order_line")
     def _compute_fsm_order_ids(self):
         for order in self:
             orders = self.env["fsm.order"]
@@ -117,9 +117,9 @@ def _field_find_fsm_order(self):
         return result
 
     @api.multi
-    def action_confirm(self):
+    def _action_confirm(self):
         """ On SO confirmation, some lines generate field service orders. """
-        result = super(SaleOrder, self).action_confirm()
+        result = super(SaleOrder, self)._action_confirm()
         self.order_line._field_service_generation()
         return result
 
diff --git a/fieldservice_sale/readme/CONFIGURE.rst b/fieldservice_sale/readme/CONFIGURE.rst
index 1db06193f3..3d35ff83f2 100644
--- a/fieldservice_sale/readme/CONFIGURE.rst
+++ b/fieldservice_sale/readme/CONFIGURE.rst
@@ -9,9 +9,7 @@ sale order line:
 
 * Go to Sales > Catalog > Products
 * Create or select a product
-* Set the Product Type to 'Service' under General Information tab
 * Set the Field Service Tracking to 'One FSM Order per Sale Order Line'
-* Under Invoicing tab, set the Field Service Tracking option
 * Select the FSM Order Template that will be used for creating FSM Orders when
   a Sale Order is confirmed with this product
 
@@ -21,6 +19,8 @@ an individual sale order:
 * Go to Sales > Catalog > Products
 * Create or select a product
 * Set the Field Service Tracking to 'One FSM Order per Sale Order'
+* Select the FSM Order Template that will be used for creating FSM Orders when
+  a Sale Order is confirmed with this product
 
 To setup a sales territory:
 

From 126b1925e4f583ab08f63c7f83e9e11862424048 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 10 Dec 2019 09:09:20 -0600
Subject: [PATCH 23/77] [FIX] fieldservice_sale: Missing the template info

---
 fieldservice_sale/__manifest__.py               |  1 +
 fieldservice_sale/models/sale_order_line.py     |  4 ++++
 fieldservice_sale/views/res_config_settings.xml | 12 ++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 fieldservice_sale/views/res_config_settings.xml

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index bf3189ea9b..89da913868 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -18,6 +18,7 @@
         'views/fsm_order.xml',
         'views/product_template.xml',
         'views/sale_order.xml',
+        'views/res_config_settings.xml',
     ],
     'license': 'AGPL-3',
     'development_status': 'Beta',
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 45e8d17f4f..939ba351ea 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -66,6 +66,7 @@ def create(self, values):
 
     def _field_create_fsm_order_prepare_values(self):
         self.ensure_one()
+        categories = self.product_id.fsm_order_template_id.category_ids
         return {
             'customer_id': self.order_id.partner_id.id,
             'location_id': self.order_id.fsm_location_id.id,
@@ -73,6 +74,9 @@ def _field_create_fsm_order_prepare_values(self):
             'scheduled_date_start': self.order_id.expected_date,
             'description': self.name,
             'template_id': self.product_id.fsm_order_template_id.id,
+            'todo': self.product_id.fsm_order_template_id.instructions,
+            'category_ids': [(6, 0, categories.ids)],
+            'scheduled_duration': self.product_id.fsm_order_template_id.hours,
             'sale_id': self.order_id.id,
             'sale_line_id': self.id,
             'company_id': self.company_id.id,
diff --git a/fieldservice_sale/views/res_config_settings.xml b/fieldservice_sale/views/res_config_settings.xml
new file mode 100644
index 0000000000..5ccce52562
--- /dev/null
+++ b/fieldservice_sale/views/res_config_settings.xml
@@ -0,0 +1,12 @@
+<odoo>
+
+    <record model="res.config.settings" id="res_config_settings_fsm_template">
+        <field name="group_fsm_template" eval="1"/>
+    </record>
+
+    <function model="res.config.settings" name="execute">
+        <!-- ids = -->      <value eval="[ref('fieldservice_sale.res_config_settings_fsm_template')]"/>
+        <!-- context = -->  <value eval="{}"/>
+    </function>
+
+</odoo>

From c032cd75c7566662c64c91fbb58c0ec660ed741b Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 10 Dec 2019 09:26:39 -0600
Subject: [PATCH 24/77] [FIX] fieldservice_sale: Missing location directions

---
 fieldservice_sale/models/sale_order.py      | 1 +
 fieldservice_sale/models/sale_order_line.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 9f4e062560..6d9488bf4b 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -50,6 +50,7 @@ def _field_create_fsm_order_prepare_values(self):
         return {
             "customer_id": self.partner_id.id,
             "location_id": self.fsm_location_id.id,
+            "location_directions": self.fsm_location_id.direction,
             "request_early": self.expected_date,
             "scheduled_date_start": self.expected_date,
             "todo": note,
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 939ba351ea..b419d86054 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -70,6 +70,7 @@ def _field_create_fsm_order_prepare_values(self):
         return {
             'customer_id': self.order_id.partner_id.id,
             'location_id': self.order_id.fsm_location_id.id,
+            'location_directions': self.fsm_location_id.direction,
             'request_early': self.order_id.expected_date,
             'scheduled_date_start': self.order_id.expected_date,
             'description': self.name,

From a892cf116e13873e93df13849e20b97d52a604a6 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 10 Dec 2019 09:39:20 -0600
Subject: [PATCH 25/77] [ADD] fieldservice_sale: Migration script to 12.0.2.0.0

---
 fieldservice_sale/README.rst                  |  23 +-
 fieldservice_sale/__manifest__.py             |   2 +-
 fieldservice_sale/i18n/de.po                  | 115 +++++--
 fieldservice_sale/i18n/es_CL.po               | 291 ++++++++++++++++++
 fieldservice_sale/i18n/fieldservice_sale.pot  |  57 ++--
 .../migrations/12.0.2.0.0/pre-migration.py    |  10 +
 .../static/description/index.html             |  21 +-
 7 files changed, 457 insertions(+), 62 deletions(-)
 create mode 100644 fieldservice_sale/i18n/es_CL.po
 create mode 100644 fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index 00615acfd7..24cb25b3ff 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -26,7 +26,7 @@ Field Service - Sales
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
 The module integrates the Field Service application with the Sales one and
-allows you to sell field service products.
+allows you to sell products that generate field service orders.
 
 **Table of contents**
 
@@ -44,12 +44,27 @@ https://github.com/OCA/geospatial/tree/12.0/base_geoengine
 Configuration
 =============
 
-To setup a product for quoting and selling field service orders:
+Products must be configured properly in order to create field service
+orders upon sale order confirmation.
+
+The field service tracking of a product defines how it generates a field service
+order if the product is sold via sale order.
+
+To configure a product that generates a unique field service order on each
+sale order line:
+
+* Go to Sales > Catalog > Products
+* Create or select a product
+* Set the Field Service Tracking to 'One FSM Order per Sale Order Line'
+* Select the FSM Order Template that will be used for creating FSM Orders when
+  a Sale Order is confirmed with this product
+
+To configure a product that generates a unique field service order for
+an individual sale order:
 
 * Go to Sales > Catalog > Products
 * Create or select a product
-* Set the Product Type to 'Service' under General Information tab
-* Under Invoicing tab, set the Field Service Tracking option
+* Set the Field Service Tracking to 'One FSM Order per Sale Order'
 * Select the FSM Order Template that will be used for creating FSM Orders when
   a Sale Order is confirmed with this product
 
diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 89da913868..b29f569ca7 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sales',
-    'version': '12.0.1.2.0',
+    'version': '12.0.2.0.0',
     'summary': 'Sell field services.',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale/i18n/de.po b/fieldservice_sale/i18n/de.po
index a3d969c242..9250350023 100644
--- a/fieldservice_sale/i18n/de.po
+++ b/fieldservice_sale/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_sale
+# 	* fieldservice_sale
 #
 msgid ""
 msgstr ""
@@ -23,12 +23,15 @@ msgstr "<span class=\"o_stat_text\">Verkaufsauftr??ge</span>"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
-msgid "According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+msgid ""
+"According to product configuration, the delivered quantity can be "
+"automatically computed by mechanism :\n"
 "  - Manual: the quantity is set manually on the line\n"
-"  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
-"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted "
+"expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to "
+"this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
-""
 msgstr ""
 
 #. module: fieldservice_sale
@@ -43,23 +46,38 @@ msgstr "Wiederkehrenden Auftrag erstellen"
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
-msgid "Create a single order"
-msgstr "Auftrag erstellen"
+#, fuzzy
+#| msgid "Create a recurring order"
+msgid "Create one FSM order per sale order"
+msgstr "Wiederkehrenden Auftrag erstellen"
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
-msgid "Don't create order"
+msgid "Create one FSM order per sale order line"
 msgstr ""
 
 #. module: fieldservice_sale
-#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
-msgid "FSM Orders"
-msgstr "Field-Service-Auftr??ge"
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
+msgid ""
+"Determines what happens upon sale order confirmation:\n"
+"                - None: nothing additional, default behavior.\n"
+"                - Per Sale Order: One FSM Order will be created for the "
+"sale.\n"
+"                - Per Sale Order Line: One FSM Order for each sale order "
+"line\n"
+"                will be created."
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Don't create FSM order"
+msgstr ""
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
-msgid "Field Service Information"
-msgstr "Field-Service-Informationen"
+msgid "FSM Orders"
+msgstr "Field-Service-Auftr??ge"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_location
@@ -73,9 +91,19 @@ msgid "Field Service Order"
 msgstr "Field-Service-Auftrag"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:93
+#: code:addons/fieldservice_sale/models/sale_order_line.py:99
+#, python-format
+msgid ""
+"Field Service Order Created (%s): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:69
 #, python-format
-msgid "Field Service Order Created (%s): <a href=\n"
+msgid ""
+"Field Service Order Created: <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
@@ -126,9 +154,13 @@ msgstr ""
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
-msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
-"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
-"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+msgid ""
+"Manually set quantities on order: Invoice based on the manually entered "
+"quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related "
+"timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation "
+"and track the work hours."
 msgstr ""
 
 #. module: fieldservice_sale
@@ -136,13 +168,6 @@ msgstr ""
 msgid "Method to update delivered qty"
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
-#: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
-msgid "On Sales order confirmation, this product can generate a field\n"
-"                service order or field service recurring order."
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Order"
@@ -153,16 +178,18 @@ msgstr "Auftrag"
 msgid "Product Template"
 msgstr "Produktvorlage"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__date_fsm_request
-msgid "Requested Service Date"
-msgstr "Gew??nschter Service-Termin"
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "SO Lines generating a FSM order will be for this location"
 msgstr ""
 
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
+#, fuzzy
+#| msgid "Sale Line"
+msgid "Sale"
+msgstr "Auftragszeile"
+
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
 msgid "Sale Line"
@@ -185,12 +212,13 @@ msgstr "Auftragszeile"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__is_field_service
-msgid "Sales Order item should generate an Order and/or\n"
+msgid ""
+"Sales Order item should generate an Order and/or\n"
 "                Order Recurrence, depending on the product settings."
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/fsm_order.py:21
+#: code:addons/fieldservice_sale/models/fsm_order.py:22
 #, python-format
 msgid "Sales Orders"
 msgstr "Verkaufsauftr??ge"
@@ -217,9 +245,19 @@ msgid "Stock Moves"
 msgstr "Lagerbewegungen"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:99
+#: code:addons/fieldservice_sale/models/sale_order.py:75
 #, python-format
-msgid "This order has been created from: <a href=\n"
+msgid ""
+"This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:105
+#, python-format
+msgid ""
+"This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
 "                "
 msgstr ""
@@ -239,3 +277,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
 msgstr ""
+
+#~ msgid "Create a single order"
+#~ msgstr "Auftrag erstellen"
+
+#~ msgid "Field Service Information"
+#~ msgstr "Field-Service-Informationen"
+
+#~ msgid "Requested Service Date"
+#~ msgstr "Gew??nschter Service-Termin"
diff --git a/fieldservice_sale/i18n/es_CL.po b/fieldservice_sale/i18n/es_CL.po
new file mode 100644
index 0000000000..2149d40a5f
--- /dev/null
+++ b/fieldservice_sale/i18n/es_CL.po
@@ -0,0 +1,291 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-12-10 21:04+0000\n"
+"Last-Translator: Nelson Ram??rez S??nchez <info@konos.cl>\n"
+"Language-Team: none\n"
+"Language: es_CL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.9.1\n"
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
+msgid "<span class=\"o_stat_text\">Sale Orders</span>"
+msgstr "<span class=\"o_stat_text\">Pedido de Venta</span>"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid "According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+"  - Manual: the quantity is set manually on the line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+"  - Stock Moves: the quantity comes from confirmed pickings\n"
+""
+msgstr ""
+"Seg??n la configuraci??n del producto, la cantidad entregada se puede calcular "
+"autom??ticamente por mecanismo:\n"
+"  - Manual: la cantidad se establece manualmente en la l??nea\n"
+"  - Anal??tica de gastos: la cantidad es la suma de la cantidad de gastos "
+"contabilizados\n"
+"  - Hoja de tiempo: la cantidad es la suma de horas registradas en tareas "
+"vinculadas a esta l??nea de venta\n"
+"  - Movimientos de stock: la cantidad proviene de pickings confirmados\n"
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Analytic From Expenses"
+msgstr "Anal??tica desde Gastos"
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create a recurring order"
+msgstr "Crear orden recurrente"
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create one FSM order per sale order"
+msgstr "Crear un pedido FSM por pedido de venta"
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create one FSM order per sale order line"
+msgstr "Crear un pedido FSM por l??nea de pedido de venta"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
+msgid "Determines what happens upon sale order confirmation:\n"
+"                - None: nothing additional, default behavior.\n"
+"                - Per Sale Order: One FSM Order will be created for the sale.\n"
+"                - Per Sale Order Line: One FSM Order for each sale order line\n"
+"                will be created."
+msgstr ""
+"Determina qu?? sucede con la confirmaci??n del pedido de venta:\n"
+"                - Ninguno: nada adicional, comportamiento predeterminado.\n"
+"                - Por orden de venta: se crear?? una orden FSM para la venta."
+"\n"
+"                - Por l??nea de pedido de venta: un pedido FSM por cada l??nea "
+"de pedido de venta\n"
+"                se crear??."
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Don't create FSM order"
+msgstr "No cree un pedido FSM"
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
+msgid "FSM Orders"
+msgstr "Pedidos FSM"
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicaci??n del Servicio de Campo"
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_order
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:99
+#, python-format
+msgid "Field Service Order Created (%s): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:69
+#, python-format
+msgid "Field Service Order Created: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Field Service Order Template"
+msgstr "Plantilla de orden de servicio de campo"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Field Service Order generated by the sales order item"
+msgstr ""
+"Pedido de servicio de campo generado por el art??culo de pedido de ventas"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
+#: selection:product.template,service_type:0
+msgid "Field Service Orders"
+msgstr "??rdenes de servicio de campo"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__field_service_tracking
+msgid "Field Service Tracking"
+msgstr "Servicio de Seguimiento de Campo"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_ids
+msgid "Field Service orders associated to this sale"
+msgstr "Pedidos de servicio de campo asociados a esta venta"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__is_field_service
+msgid "Is a Field Service"
+msgstr "Es un Servicio de Campo"
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Manually set quantities on order"
+msgstr "Establecer cantidades manualmente en orden"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
+msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+msgstr ""
+"Establecer cantidades manualmente en el pedido: Factura basada en la "
+"cantidad ingresada manualmente, sin crear una cuenta anal??tica.\n"
+"Hojas de tiempo en el contrato: Factura basada en las horas rastreadas en la "
+"hoja de tiempo relacionada.\n"
+"Crear una tarea y realizar un seguimiento de las horas: cree una tarea en la "
+"validaci??n de pedidos de ventas y realice un seguimiento de las horas de "
+"trabajo."
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid "Method to update delivered qty"
+msgstr "M??todo para actualizar la cantidad entregada"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Order"
+msgstr "Pedido"
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de Producto"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "SO Lines generating a FSM order will be for this location"
+msgstr "Las l??neas SO que generan un pedido FSM ser??n para esta ubicaci??n"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
+msgid "Sale"
+msgstr "Venta"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
+msgid "Sale Line"
+msgstr "L??nea de Venta"
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sale Order"
+msgstr "Pedido de Venta"
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "L??nea de Pedido de Ventas"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__is_field_service
+msgid "Sales Order item should generate an Order and/or\n"
+"                Order Recurrence, depending on the product settings."
+msgstr ""
+"El art??culo de pedido de ventas debe generar un pedido y / o\n"
+"                Repetici??n de pedidos, seg??n la configuraci??n del producto."
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/fsm_order.py:22
+#, python-format
+msgid "Sales Orders"
+msgstr "Pedidos de Ventas"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
+msgid "Sales Territory"
+msgstr "Territorio de Ventas"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Select the field service order template to be created"
+msgstr "Seleccione la plantilla de pedido de servicio de campo que se crear??"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "Service Location"
+msgstr "Ubicaci??n de Servicio"
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Stock Moves"
+msgstr "Movimientos de Inventario"
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:75
+#, python-format
+msgid "This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+"Este pedido ha sido creado a partir de: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                "
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:105
+#, python-format
+msgid "This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                "
+msgstr ""
+"Este pedido ha sido creado a partir de: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                "
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Timesheets"
+msgstr "Hojas de Tiempo"
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Timesheets on project (one fare per SO/Project)"
+msgstr "Hojas de tiempo en el proyecto (una tarifa por SO / Proyecto)"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
+msgid "Track Service"
+msgstr "Servicio de Seguimiento"
diff --git a/fieldservice_sale/i18n/fieldservice_sale.pot b/fieldservice_sale/i18n/fieldservice_sale.pot
index e347637e66..a216525ca0 100644
--- a/fieldservice_sale/i18n/fieldservice_sale.pot
+++ b/fieldservice_sale/i18n/fieldservice_sale.pot
@@ -40,22 +40,32 @@ msgstr ""
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
-msgid "Create a single order"
+msgid "Create one FSM order per sale order"
 msgstr ""
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
-msgid "Don't create order"
+msgid "Create one FSM order per sale order line"
 msgstr ""
 
 #. module: fieldservice_sale
-#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
-msgid "FSM Orders"
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
+msgid "Determines what happens upon sale order confirmation:\n"
+"                - None: nothing additional, default behavior.\n"
+"                - Per Sale Order: One FSM Order will be created for the sale.\n"
+"                - Per Sale Order Line: One FSM Order for each sale order line\n"
+"                will be created."
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Don't create FSM order"
 msgstr ""
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
-msgid "Field Service Information"
+msgid "FSM Orders"
 msgstr ""
 
 #. module: fieldservice_sale
@@ -70,13 +80,21 @@ msgid "Field Service Order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:93
+#: code:addons/fieldservice_sale/models/sale_order_line.py:99
 #, python-format
 msgid "Field Service Order Created (%s): <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
 
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:69
+#, python-format
+msgid "Field Service Order Created: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -133,13 +151,6 @@ msgstr ""
 msgid "Method to update delivered qty"
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
-#: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
-msgid "On Sales order confirmation, this product can generate a field\n"
-"                service order or field service recurring order."
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Order"
@@ -151,13 +162,13 @@ msgid "Product Template"
 msgstr ""
 
 #. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__date_fsm_request
-msgid "Requested Service Date"
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "SO Lines generating a FSM order will be for this location"
 msgstr ""
 
 #. module: fieldservice_sale
-#: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
-msgid "SO Lines generating a FSM order will be for this location"
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
+msgid "Sale"
 msgstr ""
 
 #. module: fieldservice_sale
@@ -187,7 +198,7 @@ msgid "Sales Order item should generate an Order and/or\n"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/fsm_order.py:21
+#: code:addons/fieldservice_sale/models/fsm_order.py:22
 #, python-format
 msgid "Sales Orders"
 msgstr ""
@@ -214,7 +225,15 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:99
+#: code:addons/fieldservice_sale/models/sale_order.py:75
+#, python-format
+msgid "This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:105
 #, python-format
 msgid "This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
diff --git a/fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py b/fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py
new file mode 100644
index 0000000000..c228e7d99a
--- /dev/null
+++ b/fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2019, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+def migrate(env, version):
+    if not version:
+        return
+
+    env.execute("UPDATE product_template SET field_service_tracking = 'sale' "
+                "WHERE field_service_tracking = 'order';")
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index c68d8fe898..036df1cc30 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -369,7 +369,7 @@ <h1 class="title">Field Service - Sales</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/12.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" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-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" href="https://runbot.odoo-community.org/runbot/264/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>The module integrates the Field Service application with the Sales one and
-allows you to sell field service products.</p>
+allows you to sell products that generate field service orders.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -394,12 +394,25 @@ <h1><a class="toc-backref" href="#id1">Installation</a></h1>
 </div>
 <div class="section" id="configuration">
 <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
-<p>To setup a product for quoting and selling field service orders:</p>
+<p>Products must be configured properly in order to create field service
+orders upon sale order confirmation.</p>
+<p>The field service tracking of a product defines how it generates a field service
+order if the product is sold via sale order.</p>
+<p>To configure a product that generates a unique field service order on each
+sale order line:</p>
 <ul class="simple">
 <li>Go to Sales &gt; Catalog &gt; Products</li>
 <li>Create or select a product</li>
-<li>Set the Product Type to ???Service??? under General Information tab</li>
-<li>Under Invoicing tab, set the Field Service Tracking option</li>
+<li>Set the Field Service Tracking to ???One FSM Order per Sale Order Line???</li>
+<li>Select the FSM Order Template that will be used for creating FSM Orders when
+a Sale Order is confirmed with this product</li>
+</ul>
+<p>To configure a product that generates a unique field service order for
+an individual sale order:</p>
+<ul class="simple">
+<li>Go to Sales &gt; Catalog &gt; Products</li>
+<li>Create or select a product</li>
+<li>Set the Field Service Tracking to ???One FSM Order per Sale Order???</li>
 <li>Select the FSM Order Template that will be used for creating FSM Orders when
 a Sale Order is confirmed with this product</li>
 </ul>

From 564d5c3e63f9223641a671176a2fa69aad46bfa8 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 10 Dec 2019 17:19:11 -0500
Subject: [PATCH 26/77] [FIX] fieldservice_sale_recurring

- Was not calling super properly and FSM orders on the sale line that were not recurring orders were not being created.
- Delete unused computed field.
---
 fieldservice_sale/README.rst                  |  1 +
 fieldservice_sale/i18n/de.po                  | 20 +----
 fieldservice_sale/i18n/es_CL.po               | 80 +++++++++++--------
 fieldservice_sale/i18n/fieldservice_sale.pot  | 19 +----
 fieldservice_sale/models/sale_order_line.py   | 11 ---
 .../static/description/index.html             |  1 +
 6 files changed, 56 insertions(+), 76 deletions(-)

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index 24cb25b3ff..650ae57b8b 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -123,6 +123,7 @@ Contributors
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
 * Rapha??l Reverdy <raphael.reverdy@akretion.com>
+* Cl??ment Mombereau <clement.mombereau@akretion.com>
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/fieldservice_sale/i18n/de.po b/fieldservice_sale/i18n/de.po
index 9250350023..0a3b8dbe0d 100644
--- a/fieldservice_sale/i18n/de.po
+++ b/fieldservice_sale/i18n/de.po
@@ -91,7 +91,7 @@ msgid "Field Service Order"
 msgstr "Field-Service-Auftrag"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:99
+#: code:addons/fieldservice_sale/models/sale_order_line.py:88
 #, python-format
 msgid ""
 "Field Service Order Created (%s): <a href=\n"
@@ -100,7 +100,7 @@ msgid ""
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:69
+#: code:addons/fieldservice_sale/models/sale_order.py:85
 #, python-format
 msgid ""
 "Field Service Order Created: <a href=\n"
@@ -136,11 +136,6 @@ msgstr ""
 msgid "Field Service orders associated to this sale"
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__is_field_service
-msgid "Is a Field Service"
-msgstr ""
-
 #. module: fieldservice_sale
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Manual"
@@ -210,13 +205,6 @@ msgstr ""
 msgid "Sales Order Line"
 msgstr "Auftragszeile"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__is_field_service
-msgid ""
-"Sales Order item should generate an Order and/or\n"
-"                Order Recurrence, depending on the product settings."
-msgstr ""
-
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/fsm_order.py:22
 #, python-format
@@ -245,7 +233,7 @@ msgid "Stock Moves"
 msgstr "Lagerbewegungen"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:75
+#: code:addons/fieldservice_sale/models/sale_order.py:91
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
@@ -254,7 +242,7 @@ msgid ""
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:105
+#: code:addons/fieldservice_sale/models/sale_order_line.py:94
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
diff --git a/fieldservice_sale/i18n/es_CL.po b/fieldservice_sale/i18n/es_CL.po
index 2149d40a5f..1113fc5ef0 100644
--- a/fieldservice_sale/i18n/es_CL.po
+++ b/fieldservice_sale/i18n/es_CL.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_sale
+# 	* fieldservice_sale
 #
 msgid ""
 msgstr ""
@@ -23,12 +23,15 @@ msgstr "<span class=\"o_stat_text\">Pedido de Venta</span>"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
-msgid "According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+msgid ""
+"According to product configuration, the delivered quantity can be "
+"automatically computed by mechanism :\n"
 "  - Manual: the quantity is set manually on the line\n"
-"  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
-"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted "
+"expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to "
+"this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
-""
 msgstr ""
 "Seg??n la configuraci??n del producto, la cantidad entregada se puede calcular "
 "autom??ticamente por mecanismo:\n"
@@ -62,16 +65,19 @@ msgstr "Crear un pedido FSM por l??nea de pedido de venta"
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
-msgid "Determines what happens upon sale order confirmation:\n"
+msgid ""
+"Determines what happens upon sale order confirmation:\n"
 "                - None: nothing additional, default behavior.\n"
-"                - Per Sale Order: One FSM Order will be created for the sale.\n"
-"                - Per Sale Order Line: One FSM Order for each sale order line\n"
+"                - Per Sale Order: One FSM Order will be created for the "
+"sale.\n"
+"                - Per Sale Order Line: One FSM Order for each sale order "
+"line\n"
 "                will be created."
 msgstr ""
 "Determina qu?? sucede con la confirmaci??n del pedido de venta:\n"
 "                - Ninguno: nada adicional, comportamiento predeterminado.\n"
-"                - Por orden de venta: se crear?? una orden FSM para la venta."
-"\n"
+"                - Por orden de venta: se crear?? una orden FSM para la "
+"venta.\n"
 "                - Por l??nea de pedido de venta: un pedido FSM por cada l??nea "
 "de pedido de venta\n"
 "                se crear??."
@@ -98,17 +104,19 @@ msgid "Field Service Order"
 msgstr "Orden de Servicio de Campo"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:99
+#: code:addons/fieldservice_sale/models/sale_order_line.py:88
 #, python-format
-msgid "Field Service Order Created (%s): <a href=\n"
+msgid ""
+"Field Service Order Created (%s): <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:69
+#: code:addons/fieldservice_sale/models/sale_order.py:85
 #, python-format
-msgid "Field Service Order Created: <a href=\n"
+msgid ""
+"Field Service Order Created: <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
@@ -142,11 +150,6 @@ msgstr "Servicio de Seguimiento de Campo"
 msgid "Field Service orders associated to this sale"
 msgstr "Pedidos de servicio de campo asociados a esta venta"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__is_field_service
-msgid "Is a Field Service"
-msgstr "Es un Servicio de Campo"
-
 #. module: fieldservice_sale
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Manual"
@@ -160,9 +163,13 @@ msgstr "Establecer cantidades manualmente en orden"
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
-msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
-"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
-"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+msgid ""
+"Manually set quantities on order: Invoice based on the manually entered "
+"quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related "
+"timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation "
+"and track the work hours."
 msgstr ""
 "Establecer cantidades manualmente en el pedido: Factura basada en la "
 "cantidad ingresada manualmente, sin crear una cuenta anal??tica.\n"
@@ -217,14 +224,6 @@ msgstr "Ventas"
 msgid "Sales Order Line"
 msgstr "L??nea de Pedido de Ventas"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__is_field_service
-msgid "Sales Order item should generate an Order and/or\n"
-"                Order Recurrence, depending on the product settings."
-msgstr ""
-"El art??culo de pedido de ventas debe generar un pedido y / o\n"
-"                Repetici??n de pedidos, seg??n la configuraci??n del producto."
-
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/fsm_order.py:22
 #, python-format
@@ -253,9 +252,10 @@ msgid "Stock Moves"
 msgstr "Movimientos de Inventario"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:75
+#: code:addons/fieldservice_sale/models/sale_order.py:91
 #, python-format
-msgid "This order has been created from: <a href=\n"
+msgid ""
+"This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
@@ -264,9 +264,10 @@ msgstr ""
 "                "
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:105
+#: code:addons/fieldservice_sale/models/sale_order_line.py:94
 #, python-format
-msgid "This order has been created from: <a href=\n"
+msgid ""
+"This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
 "                "
 msgstr ""
@@ -289,3 +290,14 @@ msgstr "Hojas de tiempo en el proyecto (una tarifa por SO / Proyecto)"
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
 msgstr "Servicio de Seguimiento"
+
+#~ msgid "Is a Field Service"
+#~ msgstr "Es un Servicio de Campo"
+
+#~ msgid ""
+#~ "Sales Order item should generate an Order and/or\n"
+#~ "                Order Recurrence, depending on the product settings."
+#~ msgstr ""
+#~ "El art??culo de pedido de ventas debe generar un pedido y / o\n"
+#~ "                Repetici??n de pedidos, seg??n la configuraci??n del "
+#~ "producto."
diff --git a/fieldservice_sale/i18n/fieldservice_sale.pot b/fieldservice_sale/i18n/fieldservice_sale.pot
index a216525ca0..c85ae3b3a3 100644
--- a/fieldservice_sale/i18n/fieldservice_sale.pot
+++ b/fieldservice_sale/i18n/fieldservice_sale.pot
@@ -80,7 +80,7 @@ msgid "Field Service Order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:99
+#: code:addons/fieldservice_sale/models/sale_order_line.py:88
 #, python-format
 msgid "Field Service Order Created (%s): <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
@@ -88,7 +88,7 @@ msgid "Field Service Order Created (%s): <a href=\n"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:69
+#: code:addons/fieldservice_sale/models/sale_order.py:85
 #, python-format
 msgid "Field Service Order Created: <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
@@ -123,11 +123,6 @@ msgstr ""
 msgid "Field Service orders associated to this sale"
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__is_field_service
-msgid "Is a Field Service"
-msgstr ""
-
 #. module: fieldservice_sale
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Manual"
@@ -191,12 +186,6 @@ msgstr ""
 msgid "Sales Order Line"
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__is_field_service
-msgid "Sales Order item should generate an Order and/or\n"
-"                Order Recurrence, depending on the product settings."
-msgstr ""
-
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/fsm_order.py:22
 #, python-format
@@ -225,7 +214,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:75
+#: code:addons/fieldservice_sale/models/sale_order.py:91
 #, python-format
 msgid "This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
@@ -233,7 +222,7 @@ msgid "This order has been created from: <a href=\n"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:105
+#: code:addons/fieldservice_sale/models/sale_order_line.py:94
 #, python-format
 msgid "This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index b419d86054..96f08a802e 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -13,17 +13,6 @@ class SaleOrderLine(models.Model):
     fsm_order_id = fields.Many2one(
         'fsm.order', 'Order', index=True,
         help="Field Service Order generated by the sales order item")
-    is_field_service = fields.Boolean(
-        "Is a Field Service", compute='_compute_is_field_service',
-        store=True,
-        help="""Sales Order item should generate an Order and/or
-                Order Recurrence, depending on the product settings.""")
-
-    @api.multi
-    @api.depends('product_id.type')
-    def _compute_is_field_service(self):
-        for so_line in self:
-            so_line.is_field_service = so_line.product_id.type == 'service'
 
     @api.depends('product_id.type')
     def _compute_product_updatable(self):
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index 036df1cc30..19d0e22146 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -473,6 +473,7 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
 <li>Rapha??l Reverdy &lt;<a class="reference external" href="mailto:raphael.reverdy&#64;akretion.com">raphael.reverdy&#64;akretion.com</a>&gt;</li>
+<li>Cl??ment Mombereau &lt;<a class="reference external" href="mailto:clement.mombereau&#64;akretion.com">clement.mombereau&#64;akretion.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

From dc10c553d2c64cc1dab49bc84d24144ea9871eaa Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 22 Dec 2019 10:54:54 -0600
Subject: [PATCH 27/77] [IMP] fieldservice_sale

---
 fieldservice_sale/models/sale_order.py      |  1 -
 fieldservice_sale/models/sale_order_line.py | 15 ++++++++-------
 fieldservice_sale/views/sale_order.xml      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 6d9488bf4b..0fa9954aad 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -48,7 +48,6 @@ def _field_create_fsm_order_prepare_values(self):
             hours += template.hours
             categories |= template.category_ids
         return {
-            "customer_id": self.partner_id.id,
             "location_id": self.fsm_location_id.id,
             "location_directions": self.fsm_location_id.direction,
             "request_early": self.expected_date,
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 96f08a802e..aa03285704 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -83,7 +83,7 @@ def _field_create_fsm_order(self):
             # create fsm_order
             values = so_line._field_create_fsm_order_prepare_values()
             fsm_order = self.env['fsm.order'].sudo().create(values)
-            so_line.write({'fsm_order_id': fsm_order.id})
+            so_line.fsm_order_id = fsm_order.id
             # post message on SO
             msg_body = _(
                 """Field Service Order Created (%s): <a href=
@@ -129,19 +129,20 @@ def _field_service_generation(self):
             exists, it simply links the existing one to the line.
         """
         if any(sol.product_id.field_service_tracking == 'sale' for sol in self):
-            sales = self.env['sale.order'].search([
-                ('order_line', 'in', self.ids)])
-            sales._field_find_fsm_order()
+            sales = self.order_id
+            so_fo_mapping = sales._field_find_fsm_order()
+            for so_line in self.filtered(
+                lambda sol: sol.product_id.field_service_tracking == 'sale'):
+                so_line.fsm_order_id = so_fo_mapping[so_line.order_id.id].id
 
         for so_line in self.filtered(
-            lambda sol: sol.product_id.field_service_tracking == 'line'
-        ):
+            lambda sol: sol.product_id.field_service_tracking == 'line'):
             so_line._field_find_fsm_order()
 
     @api.multi
     def _prepare_invoice_line(self, qty):
         res = super()._prepare_invoice_line(qty)
         res.update({
-            'fsm_order_id': self.fsm_order_id,
+            'fsm_order_id': self.fsm_order_id.id,
         })
         return res
diff --git a/fieldservice_sale/views/sale_order.xml b/fieldservice_sale/views/sale_order.xml
index 6c711745eb..ef445200a6 100644
--- a/fieldservice_sale/views/sale_order.xml
+++ b/fieldservice_sale/views/sale_order.xml
@@ -8,7 +8,7 @@
                 <button type="object"
                         name="action_view_fsm_order"
                         class="oe_stat_button"
-                        icon="fa-tasks"
+                        icon="fa-map"
                         attrs="{'invisible': [('fsm_order_count', '=', 0)]}"
                         groups="fieldservice.group_fsm_user">
                     <field name="fsm_order_count" widget="statinfo" string="FSM Orders"/>

From 3015fc2e4b92d4501f24f3fb1b5d2a32f4349ce4 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 22 Dec 2019 14:15:50 -0600
Subject: [PATCH 28/77] [FIX] fieldservice_sale

---
 fieldservice_sale/models/sale_order.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 0fa9954aad..a8da33f028 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -18,8 +18,8 @@ class SaleOrder(models.Model):
         compute="_compute_fsm_order_ids",
         string="Field Service orders associated to this sale",
     )
-    fsm_order_count = fields.Float(
-        string="Field Service Orders", compute="_compute_fsm_order_ids"
+    fsm_order_count = fields.Integer(
+        string="FSM Orders", compute="_compute_fsm_order_ids"
     )
 
     @api.multi

From 4694e0367b667b7b8c7721ec71e0ee47b92d6a7e Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 22 Dec 2019 14:29:51 -0600
Subject: [PATCH 29/77] [FIX] fieldservice_sale: PEP8 errors

---
 fieldservice_sale/models/sale_order_line.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index aa03285704..bda897d594 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -128,15 +128,17 @@ def _field_service_generation(self):
         """ For service lines, create the field service order. If it already
             exists, it simply links the existing one to the line.
         """
-        if any(sol.product_id.field_service_tracking == 'sale' for sol in self):
+        if any(sol.product_id.field_service_tracking == 'sale'
+               for sol in self):
             sales = self.order_id
             so_fo_mapping = sales._field_find_fsm_order()
             for so_line in self.filtered(
-                lambda sol: sol.product_id.field_service_tracking == 'sale'):
+                    lambda sol:
+                    sol.product_id.field_service_tracking == 'sale'):
                 so_line.fsm_order_id = so_fo_mapping[so_line.order_id.id].id
 
         for so_line in self.filtered(
-            lambda sol: sol.product_id.field_service_tracking == 'line'):
+                lambda sol: sol.product_id.field_service_tracking == 'line'):
             so_line._field_find_fsm_order()
 
     @api.multi

From d67b76b38731af1bf4e2a5ee39e1923fba45a927 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 19 Dec 2019 17:02:49 -0600
Subject: [PATCH 30/77] [FIX] fieldservice_sale

---
 fieldservice_sale/models/sale_order.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index a8da33f028..c044354f08 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -44,7 +44,7 @@ def _field_create_fsm_order_prepare_values(self):
         hours = 0.0
         categories = self.env["fsm.category"]
         for template in templates:
-            note += template.instructions
+            note += template.instructions or ""
             hours += template.hours
             categories |= template.category_ids
         return {
@@ -150,7 +150,8 @@ def action_invoice_create(self, grouped=False, final=False):
                         inv = invoice.copy()
                         inv.write({"invoice_line_ids": [(6, 0, [])]})
                         lines_by_line[i].invoice_id = inv.id
-                    inv.fsm_order_id = lines_by_line[i].fsm_order_id.id
+                    inv.fsm_order_ids = \
+                        [(4, lines_by_line[i].fsm_order_id.id)]
                     result.append(inv.id)
 
             # check for invoice lines with product
@@ -164,7 +165,7 @@ def action_invoice_create(self, grouped=False, final=False):
             if len(lines_by_sale) > 0:
                 fsm_order = self.env["fsm.order"].search([("sale_id", "=", self.id)])
                 if len(lines_by_sale) == len(invoice.invoice_line_ids):
-                    invoice.fsm_order_id = fsm_order.id
+                    invoice.fsm_order_ids = [(4, fsm_order.id)]
                 elif len(invoice.invoice_line_ids) > len(lines_by_sale):
                     new = invoice.copy()
                     new.write({"invoice_line_ids": [(6, 0, [])]})

From bb83077d584323ce3a4f2a5b09a2e78692a1f498 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 31 Dec 2019 07:23:09 -0500
Subject: [PATCH 31/77] [IMP] fieldservice_sale: Add Validation

---
 fieldservice_sale/models/sale_order.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index c044354f08..16e6290a12 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -3,6 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
 
 
 class SaleOrder(models.Model):
@@ -120,7 +121,11 @@ def _field_find_fsm_order(self):
     def _action_confirm(self):
         """ On SO confirmation, some lines generate field service orders. """
         result = super(SaleOrder, self)._action_confirm()
-        self.order_line._field_service_generation()
+        if any(sol.product_id.field_service_tracking != 'no'
+               for sol in self):
+            if not self.fsm_location_id:
+                raise ValidationError(_("FSM Location must be set"))
+            self.order_line._field_service_generation()
         return result
 
     @api.multi

From aa533810d6b444ad753271d0e123bace354f34de Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 31 Dec 2019 07:25:33 -0500
Subject: [PATCH 32/77] [FIX] fieldservice_sale: bug fixes

---
 fieldservice_sale/__manifest__.py            | 2 +-
 fieldservice_sale/i18n/de.po                 | 8 +++++++-
 fieldservice_sale/i18n/es_CL.po              | 8 +++++++-
 fieldservice_sale/i18n/fieldservice_sale.pot | 8 +++++++-
 fieldservice_sale/models/sale_order.py       | 3 +--
 fieldservice_sale/models/sale_order_line.py  | 2 +-
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index b29f569ca7..ed42f563bc 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sales',
-    'version': '12.0.2.0.0',
+    'version': '12.0.2.1.0',
     'summary': 'Sell field services.',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale/i18n/de.po b/fieldservice_sale/i18n/de.po
index 0a3b8dbe0d..2bf6148c5a 100644
--- a/fieldservice_sale/i18n/de.po
+++ b/fieldservice_sale/i18n/de.po
@@ -75,6 +75,13 @@ msgid "Don't create FSM order"
 msgstr ""
 
 #. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:129
+#, python-format
+msgid "FSM Location must be set"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
 msgid "FSM Orders"
 msgstr "Field-Service-Auftr??ge"
@@ -120,7 +127,6 @@ msgid "Field Service Order generated by the sales order item"
 msgstr ""
 
 #. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: selection:product.template,service_type:0
 msgid "Field Service Orders"
 msgstr "Field-Service-Auftr??ge"
diff --git a/fieldservice_sale/i18n/es_CL.po b/fieldservice_sale/i18n/es_CL.po
index 1113fc5ef0..72dce076e8 100644
--- a/fieldservice_sale/i18n/es_CL.po
+++ b/fieldservice_sale/i18n/es_CL.po
@@ -88,6 +88,13 @@ msgid "Don't create FSM order"
 msgstr "No cree un pedido FSM"
 
 #. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:129
+#, python-format
+msgid "FSM Location must be set"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
 msgid "FSM Orders"
 msgstr "Pedidos FSM"
@@ -134,7 +141,6 @@ msgstr ""
 "Pedido de servicio de campo generado por el art??culo de pedido de ventas"
 
 #. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: selection:product.template,service_type:0
 msgid "Field Service Orders"
 msgstr "??rdenes de servicio de campo"
diff --git a/fieldservice_sale/i18n/fieldservice_sale.pot b/fieldservice_sale/i18n/fieldservice_sale.pot
index c85ae3b3a3..57711b705f 100644
--- a/fieldservice_sale/i18n/fieldservice_sale.pot
+++ b/fieldservice_sale/i18n/fieldservice_sale.pot
@@ -64,6 +64,13 @@ msgid "Don't create FSM order"
 msgstr ""
 
 #. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:129
+#, python-format
+msgid "FSM Location must be set"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
 msgid "FSM Orders"
 msgstr ""
@@ -107,7 +114,6 @@ msgid "Field Service Order generated by the sales order item"
 msgstr ""
 
 #. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: selection:product.template,service_type:0
 msgid "Field Service Orders"
 msgstr ""
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 16e6290a12..852d7d3261 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -131,8 +131,7 @@ def _action_confirm(self):
     @api.multi
     def action_invoice_create(self, grouped=False, final=False):
         invoice_ids = super().action_invoice_create(grouped, final)
-        result = []
-        result.append(invoice_ids)
+        result = invoice_ids or []
 
         for invoice_id in invoice_ids:
             invoice = self.env["account.invoice"].browse(invoice_id)
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index bda897d594..18883c8aaa 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -59,7 +59,7 @@ def _field_create_fsm_order_prepare_values(self):
         return {
             'customer_id': self.order_id.partner_id.id,
             'location_id': self.order_id.fsm_location_id.id,
-            'location_directions': self.fsm_location_id.direction,
+            'location_directions': self.order_id.fsm_location_id.direction,
             'request_early': self.order_id.expected_date,
             'scheduled_date_start': self.order_id.expected_date,
             'description': self.name,

From 7b8a42de370f97e79a42688ae5984722cd26e661 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Wed, 1 Jan 2020 16:23:42 +0530
Subject: [PATCH 33/77] [FIX] Improved code.

---
 fieldservice_sale/models/sale_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 852d7d3261..df2b1b9638 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -122,7 +122,7 @@ def _action_confirm(self):
         """ On SO confirmation, some lines generate field service orders. """
         result = super(SaleOrder, self)._action_confirm()
         if any(sol.product_id.field_service_tracking != 'no'
-               for sol in self):
+               for sol in self.order_line):
             if not self.fsm_location_id:
                 raise ValidationError(_("FSM Location must be set"))
             self.order_line._field_service_generation()

From 9674934d8b0611f45790e325f0a8018b81f61396 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 6 Jan 2020 13:18:57 -0500
Subject: [PATCH 34/77] [FIX] fieldservice_sale

handle multiple sale order lines
---
 fieldservice_sale/models/sale_order_line.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 18883c8aaa..6602499972 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -130,7 +130,8 @@ def _field_service_generation(self):
         """
         if any(sol.product_id.field_service_tracking == 'sale'
                for sol in self):
-            sales = self.order_id
+            sales = self.env['sale.order'].search([
+                ('order_line', 'in', self.ids)])
             so_fo_mapping = sales._field_find_fsm_order()
             for so_line in self.filtered(
                     lambda sol:

From c23c9775c201cff473f8665351dd987cadfb341c Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 6 Jan 2020 17:33:52 -0600
Subject: [PATCH 35/77] [FIX] fieldservice_sale

---
 fieldservice_sale/models/sale_order.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index df2b1b9638..802df49d40 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -121,8 +121,9 @@ def _field_find_fsm_order(self):
     def _action_confirm(self):
         """ On SO confirmation, some lines generate field service orders. """
         result = super(SaleOrder, self)._action_confirm()
-        if any(sol.product_id.field_service_tracking != 'no'
-               for sol in self.order_line):
+        if any(
+            sol.product_id.field_service_tracking != "no" for sol in self.order_line
+        ):
             if not self.fsm_location_id:
                 raise ValidationError(_("FSM Location must be set"))
             self.order_line._field_service_generation()
@@ -154,8 +155,7 @@ def action_invoice_create(self, grouped=False, final=False):
                         inv = invoice.copy()
                         inv.write({"invoice_line_ids": [(6, 0, [])]})
                         lines_by_line[i].invoice_id = inv.id
-                    inv.fsm_order_ids = \
-                        [(4, lines_by_line[i].fsm_order_id.id)]
+                    inv.fsm_order_ids = [(4, lines_by_line[i].fsm_order_id.id)]
                     result.append(inv.id)
 
             # check for invoice lines with product

From 2c5155a70488143cff9297d5dbed7af31f4ceb6b Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 9 Jan 2020 13:40:34 -0800
Subject: [PATCH 36/77] [IMP] fieldservice_sale

# Conflicts:
#	fieldservice_sale/models/sale_order_line.py
---
 fieldservice_sale/models/fsm_order.py       |  5 +-
 fieldservice_sale/models/sale_order.py      | 21 +++++++-
 fieldservice_sale/models/sale_order_line.py | 57 ++++++++++-----------
 fieldservice_sale/views/fsm_order.xml       |  9 ++--
 4 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/fieldservice_sale/models/fsm_order.py b/fieldservice_sale/models/fsm_order.py
index e8329b4493..ccc92ec631 100644
--- a/fieldservice_sale/models/fsm_order.py
+++ b/fieldservice_sale/models/fsm_order.py
@@ -1,8 +1,7 @@
 # Copyright (C) 2019 Brian McMaster
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import fields, models, _
+from odoo import api, fields, models, _
 
 
 class FSMOrder(models.Model):
@@ -17,7 +16,7 @@ def action_view_sales(self):
             "type": "ir.actions.act_window",
             "res_model": "sale.order",
             "views": [[False, "form"]],
-            "res_id": self.sale_line_id.order_id.id,
+            "res_id": self.sale_line_id.order_id.id or self.sale_id.id,
             "context": {"create": False},
             "name": _("Sales Orders"),
         }
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 802df49d40..613ec43cd9 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -1,7 +1,6 @@
 # Copyright (C) 2019 Brian McMaster
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from odoo import api, fields, models, _
 from odoo.exceptions import ValidationError
 
@@ -35,6 +34,26 @@ def _compute_fsm_order_ids(self):
             order.fsm_order_ids = orders
             order.fsm_order_count = len(order.fsm_order_ids)
 
+    @api.onchange("partner_id")
+    def onchange_partner_id(self):
+        """
+        Autofill the Sale Order's FS location with the partner_id,
+        the partner_shipping_id or the partner_id.commercial_partner_id if
+        they are FS locations.
+        """
+        super(SaleOrder, self).onchange_partner_id()
+        domain = [
+            "|",
+            "|",
+            ("partner_id", "=", self.partner_id.id),
+            ("partner_id", "=", self.partner_shipping_id.id),
+            ("partner_id", "=", self.partner_id.commercial_partner_id.id),
+        ]
+        if self.partner_id.fsm_location:
+            domain = [("partner_id", "=", self.partner_id.id)]
+        location_ids = self.env["fsm.location"].search(domain)
+        self.fsm_location_id = location_ids and location_ids[0] or False
+
     def _field_create_fsm_order_prepare_values(self):
         self.ensure_one()
         lines = self.order_line.filtered(
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 6602499972..826a666b61 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -1,7 +1,6 @@
 # Copyright (C) 2019 Brian McMaster
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from odoo import api, fields, models, _
 
 
@@ -107,40 +106,40 @@ def _field_find_fsm_order(self):
             :return a mapping with the so line id and its linked fsm_order
             :rtype dict
         """
-        # one search for all so lines
-        fsm_orders = self.env['fsm.order'].search([
-            ('sale_line_id', 'in', self.ids)])
-        fsm_order_sol_mapping = {
-            fsm_order.sale_line_id.id: fsm_order for fsm_order in fsm_orders}
-        result = {}
-        for so_line in self:
-            # If the SO was confirmed, cancelled, set to draft then confirmed,
-            # avoid creating a new fsm_order.
-            fsm_order = fsm_order_sol_mapping.get(so_line.id)
-            # If not found, create one fsm_order for the so line
-            if not fsm_order:
-                fsm_order = so_line._field_create_fsm_order()[so_line.id]
-            result[so_line.id] = fsm_order
-        return result
+        for rec in self:
+            # one search for all so lines
+            fsm_orders = self.env['fsm.order'].search([
+                ('sale_line_id', 'in', rec.ids)])
+            fsm_order_sol_mapping = {
+                fsm_order.sale_line_id.id: fsm_order for fsm_order in fsm_orders}
+            res = {}
+            for so_line in rec:
+                # If the SO was confirmed, cancelled, set to draft then confirmed,
+                # avoid creating a new fsm_order.
+                fsm_order = fsm_order_sol_mapping.get(so_line.id)
+                # If not found, create one fsm_order for the so line
+                if not fsm_order:
+                    fsm_order = so_line._field_create_fsm_order()[so_line.id]
+                res[so_line.id] = fsm_order
+            return res
 
     @api.multi
     def _field_service_generation(self):
         """ For service lines, create the field service order. If it already
             exists, it simply links the existing one to the line.
         """
-        if any(sol.product_id.field_service_tracking == 'sale'
-               for sol in self):
-            sales = self.env['sale.order'].search([
-                ('order_line', 'in', self.ids)])
-            so_fo_mapping = sales._field_find_fsm_order()
-            for so_line in self.filtered(
-                    lambda sol:
-                    sol.product_id.field_service_tracking == 'sale'):
-                so_line.fsm_order_id = so_fo_mapping[so_line.order_id.id].id
-
-        for so_line in self.filtered(
-                lambda sol: sol.product_id.field_service_tracking == 'line'):
-            so_line._field_find_fsm_order()
+        for rec in self:
+            if any(sol.product_id.field_service_tracking == 'sale'
+                   for sol in rec):
+                sale = rec.order_id
+                so_fo_mapping = sale._field_find_fsm_order()
+                for so_line in rec.filtered(
+                        lambda sol:
+                        sol.product_id.field_service_tracking == 'sale'):
+                    so_line.fsm_order_id = so_fo_mapping[so_line.order_id.id].id
+            for so_line in rec.filtered(
+                    lambda sol: sol.product_id.field_service_tracking == 'line'):
+                so_line._field_find_fsm_order()
 
     @api.multi
     def _prepare_invoice_line(self, qty):
diff --git a/fieldservice_sale/views/fsm_order.xml b/fieldservice_sale/views/fsm_order.xml
index 74e1c207b1..8ac8b5392e 100644
--- a/fieldservice_sale/views/fsm_order.xml
+++ b/fieldservice_sale/views/fsm_order.xml
@@ -1,4 +1,5 @@
 <odoo>
+
     <record id="view_fsm_order_form_inherit_sale" model="ir.ui.view">
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
@@ -7,12 +8,14 @@
                 <button type="object"
                         name="action_view_sales"
                         class="oe_stat_button"
-                        icon="fa-credit-card"
-                        attrs="{'invisible': [('sale_line_id', '=', False)]}">
-                    <span class="o_stat_text">Sale Orders</span>
+                        icon="fa-usd"
+                        attrs="{'invisible': [('sale_line_id', '=', False), ('sale_id', '=', False)]}">
+                    <span class="o_stat_text">Sale Order</span>
+                    <field name="sale_id" attrs="{'invisible': 1}"/>
                     <field name="sale_line_id" attrs="{'invisible': 1}"/>
                 </button>
             </xpath>
         </field>
     </record>
+
 </odoo>

From 001f2a5235369f353029f23685549cff31a7f89a Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@ursainfosystems.com>
Date: Thu, 9 Jan 2020 17:01:02 -0800
Subject: [PATCH 37/77] Update fieldservice_sale/models/fsm_order.py

Co-Authored-By: brian10048 <brian@mcmpest.com>
---
 fieldservice_sale/__manifest__.py            |   2 +-
 fieldservice_sale/i18n/de.po                 |  16 +-
 fieldservice_sale/i18n/es.po                 | 311 +++++++++++++++++++
 fieldservice_sale/i18n/es_CL.po              |  16 +-
 fieldservice_sale/i18n/fieldservice_sale.pot |  14 +-
 fieldservice_sale/i18n/pt_BR.po              | 253 +++++++++++++++
 fieldservice_sale/models/fsm_order.py        |   2 +-
 7 files changed, 591 insertions(+), 23 deletions(-)
 create mode 100644 fieldservice_sale/i18n/es.po
 create mode 100644 fieldservice_sale/i18n/pt_BR.po

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index ed42f563bc..fee44c2c45 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sales',
-    'version': '12.0.2.1.0',
+    'version': '12.0.2.2.0',
     'summary': 'Sell field services.',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale/i18n/de.po b/fieldservice_sale/i18n/de.po
index 2bf6148c5a..7e10b7b3fc 100644
--- a/fieldservice_sale/i18n/de.po
+++ b/fieldservice_sale/i18n/de.po
@@ -18,7 +18,9 @@ msgstr ""
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
-msgid "<span class=\"o_stat_text\">Sale Orders</span>"
+#, fuzzy
+#| msgid "<span class=\"o_stat_text\">Sale Orders</span>"
+msgid "<span class=\"o_stat_text\">Sale Order</span>"
 msgstr "<span class=\"o_stat_text\">Verkaufsauftr??ge</span>"
 
 #. module: fieldservice_sale
@@ -75,7 +77,7 @@ msgid "Don't create FSM order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:129
+#: code:addons/fieldservice_sale/models/sale_order.py:130
 #, python-format
 msgid "FSM Location must be set"
 msgstr ""
@@ -98,7 +100,7 @@ msgid "Field Service Order"
 msgstr "Field-Service-Auftrag"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:88
+#: code:addons/fieldservice_sale/models/sale_order_line.py:87
 #, python-format
 msgid ""
 "Field Service Order Created (%s): <a href=\n"
@@ -107,7 +109,7 @@ msgid ""
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:85
+#: code:addons/fieldservice_sale/models/sale_order.py:86
 #, python-format
 msgid ""
 "Field Service Order Created: <a href=\n"
@@ -212,7 +214,7 @@ msgid "Sales Order Line"
 msgstr "Auftragszeile"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/fsm_order.py:22
+#: code:addons/fieldservice_sale/models/fsm_order.py:21
 #, python-format
 msgid "Sales Orders"
 msgstr "Verkaufsauftr??ge"
@@ -239,7 +241,7 @@ msgid "Stock Moves"
 msgstr "Lagerbewegungen"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:91
+#: code:addons/fieldservice_sale/models/sale_order.py:92
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
@@ -248,7 +250,7 @@ msgid ""
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:94
+#: code:addons/fieldservice_sale/models/sale_order_line.py:93
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
diff --git a/fieldservice_sale/i18n/es.po b/fieldservice_sale/i18n/es.po
new file mode 100644
index 0000000000..b55b6a19ce
--- /dev/null
+++ b/fieldservice_sale/i18n/es.po
@@ -0,0 +1,311 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-12-10 21:04+0000\n"
+"Last-Translator: Nelson Ram??rez S??nchez <info@konos.cl>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.9.1\n"
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
+#, fuzzy
+#| msgid "<span class=\"o_stat_text\">Sale Orders</span>"
+msgid "<span class=\"o_stat_text\">Sale Order</span>"
+msgstr "<span class=\"o_stat_text\">Pedido de Venta</span>"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid ""
+"According to product configuration, the delivered quantity can be "
+"automatically computed by mechanism :\n"
+"  - Manual: the quantity is set manually on the line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted "
+"expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to "
+"this sale line\n"
+"  - Stock Moves: the quantity comes from confirmed pickings\n"
+msgstr ""
+"Seg??n la configuraci??n del producto, la cantidad entregada se puede calcular "
+"autom??ticamente por mecanismo:\n"
+"  - Manual: la cantidad se establece manualmente en la l??nea\n"
+"  - Anal??tica de gastos: la cantidad es la suma de la cantidad de gastos "
+"contabilizados\n"
+"  - Hoja de tiempo: la cantidad es la suma de horas registradas en tareas "
+"vinculadas a esta l??nea de venta\n"
+"  - Movimientos de stock: la cantidad proviene de pickings confirmados\n"
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Analytic From Expenses"
+msgstr "Anal??tica desde Gastos"
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create a recurring order"
+msgstr "Crear orden recurrente"
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create one FSM order per sale order"
+msgstr "Crear un pedido FSM por pedido de venta"
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create one FSM order per sale order line"
+msgstr "Crear un pedido FSM por l??nea de pedido de venta"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
+msgid ""
+"Determines what happens upon sale order confirmation:\n"
+"                - None: nothing additional, default behavior.\n"
+"                - Per Sale Order: One FSM Order will be created for the "
+"sale.\n"
+"                - Per Sale Order Line: One FSM Order for each sale order "
+"line\n"
+"                will be created."
+msgstr ""
+"Determina qu?? sucede con la confirmaci??n del pedido de venta:\n"
+"                - Ninguno: nada adicional, comportamiento predeterminado.\n"
+"                - Por orden de venta: se crear?? una orden FSM para la "
+"venta.\n"
+"                - Por l??nea de pedido de venta: un pedido FSM por cada l??nea "
+"de pedido de venta\n"
+"                se crear??."
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Don't create FSM order"
+msgstr "No cree un pedido FSM"
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:130
+#, python-format
+msgid "FSM Location must be set"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
+msgid "FSM Orders"
+msgstr "Pedidos FSM"
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicaci??n del Servicio de Campo"
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_order
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:87
+#, python-format
+msgid ""
+"Field Service Order Created (%s): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:86
+#, python-format
+msgid ""
+"Field Service Order Created: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Field Service Order Template"
+msgstr "Plantilla de orden de servicio de campo"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Field Service Order generated by the sales order item"
+msgstr ""
+"Pedido de servicio de campo generado por el art??culo de pedido de ventas"
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Field Service Orders"
+msgstr "??rdenes de servicio de campo"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__field_service_tracking
+msgid "Field Service Tracking"
+msgstr "Servicio de Seguimiento de Campo"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_ids
+msgid "Field Service orders associated to this sale"
+msgstr "Pedidos de servicio de campo asociados a esta venta"
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Manually set quantities on order"
+msgstr "Establecer cantidades manualmente en orden"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
+msgid ""
+"Manually set quantities on order: Invoice based on the manually entered "
+"quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related "
+"timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation "
+"and track the work hours."
+msgstr ""
+"Establecer cantidades manualmente en el pedido: Factura basada en la "
+"cantidad ingresada manualmente, sin crear una cuenta anal??tica.\n"
+"Hojas de tiempo en el contrato: Factura basada en las horas rastreadas en la "
+"hoja de tiempo relacionada.\n"
+"Crear una tarea y realizar un seguimiento de las horas: cree una tarea en la "
+"validaci??n de pedidos de ventas y realice un seguimiento de las horas de "
+"trabajo."
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid "Method to update delivered qty"
+msgstr "M??todo para actualizar la cantidad entregada"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Order"
+msgstr "Pedido"
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de Producto"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "SO Lines generating a FSM order will be for this location"
+msgstr "Las l??neas SO que generan un pedido FSM ser??n para esta ubicaci??n"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
+msgid "Sale"
+msgstr "Venta"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
+msgid "Sale Line"
+msgstr "L??nea de Venta"
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sale Order"
+msgstr "Pedido de Venta"
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "L??nea de Pedido de Ventas"
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/fsm_order.py:21
+#, python-format
+msgid "Sales Orders"
+msgstr "Pedidos de Ventas"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
+msgid "Sales Territory"
+msgstr "Territorio de Ventas"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Select the field service order template to be created"
+msgstr "Seleccione la plantilla de pedido de servicio de campo que se crear??"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "Service Location"
+msgstr "Ubicaci??n de Servicio"
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Stock Moves"
+msgstr "Movimientos de Inventario"
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:92
+#, python-format
+msgid ""
+"This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+"Este pedido ha sido creado a partir de: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                "
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:93
+#, python-format
+msgid ""
+"This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                "
+msgstr ""
+"Este pedido ha sido creado a partir de: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                "
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Timesheets"
+msgstr "Hojas de Tiempo"
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Timesheets on project (one fare per SO/Project)"
+msgstr "Hojas de tiempo en el proyecto (una tarifa por SO / Proyecto)"
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
+msgid "Track Service"
+msgstr "Servicio de Seguimiento"
+
+#~ msgid "Is a Field Service"
+#~ msgstr "Es un Servicio de Campo"
+
+#~ msgid ""
+#~ "Sales Order item should generate an Order and/or\n"
+#~ "                Order Recurrence, depending on the product settings."
+#~ msgstr ""
+#~ "El art??culo de pedido de ventas debe generar un pedido y / o\n"
+#~ "                Repetici??n de pedidos, seg??n la configuraci??n del "
+#~ "producto."
diff --git a/fieldservice_sale/i18n/es_CL.po b/fieldservice_sale/i18n/es_CL.po
index 72dce076e8..b910b00247 100644
--- a/fieldservice_sale/i18n/es_CL.po
+++ b/fieldservice_sale/i18n/es_CL.po
@@ -18,7 +18,9 @@ msgstr ""
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
-msgid "<span class=\"o_stat_text\">Sale Orders</span>"
+#, fuzzy
+#| msgid "<span class=\"o_stat_text\">Sale Orders</span>"
+msgid "<span class=\"o_stat_text\">Sale Order</span>"
 msgstr "<span class=\"o_stat_text\">Pedido de Venta</span>"
 
 #. module: fieldservice_sale
@@ -88,7 +90,7 @@ msgid "Don't create FSM order"
 msgstr "No cree un pedido FSM"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:129
+#: code:addons/fieldservice_sale/models/sale_order.py:130
 #, python-format
 msgid "FSM Location must be set"
 msgstr ""
@@ -111,7 +113,7 @@ msgid "Field Service Order"
 msgstr "Orden de Servicio de Campo"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:88
+#: code:addons/fieldservice_sale/models/sale_order_line.py:87
 #, python-format
 msgid ""
 "Field Service Order Created (%s): <a href=\n"
@@ -120,7 +122,7 @@ msgid ""
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:85
+#: code:addons/fieldservice_sale/models/sale_order.py:86
 #, python-format
 msgid ""
 "Field Service Order Created: <a href=\n"
@@ -231,7 +233,7 @@ msgid "Sales Order Line"
 msgstr "L??nea de Pedido de Ventas"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/fsm_order.py:22
+#: code:addons/fieldservice_sale/models/fsm_order.py:21
 #, python-format
 msgid "Sales Orders"
 msgstr "Pedidos de Ventas"
@@ -258,7 +260,7 @@ msgid "Stock Moves"
 msgstr "Movimientos de Inventario"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:91
+#: code:addons/fieldservice_sale/models/sale_order.py:92
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
@@ -270,7 +272,7 @@ msgstr ""
 "                "
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:94
+#: code:addons/fieldservice_sale/models/sale_order_line.py:93
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
diff --git a/fieldservice_sale/i18n/fieldservice_sale.pot b/fieldservice_sale/i18n/fieldservice_sale.pot
index 57711b705f..60e9cf74a7 100644
--- a/fieldservice_sale/i18n/fieldservice_sale.pot
+++ b/fieldservice_sale/i18n/fieldservice_sale.pot
@@ -15,7 +15,7 @@ msgstr ""
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
-msgid "<span class=\"o_stat_text\">Sale Orders</span>"
+msgid "<span class=\"o_stat_text\">Sale Order</span>"
 msgstr ""
 
 #. module: fieldservice_sale
@@ -64,7 +64,7 @@ msgid "Don't create FSM order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:129
+#: code:addons/fieldservice_sale/models/sale_order.py:130
 #, python-format
 msgid "FSM Location must be set"
 msgstr ""
@@ -87,7 +87,7 @@ msgid "Field Service Order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:88
+#: code:addons/fieldservice_sale/models/sale_order_line.py:87
 #, python-format
 msgid "Field Service Order Created (%s): <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
@@ -95,7 +95,7 @@ msgid "Field Service Order Created (%s): <a href=\n"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:85
+#: code:addons/fieldservice_sale/models/sale_order.py:86
 #, python-format
 msgid "Field Service Order Created: <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
@@ -193,7 +193,7 @@ msgid "Sales Order Line"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/fsm_order.py:22
+#: code:addons/fieldservice_sale/models/fsm_order.py:21
 #, python-format
 msgid "Sales Orders"
 msgstr ""
@@ -220,7 +220,7 @@ msgid "Stock Moves"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:91
+#: code:addons/fieldservice_sale/models/sale_order.py:92
 #, python-format
 msgid "This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
@@ -228,7 +228,7 @@ msgid "This order has been created from: <a href=\n"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:94
+#: code:addons/fieldservice_sale/models/sale_order_line.py:93
 #, python-format
 msgid "This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
diff --git a/fieldservice_sale/i18n/pt_BR.po b/fieldservice_sale/i18n/pt_BR.po
new file mode 100644
index 0000000000..7f37895872
--- /dev/null
+++ b/fieldservice_sale/i18n/pt_BR.po
@@ -0,0 +1,253 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
+msgid "<span class=\"o_stat_text\">Sale Order</span>"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid "According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+"  - Manual: the quantity is set manually on the line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+"  - Stock Moves: the quantity comes from confirmed pickings\n"
+""
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Analytic From Expenses"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create a recurring order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create one FSM order per sale order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Create one FSM order per sale order line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
+msgid "Determines what happens upon sale order confirmation:\n"
+"                - None: nothing additional, default behavior.\n"
+"                - Per Sale Order: One FSM Order will be created for the sale.\n"
+"                - Per Sale Order Line: One FSM Order for each sale order line\n"
+"                will be created."
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,field_service_tracking:0
+msgid "Don't create FSM order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:130
+#, python-format
+msgid "FSM Location must be set"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
+msgid "FSM Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_order
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:87
+#, python-format
+msgid "Field Service Order Created (%s): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:86
+#, python-format
+msgid "Field Service Order Created: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Field Service Order generated by the sales order item"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Field Service Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__field_service_tracking
+msgid "Field Service Tracking"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_ids
+msgid "Field Service orders associated to this sale"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Manually set quantities on order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
+msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid "Method to update delivered qty"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "SO Lines generating a FSM order will be for this location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
+msgid "Sale"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
+msgid "Sale Line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sale Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
+msgid "Sales"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/fsm_order.py:21
+#, python-format
+msgid "Sales Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
+msgid "Sales Territory"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Select the field service order template to be created"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "Service Location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:92
+#, python-format
+msgid "This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:93
+#, python-format
+msgid "This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Timesheets"
+msgstr ""
+
+#. module: fieldservice_sale
+#: selection:product.template,service_type:0
+msgid "Timesheets on project (one fare per SO/Project)"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
+msgid "Track Service"
+msgstr ""
diff --git a/fieldservice_sale/models/fsm_order.py b/fieldservice_sale/models/fsm_order.py
index ccc92ec631..642f1667df 100644
--- a/fieldservice_sale/models/fsm_order.py
+++ b/fieldservice_sale/models/fsm_order.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2019 Brian McMaster
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import api, fields, models, _
+from odoo import fields, models, _
 
 
 class FSMOrder(models.Model):

From 9dfe7abd80f1bb43deef33efee45175bd1ec00e0 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Thu, 16 Jan 2020 17:40:44 -0500
Subject: [PATCH 38/77] [FIX] fieldservice_sale

---
 fieldservice_sale/__manifest__.py            |  2 +-
 fieldservice_sale/i18n/de.po                 |  2 +-
 fieldservice_sale/i18n/es.po                 |  2 +-
 fieldservice_sale/i18n/es_CL.po              |  2 +-
 fieldservice_sale/i18n/fieldservice_sale.pot |  2 +-
 fieldservice_sale/i18n/pt_BR.po              | 46 +++++++++++++-------
 fieldservice_sale/models/sale_order.py       |  4 +-
 fieldservice_sale/models/sale_order_line.py  | 13 ++----
 8 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index fee44c2c45..2169ea49b6 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sales',
-    'version': '12.0.2.2.0',
+    'version': '12.0.2.2.1',
     'summary': 'Sell field services.',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale/i18n/de.po b/fieldservice_sale/i18n/de.po
index 7e10b7b3fc..ca57e195a8 100644
--- a/fieldservice_sale/i18n/de.po
+++ b/fieldservice_sale/i18n/de.po
@@ -77,7 +77,7 @@ msgid "Don't create FSM order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:130
+#: code:addons/fieldservice_sale/models/sale_order.py:131
 #, python-format
 msgid "FSM Location must be set"
 msgstr ""
diff --git a/fieldservice_sale/i18n/es.po b/fieldservice_sale/i18n/es.po
index b55b6a19ce..3a96d1b97b 100644
--- a/fieldservice_sale/i18n/es.po
+++ b/fieldservice_sale/i18n/es.po
@@ -90,7 +90,7 @@ msgid "Don't create FSM order"
 msgstr "No cree un pedido FSM"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:130
+#: code:addons/fieldservice_sale/models/sale_order.py:131
 #, python-format
 msgid "FSM Location must be set"
 msgstr ""
diff --git a/fieldservice_sale/i18n/es_CL.po b/fieldservice_sale/i18n/es_CL.po
index b910b00247..70c8b25a47 100644
--- a/fieldservice_sale/i18n/es_CL.po
+++ b/fieldservice_sale/i18n/es_CL.po
@@ -90,7 +90,7 @@ msgid "Don't create FSM order"
 msgstr "No cree un pedido FSM"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:130
+#: code:addons/fieldservice_sale/models/sale_order.py:131
 #, python-format
 msgid "FSM Location must be set"
 msgstr ""
diff --git a/fieldservice_sale/i18n/fieldservice_sale.pot b/fieldservice_sale/i18n/fieldservice_sale.pot
index 60e9cf74a7..67f9f8a4e6 100644
--- a/fieldservice_sale/i18n/fieldservice_sale.pot
+++ b/fieldservice_sale/i18n/fieldservice_sale.pot
@@ -64,7 +64,7 @@ msgid "Don't create FSM order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:130
+#: code:addons/fieldservice_sale/models/sale_order.py:131
 #, python-format
 msgid "FSM Location must be set"
 msgstr ""
diff --git a/fieldservice_sale/i18n/pt_BR.po b/fieldservice_sale/i18n/pt_BR.po
index 7f37895872..f1c1df2748 100644
--- a/fieldservice_sale/i18n/pt_BR.po
+++ b/fieldservice_sale/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_sale
+# 	* fieldservice_sale
 #
 msgid ""
 msgstr ""
@@ -21,12 +21,15 @@ msgstr ""
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
-msgid "According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+msgid ""
+"According to product configuration, the delivered quantity can be "
+"automatically computed by mechanism :\n"
 "  - Manual: the quantity is set manually on the line\n"
-"  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
-"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted "
+"expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to "
+"this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
-""
 msgstr ""
 
 #. module: fieldservice_sale
@@ -52,10 +55,13 @@ msgstr ""
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
-msgid "Determines what happens upon sale order confirmation:\n"
+msgid ""
+"Determines what happens upon sale order confirmation:\n"
 "                - None: nothing additional, default behavior.\n"
-"                - Per Sale Order: One FSM Order will be created for the sale.\n"
-"                - Per Sale Order Line: One FSM Order for each sale order line\n"
+"                - Per Sale Order: One FSM Order will be created for the "
+"sale.\n"
+"                - Per Sale Order Line: One FSM Order for each sale order "
+"line\n"
 "                will be created."
 msgstr ""
 
@@ -65,7 +71,7 @@ msgid "Don't create FSM order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:130
+#: code:addons/fieldservice_sale/models/sale_order.py:131
 #, python-format
 msgid "FSM Location must be set"
 msgstr ""
@@ -90,7 +96,8 @@ msgstr ""
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:87
 #, python-format
-msgid "Field Service Order Created (%s): <a href=\n"
+msgid ""
+"Field Service Order Created (%s): <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
@@ -98,7 +105,8 @@ msgstr ""
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:86
 #, python-format
-msgid "Field Service Order Created: <a href=\n"
+msgid ""
+"Field Service Order Created: <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
@@ -143,9 +151,13 @@ msgstr ""
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
-msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
-"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
-"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+msgid ""
+"Manually set quantities on order: Invoice based on the manually entered "
+"quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related "
+"timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation "
+"and track the work hours."
 msgstr ""
 
 #. module: fieldservice_sale
@@ -223,7 +235,8 @@ msgstr ""
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:92
 #, python-format
-msgid "This order has been created from: <a href=\n"
+msgid ""
+"This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
@@ -231,7 +244,8 @@ msgstr ""
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:93
 #, python-format
-msgid "This order has been created from: <a href=\n"
+msgid ""
+"This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
 "                "
 msgstr ""
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 613ec43cd9..5c889540df 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -121,7 +121,9 @@ def _field_find_fsm_order(self):
             :rtype dict
         """
         # one search for all Sale Orders
-        fsm_orders = self.env["fsm.order"].search([("sale_id", "in", self.ids)])
+        fsm_orders = self.env["fsm.order"].search(
+            [("sale_id", "in", self.ids), ("sale_line_id", "=", False)]
+        )
         fsm_order_mapping = {
             fsm_order.sale_id.id: fsm_order for fsm_order in fsm_orders
         }
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 826a666b61..259538b7cb 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -129,17 +129,12 @@ def _field_service_generation(self):
             exists, it simply links the existing one to the line.
         """
         for rec in self:
-            if any(sol.product_id.field_service_tracking == 'sale'
-                   for sol in rec):
+            if rec.product_id.field_service_tracking == 'sale':
                 sale = rec.order_id
                 so_fo_mapping = sale._field_find_fsm_order()
-                for so_line in rec.filtered(
-                        lambda sol:
-                        sol.product_id.field_service_tracking == 'sale'):
-                    so_line.fsm_order_id = so_fo_mapping[so_line.order_id.id].id
-            for so_line in rec.filtered(
-                    lambda sol: sol.product_id.field_service_tracking == 'line'):
-                so_line._field_find_fsm_order()
+                rec.fsm_order_id = so_fo_mapping[rec.order_id.id].id
+            if rec.product_id.field_service_tracking == 'line':
+                rec._field_find_fsm_order()
 
     @api.multi
     def _prepare_invoice_line(self, qty):

From 826c4913e08042dbb8de6b9ce3c93edef4433806 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 20 Jan 2020 15:31:47 -0500
Subject: [PATCH 39/77] [FIX] fieldservice_sale

---
 fieldservice_sale/models/sale_order.py      | 8 ++++----
 fieldservice_sale/models/sale_order_line.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 5c889540df..849bd23aad 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -176,9 +176,8 @@ def action_invoice_create(self, grouped=False, final=False):
                         inv = invoice.copy()
                         inv.write({"invoice_line_ids": [(6, 0, [])]})
                         lines_by_line[i].invoice_id = inv.id
+                        result.append(inv.id)
                     inv.fsm_order_ids = [(4, lines_by_line[i].fsm_order_id.id)]
-                    result.append(inv.id)
-
             # check for invoice lines with product
             # field_service_tracking = sale
             lines_by_sale = self.env["account.invoice.line"].search(
@@ -188,14 +187,15 @@ def action_invoice_create(self, grouped=False, final=False):
                 ]
             )
             if len(lines_by_sale) > 0:
-                fsm_order = self.env["fsm.order"].search([("sale_id", "=", self.id)])
+                fsm_order = self.env["fsm.order"].search(
+                    [("sale_id", "=", self.id), ("sale_line_id", "=", False)]
+                )
                 if len(lines_by_sale) == len(invoice.invoice_line_ids):
                     invoice.fsm_order_ids = [(4, fsm_order.id)]
                 elif len(invoice.invoice_line_ids) > len(lines_by_sale):
                     new = invoice.copy()
                     new.write({"invoice_line_ids": [(6, 0, [])]})
                     lines_by_sale.invoice_id = new.id
-                    new.fsm_order_id = fsm_order.id
                     result.append(new.id)
         return result
 
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 259538b7cb..2d7f91e0f0 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -26,8 +26,8 @@ def _compute_product_updatable(self):
     def _compute_qty_delivered_method(self):
         super(SaleOrderLine, self)._compute_qty_delivered_method()
         for line in self:
-            if not line.is_expense and line.product_id.type == 'service' \
-               and line.product_id.field_service_tracking == 'sale':
+            if not line.is_expense and \
+               line.product_id.field_service_tracking == 'line':
                 line.qty_delivered_method = 'field_service'
 
     @api.multi

From ff321f6145cc0588b28771337113980e3403393e Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 20 Jan 2020 15:43:21 -0500
Subject: [PATCH 40/77] [IMP] fieldservice_sale: Add test case

Tests multiple scenarios of selling products with field service tracking options
---
 fieldservice_sale/__manifest__.py             |   2 +-
 fieldservice_sale/i18n/pt_BR.po               |  66 +--
 fieldservice_sale/tests/__init__.py           |   7 +-
 .../tests/test_fsm_sale_common.py             |  97 +++++
 .../tests/test_fsm_sale_order.py              | 386 ++++++++++++++++++
 5 files changed, 524 insertions(+), 34 deletions(-)
 create mode 100644 fieldservice_sale/tests/test_fsm_sale_common.py
 create mode 100644 fieldservice_sale/tests/test_fsm_sale_order.py

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 2169ea49b6..b17c1a5b7c 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sales',
-    'version': '12.0.2.2.1',
+    'version': '12.0.2.3.0',
     'summary': 'Sell field services.',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale/i18n/pt_BR.po b/fieldservice_sale/i18n/pt_BR.po
index f1c1df2748..1aa6ea2123 100644
--- a/fieldservice_sale/i18n/pt_BR.po
+++ b/fieldservice_sale/i18n/pt_BR.po
@@ -6,18 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2020-02-05 22:13+0000\n"
+"Last-Translator: Marcel Savegnago <marcel.savegnago@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.10\n"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
 msgid "<span class=\"o_stat_text\">Sale Order</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\">Ordem de Venda</span>"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
@@ -40,17 +42,17 @@ msgstr ""
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
 msgid "Create a recurring order"
-msgstr ""
+msgstr "Crie uma ordem recorrente"
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
 msgid "Create one FSM order per sale order"
-msgstr ""
+msgstr "Crie um pedido FSM por ordem de venda"
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
 msgid "Create one FSM order per sale order line"
-msgstr ""
+msgstr "Crie um pedido FSM por linha de pedido de venda"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
@@ -68,30 +70,30 @@ msgstr ""
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
 msgid "Don't create FSM order"
-msgstr ""
+msgstr "N??o crie ordem FSM"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:131
 #, python-format
 msgid "FSM Location must be set"
-msgstr ""
+msgstr "Localiza????o do FSM deve ser definida"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
 msgid "FSM Orders"
-msgstr ""
+msgstr "Ordens FSM"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_location
 msgid "Field Service Location"
-msgstr ""
+msgstr "Localiza????o do Servi??o de Campo"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_order
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Field Service Order"
-msgstr ""
+msgstr "Ordem de Servi??o de Campo"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:87
@@ -115,38 +117,38 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
 msgid "Field Service Order Template"
-msgstr ""
+msgstr "Modelo de Ordem de Servi??o de Campo"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Field Service Order generated by the sales order item"
-msgstr ""
+msgstr "Ordem de Servi??o de Campo gerada pelo item de ordem de vendas"
 
 #. module: fieldservice_sale
 #: selection:product.template,service_type:0
 msgid "Field Service Orders"
-msgstr ""
+msgstr "Ordens de Servi??o de Campo"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__field_service_tracking
 msgid "Field Service Tracking"
-msgstr ""
+msgstr "Rastreamento de Servi??os de Campo"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_ids
 msgid "Field Service orders associated to this sale"
-msgstr ""
+msgstr "Ordens de Servi??o de Campo associadas a esta venda"
 
 #. module: fieldservice_sale
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Manual"
-msgstr ""
+msgstr "Manual"
 
 #. module: fieldservice_sale
 #: selection:product.template,service_type:0
 msgid "Manually set quantities on order"
-msgstr ""
+msgstr "Definir manualmente quantidades em ordem"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
@@ -163,17 +165,17 @@ msgstr ""
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
 msgid "Method to update delivered qty"
-msgstr ""
+msgstr "M??todo para atualizar qtd. entregue"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Order"
-msgstr ""
+msgstr "Ordem"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Template de Produto"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
@@ -183,54 +185,54 @@ msgstr ""
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
 msgid "Sale"
-msgstr ""
+msgstr "Venda"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
 msgid "Sale Line"
-msgstr ""
+msgstr "Linha de Venda"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Ordem de Venda"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
 msgid "Sales"
-msgstr ""
+msgstr "Vendas"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Linha de Ordens de Venda"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/fsm_order.py:21
 #, python-format
 msgid "Sales Orders"
-msgstr ""
+msgstr "Ordens de Vendas"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
 msgid "Sales Territory"
-msgstr ""
+msgstr "Territ??rio de Vendas"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
 msgid "Select the field service order template to be created"
-msgstr ""
+msgstr "Selecione o modelo de ordem de servi??o de campo a ser criado"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "Service Location"
-msgstr ""
+msgstr "Local do Servi??o"
 
 #. module: fieldservice_sale
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Movimentos de Estoque"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:92
@@ -253,12 +255,12 @@ msgstr ""
 #. module: fieldservice_sale
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Planilha de Hor??rios"
 
 #. module: fieldservice_sale
 #: selection:product.template,service_type:0
 msgid "Timesheets on project (one fare per SO/Project)"
-msgstr ""
+msgstr "Planilhas de tempo no projeto (uma tarifa por OS/Projeto)"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
diff --git a/fieldservice_sale/tests/__init__.py b/fieldservice_sale/tests/__init__.py
index ec7c49d603..b37075e37e 100644
--- a/fieldservice_sale/tests/__init__.py
+++ b/fieldservice_sale/tests/__init__.py
@@ -1,4 +1,9 @@
 # Copyright (C) 2019 Cl??ment Mombereau (Akretion)
+# Copyright (C) 2020 Brian McMaster <brian@mcmpest.com>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 
-from . import test_fsm_sale_onchange_partner
+from . import (
+    test_fsm_sale_onchange_partner,
+    test_fsm_sale_common,
+    test_fsm_sale_order,
+)
diff --git a/fieldservice_sale/tests/test_fsm_sale_common.py b/fieldservice_sale/tests/test_fsm_sale_common.py
new file mode 100644
index 0000000000..1b8a70c11f
--- /dev/null
+++ b/fieldservice_sale/tests/test_fsm_sale_common.py
@@ -0,0 +1,97 @@
+# Copyright (C) 2019 Brian McMaster <brian@mcmpest.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.addons.sale.tests.test_sale_common import TestCommonSaleNoChart
+
+
+class TestFSMSale(TestCommonSaleNoChart):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestFSMSale, cls).setUpClass()
+
+    @classmethod
+    def setUpFSMTemplates(cls):
+        # Create some templates to use on the FSM products
+        FSMTemplate = cls.env['fsm.template']
+
+        # Template 1
+        cls.fsm_template_1 = FSMTemplate.create({
+            'name': 'Test FSM Template #1',
+            'instructions': 'These are the instructions for Template #1',
+            'hours': 2.25,
+        })
+        # Template 2
+        cls.fsm_template_2 = FSMTemplate.create({
+            'name': 'Test FSM Template #2',
+            'instructions': 'Template #2 requires a lot of work',
+            'hours': 4.5,
+        })
+        # Template 3
+        cls.fsm_template_3 = FSMTemplate.create({
+            'name': 'Test FSM Template #3',
+            'instructions': 'Complete the steps outlined for Template #3',
+            'hours': 0.75,
+        })
+        # Template 4
+        cls.fsm_template_4 = FSMTemplate.create({
+            'name': 'Test FSM Template #4',
+            'instructions': 'These notes apply to Template #4',
+            'hours': 0.75,
+        })
+
+    @classmethod
+    def setUpFSMProducts(cls):
+        cls.setUpFSMTemplates()
+        # Product 1 that creates one FSM Order per SO
+        cls.fsm_per_order_1 = cls.env['product.product'].create({
+            'name': 'FSM Order per Sale Order #1',
+            'categ_id': cls.env.ref('product.product_category_3').id,
+            'standard_price': 85.0,
+            'list_price': 90.0,
+            'type': 'service',
+            'uom_id': cls.env.ref('uom.product_uom_unit').id,
+            'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
+            'invoice_policy': 'order',
+            'field_service_tracking': 'sale',
+            'fsm_order_template_id': cls.fsm_template_1.id,
+        })
+        # Product 2 that creates one FSM Order per SO
+        cls.fsm_per_order_2 = cls.env['product.product'].create({
+            'name': 'FSM Order per Sale Order #2',
+            'categ_id': cls.env.ref('product.product_category_3').id,
+            'standard_price': 125.0,
+            'list_price': 140.0,
+            'type': 'service',
+            'uom_id': cls.env.ref('uom.product_uom_unit').id,
+            'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
+            'invoice_policy': 'order',
+            'field_service_tracking': 'sale',
+            'fsm_order_template_id': cls.fsm_template_2.id,
+        })
+        # Product 1 that creates one FSM Order per SO Line
+        cls.fsm_per_line_1 = cls.env['product.product'].create({
+            'name': 'FSM Order per SO Line #1',
+            'categ_id': cls.env.ref('product.product_category_3').id,
+            'standard_price': 75.0,
+            'list_price': 80.0,
+            'type': 'service',
+            'uom_id': cls.env.ref('uom.product_uom_unit').id,
+            'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
+            'invoice_policy': 'delivery',
+            'field_service_tracking': 'line',
+            'fsm_order_template_id': cls.fsm_template_3.id,
+        })
+        # Product 2 that creates one FSM Order per SO Line
+        cls.fsm_per_line_2 = cls.env['product.product'].create({
+            'name': 'FSM Order per SO Line #2',
+            'categ_id': cls.env.ref('product.product_category_3').id,
+            'standard_price': 75.0,
+            'list_price': 80.0,
+            'type': 'service',
+            'uom_id': cls.env.ref('uom.product_uom_unit').id,
+            'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
+            'invoice_policy': 'delivery',
+            'field_service_tracking': 'line',
+            'fsm_order_template_id': cls.fsm_template_4.id,
+        })
diff --git a/fieldservice_sale/tests/test_fsm_sale_order.py b/fieldservice_sale/tests/test_fsm_sale_order.py
new file mode 100644
index 0000000000..39c2f63485
--- /dev/null
+++ b/fieldservice_sale/tests/test_fsm_sale_order.py
@@ -0,0 +1,386 @@
+# Copyright (C) 2019 Brian McMaster <brian@mcmpest.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields
+from .test_fsm_sale_common import TestFSMSale
+
+
+class TestFSMSaleOrder(TestFSMSale):
+    @classmethod
+    def setUpClass(cls):
+        super(TestFSMSaleOrder, cls).setUpClass()
+        cls.test_location = cls.env.ref('fieldservice.test_location')
+
+        # Setup products that when sold will create some FSM orders
+        cls.setUpFSMProducts()
+
+        # Create some sale orders that will use the above products
+        SaleOrder = cls.env['sale.order'].with_context(tracking_disable=True)
+        # create a generic Sale Order with one product
+        # set to create FSM service per sale order
+        cls.sale_order_1 = SaleOrder.create({
+            'partner_id': cls.partner_customer_usd.id,
+            'fsm_location_id': cls.test_location.id,
+            'pricelist_id': cls.pricelist_usd.id,
+        })
+        cls.sol_service_per_order_1 = cls.env['sale.order.line'].create({
+            'name': cls.fsm_per_order_1.name,
+            'product_id': cls.fsm_per_order_1.id,
+            'product_uom_qty': 1,
+            'product_uom': cls.fsm_per_order_1.uom_id.id,
+            'price_unit': cls.fsm_per_order_1.list_price,
+            'order_id': cls.sale_order_1.id,
+            'tax_id': False,
+        })
+        # create a generic Sale Order with one product
+        # set to create FSM service per sale order line
+        cls.sale_order_2 = SaleOrder.create({
+            'partner_id': cls.partner_customer_usd.id,
+            'fsm_location_id': cls.test_location.id,
+            'pricelist_id': cls.pricelist_usd.id,
+        })
+        cls.sol_service_per_line_1 = cls.env['sale.order.line'].create({
+            'name': cls.fsm_per_line_1.name,
+            'product_id': cls.fsm_per_line_1.id,
+            'product_uom_qty': 1,
+            'product_uom': cls.fsm_per_line_1.uom_id.id,
+            'price_unit': cls.fsm_per_line_1.list_price,
+            'order_id': cls.sale_order_2.id,
+            'tax_id': False,
+        })
+        # create a generic Sale Order with multiple products
+        # set to create FSM service per sale order line
+        cls.sale_order_3 = SaleOrder.create({
+            'partner_id': cls.partner_customer_usd.id,
+            'fsm_location_id': cls.test_location.id,
+            'pricelist_id': cls.pricelist_usd.id,
+        })
+        cls.sol_service_per_line_2 = cls.env['sale.order.line'].create({
+            'name': cls.fsm_per_line_1.name,
+            'product_id': cls.fsm_per_line_1.id,
+            'product_uom_qty': 1,
+            'product_uom': cls.fsm_per_line_1.uom_id.id,
+            'price_unit': cls.fsm_per_line_1.list_price,
+            'order_id': cls.sale_order_3.id,
+            'tax_id': False,
+        })
+        cls.sol_service_per_line_3 = cls.env['sale.order.line'].create({
+            'name': cls.fsm_per_line_2.name,
+            'product_id': cls.fsm_per_line_2.id,
+            'product_uom_qty': 1,
+            'product_uom': cls.fsm_per_line_2.uom_id.id,
+            'price_unit': cls.fsm_per_line_2.list_price,
+            'order_id': cls.sale_order_3.id,
+            'tax_id': False,
+        })
+        # create a generic Sale Order with mixed products
+        # 2 lines based on service per sale order line
+        # 2 lines based on service per sale order
+        cls.sale_order_4 = SaleOrder.create({
+            'partner_id': cls.partner_customer_usd.id,
+            'fsm_location_id': cls.test_location.id,
+            'pricelist_id': cls.pricelist_usd.id,
+        })
+        cls.sol_service_per_line_4 = cls.env['sale.order.line'].create({
+            'name': cls.fsm_per_line_1.name,
+            'product_id': cls.fsm_per_line_1.id,
+            'product_uom_qty': 1,
+            'product_uom': cls.fsm_per_line_1.uom_id.id,
+            'price_unit': cls.fsm_per_line_1.list_price,
+            'order_id': cls.sale_order_4.id,
+            'tax_id': False,
+        })
+        cls.sol_service_per_line_5 = cls.env['sale.order.line'].create({
+            'name': cls.fsm_per_line_2.name,
+            'product_id': cls.fsm_per_line_2.id,
+            'product_uom_qty': 1,
+            'product_uom': cls.fsm_per_line_2.uom_id.id,
+            'price_unit': cls.fsm_per_line_2.list_price,
+            'order_id': cls.sale_order_4.id,
+            'tax_id': False,
+        })
+        cls.sol_service_per_order_2 = cls.env['sale.order.line'].create({
+            'name': cls.fsm_per_order_1.name,
+            'product_id': cls.fsm_per_order_1.id,
+            'product_uom_qty': 1,
+            'product_uom': cls.fsm_per_order_1.uom_id.id,
+            'price_unit': cls.fsm_per_order_1.list_price,
+            'order_id': cls.sale_order_4.id,
+            'tax_id': False,
+        })
+        cls.sol_service_per_order_3 = cls.env['sale.order.line'].create({
+            'name': cls.fsm_per_order_2.name,
+            'product_id': cls.fsm_per_order_2.id,
+            'product_uom_qty': 1,
+            'product_uom': cls.fsm_per_order_2.uom_id.id,
+            'price_unit': cls.fsm_per_order_2.list_price,
+            'order_id': cls.sale_order_4.id,
+            'tax_id': False,
+        })
+
+    def _isp_account_installed(self):
+        """ Checks if module is installed which will require more
+            logic for the tests.
+            :return Boolean indicating the installed status of the module
+        """
+        result = False
+        isp_account_module = self.env['ir.module.module'].search(
+            [('name', '=', 'fieldservice_isp_account')])
+        if isp_account_module and \
+           isp_account_module.state == 'installed':
+            result = True
+        return result
+
+    def _fulfill_order(self, order):
+        """ Extra logic required to fulfill FSM order status and prevent
+            validation error when attempting to complete the FSM order
+            :return FSM Order with additional fields set
+        """
+        analytic_account = self.env.ref('analytic.analytic_administratif')
+        self.test_location.analytic_account_id = analytic_account.id
+        timesheet = self.env['account.analytic.line'].create({
+            'name': 'timesheet_line',
+            'unit_amount': 1,
+            'account_id': analytic_account.id,
+            'user_id': self.env.ref('base.partner_admin').id,
+            'product_id': self.env.ref(
+                'fieldservice_isp_account.field_service_regular_time').id,
+        })
+        order.write({
+            'employee_timesheet_ids': [(6, 0, timesheet.ids)],
+        })
+        return order
+
+    def test_sale_order_1(self):
+        """ Test the sales order 1 flow from sale to invoice.
+            - One FSM order linked to the Sale Order should be created.
+            - One Invoice linked to the FSM Order should be created.
+        """
+        # Confirm the sale order
+        self.sale_order_1.action_confirm()
+        # 1 FSM order created
+        self.assertEqual(
+            len(self.sale_order_1.fsm_order_ids.ids), 1,
+            'FSM Sale: Sale Order 1 should create 1 FSM Order')
+        FSM_Order = self.env['fsm.order']
+        fsm_order = FSM_Order.search(
+            [('id', '=', self.sale_order_1.fsm_order_ids[0].id)])
+        # Sale Order linked to FSM order
+        self.assertEqual(
+            len(fsm_order.ids), 1,
+            'FSM Sale: Sale Order not linked to FSM Order')
+
+        # Complete the FSM order
+        if self._isp_account_installed():
+            fsm_order = self._fulfill_order(fsm_order)
+        fsm_order.write({
+            'date_end': fields.Datetime.today(),
+            'resolution': 'Work completed',
+        })
+        fsm_order.action_complete()
+
+        # Invoice the order
+        Invoice = self.env['account.invoice']
+        inv_id = self.sale_order_1.action_invoice_create()
+        invoice = Invoice.browse(inv_id)
+        # 1 invoices created
+        self.assertEqual(
+            len(invoice.ids), 1,
+            'FSM Sale: Sale Order 1 should create 1 invoice')
+        self.assertTrue(
+            fsm_order in invoice.fsm_order_ids,
+            'FSM Sale: Invoice should be linked to FSM Order')
+
+    def test_sale_order_2(self):
+        """ Test the sales order 2 flow from sale to invoice.
+            - One FSM order linked to the Sale Order Line should be created.
+            - The FSM Order should update qty_delivered when completed.
+            - One Invoice linked to the FSM Order should be created.
+        """
+        sol = self.sol_service_per_line_1
+        # Confirm the sale order
+        self.sale_order_2.action_confirm()
+        # 1 order created
+        self.assertEqual(
+            len(self.sale_order_2.fsm_order_ids.ids), 1,
+            'FSM Sale: Sale Order 2 should create 1 FSM Order')
+        FSM_Order = self.env['fsm.order']
+        fsm_order = FSM_Order.search(
+            [('id', '=', sol.fsm_order_id.id)])
+        # SOL linked to FSM order
+        self.assertTrue(
+            sol.fsm_order_id.id == fsm_order.id,
+            'FSM Sale: Sale Order 2 Line not linked to FSM Order')
+
+        # Complete the FSM order
+        if self._isp_account_installed():
+            fsm_order = self._fulfill_order(fsm_order)
+        fsm_order.write({
+            'date_end': fields.Datetime.today(),
+            'resolution': 'Work completed',
+        })
+        fsm_order.action_complete()
+        # qty delivered should be updated
+        self.assertTrue(
+            sol.qty_delivered == sol.product_uom_qty,
+            'FSM Sale: Sale Order Line qty delivered not equal to qty ordered'
+        )
+
+        # Invoice the order
+        Invoice = self.env['account.invoice']
+        inv_id = self.sale_order_2.action_invoice_create()
+        invoice = Invoice.browse(inv_id)
+        # 1 invoice created
+        self.assertEqual(
+            len(invoice.ids), 1,
+            'FSM Sale: Sale Order 2 should create 1 invoice')
+        self.assertTrue(
+            fsm_order in invoice.fsm_order_ids,
+            'FSM Sale: Invoice should be linked to FSM Order')
+
+    def test_sale_order_3(self):
+        """ Test sale order 3 flow from sale to invoice.
+            - An FSM order should be created for each Sale Order Line.
+            - The FSM Order should update qty_delivered when completed.
+            - An Invoice linked to each FSM Order should be created.
+        """
+        sol1 = self.sol_service_per_line_2
+        sol2 = self.sol_service_per_line_3
+
+        # Confirm the sale order
+        self.sale_order_3.action_confirm()
+        # 2 orders created and SOLs linked to FSM orders
+        self.assertEqual(
+            len(self.sale_order_3.fsm_order_ids.ids), 2,
+            'FSM Sale: Sale Order 3 should create 2 FSM Orders')
+        FSM_Order = self.env['fsm.order']
+        fsm_order_1 = FSM_Order.search([('id', '=', sol1.fsm_order_id.id)])
+        self.assertTrue(
+            sol1.fsm_order_id.id == fsm_order_1.id,
+            'FSM Sale: Sale Order Line 2 not linked to FSM Order')
+        fsm_order_2 = FSM_Order.search([('id', '=', sol2.fsm_order_id.id)])
+        self.assertTrue(
+            sol2.fsm_order_id.id == fsm_order_2.id,
+            'FSM Sale: Sale Order Line 3 not linked to FSM Order')
+
+        # Complete the FSM orders
+        if self._isp_account_installed():
+            fsm_order_1 = self._fulfill_order(fsm_order_1)
+        fsm_order_1.write({
+            'date_end': fields.Datetime.today(),
+            'resolution': 'Work completed',
+        })
+        fsm_order_1.action_complete()
+        self.assertTrue(
+            sol1.qty_delivered == sol1.product_uom_qty,
+            'FSM Sale: Sale Order Line qty delivered not equal to qty ordered'
+        )
+        if self._isp_account_installed():
+            fsm_order_2 = self._fulfill_order(fsm_order_2)
+        fsm_order_2.write({
+            'date_end': fields.Datetime.today(),
+            'resolution': 'Work completed',
+        })
+        fsm_order_2.action_complete()
+        self.assertTrue(
+            sol2.qty_delivered == sol2.product_uom_qty,
+            'FSM Sale: Sale Order Line qty delivered not equal to qty ordered'
+        )
+
+        # Invoice the sale order
+        Invoice = self.env['account.invoice']
+        inv_id = self.sale_order_3.action_invoice_create()
+        invoices = Invoice.browse(inv_id)
+        # 2 invoices created
+        self.assertEqual(
+            len(invoices.ids), 2,
+            'FSM Sale: Sale Order 3 should create 2 invoices')
+        inv_fsm_orders = FSM_Order
+        for inv in invoices:
+            inv_fsm_orders |= inv.fsm_order_ids
+        self.assertTrue(
+            fsm_order_1 in inv_fsm_orders,
+            'FSM Sale: FSM Order 1 should be linked to invoice')
+        self.assertTrue(
+            fsm_order_2 in inv_fsm_orders,
+            'FSM Sale: FSM Order 2 should be linked to invoice')
+
+    def test_sale_order_4(self):
+        """ Test sale order 4 flow from sale to invoice.
+            - Two FSM orders linked to the Sale Order Lines should be created.
+            - One FSM order linked to the Sale Order should be created.
+            - Three Invoices should be created (One for each FSM Order).
+        """
+        sol1 = self.sol_service_per_line_4
+        sol2 = self.sol_service_per_line_5
+        # sol3 = self.sol_service_per_order_2
+        # sol4 = self.sol_service_per_order_3
+
+        # Confirm the sale order
+        self.sale_order_4.action_confirm()
+        # 3 orders created
+        self.assertEqual(
+            len(self.sale_order_4.fsm_order_ids.ids), 3,
+            'FSM Sale: Sale Order 4 should create 3 FSM Orders')
+        FSM_Order = self.env['fsm.order']
+        fsm_order_1 = FSM_Order.search([('id', '=', sol1.fsm_order_id.id)])
+        self.assertTrue(
+            sol1.fsm_order_id.id == fsm_order_1.id,
+            'FSM Sale: Sale Order Line not linked to FSM Order')
+        fsm_order_2 = FSM_Order.search([('id', '=', sol2.fsm_order_id.id)])
+        self.assertTrue(
+            sol2.fsm_order_id.id == fsm_order_2.id,
+            'FSM Sale: Sale Order Line not linked to FSM Order')
+        fsm_order_3 = FSM_Order.search([
+            ('id', 'in', self.sale_order_4.fsm_order_ids.ids),
+            ('sale_line_id', '=', False)])
+        self.assertEqual(
+            len(fsm_order_3.ids), 1,
+            'FSM Sale: FSM Order not linked to Sale Order')
+
+        # Complete the FSM order
+        if self._isp_account_installed():
+            fsm_order_1 = self._fulfill_order(fsm_order_1)
+        fsm_order_1.write({
+            'date_end': fields.Datetime.today(),
+            'resolution': 'Work completed',
+        })
+        fsm_order_1.action_complete()
+        self.assertTrue(
+            sol1.qty_delivered == sol1.product_uom_qty,
+            'FSM Sale: Sale Order Line qty delivered not equal to qty ordered'
+        )
+        if self._isp_account_installed():
+            fsm_order_2 = self._fulfill_order(fsm_order_2)
+        fsm_order_2.write({
+            'date_end': fields.Datetime.today(),
+            'resolution': 'Work completed',
+        })
+        fsm_order_2.action_complete()
+        self.assertTrue(
+            sol2.qty_delivered == sol2.product_uom_qty,
+            'FSM Sale: Sale Order Line qty delivered not equal to qty ordered'
+        )
+        if self._isp_account_installed():
+            fsm_order_3 = self._fulfill_order(fsm_order_3)
+        fsm_order_3.write({
+            'date_end': fields.Datetime.today(),
+            'resolution': 'Work completed',
+        })
+        fsm_order_3.action_complete()
+        # qty_delivered does not update for FSM orders linked only to the sale
+
+        # Invoice the sale order
+        Invoice = self.env['account.invoice']
+        inv_id = self.sale_order_4.action_invoice_create()
+        invoices = Invoice.browse(inv_id)
+        # 3 invoices created
+        self.assertEqual(
+            len(invoices.ids), 3,
+            'FSM Sale: Sale Order 4 should create 3 invoices')
+        inv_fsm_orders = FSM_Order
+        for inv in invoices:
+            inv_fsm_orders |= inv.fsm_order_ids
+        self.assertEqual(
+            len(inv_fsm_orders.ids), 3,
+            'FSM Sale: There should be 3 orders for 3 invoices')

From 76cb741de042b0299ea9983393a0a6f7f0b098b4 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 24 Feb 2020 10:35:49 -0500
Subject: [PATCH 41/77] [FIX] fieldservice_sale

---
 fieldservice_sale/__manifest__.py      |  2 +-
 fieldservice_sale/i18n/es.po           | 12 +++++++++---
 fieldservice_sale/i18n/es_CL.po        | 14 ++++++++++----
 fieldservice_sale/i18n/pt_BR.po        | 14 +++++++-------
 fieldservice_sale/models/sale_order.py |  2 +-
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index b17c1a5b7c..69cd8226af 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sales',
-    'version': '12.0.2.3.0',
+    'version': '12.0.2.3.1',
     'summary': 'Sell field services.',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale/i18n/es.po b/fieldservice_sale/i18n/es.po
index 3a96d1b97b..cd8e94c7c3 100644
--- a/fieldservice_sale/i18n/es.po
+++ b/fieldservice_sale/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-12-10 21:04+0000\n"
+"PO-Revision-Date: 2020-03-04 00:13+0000\n"
 "Last-Translator: Nelson Ram??rez S??nchez <info@konos.cl>\n"
 "Language-Team: none\n"
 "Language: es\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.9.1\n"
+"X-Generator: Weblate 3.10\n"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
@@ -93,7 +93,7 @@ msgstr "No cree un pedido FSM"
 #: code:addons/fieldservice_sale/models/sale_order.py:131
 #, python-format
 msgid "FSM Location must be set"
-msgstr ""
+msgstr "Se debe establecer la ubicaci??n FSM"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
@@ -120,6 +120,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
+"Orden de Servicio de Campo Creada (%s): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:86
@@ -129,6 +132,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
+"Orden de Servicio de Campo Creada: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
diff --git a/fieldservice_sale/i18n/es_CL.po b/fieldservice_sale/i18n/es_CL.po
index 70c8b25a47..42473f4a28 100644
--- a/fieldservice_sale/i18n/es_CL.po
+++ b/fieldservice_sale/i18n/es_CL.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-12-10 21:04+0000\n"
+"PO-Revision-Date: 2020-03-25 17:13+0000\n"
 "Last-Translator: Nelson Ram??rez S??nchez <info@konos.cl>\n"
 "Language-Team: none\n"
 "Language: es_CL\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.9.1\n"
+"X-Generator: Weblate 3.10\n"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
@@ -93,7 +93,7 @@ msgstr "No cree un pedido FSM"
 #: code:addons/fieldservice_sale/models/sale_order.py:131
 #, python-format
 msgid "FSM Location must be set"
-msgstr ""
+msgstr "Se debe establecer la ubicaci??n FSM"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
@@ -120,6 +120,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
+"Orden de servicio de campo creada (%s): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:86
@@ -129,6 +132,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
+"Orden de servicio de campo creada: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
@@ -161,7 +167,7 @@ msgstr "Pedidos de servicio de campo asociados a esta venta"
 #. module: fieldservice_sale
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Manual"
-msgstr ""
+msgstr "Manual"
 
 #. module: fieldservice_sale
 #: selection:product.template,service_type:0
diff --git a/fieldservice_sale/i18n/pt_BR.po b/fieldservice_sale/i18n/pt_BR.po
index 1aa6ea2123..c1c1e9900b 100644
--- a/fieldservice_sale/i18n/pt_BR.po
+++ b/fieldservice_sale/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-02-05 22:13+0000\n"
+"PO-Revision-Date: 2020-02-25 09:13+0000\n"
 "Last-Translator: Marcel Savegnago <marcel.savegnago@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
@@ -19,7 +19,7 @@ msgstr ""
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
 msgid "<span class=\"o_stat_text\">Sale Order</span>"
-msgstr "<span class=\"o_stat_text\">Ordem de Venda</span>"
+msgstr "<span class=\"o_stat_text\">Pedido de Venda</span>"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
@@ -47,7 +47,7 @@ msgstr "Crie uma ordem recorrente"
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
 msgid "Create one FSM order per sale order"
-msgstr "Crie um pedido FSM por ordem de venda"
+msgstr "Crie um pedido FSM por pedido de venda"
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
@@ -122,7 +122,7 @@ msgstr "Modelo de Ordem de Servi??o de Campo"
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Field Service Order generated by the sales order item"
-msgstr "Ordem de Servi??o de Campo gerada pelo item de ordem de vendas"
+msgstr "Ordem de Servi??o de Campo gerada pelo item de pedido de vendas"
 
 #. module: fieldservice_sale
 #: selection:product.template,service_type:0
@@ -195,7 +195,7 @@ msgstr "Linha de Venda"
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order
 msgid "Sale Order"
-msgstr "Ordem de Venda"
+msgstr "Pedido de Venda"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
@@ -205,13 +205,13 @@ msgstr "Vendas"
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Linha de Ordens de Venda"
+msgstr "Linha de Pedidos de Venda"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/fsm_order.py:21
 #, python-format
 msgid "Sales Orders"
-msgstr "Ordens de Vendas"
+msgstr "Pedidos de Vendas"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 849bd23aad..6425df08f8 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -195,7 +195,7 @@ def action_invoice_create(self, grouped=False, final=False):
                 elif len(invoice.invoice_line_ids) > len(lines_by_sale):
                     new = invoice.copy()
                     new.write({"invoice_line_ids": [(6, 0, [])]})
-                    lines_by_sale.invoice_id = new.id
+                    lines_by_sale.write({"invoice_id": new.id})
                     result.append(new.id)
         return result
 

From 5f97b503e86e14ea61416bfc634a7ae87112fc6c Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 3 Apr 2020 17:40:32 -0600
Subject: [PATCH 42/77] [FIX] fieldservice_sale: Access rights

---
 fieldservice_sale/__manifest__.py              | 3 ++-
 fieldservice_sale/security/ir.model.access.csv | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_sale/security/ir.model.access.csv

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 69cd8226af..fcb15f8ada 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sales',
-    'version': '12.0.2.3.1',
+    'version': '12.0.2.4.0',
     'summary': 'Sell field services.',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
@@ -14,6 +14,7 @@
         'fieldservice_account',
     ],
     'data': [
+        'security/ir.model.access.csv',
         'views/fsm_location.xml',
         'views/fsm_order.xml',
         'views/product_template.xml',
diff --git a/fieldservice_sale/security/ir.model.access.csv b/fieldservice_sale/security/ir.model.access.csv
new file mode 100644
index 0000000000..595094f653
--- /dev/null
+++ b/fieldservice_sale/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sale_order_fsm_user,sale.order.fsm.user,model_sale_order,fieldservice.group_fsm_user,1,0,0,0

From ef269591ac810af6dfca308ca61760c0639865eb Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 12 May 2020 18:08:38 -0500
Subject: [PATCH 43/77] [FIX] fieldservice_sale

---
 fieldservice_sale/models/sale_order.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 6425df08f8..ebcbfa9ffd 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -175,6 +175,8 @@ def action_invoice_create(self, grouped=False, final=False):
                     if duplicate:
                         inv = invoice.copy()
                         inv.write({"invoice_line_ids": [(6, 0, [])]})
+                        inv.compute_taxes()
+                        invoice.compute_taxes()
                         lines_by_line[i].invoice_id = inv.id
                         result.append(inv.id)
                     inv.fsm_order_ids = [(4, lines_by_line[i].fsm_order_id.id)]
@@ -196,6 +198,8 @@ def action_invoice_create(self, grouped=False, final=False):
                     new = invoice.copy()
                     new.write({"invoice_line_ids": [(6, 0, [])]})
                     lines_by_sale.write({"invoice_id": new.id})
+                    new.compute_taxes()
+                    invoice.compute_taxes()
                     result.append(new.id)
         return result
 

From 8b2453b8d6d6c0e14deb19924a80aa60788bf0d6 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 13 May 2020 19:09:20 -0500
Subject: [PATCH 44/77] [IMP] fieldservice_sale: Pricelist on branch

---
 fieldservice_sale/README.rst                    |  4 ++--
 fieldservice_sale/__manifest__.py               |  4 ++--
 fieldservice_sale/i18n/de.po                    | 15 +++++++++++++++
 fieldservice_sale/i18n/es.po                    | 15 +++++++++++++++
 fieldservice_sale/i18n/es_CL.po                 | 15 +++++++++++++++
 fieldservice_sale/i18n/fieldservice_sale.pot    | 15 +++++++++++++++
 fieldservice_sale/i18n/pt_BR.po                 | 15 +++++++++++++++
 fieldservice_sale/models/__init__.py            |  1 +
 fieldservice_sale/models/fsm_branch.py          | 11 +++++++++++
 fieldservice_sale/readme/ROADMAP.rst            |  4 ++--
 fieldservice_sale/static/description/index.html |  6 ++++--
 fieldservice_sale/views/fsm_branch.xml          | 14 ++++++++++++++
 12 files changed, 111 insertions(+), 8 deletions(-)
 create mode 100644 fieldservice_sale/models/fsm_branch.py
 create mode 100644 fieldservice_sale/views/fsm_branch.xml

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index 650ae57b8b..5d2e317105 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -90,8 +90,8 @@ Usage
 Known issues / Roadmap
 ======================
 
-The roadmap of the Field Service application is documented on
-`Github <https://github.com/OCA/field-service/issues/1>`_.
+* Provide a mapping between an address and the branch and use it to set the
+  pricelist of a new partner
 
 Bug Tracker
 ===========
diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index fcb15f8ada..abf9efa481 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -1,9 +1,8 @@
 # Copyright (C) 2018 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 {
     'name': 'Field Service - Sales',
-    'version': '12.0.2.4.0',
+    'version': '12.0.2.5.0',
     'summary': 'Sell field services.',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
@@ -15,6 +14,7 @@
     ],
     'data': [
         'security/ir.model.access.csv',
+        'views/fsm_branch.xml',
         'views/fsm_location.xml',
         'views/fsm_order.xml',
         'views/product_template.xml',
diff --git a/fieldservice_sale/i18n/de.po b/fieldservice_sale/i18n/de.po
index ca57e195a8..d8eb8c7019 100644
--- a/fieldservice_sale/i18n/de.po
+++ b/fieldservice_sale/i18n/de.po
@@ -58,6 +58,16 @@ msgstr "Wiederkehrenden Auftrag erstellen"
 msgid "Create one FSM order per sale order line"
 msgstr ""
 
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
+msgid "Default Pricelist"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
+msgid "Default pricelist for new customers of this branch."
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
@@ -274,6 +284,11 @@ msgstr ""
 msgid "Track Service"
 msgstr ""
 
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_branch
+msgid "branch"
+msgstr ""
+
 #~ msgid "Create a single order"
 #~ msgstr "Auftrag erstellen"
 
diff --git a/fieldservice_sale/i18n/es.po b/fieldservice_sale/i18n/es.po
index cd8e94c7c3..7b070314a0 100644
--- a/fieldservice_sale/i18n/es.po
+++ b/fieldservice_sale/i18n/es.po
@@ -64,6 +64,16 @@ msgstr "Crear un pedido FSM por pedido de venta"
 msgid "Create one FSM order per sale order line"
 msgstr "Crear un pedido FSM por l??nea de pedido de venta"
 
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
+msgid "Default Pricelist"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
+msgid "Default pricelist for new customers of this branch."
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
@@ -305,6 +315,11 @@ msgstr "Hojas de tiempo en el proyecto (una tarifa por SO / Proyecto)"
 msgid "Track Service"
 msgstr "Servicio de Seguimiento"
 
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_branch
+msgid "branch"
+msgstr ""
+
 #~ msgid "Is a Field Service"
 #~ msgstr "Es un Servicio de Campo"
 
diff --git a/fieldservice_sale/i18n/es_CL.po b/fieldservice_sale/i18n/es_CL.po
index 42473f4a28..7ff9079d19 100644
--- a/fieldservice_sale/i18n/es_CL.po
+++ b/fieldservice_sale/i18n/es_CL.po
@@ -64,6 +64,16 @@ msgstr "Crear un pedido FSM por pedido de venta"
 msgid "Create one FSM order per sale order line"
 msgstr "Crear un pedido FSM por l??nea de pedido de venta"
 
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
+msgid "Default Pricelist"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
+msgid "Default pricelist for new customers of this branch."
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
@@ -305,6 +315,11 @@ msgstr "Hojas de tiempo en el proyecto (una tarifa por SO / Proyecto)"
 msgid "Track Service"
 msgstr "Servicio de Seguimiento"
 
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_branch
+msgid "branch"
+msgstr ""
+
 #~ msgid "Is a Field Service"
 #~ msgstr "Es un Servicio de Campo"
 
diff --git a/fieldservice_sale/i18n/fieldservice_sale.pot b/fieldservice_sale/i18n/fieldservice_sale.pot
index 67f9f8a4e6..9326106b9a 100644
--- a/fieldservice_sale/i18n/fieldservice_sale.pot
+++ b/fieldservice_sale/i18n/fieldservice_sale.pot
@@ -48,6 +48,16 @@ msgstr ""
 msgid "Create one FSM order per sale order line"
 msgstr ""
 
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
+msgid "Default Pricelist"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
+msgid "Default pricelist for new customers of this branch."
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
@@ -251,3 +261,8 @@ msgstr ""
 msgid "Track Service"
 msgstr ""
 
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_branch
+msgid "branch"
+msgstr ""
+
diff --git a/fieldservice_sale/i18n/pt_BR.po b/fieldservice_sale/i18n/pt_BR.po
index c1c1e9900b..ab45323d4b 100644
--- a/fieldservice_sale/i18n/pt_BR.po
+++ b/fieldservice_sale/i18n/pt_BR.po
@@ -54,6 +54,16 @@ msgstr "Crie um pedido FSM por pedido de venda"
 msgid "Create one FSM order per sale order line"
 msgstr "Crie um pedido FSM por linha de pedido de venda"
 
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
+msgid "Default Pricelist"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
+msgid "Default pricelist for new customers of this branch."
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
@@ -267,3 +277,8 @@ msgstr "Planilhas de tempo no projeto (uma tarifa por OS/Projeto)"
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
 msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_branch
+msgid "branch"
+msgstr ""
diff --git a/fieldservice_sale/models/__init__.py b/fieldservice_sale/models/__init__.py
index 09f9ccf083..fda80ebcfa 100644
--- a/fieldservice_sale/models/__init__.py
+++ b/fieldservice_sale/models/__init__.py
@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
+    fsm_branch,
     fsm_location,
     fsm_order,
     product_template,
diff --git a/fieldservice_sale/models/fsm_branch.py b/fieldservice_sale/models/fsm_branch.py
new file mode 100644
index 0000000000..94a45e9f5b
--- /dev/null
+++ b/fieldservice_sale/models/fsm_branch.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2020 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class FSMBranch(models.Model):
+    _inherit = 'fsm.branch'
+
+    pricelist_id = fields.Many2one(
+        'product.pricelist', string='Default Pricelist',
+        help="Default pricelist for new customers of this branch.")
diff --git a/fieldservice_sale/readme/ROADMAP.rst b/fieldservice_sale/readme/ROADMAP.rst
index f607015959..cff5b81aa8 100644
--- a/fieldservice_sale/readme/ROADMAP.rst
+++ b/fieldservice_sale/readme/ROADMAP.rst
@@ -1,2 +1,2 @@
-The roadmap of the Field Service application is documented on
-`Github <https://github.com/OCA/field-service/issues/1>`_.
+* Provide a mapping between an address and the branch and use it to set the
+  pricelist of a new partner
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index 19d0e22146..f42508a9d8 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -442,8 +442,10 @@ <h1><a class="toc-backref" href="#id3">Usage</a></h1>
 </div>
 <div class="section" id="known-issues-roadmap">
 <h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
-<p>The roadmap of the Field Service application is documented on
-<a class="reference external" href="https://github.com/OCA/field-service/issues/1">Github</a>.</p>
+<ul class="simple">
+<li>Provide a mapping between an address and the branch and use it to set the
+pricelist of a new partner</li>
+</ul>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#id5">Bug Tracker</a></h1>
diff --git a/fieldservice_sale/views/fsm_branch.xml b/fieldservice_sale/views/fsm_branch.xml
new file mode 100644
index 0000000000..279f5ab023
--- /dev/null
+++ b/fieldservice_sale/views/fsm_branch.xml
@@ -0,0 +1,14 @@
+<odoo>
+
+    <record id="fsm_branch_form_view_pricelist" model="ir.ui.view">
+        <field name="name">fsm.branch.form.pricelist</field>
+        <field name="model">fsm.branch</field>
+        <field name="inherit_id" ref="fieldservice.fsm_branch_form_view"/>
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="pricelist_id" groups="product.group_sale_pricelist" />
+            </field>
+        </field>
+    </record>
+
+</odoo>

From fd879b678354b01f50734494d2246f266cd94c37 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sat, 16 May 2020 18:56:45 -0500
Subject: [PATCH 45/77] [FIX] fieldservice_sale: Singleton error

---
 fieldservice_sale/__manifest__.py      |  2 +-
 fieldservice_sale/i18n/es.po           |  8 ++--
 fieldservice_sale/i18n/es_CL.po        |  8 ++--
 fieldservice_sale/i18n/pt_BR.po        | 55 ++++++++++++++++++++------
 fieldservice_sale/models/sale_order.py |  8 ++--
 5 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index abf9efa481..3c847a4756 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': 'Field Service - Sales',
-    'version': '12.0.2.5.0',
+    'version': '12.0.2.5.1',
     'summary': 'Sell field services.',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale/i18n/es.po b/fieldservice_sale/i18n/es.po
index 7b070314a0..1b59ee19c8 100644
--- a/fieldservice_sale/i18n/es.po
+++ b/fieldservice_sale/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-03-04 00:13+0000\n"
-"Last-Translator: Nelson Ram??rez S??nchez <info@konos.cl>\n"
+"PO-Revision-Date: 2020-07-14 18:19+0000\n"
+"Last-Translator: brian10048 <brian@mcmpest.com>\n"
 "Language-Team: none\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "Pedidos de servicio de campo asociados a esta venta"
 #. module: fieldservice_sale
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Manual"
-msgstr ""
+msgstr "Manual"
 
 #. module: fieldservice_sale
 #: selection:product.template,service_type:0
@@ -318,7 +318,7 @@ msgstr "Servicio de Seguimiento"
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_branch
 msgid "branch"
-msgstr ""
+msgstr "sucursal"
 
 #~ msgid "Is a Field Service"
 #~ msgstr "Es un Servicio de Campo"
diff --git a/fieldservice_sale/i18n/es_CL.po b/fieldservice_sale/i18n/es_CL.po
index 7ff9079d19..07e6793790 100644
--- a/fieldservice_sale/i18n/es_CL.po
+++ b/fieldservice_sale/i18n/es_CL.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-03-25 17:13+0000\n"
+"PO-Revision-Date: 2020-06-07 05:19+0000\n"
 "Last-Translator: Nelson Ram??rez S??nchez <info@konos.cl>\n"
 "Language-Team: none\n"
 "Language: es_CL\n"
@@ -67,12 +67,12 @@ msgstr "Crear un pedido FSM por l??nea de pedido de venta"
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
 msgid "Default Pricelist"
-msgstr ""
+msgstr "Tarifa Predeterminada"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
 msgid "Default pricelist for new customers of this branch."
-msgstr ""
+msgstr "Lista de precios predeterminada para nuevos clientes de esta sucursal."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
@@ -318,7 +318,7 @@ msgstr "Servicio de Seguimiento"
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_branch
 msgid "branch"
-msgstr ""
+msgstr "sucursal"
 
 #~ msgid "Is a Field Service"
 #~ msgstr "Es un Servicio de Campo"
diff --git a/fieldservice_sale/i18n/pt_BR.po b/fieldservice_sale/i18n/pt_BR.po
index ab45323d4b..2942cf4c62 100644
--- a/fieldservice_sale/i18n/pt_BR.po
+++ b/fieldservice_sale/i18n/pt_BR.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-02-25 09:13+0000\n"
-"Last-Translator: Marcel Savegnago <marcel.savegnago@gmail.com>\n"
+"PO-Revision-Date: 2020-06-17 22:19+0000\n"
+"Last-Translator: Fernando Colus <fcolus1@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -33,11 +33,20 @@ msgid ""
 "this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
 msgstr ""
+"De acordo com a configura????o do produto, a quantidade entregue pode ser "
+"calculada automaticamente pelo mecanismo:\n"
+"   - Manual: a quantidade ?? definida manualmente na linha\n"
+"   - Anal??tico de despesas: a quantidade ?? a soma da quantidade das despesas "
+"lan??adas\n"
+"   - Quadro de hor??rios: a quantidade ?? a soma das horas registradas nas "
+"tarefas vinculadas a esta linha de venda\n"
+"   - Movimenta????o de estoque: a quantidade ?? proveniente das coletas "
+"confirmadas\n"
 
 #. module: fieldservice_sale
 #: selection:sale.order.line,qty_delivered_method:0
 msgid "Analytic From Expenses"
-msgstr ""
+msgstr "Anal??tico de despesas"
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
@@ -52,17 +61,17 @@ msgstr "Crie um pedido FSM por pedido de venda"
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
 msgid "Create one FSM order per sale order line"
-msgstr "Crie um pedido FSM por linha de pedido de venda"
+msgstr "Crie um pedido FSM por linha do pedido de venda"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
 msgid "Default Pricelist"
-msgstr ""
+msgstr "Lista de pre??os padr??o"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
 msgid "Default pricelist for new customers of this branch."
-msgstr ""
+msgstr "Lista de pre??os padr??o para novos clientes desta filial."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
@@ -76,6 +85,12 @@ msgid ""
 "line\n"
 "                will be created."
 msgstr ""
+"Determina o que acontece ap??s a confirma????o do pedido de venda:\n"
+"                 - Nenhum: nada adicional, comportamento padr??o.\n"
+"                 - Por pedido de venda: um pedido do FSM ser?? criado para a "
+"venda.\n"
+"                 - Por linha de pedido de venda: um pedido do FSM para cada "
+"linha de pedido de venda ser?? criado."
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
@@ -92,7 +107,7 @@ msgstr "Localiza????o do FSM deve ser definida"
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
 msgid "FSM Orders"
-msgstr "Ordens FSM"
+msgstr "Ordens do FSM (Field Service Management)"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_location
@@ -113,6 +128,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
+"Ordem de servi??o de campo criada (%s): <a href =# data-oe-model = fsm.order "
+"data-oe-id =%d>%s </a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:86
@@ -122,6 +140,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
+"Ordem de servi??o de campo criada: <a href =#data-oe-model = fsm.order data-"
+"oe-id =%d>%s </a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
@@ -171,6 +192,12 @@ msgid ""
 "Create a task and track hours: Create a task on the sales order validation "
 "and track the work hours."
 msgstr ""
+"Definir quantidades manualmente no pedido: fatura com base na quantidade "
+"inserida manualmente, sem criar uma conta anal??tica.\n"
+"Quadros de hor??rios do contrato: fatura com base nas horas rastreadas no "
+"quadro de hor??rios relacionado.\n"
+"Crie uma tarefa e acompanhe o hor??rio: crie uma tarefa na valida????o do "
+"pedido de vendas e acompanhe o hor??rio de trabalho."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
@@ -185,12 +212,12 @@ msgstr "Ordem"
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_product_template
 msgid "Product Template"
-msgstr "Template de Produto"
+msgstr "Modelo de Produto"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "SO Lines generating a FSM order will be for this location"
-msgstr ""
+msgstr "Linhas SO que geram um pedido FSM ser??o para este local"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
@@ -252,6 +279,9 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
+"Este pedido foi criado a partir de: <a href =# data-oe-model = sale.order "
+"data-oe-id =%d>%s </a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:93
@@ -261,6 +291,9 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
 "                "
 msgstr ""
+"Este pedido foi criado a partir de: <a href =# data-oe-model = sale.order "
+"data-oe-id =%d>%s </a> (%s)\n"
+"                "
 
 #. module: fieldservice_sale
 #: selection:sale.order.line,qty_delivered_method:0
@@ -276,9 +309,9 @@ msgstr "Planilhas de tempo no projeto (uma tarifa por OS/Projeto)"
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
-msgstr ""
+msgstr "Rastrear Servi??o"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_branch
 msgid "branch"
-msgstr ""
+msgstr "Filial"
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index ebcbfa9ffd..b106b757b7 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -189,11 +189,13 @@ def action_invoice_create(self, grouped=False, final=False):
                 ]
             )
             if len(lines_by_sale) > 0:
-                fsm_order = self.env["fsm.order"].search(
-                    [("sale_id", "=", self.id), ("sale_line_id", "=", False)]
+                fsm_orders = self.env["fsm.order"].search(
+                    [("sale_id", "in", self.ids), ("sale_line_id", "=", False)]
                 )
                 if len(lines_by_sale) == len(invoice.invoice_line_ids):
-                    invoice.fsm_order_ids = [(4, fsm_order.id)]
+                    invoice.fsm_order_ids = [
+                        (4, fsm_order.id) for fsm_order in fsm_orders
+                    ]
                 elif len(invoice.invoice_line_ids) > len(lines_by_sale):
                     new = invoice.copy()
                     new.write({"invoice_line_ids": [(6, 0, [])]})

From 0e352ecb65743df9257572915fb72225f0b20d87 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Fri, 17 Jul 2020 23:57:01 -0400
Subject: [PATCH 46/77] [IMP] fieldservice_sale: black, isort, prettier

---
 fieldservice_sale/__manifest__.py             |   46 +-
 .../migrations/12.0.2.0.0/pre-migration.py    |    6 +-
 fieldservice_sale/models/fsm_branch.py        |    8 +-
 fieldservice_sale/models/fsm_location.py      |    6 +-
 fieldservice_sale/models/fsm_order.py         |    8 +-
 fieldservice_sale/models/product_template.py  |   33 +-
 fieldservice_sale/models/sale_order.py        |    2 +-
 fieldservice_sale/models/sale_order_line.py   |   95 +-
 .../static/description/description/icon.png   |  Bin 17808 -> 0 bytes
 .../static/description/description/index.html |  464 ------
 .../static/description/index.html             | 1263 +++++++++++------
 .../tests/test_fsm_sale_common.py             |  156 +-
 .../tests/test_fsm_sale_onchange_partner.py   |   50 +-
 .../tests/test_fsm_sale_order.py              |  426 +++---
 fieldservice_sale/views/fsm_branch.xml        |    4 +-
 fieldservice_sale/views/fsm_location.xml      |    7 +-
 fieldservice_sale/views/fsm_order.xml         |   20 +-
 fieldservice_sale/views/product_template.xml  |   10 +-
 .../views/res_config_settings.xml             |   11 +-
 fieldservice_sale/views/sale_order.xml        |   24 +-
 20 files changed, 1280 insertions(+), 1359 deletions(-)
 delete mode 100644 fieldservice_sale/static/description/description/icon.png
 delete mode 100644 fieldservice_sale/static/description/description/index.html

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 3c847a4756..7f47a70077 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -1,32 +1,24 @@
 # Copyright (C) 2018 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
-    'name': 'Field Service - Sales',
-    'version': '12.0.2.5.1',
-    'summary': 'Sell field services.',
-    'category': 'Field Service',
-    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice',
-        'sale_management',
-        'fieldservice_account',
+    "name": "Field Service - Sales",
+    "version": "12.0.2.5.1",
+    "summary": "Sell field services.",
+    "category": "Field Service",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": ["fieldservice", "sale_management", "fieldservice_account"],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/fsm_branch.xml",
+        "views/fsm_location.xml",
+        "views/fsm_order.xml",
+        "views/product_template.xml",
+        "views/sale_order.xml",
+        "views/res_config_settings.xml",
     ],
-    'data': [
-        'security/ir.model.access.csv',
-        'views/fsm_branch.xml',
-        'views/fsm_location.xml',
-        'views/fsm_order.xml',
-        'views/product_template.xml',
-        'views/sale_order.xml',
-        'views/res_config_settings.xml',
-    ],
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'wolfhall',
-        'max3903',
-        'brian10048',
-    ],
-    'installable': True,
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": ["wolfhall", "max3903", "brian10048"],
+    "installable": True,
 }
diff --git a/fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py b/fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py
index c228e7d99a..3a7530b375 100644
--- a/fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py
+++ b/fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py
@@ -6,5 +6,7 @@ def migrate(env, version):
     if not version:
         return
 
-    env.execute("UPDATE product_template SET field_service_tracking = 'sale' "
-                "WHERE field_service_tracking = 'order';")
+    env.execute(
+        "UPDATE product_template SET field_service_tracking = 'sale' "
+        "WHERE field_service_tracking = 'order';"
+    )
diff --git a/fieldservice_sale/models/fsm_branch.py b/fieldservice_sale/models/fsm_branch.py
index 94a45e9f5b..a8fadfee49 100644
--- a/fieldservice_sale/models/fsm_branch.py
+++ b/fieldservice_sale/models/fsm_branch.py
@@ -4,8 +4,10 @@
 
 
 class FSMBranch(models.Model):
-    _inherit = 'fsm.branch'
+    _inherit = "fsm.branch"
 
     pricelist_id = fields.Many2one(
-        'product.pricelist', string='Default Pricelist',
-        help="Default pricelist for new customers of this branch.")
+        "product.pricelist",
+        string="Default Pricelist",
+        help="Default pricelist for new customers of this branch.",
+    )
diff --git a/fieldservice_sale/models/fsm_location.py b/fieldservice_sale/models/fsm_location.py
index d7f24ba0ef..eb1d302ae0 100644
--- a/fieldservice_sale/models/fsm_location.py
+++ b/fieldservice_sale/models/fsm_location.py
@@ -1,11 +1,9 @@
 # Copyright (C) 2018 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from odoo import fields, models
 
 
 class FSMLocation(models.Model):
-    _inherit = 'fsm.location'
+    _inherit = "fsm.location"
 
-    sales_territory_id = fields.Many2one('fsm.territory',
-                                         string='Sales Territory')
+    sales_territory_id = fields.Many2one("fsm.territory", string="Sales Territory")
diff --git a/fieldservice_sale/models/fsm_order.py b/fieldservice_sale/models/fsm_order.py
index 642f1667df..b9dbcaaf1c 100644
--- a/fieldservice_sale/models/fsm_order.py
+++ b/fieldservice_sale/models/fsm_order.py
@@ -1,14 +1,14 @@
 # Copyright (C) 2019 Brian McMaster
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import fields, models, _
+from odoo import _, fields, models
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
-    sale_id = fields.Many2one('sale.order')
-    sale_line_id = fields.Many2one('sale.order.line')
+    sale_id = fields.Many2one("sale.order")
+    sale_line_id = fields.Many2one("sale.order.line")
 
     def action_view_sales(self):
         self.ensure_one()
diff --git a/fieldservice_sale/models/product_template.py b/fieldservice_sale/models/product_template.py
index e2b10a041f..67124ddf8c 100644
--- a/fieldservice_sale/models/product_template.py
+++ b/fieldservice_sale/models/product_template.py
@@ -1,31 +1,34 @@
 # Copyright (C) 2019 Brian McMaster
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from odoo import api, fields, models
 
 
 class ProductTemplate(models.Model):
-    _inherit = 'product.template'
+    _inherit = "product.template"
 
-    service_type = fields.Selection(selection_add=[
-        ('field', 'Field Service Orders'),
-    ])
-    field_service_tracking = fields.Selection([
-        ('no', 'Don\'t create FSM order'),
-        ('sale', 'Create one FSM order per sale order'),
-        ('line', 'Create one FSM order per sale order line'),
-    ], string='Field Service Tracking', default='no',
+    service_type = fields.Selection(selection_add=[("field", "Field Service Orders")])
+    field_service_tracking = fields.Selection(
+        [
+            ("no", "Don't create FSM order"),
+            ("sale", "Create one FSM order per sale order"),
+            ("line", "Create one FSM order per sale order line"),
+        ],
+        string="Field Service Tracking",
+        default="no",
         help="""Determines what happens upon sale order confirmation:
                 - None: nothing additional, default behavior.
                 - Per Sale Order: One FSM Order will be created for the sale.
                 - Per Sale Order Line: One FSM Order for each sale order line
-                will be created.""")
+                will be created.""",
+    )
     fsm_order_template_id = fields.Many2one(
-        'fsm.template', 'Field Service Order Template',
-        help="Select the field service order template to be created")
+        "fsm.template",
+        "Field Service Order Template",
+        help="Select the field service order template to be created",
+    )
 
-    @api.onchange('field_service_tracking')
+    @api.onchange("field_service_tracking")
     def _onchange_field_service_tracking(self):
-        if self.field_service_tracking == 'no':
+        if self.field_service_tracking == "no":
             self.fsm_order_template_id = False
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index b106b757b7..571e0317c0 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2019 Brian McMaster
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import api, fields, models, _
+from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
 
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 2d7f91e0f0..cbc793aac6 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -1,44 +1,46 @@
 # Copyright (C) 2019 Brian McMaster
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import api, fields, models, _
+from odoo import _, api, fields, models
 
 
 class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
 
     qty_delivered_method = fields.Selection(
-        selection_add=[('field_service', 'Field Service Order')])
+        selection_add=[("field_service", "Field Service Order")]
+    )
     fsm_order_id = fields.Many2one(
-        'fsm.order', 'Order', index=True,
-        help="Field Service Order generated by the sales order item")
+        "fsm.order",
+        "Order",
+        index=True,
+        help="Field Service Order generated by the sales order item",
+    )
 
-    @api.depends('product_id.type')
+    @api.depends("product_id.type")
     def _compute_product_updatable(self):
         for line in self:
-            if line.product_id.type == 'service' and line.state == 'sale':
+            if line.product_id.type == "service" and line.state == "sale":
                 line.product_updatable = False
             else:
                 super(SaleOrderLine, line)._compute_product_updatable()
 
     @api.multi
-    @api.depends('product_id')
+    @api.depends("product_id")
     def _compute_qty_delivered_method(self):
         super(SaleOrderLine, self)._compute_qty_delivered_method()
         for line in self:
-            if not line.is_expense and \
-               line.product_id.field_service_tracking == 'line':
-                line.qty_delivered_method = 'field_service'
+            if not line.is_expense and line.product_id.field_service_tracking == "line":
+                line.qty_delivered_method = "field_service"
 
     @api.multi
-    @api.depends('fsm_order_id.stage_id')
+    @api.depends("fsm_order_id.stage_id")
     def _compute_qty_delivered(self):
         super(SaleOrderLine, self)._compute_qty_delivered()
         lines_by_fsm = self.filtered(
-            lambda sol:
-                sol.qty_delivered_method == 'field_service'
+            lambda sol: sol.qty_delivered_method == "field_service"
         )
-        complete = self.env.ref('fieldservice.fsm_stage_completed')
+        complete = self.env.ref("fieldservice.fsm_stage_completed")
         for line in lines_by_fsm:
             qty = 0
             if line.fsm_order_id.stage_id == complete:
@@ -48,7 +50,7 @@ def _compute_qty_delivered(self):
     @api.model
     def create(self, values):
         line = super(SaleOrderLine, self).create(values)
-        if line.state == 'sale':
+        if line.state == "sale":
             line._field_service_generation()
         return line
 
@@ -56,19 +58,19 @@ def _field_create_fsm_order_prepare_values(self):
         self.ensure_one()
         categories = self.product_id.fsm_order_template_id.category_ids
         return {
-            'customer_id': self.order_id.partner_id.id,
-            'location_id': self.order_id.fsm_location_id.id,
-            'location_directions': self.order_id.fsm_location_id.direction,
-            'request_early': self.order_id.expected_date,
-            'scheduled_date_start': self.order_id.expected_date,
-            'description': self.name,
-            'template_id': self.product_id.fsm_order_template_id.id,
-            'todo': self.product_id.fsm_order_template_id.instructions,
-            'category_ids': [(6, 0, categories.ids)],
-            'scheduled_duration': self.product_id.fsm_order_template_id.hours,
-            'sale_id': self.order_id.id,
-            'sale_line_id': self.id,
-            'company_id': self.company_id.id,
+            "customer_id": self.order_id.partner_id.id,
+            "location_id": self.order_id.fsm_location_id.id,
+            "location_directions": self.order_id.fsm_location_id.direction,
+            "request_early": self.order_id.expected_date,
+            "scheduled_date_start": self.order_id.expected_date,
+            "description": self.name,
+            "template_id": self.product_id.fsm_order_template_id.id,
+            "todo": self.product_id.fsm_order_template_id.instructions,
+            "category_ids": [(6, 0, categories.ids)],
+            "scheduled_duration": self.product_id.fsm_order_template_id.hours,
+            "sale_id": self.order_id.id,
+            "sale_line_id": self.id,
+            "company_id": self.company_id.id,
         }
 
     @api.multi
@@ -81,20 +83,27 @@ def _field_create_fsm_order(self):
         for so_line in self:
             # create fsm_order
             values = so_line._field_create_fsm_order_prepare_values()
-            fsm_order = self.env['fsm.order'].sudo().create(values)
+            fsm_order = self.env["fsm.order"].sudo().create(values)
             so_line.fsm_order_id = fsm_order.id
             # post message on SO
-            msg_body = _(
-                """Field Service Order Created (%s): <a href=
+            msg_body = (
+                _(
+                    """Field Service Order Created (%s): <a href=
                    # data-oe-model=fsm.order data-oe-id=%d>%s</a>
-                """) % (so_line.product_id.name, fsm_order.id, fsm_order.name)
+                """
+                )
+                % (so_line.product_id.name, fsm_order.id, fsm_order.name)
+            )
             so_line.order_id.message_post(body=msg_body)
             # post message on fsm_order
-            fsm_order_msg = _(
-                """This order has been created from: <a href=
+            fsm_order_msg = (
+                _(
+                    """This order has been created from: <a href=
                    # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)
-                """) % (so_line.order_id.id, so_line.order_id.name,
-                        so_line.product_id.name)
+                """
+                )
+                % (so_line.order_id.id, so_line.order_id.name, so_line.product_id.name)
+            )
             fsm_order.message_post(body=fsm_order_msg)
             result[so_line.id] = fsm_order
         return result
@@ -108,10 +117,10 @@ def _field_find_fsm_order(self):
         """
         for rec in self:
             # one search for all so lines
-            fsm_orders = self.env['fsm.order'].search([
-                ('sale_line_id', 'in', rec.ids)])
+            fsm_orders = self.env["fsm.order"].search([("sale_line_id", "in", rec.ids)])
             fsm_order_sol_mapping = {
-                fsm_order.sale_line_id.id: fsm_order for fsm_order in fsm_orders}
+                fsm_order.sale_line_id.id: fsm_order for fsm_order in fsm_orders
+            }
             res = {}
             for so_line in rec:
                 # If the SO was confirmed, cancelled, set to draft then confirmed,
@@ -129,17 +138,15 @@ def _field_service_generation(self):
             exists, it simply links the existing one to the line.
         """
         for rec in self:
-            if rec.product_id.field_service_tracking == 'sale':
+            if rec.product_id.field_service_tracking == "sale":
                 sale = rec.order_id
                 so_fo_mapping = sale._field_find_fsm_order()
                 rec.fsm_order_id = so_fo_mapping[rec.order_id.id].id
-            if rec.product_id.field_service_tracking == 'line':
+            if rec.product_id.field_service_tracking == "line":
                 rec._field_find_fsm_order()
 
     @api.multi
     def _prepare_invoice_line(self, qty):
         res = super()._prepare_invoice_line(qty)
-        res.update({
-            'fsm_order_id': self.fsm_order_id.id,
-        })
+        res.update({"fsm_order_id": self.fsm_order_id.id})
         return res
diff --git a/fieldservice_sale/static/description/description/icon.png b/fieldservice_sale/static/description/description/icon.png
deleted file mode 100644
index 955674d8f0b8c47de3ffa9db25cb109fbe4a1091..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17808
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

diff --git a/fieldservice_sale/static/description/description/index.html b/fieldservice_sale/static/description/description/index.html
deleted file mode 100644
index 734a351843..0000000000
--- a/fieldservice_sale/static/description/description/index.html
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
-<title>Field Service</title>
-<style type="text/css">
-
-/*
-:Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
-:Copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
-customize this style sheet.
-*/
-
-/* used to remove borders from tables and images */
-.borderless, table.borderless td, table.borderless th {
-  border: 0 }
-
-table.borderless td, table.borderless th {
-  /* Override padding for "table.docutils td" with "! important".
-     The right padding separates the table cells. */
-  padding: 0 0.5em 0 0 ! important }
-
-.first {
-  /* Override more specific margin styles with "! important". */
-  margin-top: 0 ! important }
-
-.last, .with-subtitle {
-  margin-bottom: 0 ! important }
-
-.hidden {
-  display: none }
-
-.subscript {
-  vertical-align: sub;
-  font-size: smaller }
-
-.superscript {
-  vertical-align: super;
-  font-size: smaller }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-blockquote.epigraph {
-  margin: 2em 5em ; }
-
-dl.docutils dd {
-  margin-bottom: 0.5em }
-
-object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
-  overflow: hidden;
-}
-
-/* Uncomment (and remove this text!) to get bold-faced definition list terms
-dl.docutils dt {
-  font-weight: bold }
-*/
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.admonition p.admonition-title, div.hint p.admonition-title,
-div.important p.admonition-title, div.note p.admonition-title,
-div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title, .code .error {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-/* Uncomment (and remove this text!) to get reduced vertical space in
-   compound paragraphs.
-div.compound .compound-first, div.compound .compound-middle {
-  margin-bottom: 0.5em }
-
-div.compound .compound-last, div.compound .compound-middle {
-  margin-top: 0.5em }
-*/
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-div.footer, div.header {
-  clear: both;
-  font-size: smaller }
-
-div.line-block {
-  display: block ;
-  margin-top: 1em ;
-  margin-bottom: 1em }
-
-div.line-block div.line-block {
-  margin-top: 0 ;
-  margin-bottom: 0 ;
-  margin-left: 1.5em }
-
-div.sidebar {
-  margin: 0 0 0.5em 1em ;
-  border: medium outset ;
-  padding: 1em ;
-  background-color: #ffffee ;
-  width: 40% ;
-  float: right ;
-  clear: right }
-
-div.sidebar p.rubric {
-  font-family: sans-serif ;
-  font-size: medium }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
-  margin-top: 0.4em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr.docutils {
-  width: 75% }
-
-img.align-left, .figure.align-left, object.align-left, table.align-left {
-  clear: left ;
-  float: left ;
-  margin-right: 1em }
-
-img.align-right, .figure.align-right, object.align-right, table.align-right {
-  clear: right ;
-  float: right ;
-  margin-left: 1em }
-
-img.align-center, .figure.align-center, object.align-center {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-table.align-center {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.align-left {
-  text-align: left }
-
-.align-center {
-  clear: both ;
-  text-align: center }
-
-.align-right {
-  text-align: right }
-
-/* reset inner alignment in figures */
-div.align-right {
-  text-align: inherit }
-
-/* div.align-center * { */
-/*   text-align: left } */
-
-.align-top    {
-  vertical-align: top }
-
-.align-middle {
-  vertical-align: middle }
-
-.align-bottom {
-  vertical-align: bottom }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.attribution {
-  text-align: right ;
-  margin-left: 50% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.rubric {
-  font-weight: bold ;
-  font-size: larger ;
-  color: maroon ;
-  text-align: center }
-
-p.sidebar-title {
-  font-family: sans-serif ;
-  font-weight: bold ;
-  font-size: larger }
-
-p.sidebar-subtitle {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font: inherit }
-
-pre.literal-block, pre.doctest-block, pre.math, pre.code {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-pre.code .ln { color: grey; } /* 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 }
-pre.code .literal.string, code .literal.string { color: #0C5404 }
-pre.code .name.builtin, code .name.builtin { color: #352B84 }
-pre.code .deleted, code .deleted { background-color: #DEB0A1}
-pre.code .inserted, code .inserted { background-color: #A3D289}
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-span.section-subtitle {
-  /* font-size relative to parent (h1..h6 element) */
-  font-size: 80% }
-
-table.citation {
-  border-left: solid 1px gray;
-  margin-left: 1px }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.docutils {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.footnote {
-  border-left: solid 1px black;
-  margin-left: 1px }
-
-table.docutils td, table.docutils th,
-table.docinfo td, table.docinfo th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-table.docutils th.field-name, table.docinfo th.docinfo-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap ;
-  padding-left: 0 }
-
-/* "booktabs" style (no vertical lines) */
-table.docutils.booktabs {
-  border: 0px;
-  border-top: 2px solid;
-  border-bottom: 2px solid;
-  border-collapse: collapse;
-}
-table.docutils.booktabs * {
-  border: 0px;
-}
-table.docutils.booktabs th {
-  border-bottom: thin solid;
-  text-align: left;
-}
-
-h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
-h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
-  font-size: 100% }
-
-ul.auto-toc {
-  list-style-type: none }
-
-</style>
-</head>
-<body>
-<div class="document" id="field-service">
-<h1 class="title">Field Service</h1>
-
-<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! This file is generated by oca-gen-addon-readme !!
-!! changes will be overwritten.                   !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/11.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" href="https://translation.odoo-community.org/projects/field-service-11-0/field-service-11-0-fieldservice"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/264/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
-<p>This module is the base of the Field Service application in Odoo.</p>
-<p><strong>Table of contents</strong></p>
-<div class="contents local topic" id="contents">
-<ul class="simple">
-<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
-<li><a class="reference internal" href="#configuration" id="id2">Configuration</a></li>
-<li><a class="reference internal" href="#usage" id="id3">Usage</a></li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="id4">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id5">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id6">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id7">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id8">Contributors</a></li>
-<li><a class="reference internal" href="#other-credits" id="id9">Other credits</a></li>
-<li><a class="reference internal" href="#maintainers" id="id10">Maintainers</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="installation">
-<h1><a class="toc-backref" href="#id1">Installation</a></h1>
-<p>To install Field Service and have the mapping features, you need to install GeoEngine.</p>
-<p>Please refer to the installation instructions available at:
-<a class="reference external" href="https://github.com/OCA/geospatial/tree/11.0/base_geoengine">https://github.com/OCA/geospatial/tree/11.0/base_geoengine</a></p>
-</div>
-<div class="section" id="configuration">
-<h1><a class="toc-backref" href="#id2">Configuration</a></h1>
-<p>To configure this module, you need to:</p>
-<ul class="simple">
-<li>Go to Field Service &gt; Configuration &gt; Settings</li>
-</ul>
-</div>
-<div class="section" id="usage">
-<h1><a class="toc-backref" href="#id3">Usage</a></h1>
-<p>To use this module, you need to:</p>
-<ul class="simple">
-<li>Go to Field Service</li>
-<li>Create or select an order</li>
-<li>Follow the process</li>
-</ul>
-</div>
-<div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
-<p>The roadmap of the Field Service application is documented on
-<a class="reference external" href="https://github.com/OCA/field-service/issues/1">Github</a>.</p>
-</div>
-<div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice%0Aversion:%2011.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">
-<h1><a class="toc-backref" href="#id6">Credits</a></h1>
-<div class="section" id="authors">
-<h2><a class="toc-backref" href="#id7">Authors</a></h2>
-<ul class="simple">
-<li>Open Source Integrators</li>
-</ul>
-</div>
-<div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id8">Contributors</a></h2>
-<ul class="simple">
-<li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
-<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
-<li>Steve Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#64;opensourceintegrators.com</a>&gt;</li>
-<li>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
-<li>Michael Allen &lt;<a class="reference external" href="mailto:mallen&#64;opensourceintegrators.com">mallen&#64;opensourceintegrators.com</a>&gt;</li>
-</ul>
-</div>
-<div class="section" id="other-credits">
-<h2><a class="toc-backref" href="#id9">Other credits</a></h2>
-<p>The development of this module has been financially supported by:</p>
-<ul class="simple">
-<li>Open Source Integrators &lt;<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>&gt;</li>
-</ul>
-</div>
-<div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id10">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>
-<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">maintainers</a>:</p>
-<p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" 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/11.0/fieldservice">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>
-</div>
-</body>
-</html>
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index f42508a9d8..c71bfa5db3 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
-<title>Field Service - Sales</title>
-<style type="text/css">
-
-/*
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta
+      name="generator"
+      content="Docutils 0.15.1: http://docutils.sourceforge.net/"
+    />
+    <title>Field Service - Sales</title>
+    <style type="text/css">
+      /*
 :Author: David Goodger (goodger@python.org)
 :Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
@@ -18,79 +20,112 @@
 customize this style sheet.
 */
 
-/* used to remove borders from tables and images */
-.borderless, table.borderless td, table.borderless th {
-  border: 0 }
+      /* used to remove borders from tables and images */
+      .borderless,
+      table.borderless td,
+      table.borderless th {
+        border: 0;
+      }
 
-table.borderless td, table.borderless th {
-  /* Override padding for "table.docutils td" with "! important".
+      table.borderless td,
+      table.borderless th {
+        /* Override padding for "table.docutils td" with "! important".
      The right padding separates the table cells. */
-  padding: 0 0.5em 0 0 ! important }
-
-.first {
-  /* Override more specific margin styles with "! important". */
-  margin-top: 0 ! important }
-
-.last, .with-subtitle {
-  margin-bottom: 0 ! important }
-
-.hidden {
-  display: none }
-
-.subscript {
-  vertical-align: sub;
-  font-size: smaller }
-
-.superscript {
-  vertical-align: super;
-  font-size: smaller }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-blockquote.epigraph {
-  margin: 2em 5em ; }
-
-dl.docutils dd {
-  margin-bottom: 0.5em }
-
-object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
-  overflow: hidden;
-}
-
-/* Uncomment (and remove this text!) to get bold-faced definition list terms
+        padding: 0 0.5em 0 0 !important;
+      }
+
+      .first {
+        /* Override more specific margin styles with "! important". */
+        margin-top: 0 !important;
+      }
+
+      .last,
+      .with-subtitle {
+        margin-bottom: 0 !important;
+      }
+
+      .hidden {
+        display: none;
+      }
+
+      .subscript {
+        vertical-align: sub;
+        font-size: smaller;
+      }
+
+      .superscript {
+        vertical-align: super;
+        font-size: smaller;
+      }
+
+      a.toc-backref {
+        text-decoration: none;
+        color: black;
+      }
+
+      blockquote.epigraph {
+        margin: 2em 5em;
+      }
+
+      dl.docutils dd {
+        margin-bottom: 0.5em;
+      }
+
+      object[type="image/svg+xml"],
+      object[type="application/x-shockwave-flash"] {
+        overflow: hidden;
+      }
+
+      /* Uncomment (and remove this text!) to get bold-faced definition list terms
 dl.docutils dt {
   font-weight: bold }
 */
 
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.admonition p.admonition-title, div.hint p.admonition-title,
-div.important p.admonition-title, div.note p.admonition-title,
-div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title, .code .error {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-/* Uncomment (and remove this text!) to get reduced vertical space in
+      div.abstract {
+        margin: 2em 5em;
+      }
+
+      div.abstract p.topic-title {
+        font-weight: bold;
+        text-align: center;
+      }
+
+      div.admonition,
+      div.attention,
+      div.caution,
+      div.danger,
+      div.error,
+      div.hint,
+      div.important,
+      div.note,
+      div.tip,
+      div.warning {
+        margin: 2em;
+        border: medium outset;
+        padding: 1em;
+      }
+
+      div.admonition p.admonition-title,
+      div.hint p.admonition-title,
+      div.important p.admonition-title,
+      div.note p.admonition-title,
+      div.tip p.admonition-title {
+        font-weight: bold;
+        font-family: sans-serif;
+      }
+
+      div.attention p.admonition-title,
+      div.caution p.admonition-title,
+      div.danger p.admonition-title,
+      div.error p.admonition-title,
+      div.warning p.admonition-title,
+      .code .error {
+        color: red;
+        font-weight: bold;
+        font-family: sans-serif;
+      }
+
+      /* Uncomment (and remove this text!) to get reduced vertical space in
    compound paragraphs.
 div.compound .compound-first, div.compound .compound-middle {
   margin-bottom: 0.5em }
@@ -99,398 +134,696 @@
   margin-top: 0.5em }
 */
 
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-div.footer, div.header {
-  clear: both;
-  font-size: smaller }
-
-div.line-block {
-  display: block ;
-  margin-top: 1em ;
-  margin-bottom: 1em }
-
-div.line-block div.line-block {
-  margin-top: 0 ;
-  margin-bottom: 0 ;
-  margin-left: 1.5em }
-
-div.sidebar {
-  margin: 0 0 0.5em 1em ;
-  border: medium outset ;
-  padding: 1em ;
-  background-color: #ffffee ;
-  width: 40% ;
-  float: right ;
-  clear: right }
-
-div.sidebar p.rubric {
-  font-family: sans-serif ;
-  font-size: medium }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
-  margin-top: 0.4em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr.docutils {
-  width: 75% }
-
-img.align-left, .figure.align-left, object.align-left, table.align-left {
-  clear: left ;
-  float: left ;
-  margin-right: 1em }
-
-img.align-right, .figure.align-right, object.align-right, table.align-right {
-  clear: right ;
-  float: right ;
-  margin-left: 1em }
-
-img.align-center, .figure.align-center, object.align-center {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-table.align-center {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.align-left {
-  text-align: left }
-
-.align-center {
-  clear: both ;
-  text-align: center }
-
-.align-right {
-  text-align: right }
-
-/* reset inner alignment in figures */
-div.align-right {
-  text-align: inherit }
-
-/* div.align-center * { */
-/*   text-align: left } */
-
-.align-top    {
-  vertical-align: top }
-
-.align-middle {
-  vertical-align: middle }
-
-.align-bottom {
-  vertical-align: bottom }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.attribution {
-  text-align: right ;
-  margin-left: 50% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.rubric {
-  font-weight: bold ;
-  font-size: larger ;
-  color: maroon ;
-  text-align: center }
-
-p.sidebar-title {
-  font-family: sans-serif ;
-  font-weight: bold ;
-  font-size: larger }
-
-p.sidebar-subtitle {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font: inherit }
-
-pre.literal-block, pre.doctest-block, pre.math, pre.code {
-  margin-left: 2em ;
-  margin-right: 2em }
-
-pre.code .ln { color: grey; } /* 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 }
-pre.code .literal.string, code .literal.string { color: #0C5404 }
-pre.code .name.builtin, code .name.builtin { color: #352B84 }
-pre.code .deleted, code .deleted { background-color: #DEB0A1}
-pre.code .inserted, code .inserted { background-color: #A3D289}
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-span.section-subtitle {
-  /* font-size relative to parent (h1..h6 element) */
-  font-size: 80% }
-
-table.citation {
-  border-left: solid 1px gray;
-  margin-left: 1px }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.docutils {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.footnote {
-  border-left: solid 1px black;
-  margin-left: 1px }
-
-table.docutils td, table.docutils th,
-table.docinfo td, table.docinfo th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-table.docutils th.field-name, table.docinfo th.docinfo-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap ;
-  padding-left: 0 }
-
-/* "booktabs" style (no vertical lines) */
-table.docutils.booktabs {
-  border: 0px;
-  border-top: 2px solid;
-  border-bottom: 2px solid;
-  border-collapse: collapse;
-}
-table.docutils.booktabs * {
-  border: 0px;
-}
-table.docutils.booktabs th {
-  border-bottom: thin solid;
-  text-align: left;
-}
-
-h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
-h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
-  font-size: 100% }
-
-ul.auto-toc {
-  list-style-type: none }
-
-</style>
-</head>
-<body>
-<div class="document" id="field-service-sales">
-<h1 class="title">Field Service - Sales</h1>
-
-<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      div.dedication {
+        margin: 2em 5em;
+        text-align: center;
+        font-style: italic;
+      }
+
+      div.dedication p.topic-title {
+        font-weight: bold;
+        font-style: normal;
+      }
+
+      div.figure {
+        margin-left: 2em;
+        margin-right: 2em;
+      }
+
+      div.footer,
+      div.header {
+        clear: both;
+        font-size: smaller;
+      }
+
+      div.line-block {
+        display: block;
+        margin-top: 1em;
+        margin-bottom: 1em;
+      }
+
+      div.line-block div.line-block {
+        margin-top: 0;
+        margin-bottom: 0;
+        margin-left: 1.5em;
+      }
+
+      div.sidebar {
+        margin: 0 0 0.5em 1em;
+        border: medium outset;
+        padding: 1em;
+        background-color: #ffffee;
+        width: 40%;
+        float: right;
+        clear: right;
+      }
+
+      div.sidebar p.rubric {
+        font-family: sans-serif;
+        font-size: medium;
+      }
+
+      div.system-messages {
+        margin: 5em;
+      }
+
+      div.system-messages h1 {
+        color: red;
+      }
+
+      div.system-message {
+        border: medium outset;
+        padding: 1em;
+      }
+
+      div.system-message p.system-message-title {
+        color: red;
+        font-weight: bold;
+      }
+
+      div.topic {
+        margin: 2em;
+      }
+
+      h1.section-subtitle,
+      h2.section-subtitle,
+      h3.section-subtitle,
+      h4.section-subtitle,
+      h5.section-subtitle,
+      h6.section-subtitle {
+        margin-top: 0.4em;
+      }
+
+      h1.title {
+        text-align: center;
+      }
+
+      h2.subtitle {
+        text-align: center;
+      }
+
+      hr.docutils {
+        width: 75%;
+      }
+
+      img.align-left,
+      .figure.align-left,
+      object.align-left,
+      table.align-left {
+        clear: left;
+        float: left;
+        margin-right: 1em;
+      }
+
+      img.align-right,
+      .figure.align-right,
+      object.align-right,
+      table.align-right {
+        clear: right;
+        float: right;
+        margin-left: 1em;
+      }
+
+      img.align-center,
+      .figure.align-center,
+      object.align-center {
+        display: block;
+        margin-left: auto;
+        margin-right: auto;
+      }
+
+      table.align-center {
+        margin-left: auto;
+        margin-right: auto;
+      }
+
+      .align-left {
+        text-align: left;
+      }
+
+      .align-center {
+        clear: both;
+        text-align: center;
+      }
+
+      .align-right {
+        text-align: right;
+      }
+
+      /* reset inner alignment in figures */
+      div.align-right {
+        text-align: inherit;
+      }
+
+      /* div.align-center * { */
+      /*   text-align: left } */
+
+      .align-top {
+        vertical-align: top;
+      }
+
+      .align-middle {
+        vertical-align: middle;
+      }
+
+      .align-bottom {
+        vertical-align: bottom;
+      }
+
+      ol.simple,
+      ul.simple {
+        margin-bottom: 1em;
+      }
+
+      ol.arabic {
+        list-style: decimal;
+      }
+
+      ol.loweralpha {
+        list-style: lower-alpha;
+      }
+
+      ol.upperalpha {
+        list-style: upper-alpha;
+      }
+
+      ol.lowerroman {
+        list-style: lower-roman;
+      }
+
+      ol.upperroman {
+        list-style: upper-roman;
+      }
+
+      p.attribution {
+        text-align: right;
+        margin-left: 50%;
+      }
+
+      p.caption {
+        font-style: italic;
+      }
+
+      p.credits {
+        font-style: italic;
+        font-size: smaller;
+      }
+
+      p.label {
+        white-space: nowrap;
+      }
+
+      p.rubric {
+        font-weight: bold;
+        font-size: larger;
+        color: maroon;
+        text-align: center;
+      }
+
+      p.sidebar-title {
+        font-family: sans-serif;
+        font-weight: bold;
+        font-size: larger;
+      }
+
+      p.sidebar-subtitle {
+        font-family: sans-serif;
+        font-weight: bold;
+      }
+
+      p.topic-title {
+        font-weight: bold;
+      }
+
+      pre.address {
+        margin-bottom: 0;
+        margin-top: 0;
+        font: inherit;
+      }
+
+      pre.literal-block,
+      pre.doctest-block,
+      pre.math,
+      pre.code {
+        margin-left: 2em;
+        margin-right: 2em;
+      }
+
+      pre.code .ln {
+        color: grey;
+      } /* 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;
+      }
+      pre.code .literal.string,
+      code .literal.string {
+        color: #0c5404;
+      }
+      pre.code .name.builtin,
+      code .name.builtin {
+        color: #352b84;
+      }
+      pre.code .deleted,
+      code .deleted {
+        background-color: #deb0a1;
+      }
+      pre.code .inserted,
+      code .inserted {
+        background-color: #a3d289;
+      }
+
+      span.classifier {
+        font-family: sans-serif;
+        font-style: oblique;
+      }
+
+      span.classifier-delimiter {
+        font-family: sans-serif;
+        font-weight: bold;
+      }
+
+      span.interpreted {
+        font-family: sans-serif;
+      }
+
+      span.option {
+        white-space: nowrap;
+      }
+
+      span.pre {
+        white-space: pre;
+      }
+
+      span.problematic {
+        color: red;
+      }
+
+      span.section-subtitle {
+        /* font-size relative to parent (h1..h6 element) */
+        font-size: 80%;
+      }
+
+      table.citation {
+        border-left: solid 1px gray;
+        margin-left: 1px;
+      }
+
+      table.docinfo {
+        margin: 2em 4em;
+      }
+
+      table.docutils {
+        margin-top: 0.5em;
+        margin-bottom: 0.5em;
+      }
+
+      table.footnote {
+        border-left: solid 1px black;
+        margin-left: 1px;
+      }
+
+      table.docutils td,
+      table.docutils th,
+      table.docinfo td,
+      table.docinfo th {
+        padding-left: 0.5em;
+        padding-right: 0.5em;
+        vertical-align: top;
+      }
+
+      table.docutils th.field-name,
+      table.docinfo th.docinfo-name {
+        font-weight: bold;
+        text-align: left;
+        white-space: nowrap;
+        padding-left: 0;
+      }
+
+      /* "booktabs" style (no vertical lines) */
+      table.docutils.booktabs {
+        border: 0px;
+        border-top: 2px solid;
+        border-bottom: 2px solid;
+        border-collapse: collapse;
+      }
+      table.docutils.booktabs * {
+        border: 0px;
+      }
+      table.docutils.booktabs th {
+        border-bottom: thin solid;
+        text-align: left;
+      }
+
+      h1 tt.docutils,
+      h2 tt.docutils,
+      h3 tt.docutils,
+      h4 tt.docutils,
+      h5 tt.docutils,
+      h6 tt.docutils {
+        font-size: 100%;
+      }
+
+      ul.auto-toc {
+        list-style-type: none;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="document" id="field-service-sales">
+      <h1 class="title">Field Service - Sales</h1>
+
+      <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/12.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" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-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" href="https://runbot.odoo-community.org/runbot/264/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
-<p>The module integrates the Field Service application with the Sales one and
-allows you to sell products that generate field service orders.</p>
-<p><strong>Table of contents</strong></p>
-<div class="contents local topic" id="contents">
-<ul class="simple">
-<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
-<li><a class="reference internal" href="#configuration" id="id2">Configuration</a></li>
-<li><a class="reference internal" href="#usage" id="id3">Usage</a></li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="id4">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id5">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id6">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id7">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id8">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id9">Maintainers</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="installation">
-<h1><a class="toc-backref" href="#id1">Installation</a></h1>
-<p>To install Field Service and have the mapping features, you need to install GeoEngine.</p>
-<p>Please refer to the installation instructions available at:
-<a class="reference external" href="https://github.com/OCA/geospatial/tree/12.0/base_geoengine">https://github.com/OCA/geospatial/tree/12.0/base_geoengine</a></p>
-</div>
-<div class="section" id="configuration">
-<h1><a class="toc-backref" href="#id2">Configuration</a></h1>
-<p>Products must be configured properly in order to create field service
-orders upon sale order confirmation.</p>
-<p>The field service tracking of a product defines how it generates a field service
-order if the product is sold via sale order.</p>
-<p>To configure a product that generates a unique field service order on each
-sale order line:</p>
-<ul class="simple">
-<li>Go to Sales &gt; Catalog &gt; Products</li>
-<li>Create or select a product</li>
-<li>Set the Field Service Tracking to ???One FSM Order per Sale Order Line???</li>
-<li>Select the FSM Order Template that will be used for creating FSM Orders when
-a Sale Order is confirmed with this product</li>
-</ul>
-<p>To configure a product that generates a unique field service order for
-an individual sale order:</p>
-<ul class="simple">
-<li>Go to Sales &gt; Catalog &gt; Products</li>
-<li>Create or select a product</li>
-<li>Set the Field Service Tracking to ???One FSM Order per Sale Order???</li>
-<li>Select the FSM Order Template that will be used for creating FSM Orders when
-a Sale Order is confirmed with this product</li>
-</ul>
-<p>To setup a sales territory:</p>
-<ul class="simple">
-<li>Go to Field Service &gt; Master Data &gt; Locations</li>
-<li>Create or select a location</li>
-<li>Go to the Sales tab and select the sales territory</li>
-</ul>
-</div>
-<div class="section" id="usage">
-<h1><a class="toc-backref" href="#id3">Usage</a></h1>
-<ul class="simple">
-<li>Go to Sales</li>
-<li>Create a new Quotation/Sale Order</li>
-<li>Set the FSM Location to be used</li>
-<li>On a Sale Order Line, select a product configured for field service orders</li>
-<li>Confirm the Sale Order</li>
-<li>Field Service orders linked to SO lines are created</li>
-<li><dl class="first docutils">
-<dt>When a Field Service order is completed, the quantity delivered for its</dt>
-<dd>linked sale order line will be updated to the quantity ordered, indicating
-this line is ready for invoicing.</dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
-<ul class="simple">
-<li>Provide a mapping between an address and the branch and use it to set the
-pricelist of a new partner</li>
-</ul>
-</div>
-<div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2012.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">
-<h1><a class="toc-backref" href="#id6">Credits</a></h1>
-<div class="section" id="authors">
-<h2><a class="toc-backref" href="#id7">Authors</a></h2>
-<ul class="simple">
-<li>Open Source Integrators</li>
-</ul>
-</div>
-<div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id8">Contributors</a></h2>
-<ul class="simple">
-<li>Open Source Integrators &lt;<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>&gt;<ul>
-<li>Steve Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#64;opensourceintegrators.com</a>&gt;</li>
-<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
-<li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
-</ul>
-</li>
-<li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
-<li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
-<li>Rapha??l Reverdy &lt;<a class="reference external" href="mailto:raphael.reverdy&#64;akretion.com">raphael.reverdy&#64;akretion.com</a>&gt;</li>
-<li>Cl??ment Mombereau &lt;<a class="reference external" href="mailto:clement.mombereau&#64;akretion.com">clement.mombereau&#64;akretion.com</a>&gt;</li>
-</ul>
-</div>
-<div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id9">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>
-<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">maintainers</a>:</p>
-<p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/12.0/fieldservice_sale">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>
-</div>
-</body>
+      <p>
+        <a
+          class="reference external"
+          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"
+          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"
+          href="https://github.com/OCA/field-service/tree/12.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"
+          href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-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"
+          href="https://runbot.odoo-community.org/runbot/264/12.0"
+          ><img
+            alt="Try me on Runbot"
+            src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png"
+        /></a>
+      </p>
+      <p>
+        The module integrates the Field Service application with the Sales one and
+        allows you to sell products that generate field service orders.
+      </p>
+      <p><strong>Table of contents</strong></p>
+      <div class="contents local topic" id="contents">
+        <ul class="simple">
+          <li>
+            <a class="reference internal" href="#installation" id="id1">Installation</a>
+          </li>
+          <li>
+            <a class="reference internal" href="#configuration" id="id2"
+              >Configuration</a
+            >
+          </li>
+          <li><a class="reference internal" href="#usage" id="id3">Usage</a></li>
+          <li>
+            <a class="reference internal" href="#known-issues-roadmap" id="id4"
+              >Known issues / Roadmap</a
+            >
+          </li>
+          <li>
+            <a class="reference internal" href="#bug-tracker" id="id5">Bug Tracker</a>
+          </li>
+          <li>
+            <a class="reference internal" href="#credits" id="id6">Credits</a>
+            <ul>
+              <li>
+                <a class="reference internal" href="#authors" id="id7">Authors</a>
+              </li>
+              <li>
+                <a class="reference internal" href="#contributors" id="id8"
+                  >Contributors</a
+                >
+              </li>
+              <li>
+                <a class="reference internal" href="#maintainers" id="id9"
+                  >Maintainers</a
+                >
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+      <div class="section" id="installation">
+        <h1><a class="toc-backref" href="#id1">Installation</a></h1>
+        <p>
+          To install Field Service and have the mapping features, you need to install
+          GeoEngine.
+        </p>
+        <p>
+          Please refer to the installation instructions available at:
+          <a
+            class="reference external"
+            href="https://github.com/OCA/geospatial/tree/12.0/base_geoengine"
+            >https://github.com/OCA/geospatial/tree/12.0/base_geoengine</a
+          >
+        </p>
+      </div>
+      <div class="section" id="configuration">
+        <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
+        <p>
+          Products must be configured properly in order to create field service orders
+          upon sale order confirmation.
+        </p>
+        <p>
+          The field service tracking of a product defines how it generates a field
+          service order if the product is sold via sale order.
+        </p>
+        <p>
+          To configure a product that generates a unique field service order on each
+          sale order line:
+        </p>
+        <ul class="simple">
+          <li>Go to Sales &gt; Catalog &gt; Products</li>
+          <li>Create or select a product</li>
+          <li>
+            Set the Field Service Tracking to ???One FSM Order per Sale Order Line???
+          </li>
+          <li>
+            Select the FSM Order Template that will be used for creating FSM Orders when
+            a Sale Order is confirmed with this product
+          </li>
+        </ul>
+        <p>
+          To configure a product that generates a unique field service order for an
+          individual sale order:
+        </p>
+        <ul class="simple">
+          <li>Go to Sales &gt; Catalog &gt; Products</li>
+          <li>Create or select a product</li>
+          <li>Set the Field Service Tracking to ???One FSM Order per Sale Order???</li>
+          <li>
+            Select the FSM Order Template that will be used for creating FSM Orders when
+            a Sale Order is confirmed with this product
+          </li>
+        </ul>
+        <p>To setup a sales territory:</p>
+        <ul class="simple">
+          <li>Go to Field Service &gt; Master Data &gt; Locations</li>
+          <li>Create or select a location</li>
+          <li>Go to the Sales tab and select the sales territory</li>
+        </ul>
+      </div>
+      <div class="section" id="usage">
+        <h1><a class="toc-backref" href="#id3">Usage</a></h1>
+        <ul class="simple">
+          <li>Go to Sales</li>
+          <li>Create a new Quotation/Sale Order</li>
+          <li>Set the FSM Location to be used</li>
+          <li>
+            On a Sale Order Line, select a product configured for field service orders
+          </li>
+          <li>Confirm the Sale Order</li>
+          <li>Field Service orders linked to SO lines are created</li>
+          <li>
+            <dl class="first docutils">
+              <dt>
+                When a Field Service order is completed, the quantity delivered for its
+              </dt>
+              <dd>
+                linked sale order line will be updated to the quantity ordered,
+                indicating this line is ready for invoicing.
+              </dd>
+            </dl>
+          </li>
+        </ul>
+      </div>
+      <div class="section" id="known-issues-roadmap">
+        <h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
+        <ul class="simple">
+          <li>
+            Provide a mapping between an address and the branch and use it to set the
+            pricelist of a new partner
+          </li>
+        </ul>
+      </div>
+      <div class="section" id="bug-tracker">
+        <h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed
+          and welcomed
+          <a
+            class="reference external"
+            href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2012.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">
+        <h1><a class="toc-backref" href="#id6">Credits</a></h1>
+        <div class="section" id="authors">
+          <h2><a class="toc-backref" href="#id7">Authors</a></h2>
+          <ul class="simple">
+            <li>Open Source Integrators</li>
+          </ul>
+        </div>
+        <div class="section" id="contributors">
+          <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
+          <ul class="simple">
+            <li>
+              Open Source Integrators &lt;<a
+                class="reference external"
+                href="https://opensourceintegrators.com"
+                >https://opensourceintegrators.com</a
+              >&gt;
+              <ul>
+                <li>
+                  Steve Campbell &lt;<a
+                    class="reference external"
+                    href="mailto:scampbell&#64;opensourceintegrators.com"
+                    >scampbell&#64;opensourceintegrators.com</a
+                  >&gt;
+                </li>
+                <li>
+                  Maxime Chambreuil &lt;<a
+                    class="reference external"
+                    href="mailto:mchambreuil&#64;opensourceintegrators.com"
+                    >mchambreuil&#64;opensourceintegrators.com</a
+                  >&gt;
+                </li>
+                <li>
+                  Wolfgang Hall &lt;<a
+                    class="reference external"
+                    href="mailto:whall&#64;opensourceintegrators.com"
+                    >whall&#64;opensourceintegrators.com</a
+                  >&gt;
+                </li>
+              </ul>
+            </li>
+            <li>
+              Serpent Consulting Services Pvt. Ltd. &lt;<a
+                class="reference external"
+                href="mailto:support&#64;serpentcs.com"
+                >support&#64;serpentcs.com</a
+              >&gt;
+            </li>
+            <li>
+              Brian McMaster &lt;<a
+                class="reference external"
+                href="mailto:brian&#64;mcmpest.com"
+                >brian&#64;mcmpest.com</a
+              >&gt;
+            </li>
+            <li>
+              Rapha??l Reverdy &lt;<a
+                class="reference external"
+                href="mailto:raphael.reverdy&#64;akretion.com"
+                >raphael.reverdy&#64;akretion.com</a
+              >&gt;
+            </li>
+            <li>
+              Cl??ment Mombereau &lt;<a
+                class="reference external"
+                href="mailto:clement.mombereau&#64;akretion.com"
+                >clement.mombereau&#64;akretion.com</a
+              >&gt;
+            </li>
+          </ul>
+        </div>
+        <div class="section" id="maintainers">
+          <h2><a class="toc-backref" href="#id9">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>
+          <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"
+              >maintainers</a
+            >:
+          </p>
+          <p>
+            <a class="reference external" href="https://github.com/wolfhall"
+              ><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px"
+            /></a>
+            <a class="reference external" href="https://github.com/max3903"
+              ><img alt="max3903" src="https://github.com/max3903.png?size=40px"
+            /></a>
+            <a class="reference external" href="https://github.com/brian10048"
+              ><img alt="brian10048" src="https://github.com/brian10048.png?size=40px"
+            /></a>
+          </p>
+          <p>
+            This module is part of the
+            <a
+              class="reference external"
+              href="https://github.com/OCA/field-service/tree/12.0/fieldservice_sale"
+              >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>
+    </div>
+  </body>
 </html>
diff --git a/fieldservice_sale/tests/test_fsm_sale_common.py b/fieldservice_sale/tests/test_fsm_sale_common.py
index 1b8a70c11f..cf182afdd4 100644
--- a/fieldservice_sale/tests/test_fsm_sale_common.py
+++ b/fieldservice_sale/tests/test_fsm_sale_common.py
@@ -1,11 +1,9 @@
 # Copyright (C) 2019 Brian McMaster <brian@mcmpest.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from odoo.addons.sale.tests.test_sale_common import TestCommonSaleNoChart
 
 
 class TestFSMSale(TestCommonSaleNoChart):
-
     @classmethod
     def setUpClass(cls):
         super(TestFSMSale, cls).setUpClass()
@@ -13,85 +11,101 @@ def setUpClass(cls):
     @classmethod
     def setUpFSMTemplates(cls):
         # Create some templates to use on the FSM products
-        FSMTemplate = cls.env['fsm.template']
+        FSMTemplate = cls.env["fsm.template"]
 
         # Template 1
-        cls.fsm_template_1 = FSMTemplate.create({
-            'name': 'Test FSM Template #1',
-            'instructions': 'These are the instructions for Template #1',
-            'hours': 2.25,
-        })
+        cls.fsm_template_1 = FSMTemplate.create(
+            {
+                "name": "Test FSM Template #1",
+                "instructions": "These are the instructions for Template #1",
+                "hours": 2.25,
+            }
+        )
         # Template 2
-        cls.fsm_template_2 = FSMTemplate.create({
-            'name': 'Test FSM Template #2',
-            'instructions': 'Template #2 requires a lot of work',
-            'hours': 4.5,
-        })
+        cls.fsm_template_2 = FSMTemplate.create(
+            {
+                "name": "Test FSM Template #2",
+                "instructions": "Template #2 requires a lot of work",
+                "hours": 4.5,
+            }
+        )
         # Template 3
-        cls.fsm_template_3 = FSMTemplate.create({
-            'name': 'Test FSM Template #3',
-            'instructions': 'Complete the steps outlined for Template #3',
-            'hours': 0.75,
-        })
+        cls.fsm_template_3 = FSMTemplate.create(
+            {
+                "name": "Test FSM Template #3",
+                "instructions": "Complete the steps outlined for Template #3",
+                "hours": 0.75,
+            }
+        )
         # Template 4
-        cls.fsm_template_4 = FSMTemplate.create({
-            'name': 'Test FSM Template #4',
-            'instructions': 'These notes apply to Template #4',
-            'hours': 0.75,
-        })
+        cls.fsm_template_4 = FSMTemplate.create(
+            {
+                "name": "Test FSM Template #4",
+                "instructions": "These notes apply to Template #4",
+                "hours": 0.75,
+            }
+        )
 
     @classmethod
     def setUpFSMProducts(cls):
         cls.setUpFSMTemplates()
         # Product 1 that creates one FSM Order per SO
-        cls.fsm_per_order_1 = cls.env['product.product'].create({
-            'name': 'FSM Order per Sale Order #1',
-            'categ_id': cls.env.ref('product.product_category_3').id,
-            'standard_price': 85.0,
-            'list_price': 90.0,
-            'type': 'service',
-            'uom_id': cls.env.ref('uom.product_uom_unit').id,
-            'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
-            'invoice_policy': 'order',
-            'field_service_tracking': 'sale',
-            'fsm_order_template_id': cls.fsm_template_1.id,
-        })
+        cls.fsm_per_order_1 = cls.env["product.product"].create(
+            {
+                "name": "FSM Order per Sale Order #1",
+                "categ_id": cls.env.ref("product.product_category_3").id,
+                "standard_price": 85.0,
+                "list_price": 90.0,
+                "type": "service",
+                "uom_id": cls.env.ref("uom.product_uom_unit").id,
+                "uom_po_id": cls.env.ref("uom.product_uom_unit").id,
+                "invoice_policy": "order",
+                "field_service_tracking": "sale",
+                "fsm_order_template_id": cls.fsm_template_1.id,
+            }
+        )
         # Product 2 that creates one FSM Order per SO
-        cls.fsm_per_order_2 = cls.env['product.product'].create({
-            'name': 'FSM Order per Sale Order #2',
-            'categ_id': cls.env.ref('product.product_category_3').id,
-            'standard_price': 125.0,
-            'list_price': 140.0,
-            'type': 'service',
-            'uom_id': cls.env.ref('uom.product_uom_unit').id,
-            'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
-            'invoice_policy': 'order',
-            'field_service_tracking': 'sale',
-            'fsm_order_template_id': cls.fsm_template_2.id,
-        })
+        cls.fsm_per_order_2 = cls.env["product.product"].create(
+            {
+                "name": "FSM Order per Sale Order #2",
+                "categ_id": cls.env.ref("product.product_category_3").id,
+                "standard_price": 125.0,
+                "list_price": 140.0,
+                "type": "service",
+                "uom_id": cls.env.ref("uom.product_uom_unit").id,
+                "uom_po_id": cls.env.ref("uom.product_uom_unit").id,
+                "invoice_policy": "order",
+                "field_service_tracking": "sale",
+                "fsm_order_template_id": cls.fsm_template_2.id,
+            }
+        )
         # Product 1 that creates one FSM Order per SO Line
-        cls.fsm_per_line_1 = cls.env['product.product'].create({
-            'name': 'FSM Order per SO Line #1',
-            'categ_id': cls.env.ref('product.product_category_3').id,
-            'standard_price': 75.0,
-            'list_price': 80.0,
-            'type': 'service',
-            'uom_id': cls.env.ref('uom.product_uom_unit').id,
-            'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
-            'invoice_policy': 'delivery',
-            'field_service_tracking': 'line',
-            'fsm_order_template_id': cls.fsm_template_3.id,
-        })
+        cls.fsm_per_line_1 = cls.env["product.product"].create(
+            {
+                "name": "FSM Order per SO Line #1",
+                "categ_id": cls.env.ref("product.product_category_3").id,
+                "standard_price": 75.0,
+                "list_price": 80.0,
+                "type": "service",
+                "uom_id": cls.env.ref("uom.product_uom_unit").id,
+                "uom_po_id": cls.env.ref("uom.product_uom_unit").id,
+                "invoice_policy": "delivery",
+                "field_service_tracking": "line",
+                "fsm_order_template_id": cls.fsm_template_3.id,
+            }
+        )
         # Product 2 that creates one FSM Order per SO Line
-        cls.fsm_per_line_2 = cls.env['product.product'].create({
-            'name': 'FSM Order per SO Line #2',
-            'categ_id': cls.env.ref('product.product_category_3').id,
-            'standard_price': 75.0,
-            'list_price': 80.0,
-            'type': 'service',
-            'uom_id': cls.env.ref('uom.product_uom_unit').id,
-            'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
-            'invoice_policy': 'delivery',
-            'field_service_tracking': 'line',
-            'fsm_order_template_id': cls.fsm_template_4.id,
-        })
+        cls.fsm_per_line_2 = cls.env["product.product"].create(
+            {
+                "name": "FSM Order per SO Line #2",
+                "categ_id": cls.env.ref("product.product_category_3").id,
+                "standard_price": 75.0,
+                "list_price": 80.0,
+                "type": "service",
+                "uom_id": cls.env.ref("uom.product_uom_unit").id,
+                "uom_po_id": cls.env.ref("uom.product_uom_unit").id,
+                "invoice_policy": "delivery",
+                "field_service_tracking": "line",
+                "fsm_order_template_id": cls.fsm_template_4.id,
+            }
+        )
diff --git a/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py b/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
index 8ccbb6c819..a856900b04 100644
--- a/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
+++ b/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
@@ -4,7 +4,6 @@
 
 
 class FSMSale(TransactionCase):
-
     def setUp(self):
         """Create 3 related partners : a parent company, a child partner and
         a child shipping partner.
@@ -16,23 +15,23 @@ def setUp(self):
         """
         super(FSMSale, self).setUp()
         # create a parent company
-        self.commercial_partner = self.env['res.partner'].create({
-            'name': 'Company Commercial Partner',
-            'is_company': True,
-        })
+        self.commercial_partner = self.env["res.partner"].create(
+            {"name": "Company Commercial Partner", "is_company": True}
+        )
         # create a child partner
-        self.partner = self.env['res.partner'].create({
-            'name': 'Child Partner',
-            'parent_id': self.commercial_partner.id,
-        })
+        self.partner = self.env["res.partner"].create(
+            {"name": "Child Partner", "parent_id": self.commercial_partner.id}
+        )
         # create a child partner shipping address
-        self.shipping_partner = self.env['res.partner'].create({
-            'name': 'Shipping Partner',
-            'parent_id': self.commercial_partner.id,
-            'type': 'delivery'
-        })
+        self.shipping_partner = self.env["res.partner"].create(
+            {
+                "name": "Shipping Partner",
+                "parent_id": self.commercial_partner.id,
+                "type": "delivery",
+            }
+        )
         # Demo FS location
-        self.location = self.env.ref('fieldservice.location_1')
+        self.location = self.env.ref("fieldservice.location_1")
 
     def test_1_autofill_so_fsm_location(self):
         """ First case :
@@ -45,12 +44,9 @@ def test_1_autofill_so_fsm_location(self):
         # Link demo FS location to self.partner
         self.location.partner_id = self.partner.id
         # create a Sale Order and run onchange_partner_id
-        self.so = self.env['sale.order'].create(
-            {'partner_id': self.partner.id})
+        self.so = self.env["sale.order"].create({"partner_id": self.partner.id})
         self.so.onchange_partner_id()
-        self.assertEqual(
-            self.so.fsm_location_id.id,
-            self.location.id)
+        self.assertEqual(self.so.fsm_location_id.id, self.location.id)
 
     def test_2_autofill_so_fsm_location(self):
         """ Second case :
@@ -63,12 +59,9 @@ def test_2_autofill_so_fsm_location(self):
         # Link demo FS location to self.shipping_partner
         self.location.partner_id = self.shipping_partner.id
         # create a Sale Order and run onchange_partner_id
-        self.so = self.env['sale.order'].create(
-            {'partner_id': self.partner.id})
+        self.so = self.env["sale.order"].create({"partner_id": self.partner.id})
         self.so.onchange_partner_id()
-        self.assertEqual(
-            self.so.fsm_location_id.id,
-            self.location.id)
+        self.assertEqual(self.so.fsm_location_id.id, self.location.id)
 
     def test_3_autofill_so_fsm_location(self):
         """ Third case :
@@ -81,9 +74,6 @@ def test_3_autofill_so_fsm_location(self):
         # Link demo FS location to self.commercial_partner
         self.location.partner_id = self.commercial_partner.id
         # create a Sale Order and run onchange_partner_id
-        self.so = self.env['sale.order'].create(
-            {'partner_id': self.partner.id})
+        self.so = self.env["sale.order"].create({"partner_id": self.partner.id})
         self.so.onchange_partner_id()
-        self.assertEqual(
-            self.so.fsm_location_id.id,
-            self.location.id)
+        self.assertEqual(self.so.fsm_location_id.id, self.location.id)
diff --git a/fieldservice_sale/tests/test_fsm_sale_order.py b/fieldservice_sale/tests/test_fsm_sale_order.py
index 39c2f63485..c74fc5b549 100644
--- a/fieldservice_sale/tests/test_fsm_sale_order.py
+++ b/fieldservice_sale/tests/test_fsm_sale_order.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2019 Brian McMaster <brian@mcmpest.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from odoo import fields
+
 from .test_fsm_sale_common import TestFSMSale
 
 
@@ -9,114 +9,138 @@ class TestFSMSaleOrder(TestFSMSale):
     @classmethod
     def setUpClass(cls):
         super(TestFSMSaleOrder, cls).setUpClass()
-        cls.test_location = cls.env.ref('fieldservice.test_location')
+        cls.test_location = cls.env.ref("fieldservice.test_location")
 
         # Setup products that when sold will create some FSM orders
         cls.setUpFSMProducts()
 
         # Create some sale orders that will use the above products
-        SaleOrder = cls.env['sale.order'].with_context(tracking_disable=True)
+        SaleOrder = cls.env["sale.order"].with_context(tracking_disable=True)
         # create a generic Sale Order with one product
         # set to create FSM service per sale order
-        cls.sale_order_1 = SaleOrder.create({
-            'partner_id': cls.partner_customer_usd.id,
-            'fsm_location_id': cls.test_location.id,
-            'pricelist_id': cls.pricelist_usd.id,
-        })
-        cls.sol_service_per_order_1 = cls.env['sale.order.line'].create({
-            'name': cls.fsm_per_order_1.name,
-            'product_id': cls.fsm_per_order_1.id,
-            'product_uom_qty': 1,
-            'product_uom': cls.fsm_per_order_1.uom_id.id,
-            'price_unit': cls.fsm_per_order_1.list_price,
-            'order_id': cls.sale_order_1.id,
-            'tax_id': False,
-        })
+        cls.sale_order_1 = SaleOrder.create(
+            {
+                "partner_id": cls.partner_customer_usd.id,
+                "fsm_location_id": cls.test_location.id,
+                "pricelist_id": cls.pricelist_usd.id,
+            }
+        )
+        cls.sol_service_per_order_1 = cls.env["sale.order.line"].create(
+            {
+                "name": cls.fsm_per_order_1.name,
+                "product_id": cls.fsm_per_order_1.id,
+                "product_uom_qty": 1,
+                "product_uom": cls.fsm_per_order_1.uom_id.id,
+                "price_unit": cls.fsm_per_order_1.list_price,
+                "order_id": cls.sale_order_1.id,
+                "tax_id": False,
+            }
+        )
         # create a generic Sale Order with one product
         # set to create FSM service per sale order line
-        cls.sale_order_2 = SaleOrder.create({
-            'partner_id': cls.partner_customer_usd.id,
-            'fsm_location_id': cls.test_location.id,
-            'pricelist_id': cls.pricelist_usd.id,
-        })
-        cls.sol_service_per_line_1 = cls.env['sale.order.line'].create({
-            'name': cls.fsm_per_line_1.name,
-            'product_id': cls.fsm_per_line_1.id,
-            'product_uom_qty': 1,
-            'product_uom': cls.fsm_per_line_1.uom_id.id,
-            'price_unit': cls.fsm_per_line_1.list_price,
-            'order_id': cls.sale_order_2.id,
-            'tax_id': False,
-        })
+        cls.sale_order_2 = SaleOrder.create(
+            {
+                "partner_id": cls.partner_customer_usd.id,
+                "fsm_location_id": cls.test_location.id,
+                "pricelist_id": cls.pricelist_usd.id,
+            }
+        )
+        cls.sol_service_per_line_1 = cls.env["sale.order.line"].create(
+            {
+                "name": cls.fsm_per_line_1.name,
+                "product_id": cls.fsm_per_line_1.id,
+                "product_uom_qty": 1,
+                "product_uom": cls.fsm_per_line_1.uom_id.id,
+                "price_unit": cls.fsm_per_line_1.list_price,
+                "order_id": cls.sale_order_2.id,
+                "tax_id": False,
+            }
+        )
         # create a generic Sale Order with multiple products
         # set to create FSM service per sale order line
-        cls.sale_order_3 = SaleOrder.create({
-            'partner_id': cls.partner_customer_usd.id,
-            'fsm_location_id': cls.test_location.id,
-            'pricelist_id': cls.pricelist_usd.id,
-        })
-        cls.sol_service_per_line_2 = cls.env['sale.order.line'].create({
-            'name': cls.fsm_per_line_1.name,
-            'product_id': cls.fsm_per_line_1.id,
-            'product_uom_qty': 1,
-            'product_uom': cls.fsm_per_line_1.uom_id.id,
-            'price_unit': cls.fsm_per_line_1.list_price,
-            'order_id': cls.sale_order_3.id,
-            'tax_id': False,
-        })
-        cls.sol_service_per_line_3 = cls.env['sale.order.line'].create({
-            'name': cls.fsm_per_line_2.name,
-            'product_id': cls.fsm_per_line_2.id,
-            'product_uom_qty': 1,
-            'product_uom': cls.fsm_per_line_2.uom_id.id,
-            'price_unit': cls.fsm_per_line_2.list_price,
-            'order_id': cls.sale_order_3.id,
-            'tax_id': False,
-        })
+        cls.sale_order_3 = SaleOrder.create(
+            {
+                "partner_id": cls.partner_customer_usd.id,
+                "fsm_location_id": cls.test_location.id,
+                "pricelist_id": cls.pricelist_usd.id,
+            }
+        )
+        cls.sol_service_per_line_2 = cls.env["sale.order.line"].create(
+            {
+                "name": cls.fsm_per_line_1.name,
+                "product_id": cls.fsm_per_line_1.id,
+                "product_uom_qty": 1,
+                "product_uom": cls.fsm_per_line_1.uom_id.id,
+                "price_unit": cls.fsm_per_line_1.list_price,
+                "order_id": cls.sale_order_3.id,
+                "tax_id": False,
+            }
+        )
+        cls.sol_service_per_line_3 = cls.env["sale.order.line"].create(
+            {
+                "name": cls.fsm_per_line_2.name,
+                "product_id": cls.fsm_per_line_2.id,
+                "product_uom_qty": 1,
+                "product_uom": cls.fsm_per_line_2.uom_id.id,
+                "price_unit": cls.fsm_per_line_2.list_price,
+                "order_id": cls.sale_order_3.id,
+                "tax_id": False,
+            }
+        )
         # create a generic Sale Order with mixed products
         # 2 lines based on service per sale order line
         # 2 lines based on service per sale order
-        cls.sale_order_4 = SaleOrder.create({
-            'partner_id': cls.partner_customer_usd.id,
-            'fsm_location_id': cls.test_location.id,
-            'pricelist_id': cls.pricelist_usd.id,
-        })
-        cls.sol_service_per_line_4 = cls.env['sale.order.line'].create({
-            'name': cls.fsm_per_line_1.name,
-            'product_id': cls.fsm_per_line_1.id,
-            'product_uom_qty': 1,
-            'product_uom': cls.fsm_per_line_1.uom_id.id,
-            'price_unit': cls.fsm_per_line_1.list_price,
-            'order_id': cls.sale_order_4.id,
-            'tax_id': False,
-        })
-        cls.sol_service_per_line_5 = cls.env['sale.order.line'].create({
-            'name': cls.fsm_per_line_2.name,
-            'product_id': cls.fsm_per_line_2.id,
-            'product_uom_qty': 1,
-            'product_uom': cls.fsm_per_line_2.uom_id.id,
-            'price_unit': cls.fsm_per_line_2.list_price,
-            'order_id': cls.sale_order_4.id,
-            'tax_id': False,
-        })
-        cls.sol_service_per_order_2 = cls.env['sale.order.line'].create({
-            'name': cls.fsm_per_order_1.name,
-            'product_id': cls.fsm_per_order_1.id,
-            'product_uom_qty': 1,
-            'product_uom': cls.fsm_per_order_1.uom_id.id,
-            'price_unit': cls.fsm_per_order_1.list_price,
-            'order_id': cls.sale_order_4.id,
-            'tax_id': False,
-        })
-        cls.sol_service_per_order_3 = cls.env['sale.order.line'].create({
-            'name': cls.fsm_per_order_2.name,
-            'product_id': cls.fsm_per_order_2.id,
-            'product_uom_qty': 1,
-            'product_uom': cls.fsm_per_order_2.uom_id.id,
-            'price_unit': cls.fsm_per_order_2.list_price,
-            'order_id': cls.sale_order_4.id,
-            'tax_id': False,
-        })
+        cls.sale_order_4 = SaleOrder.create(
+            {
+                "partner_id": cls.partner_customer_usd.id,
+                "fsm_location_id": cls.test_location.id,
+                "pricelist_id": cls.pricelist_usd.id,
+            }
+        )
+        cls.sol_service_per_line_4 = cls.env["sale.order.line"].create(
+            {
+                "name": cls.fsm_per_line_1.name,
+                "product_id": cls.fsm_per_line_1.id,
+                "product_uom_qty": 1,
+                "product_uom": cls.fsm_per_line_1.uom_id.id,
+                "price_unit": cls.fsm_per_line_1.list_price,
+                "order_id": cls.sale_order_4.id,
+                "tax_id": False,
+            }
+        )
+        cls.sol_service_per_line_5 = cls.env["sale.order.line"].create(
+            {
+                "name": cls.fsm_per_line_2.name,
+                "product_id": cls.fsm_per_line_2.id,
+                "product_uom_qty": 1,
+                "product_uom": cls.fsm_per_line_2.uom_id.id,
+                "price_unit": cls.fsm_per_line_2.list_price,
+                "order_id": cls.sale_order_4.id,
+                "tax_id": False,
+            }
+        )
+        cls.sol_service_per_order_2 = cls.env["sale.order.line"].create(
+            {
+                "name": cls.fsm_per_order_1.name,
+                "product_id": cls.fsm_per_order_1.id,
+                "product_uom_qty": 1,
+                "product_uom": cls.fsm_per_order_1.uom_id.id,
+                "price_unit": cls.fsm_per_order_1.list_price,
+                "order_id": cls.sale_order_4.id,
+                "tax_id": False,
+            }
+        )
+        cls.sol_service_per_order_3 = cls.env["sale.order.line"].create(
+            {
+                "name": cls.fsm_per_order_2.name,
+                "product_id": cls.fsm_per_order_2.id,
+                "product_uom_qty": 1,
+                "product_uom": cls.fsm_per_order_2.uom_id.id,
+                "price_unit": cls.fsm_per_order_2.list_price,
+                "order_id": cls.sale_order_4.id,
+                "tax_id": False,
+            }
+        )
 
     def _isp_account_installed(self):
         """ Checks if module is installed which will require more
@@ -124,10 +148,10 @@ def _isp_account_installed(self):
             :return Boolean indicating the installed status of the module
         """
         result = False
-        isp_account_module = self.env['ir.module.module'].search(
-            [('name', '=', 'fieldservice_isp_account')])
-        if isp_account_module and \
-           isp_account_module.state == 'installed':
+        isp_account_module = self.env["ir.module.module"].search(
+            [("name", "=", "fieldservice_isp_account")]
+        )
+        if isp_account_module and isp_account_module.state == "installed":
             result = True
         return result
 
@@ -136,19 +160,20 @@ def _fulfill_order(self, order):
             validation error when attempting to complete the FSM order
             :return FSM Order with additional fields set
         """
-        analytic_account = self.env.ref('analytic.analytic_administratif')
+        analytic_account = self.env.ref("analytic.analytic_administratif")
         self.test_location.analytic_account_id = analytic_account.id
-        timesheet = self.env['account.analytic.line'].create({
-            'name': 'timesheet_line',
-            'unit_amount': 1,
-            'account_id': analytic_account.id,
-            'user_id': self.env.ref('base.partner_admin').id,
-            'product_id': self.env.ref(
-                'fieldservice_isp_account.field_service_regular_time').id,
-        })
-        order.write({
-            'employee_timesheet_ids': [(6, 0, timesheet.ids)],
-        })
+        timesheet = self.env["account.analytic.line"].create(
+            {
+                "name": "timesheet_line",
+                "unit_amount": 1,
+                "account_id": analytic_account.id,
+                "user_id": self.env.ref("base.partner_admin").id,
+                "product_id": self.env.ref(
+                    "fieldservice_isp_account.field_service_regular_time"
+                ).id,
+            }
+        )
+        order.write({"employee_timesheet_ids": [(6, 0, timesheet.ids)]})
         return order
 
     def test_sale_order_1(self):
@@ -160,36 +185,39 @@ def test_sale_order_1(self):
         self.sale_order_1.action_confirm()
         # 1 FSM order created
         self.assertEqual(
-            len(self.sale_order_1.fsm_order_ids.ids), 1,
-            'FSM Sale: Sale Order 1 should create 1 FSM Order')
-        FSM_Order = self.env['fsm.order']
+            len(self.sale_order_1.fsm_order_ids.ids),
+            1,
+            "FSM Sale: Sale Order 1 should create 1 FSM Order",
+        )
+        FSM_Order = self.env["fsm.order"]
         fsm_order = FSM_Order.search(
-            [('id', '=', self.sale_order_1.fsm_order_ids[0].id)])
+            [("id", "=", self.sale_order_1.fsm_order_ids[0].id)]
+        )
         # Sale Order linked to FSM order
         self.assertEqual(
-            len(fsm_order.ids), 1,
-            'FSM Sale: Sale Order not linked to FSM Order')
+            len(fsm_order.ids), 1, "FSM Sale: Sale Order not linked to FSM Order"
+        )
 
         # Complete the FSM order
         if self._isp_account_installed():
             fsm_order = self._fulfill_order(fsm_order)
-        fsm_order.write({
-            'date_end': fields.Datetime.today(),
-            'resolution': 'Work completed',
-        })
+        fsm_order.write(
+            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+        )
         fsm_order.action_complete()
 
         # Invoice the order
-        Invoice = self.env['account.invoice']
+        Invoice = self.env["account.invoice"]
         inv_id = self.sale_order_1.action_invoice_create()
         invoice = Invoice.browse(inv_id)
         # 1 invoices created
         self.assertEqual(
-            len(invoice.ids), 1,
-            'FSM Sale: Sale Order 1 should create 1 invoice')
+            len(invoice.ids), 1, "FSM Sale: Sale Order 1 should create 1 invoice"
+        )
         self.assertTrue(
             fsm_order in invoice.fsm_order_ids,
-            'FSM Sale: Invoice should be linked to FSM Order')
+            "FSM Sale: Invoice should be linked to FSM Order",
+        )
 
     def test_sale_order_2(self):
         """ Test the sales order 2 flow from sale to invoice.
@@ -202,41 +230,43 @@ def test_sale_order_2(self):
         self.sale_order_2.action_confirm()
         # 1 order created
         self.assertEqual(
-            len(self.sale_order_2.fsm_order_ids.ids), 1,
-            'FSM Sale: Sale Order 2 should create 1 FSM Order')
-        FSM_Order = self.env['fsm.order']
-        fsm_order = FSM_Order.search(
-            [('id', '=', sol.fsm_order_id.id)])
+            len(self.sale_order_2.fsm_order_ids.ids),
+            1,
+            "FSM Sale: Sale Order 2 should create 1 FSM Order",
+        )
+        FSM_Order = self.env["fsm.order"]
+        fsm_order = FSM_Order.search([("id", "=", sol.fsm_order_id.id)])
         # SOL linked to FSM order
         self.assertTrue(
             sol.fsm_order_id.id == fsm_order.id,
-            'FSM Sale: Sale Order 2 Line not linked to FSM Order')
+            "FSM Sale: Sale Order 2 Line not linked to FSM Order",
+        )
 
         # Complete the FSM order
         if self._isp_account_installed():
             fsm_order = self._fulfill_order(fsm_order)
-        fsm_order.write({
-            'date_end': fields.Datetime.today(),
-            'resolution': 'Work completed',
-        })
+        fsm_order.write(
+            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+        )
         fsm_order.action_complete()
         # qty delivered should be updated
         self.assertTrue(
             sol.qty_delivered == sol.product_uom_qty,
-            'FSM Sale: Sale Order Line qty delivered not equal to qty ordered'
+            "FSM Sale: Sale Order Line qty delivered not equal to qty ordered",
         )
 
         # Invoice the order
-        Invoice = self.env['account.invoice']
+        Invoice = self.env["account.invoice"]
         inv_id = self.sale_order_2.action_invoice_create()
         invoice = Invoice.browse(inv_id)
         # 1 invoice created
         self.assertEqual(
-            len(invoice.ids), 1,
-            'FSM Sale: Sale Order 2 should create 1 invoice')
+            len(invoice.ids), 1, "FSM Sale: Sale Order 2 should create 1 invoice"
+        )
         self.assertTrue(
             fsm_order in invoice.fsm_order_ids,
-            'FSM Sale: Invoice should be linked to FSM Order')
+            "FSM Sale: Invoice should be linked to FSM Order",
+        )
 
     def test_sale_order_3(self):
         """ Test sale order 3 flow from sale to invoice.
@@ -251,59 +281,63 @@ def test_sale_order_3(self):
         self.sale_order_3.action_confirm()
         # 2 orders created and SOLs linked to FSM orders
         self.assertEqual(
-            len(self.sale_order_3.fsm_order_ids.ids), 2,
-            'FSM Sale: Sale Order 3 should create 2 FSM Orders')
-        FSM_Order = self.env['fsm.order']
-        fsm_order_1 = FSM_Order.search([('id', '=', sol1.fsm_order_id.id)])
+            len(self.sale_order_3.fsm_order_ids.ids),
+            2,
+            "FSM Sale: Sale Order 3 should create 2 FSM Orders",
+        )
+        FSM_Order = self.env["fsm.order"]
+        fsm_order_1 = FSM_Order.search([("id", "=", sol1.fsm_order_id.id)])
         self.assertTrue(
             sol1.fsm_order_id.id == fsm_order_1.id,
-            'FSM Sale: Sale Order Line 2 not linked to FSM Order')
-        fsm_order_2 = FSM_Order.search([('id', '=', sol2.fsm_order_id.id)])
+            "FSM Sale: Sale Order Line 2 not linked to FSM Order",
+        )
+        fsm_order_2 = FSM_Order.search([("id", "=", sol2.fsm_order_id.id)])
         self.assertTrue(
             sol2.fsm_order_id.id == fsm_order_2.id,
-            'FSM Sale: Sale Order Line 3 not linked to FSM Order')
+            "FSM Sale: Sale Order Line 3 not linked to FSM Order",
+        )
 
         # Complete the FSM orders
         if self._isp_account_installed():
             fsm_order_1 = self._fulfill_order(fsm_order_1)
-        fsm_order_1.write({
-            'date_end': fields.Datetime.today(),
-            'resolution': 'Work completed',
-        })
+        fsm_order_1.write(
+            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+        )
         fsm_order_1.action_complete()
         self.assertTrue(
             sol1.qty_delivered == sol1.product_uom_qty,
-            'FSM Sale: Sale Order Line qty delivered not equal to qty ordered'
+            "FSM Sale: Sale Order Line qty delivered not equal to qty ordered",
         )
         if self._isp_account_installed():
             fsm_order_2 = self._fulfill_order(fsm_order_2)
-        fsm_order_2.write({
-            'date_end': fields.Datetime.today(),
-            'resolution': 'Work completed',
-        })
+        fsm_order_2.write(
+            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+        )
         fsm_order_2.action_complete()
         self.assertTrue(
             sol2.qty_delivered == sol2.product_uom_qty,
-            'FSM Sale: Sale Order Line qty delivered not equal to qty ordered'
+            "FSM Sale: Sale Order Line qty delivered not equal to qty ordered",
         )
 
         # Invoice the sale order
-        Invoice = self.env['account.invoice']
+        Invoice = self.env["account.invoice"]
         inv_id = self.sale_order_3.action_invoice_create()
         invoices = Invoice.browse(inv_id)
         # 2 invoices created
         self.assertEqual(
-            len(invoices.ids), 2,
-            'FSM Sale: Sale Order 3 should create 2 invoices')
+            len(invoices.ids), 2, "FSM Sale: Sale Order 3 should create 2 invoices"
+        )
         inv_fsm_orders = FSM_Order
         for inv in invoices:
             inv_fsm_orders |= inv.fsm_order_ids
         self.assertTrue(
             fsm_order_1 in inv_fsm_orders,
-            'FSM Sale: FSM Order 1 should be linked to invoice')
+            "FSM Sale: FSM Order 1 should be linked to invoice",
+        )
         self.assertTrue(
             fsm_order_2 in inv_fsm_orders,
-            'FSM Sale: FSM Order 2 should be linked to invoice')
+            "FSM Sale: FSM Order 2 should be linked to invoice",
+        )
 
     def test_sale_order_4(self):
         """ Test sale order 4 flow from sale to invoice.
@@ -320,67 +354,73 @@ def test_sale_order_4(self):
         self.sale_order_4.action_confirm()
         # 3 orders created
         self.assertEqual(
-            len(self.sale_order_4.fsm_order_ids.ids), 3,
-            'FSM Sale: Sale Order 4 should create 3 FSM Orders')
-        FSM_Order = self.env['fsm.order']
-        fsm_order_1 = FSM_Order.search([('id', '=', sol1.fsm_order_id.id)])
+            len(self.sale_order_4.fsm_order_ids.ids),
+            3,
+            "FSM Sale: Sale Order 4 should create 3 FSM Orders",
+        )
+        FSM_Order = self.env["fsm.order"]
+        fsm_order_1 = FSM_Order.search([("id", "=", sol1.fsm_order_id.id)])
         self.assertTrue(
             sol1.fsm_order_id.id == fsm_order_1.id,
-            'FSM Sale: Sale Order Line not linked to FSM Order')
-        fsm_order_2 = FSM_Order.search([('id', '=', sol2.fsm_order_id.id)])
+            "FSM Sale: Sale Order Line not linked to FSM Order",
+        )
+        fsm_order_2 = FSM_Order.search([("id", "=", sol2.fsm_order_id.id)])
         self.assertTrue(
             sol2.fsm_order_id.id == fsm_order_2.id,
-            'FSM Sale: Sale Order Line not linked to FSM Order')
-        fsm_order_3 = FSM_Order.search([
-            ('id', 'in', self.sale_order_4.fsm_order_ids.ids),
-            ('sale_line_id', '=', False)])
+            "FSM Sale: Sale Order Line not linked to FSM Order",
+        )
+        fsm_order_3 = FSM_Order.search(
+            [
+                ("id", "in", self.sale_order_4.fsm_order_ids.ids),
+                ("sale_line_id", "=", False),
+            ]
+        )
         self.assertEqual(
-            len(fsm_order_3.ids), 1,
-            'FSM Sale: FSM Order not linked to Sale Order')
+            len(fsm_order_3.ids), 1, "FSM Sale: FSM Order not linked to Sale Order"
+        )
 
         # Complete the FSM order
         if self._isp_account_installed():
             fsm_order_1 = self._fulfill_order(fsm_order_1)
-        fsm_order_1.write({
-            'date_end': fields.Datetime.today(),
-            'resolution': 'Work completed',
-        })
+        fsm_order_1.write(
+            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+        )
         fsm_order_1.action_complete()
         self.assertTrue(
             sol1.qty_delivered == sol1.product_uom_qty,
-            'FSM Sale: Sale Order Line qty delivered not equal to qty ordered'
+            "FSM Sale: Sale Order Line qty delivered not equal to qty ordered",
         )
         if self._isp_account_installed():
             fsm_order_2 = self._fulfill_order(fsm_order_2)
-        fsm_order_2.write({
-            'date_end': fields.Datetime.today(),
-            'resolution': 'Work completed',
-        })
+        fsm_order_2.write(
+            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+        )
         fsm_order_2.action_complete()
         self.assertTrue(
             sol2.qty_delivered == sol2.product_uom_qty,
-            'FSM Sale: Sale Order Line qty delivered not equal to qty ordered'
+            "FSM Sale: Sale Order Line qty delivered not equal to qty ordered",
         )
         if self._isp_account_installed():
             fsm_order_3 = self._fulfill_order(fsm_order_3)
-        fsm_order_3.write({
-            'date_end': fields.Datetime.today(),
-            'resolution': 'Work completed',
-        })
+        fsm_order_3.write(
+            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+        )
         fsm_order_3.action_complete()
         # qty_delivered does not update for FSM orders linked only to the sale
 
         # Invoice the sale order
-        Invoice = self.env['account.invoice']
+        Invoice = self.env["account.invoice"]
         inv_id = self.sale_order_4.action_invoice_create()
         invoices = Invoice.browse(inv_id)
         # 3 invoices created
         self.assertEqual(
-            len(invoices.ids), 3,
-            'FSM Sale: Sale Order 4 should create 3 invoices')
+            len(invoices.ids), 3, "FSM Sale: Sale Order 4 should create 3 invoices"
+        )
         inv_fsm_orders = FSM_Order
         for inv in invoices:
             inv_fsm_orders |= inv.fsm_order_ids
         self.assertEqual(
-            len(inv_fsm_orders.ids), 3,
-            'FSM Sale: There should be 3 orders for 3 invoices')
+            len(inv_fsm_orders.ids),
+            3,
+            "FSM Sale: There should be 3 orders for 3 invoices",
+        )
diff --git a/fieldservice_sale/views/fsm_branch.xml b/fieldservice_sale/views/fsm_branch.xml
index 279f5ab023..6f46faa6a1 100644
--- a/fieldservice_sale/views/fsm_branch.xml
+++ b/fieldservice_sale/views/fsm_branch.xml
@@ -1,14 +1,12 @@
 <odoo>
-
     <record id="fsm_branch_form_view_pricelist" model="ir.ui.view">
         <field name="name">fsm.branch.form.pricelist</field>
         <field name="model">fsm.branch</field>
-        <field name="inherit_id" ref="fieldservice.fsm_branch_form_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_branch_form_view" />
         <field name="arch" type="xml">
             <field name="partner_id" position="after">
                 <field name="pricelist_id" groups="product.group_sale_pricelist" />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_sale/views/fsm_location.xml b/fieldservice_sale/views/fsm_location.xml
index 2e5941b96d..c8afa77643 100644
--- a/fieldservice_sale/views/fsm_location.xml
+++ b/fieldservice_sale/views/fsm_location.xml
@@ -1,17 +1,16 @@
 <odoo>
-
     <!-- Field Service Location Form View-->
     <record id="fsm_location_form_view" model="ir.ui.view">
         <field name="name">fsm.location.form</field>
         <field name="model">fsm.location</field>
-        <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_location_form_view" />
         <field name="arch" type="xml">
             <page id="others-page" position="before">
                 <page string="Sales">
                     <group>
                         <group>
-                            <field name="sales_territory_id"/>
-                            <field name="user_id"/>
+                            <field name="sales_territory_id" />
+                            <field name="user_id" />
                         </group>
                     </group>
                 </page>
diff --git a/fieldservice_sale/views/fsm_order.xml b/fieldservice_sale/views/fsm_order.xml
index 8ac8b5392e..d19e4da8f1 100644
--- a/fieldservice_sale/views/fsm_order.xml
+++ b/fieldservice_sale/views/fsm_order.xml
@@ -1,21 +1,21 @@
 <odoo>
-
     <record id="view_fsm_order_form_inherit_sale" model="ir.ui.view">
         <field name="model">fsm.order</field>
-        <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
-                <button type="object"
-                        name="action_view_sales"
-                        class="oe_stat_button"
-                        icon="fa-usd"
-                        attrs="{'invisible': [('sale_line_id', '=', False), ('sale_id', '=', False)]}">
+                <button
+                    type="object"
+                    name="action_view_sales"
+                    class="oe_stat_button"
+                    icon="fa-usd"
+                    attrs="{'invisible': [('sale_line_id', '=', False), ('sale_id', '=', False)]}"
+                >
                     <span class="o_stat_text">Sale Order</span>
-                    <field name="sale_id" attrs="{'invisible': 1}"/>
-                    <field name="sale_line_id" attrs="{'invisible': 1}"/>
+                    <field name="sale_id" attrs="{'invisible': 1}" />
+                    <field name="sale_line_id" attrs="{'invisible': 1}" />
                 </button>
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_sale/views/product_template.xml b/fieldservice_sale/views/product_template.xml
index f7e5e51307..a1da19f361 100644
--- a/fieldservice_sale/views/product_template.xml
+++ b/fieldservice_sale/views/product_template.xml
@@ -2,12 +2,14 @@
     <record id="view_product_fieldservice_form" model="ir.ui.view">
         <field name="name">product.template.fieldservice.form</field>
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy"/>
+        <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='service_type']" position="after">
-                <field name="field_service_tracking" widget="radio"/>
-                <field name="fsm_order_template_id"
-                       attrs="{'invisible': [('field_service_tracking', '=', 'no')], 'required': [('field_service_tracking', '!=', 'no')]}"/>
+                <field name="field_service_tracking" widget="radio" />
+                <field
+                    name="fsm_order_template_id"
+                    attrs="{'invisible': [('field_service_tracking', '=', 'no')], 'required': [('field_service_tracking', '!=', 'no')]}"
+                />
             </xpath>
         </field>
     </record>
diff --git a/fieldservice_sale/views/res_config_settings.xml b/fieldservice_sale/views/res_config_settings.xml
index 5ccce52562..61ebb9c951 100644
--- a/fieldservice_sale/views/res_config_settings.xml
+++ b/fieldservice_sale/views/res_config_settings.xml
@@ -1,12 +1,11 @@
 <odoo>
-
     <record model="res.config.settings" id="res_config_settings_fsm_template">
-        <field name="group_fsm_template" eval="1"/>
+        <field name="group_fsm_template" eval="1" />
     </record>
-
     <function model="res.config.settings" name="execute">
-        <!-- ids = -->      <value eval="[ref('fieldservice_sale.res_config_settings_fsm_template')]"/>
-        <!-- context = -->  <value eval="{}"/>
+        <!-- ids = -->
+        <value eval="[ref('fieldservice_sale.res_config_settings_fsm_template')]" />
+        <!-- context = -->
+        <value eval="{}" />
     </function>
-
 </odoo>
diff --git a/fieldservice_sale/views/sale_order.xml b/fieldservice_sale/views/sale_order.xml
index ef445200a6..fa628c2f6b 100644
--- a/fieldservice_sale/views/sale_order.xml
+++ b/fieldservice_sale/views/sale_order.xml
@@ -2,20 +2,26 @@
     <record id="view_order_form_inherit_sale_fieldservice" model="ir.ui.view">
         <field name="name">sale.order.form.sale.fieldservice</field>
         <field name="model">sale.order</field>
-        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
             <xpath expr="//button[@name='action_view_invoice']" position="before">
-                <button type="object"
-                        name="action_view_fsm_order"
-                        class="oe_stat_button"
-                        icon="fa-map"
-                        attrs="{'invisible': [('fsm_order_count', '=', 0)]}"
-                        groups="fieldservice.group_fsm_user">
-                    <field name="fsm_order_count" widget="statinfo" string="FSM Orders"/>
+                <button
+                    type="object"
+                    name="action_view_fsm_order"
+                    class="oe_stat_button"
+                    icon="fa-map"
+                    attrs="{'invisible': [('fsm_order_count', '=', 0)]}"
+                    groups="fieldservice.group_fsm_user"
+                >
+                    <field
+                        name="fsm_order_count"
+                        widget="statinfo"
+                        string="FSM Orders"
+                    />
                 </button>
             </xpath>
             <xpath expr="//field[@name='partner_shipping_id']" position="after">
-                <field name="fsm_location_id"/>
+                <field name="fsm_location_id" />
             </xpath>
         </field>
     </record>

From 571e22a8c413247616efa80c006998e72faa0474 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 18 Jul 2020 00:08:36 -0400
Subject: [PATCH 47/77] [MIG] fieldservice_sale: Migration to 13.0

---
 fieldservice_sale/__manifest__.py           | 2 +-
 fieldservice_sale/models/sale_order.py      | 6 ------
 fieldservice_sale/models/sale_order_line.py | 6 ------
 fieldservice_sale/readme/INSTALL.rst        | 2 +-
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 7f47a70077..94b8f9007c 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service - Sales",
-    "version": "12.0.2.5.1",
+    "version": "13.0.1.0.0",
     "summary": "Sell field services.",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 571e0317c0..30c06f7e3c 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -22,7 +22,6 @@ class SaleOrder(models.Model):
         string="FSM Orders", compute="_compute_fsm_order_ids"
     )
 
-    @api.multi
     @api.depends("order_line")
     def _compute_fsm_order_ids(self):
         for order in self:
@@ -79,7 +78,6 @@ def _field_create_fsm_order_prepare_values(self):
             "company_id": self.company_id.id,
         }
 
-    @api.multi
     def _field_create_fsm_order(self):
         """ Generate fsm_order for the given Sale Order, and link it.
             :return a mapping with the sale order id and its linked fsm_order
@@ -113,7 +111,6 @@ def _field_create_fsm_order(self):
             result[so.id] = fsm_order
         return result
 
-    @api.multi
     def _field_find_fsm_order(self):
         """ Find the fsm_order generated by the Sale Order. If no fsm_order
             linked, it will be created automatically.
@@ -138,7 +135,6 @@ def _field_find_fsm_order(self):
             result[so.id] = fsm_order
         return result
 
-    @api.multi
     def _action_confirm(self):
         """ On SO confirmation, some lines generate field service orders. """
         result = super(SaleOrder, self)._action_confirm()
@@ -150,7 +146,6 @@ def _action_confirm(self):
             self.order_line._field_service_generation()
         return result
 
-    @api.multi
     def action_invoice_create(self, grouped=False, final=False):
         invoice_ids = super().action_invoice_create(grouped, final)
         result = invoice_ids or []
@@ -205,7 +200,6 @@ def action_invoice_create(self, grouped=False, final=False):
                     result.append(new.id)
         return result
 
-    @api.multi
     def action_view_fsm_order(self):
         fsm_orders = self.mapped("fsm_order_ids")
         action = self.env.ref("fieldservice.action_fsm_dash_order").read()[0]
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index cbc793aac6..db320def81 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -25,7 +25,6 @@ def _compute_product_updatable(self):
             else:
                 super(SaleOrderLine, line)._compute_product_updatable()
 
-    @api.multi
     @api.depends("product_id")
     def _compute_qty_delivered_method(self):
         super(SaleOrderLine, self)._compute_qty_delivered_method()
@@ -33,7 +32,6 @@ def _compute_qty_delivered_method(self):
             if not line.is_expense and line.product_id.field_service_tracking == "line":
                 line.qty_delivered_method = "field_service"
 
-    @api.multi
     @api.depends("fsm_order_id.stage_id")
     def _compute_qty_delivered(self):
         super(SaleOrderLine, self)._compute_qty_delivered()
@@ -73,7 +71,6 @@ def _field_create_fsm_order_prepare_values(self):
             "company_id": self.company_id.id,
         }
 
-    @api.multi
     def _field_create_fsm_order(self):
         """ Generate fsm_order for the given so line, and link it.
             :return a mapping with the so line id and its linked fsm_order
@@ -108,7 +105,6 @@ def _field_create_fsm_order(self):
             result[so_line.id] = fsm_order
         return result
 
-    @api.multi
     def _field_find_fsm_order(self):
         """ Find the fsm_order generated by the so lines. If no fsm_order
             linked, it will be created automatically.
@@ -132,7 +128,6 @@ def _field_find_fsm_order(self):
                 res[so_line.id] = fsm_order
             return res
 
-    @api.multi
     def _field_service_generation(self):
         """ For service lines, create the field service order. If it already
             exists, it simply links the existing one to the line.
@@ -145,7 +140,6 @@ def _field_service_generation(self):
             if rec.product_id.field_service_tracking == "line":
                 rec._field_find_fsm_order()
 
-    @api.multi
     def _prepare_invoice_line(self, qty):
         res = super()._prepare_invoice_line(qty)
         res.update({"fsm_order_id": self.fsm_order_id.id})
diff --git a/fieldservice_sale/readme/INSTALL.rst b/fieldservice_sale/readme/INSTALL.rst
index 8571f65376..e5355c4b0f 100644
--- a/fieldservice_sale/readme/INSTALL.rst
+++ b/fieldservice_sale/readme/INSTALL.rst
@@ -1,4 +1,4 @@
 To install Field Service and have the mapping features, you need to install GeoEngine.
 
 Please refer to the installation instructions available at:
-https://github.com/OCA/geospatial/tree/12.0/base_geoengine
+https://github.com/OCA/geospatial/tree/13.0/base_geoengine

From 9a610c0ba755677326f0b7c8f07d3418b0f65040 Mon Sep 17 00:00:00 2001
From: Raphael <rlee@opensourceintegrators.com>
Date: Mon, 5 Oct 2020 16:31:29 -0700
Subject: [PATCH 48/77] [FIX] fieldservice_sale migration changes

---
 fieldservice_sale/__manifest__.py                    |  2 +-
 fieldservice_sale/models/__init__.py                 |  2 +-
 fieldservice_sale/models/fsm_location.py             |  2 +-
 .../models/{fsm_branch.py => res_branch.py}          |  4 ++--
 fieldservice_sale/readme/CONTRIBUTORS.rst            |  1 +
 fieldservice_sale/views/fsm_branch.xml               | 12 ------------
 fieldservice_sale/views/res_branch.xml               | 12 ++++++++++++
 fieldservice_sale/views/res_config_settings.xml      |  3 ---
 8 files changed, 18 insertions(+), 20 deletions(-)
 rename fieldservice_sale/models/{fsm_branch.py => res_branch.py} (84%)
 delete mode 100644 fieldservice_sale/views/fsm_branch.xml
 create mode 100644 fieldservice_sale/views/res_branch.xml

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 94b8f9007c..1659be6b22 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -10,10 +10,10 @@
     "depends": ["fieldservice", "sale_management", "fieldservice_account"],
     "data": [
         "security/ir.model.access.csv",
-        "views/fsm_branch.xml",
         "views/fsm_location.xml",
         "views/fsm_order.xml",
         "views/product_template.xml",
+        "views/res_branch.xml",
         "views/sale_order.xml",
         "views/res_config_settings.xml",
     ],
diff --git a/fieldservice_sale/models/__init__.py b/fieldservice_sale/models/__init__.py
index fda80ebcfa..dfe9d6412e 100644
--- a/fieldservice_sale/models/__init__.py
+++ b/fieldservice_sale/models/__init__.py
@@ -2,10 +2,10 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
-    fsm_branch,
     fsm_location,
     fsm_order,
     product_template,
+    res_branch,
     sale_order_line,
     sale_order,
 )
diff --git a/fieldservice_sale/models/fsm_location.py b/fieldservice_sale/models/fsm_location.py
index eb1d302ae0..be5cb6f85f 100644
--- a/fieldservice_sale/models/fsm_location.py
+++ b/fieldservice_sale/models/fsm_location.py
@@ -6,4 +6,4 @@
 class FSMLocation(models.Model):
     _inherit = "fsm.location"
 
-    sales_territory_id = fields.Many2one("fsm.territory", string="Sales Territory")
+    sales_territory_id = fields.Many2one("res.territory", string="Sales Territory")
diff --git a/fieldservice_sale/models/fsm_branch.py b/fieldservice_sale/models/res_branch.py
similarity index 84%
rename from fieldservice_sale/models/fsm_branch.py
rename to fieldservice_sale/models/res_branch.py
index a8fadfee49..e9a601932e 100644
--- a/fieldservice_sale/models/fsm_branch.py
+++ b/fieldservice_sale/models/res_branch.py
@@ -3,8 +3,8 @@
 from odoo import fields, models
 
 
-class FSMBranch(models.Model):
-    _inherit = "fsm.branch"
+class ResBranch(models.Model):
+    _inherit = "res.branch"
 
     pricelist_id = fields.Many2one(
         "product.pricelist",
diff --git a/fieldservice_sale/readme/CONTRIBUTORS.rst b/fieldservice_sale/readme/CONTRIBUTORS.rst
index 44ba2fbfcb..674036d84b 100644
--- a/fieldservice_sale/readme/CONTRIBUTORS.rst
+++ b/fieldservice_sale/readme/CONTRIBUTORS.rst
@@ -3,6 +3,7 @@
   * Steve Campbell <scampbell@opensourceintegrators.com>
   * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
   * Wolfgang Hall <whall@opensourceintegrators.com>
+  * Raphael Lee <rlee@opensourceintegrators.com>
 
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_sale/views/fsm_branch.xml b/fieldservice_sale/views/fsm_branch.xml
deleted file mode 100644
index 6f46faa6a1..0000000000
--- a/fieldservice_sale/views/fsm_branch.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<odoo>
-    <record id="fsm_branch_form_view_pricelist" model="ir.ui.view">
-        <field name="name">fsm.branch.form.pricelist</field>
-        <field name="model">fsm.branch</field>
-        <field name="inherit_id" ref="fieldservice.fsm_branch_form_view" />
-        <field name="arch" type="xml">
-            <field name="partner_id" position="after">
-                <field name="pricelist_id" groups="product.group_sale_pricelist" />
-            </field>
-        </field>
-    </record>
-</odoo>
diff --git a/fieldservice_sale/views/res_branch.xml b/fieldservice_sale/views/res_branch.xml
new file mode 100644
index 0000000000..9629a57a15
--- /dev/null
+++ b/fieldservice_sale/views/res_branch.xml
@@ -0,0 +1,12 @@
+<odoo>
+    <record id="res_branch_form_view_pricelist" model="ir.ui.view">
+        <field name="name">res.branch.form.pricelist</field>
+        <field name="model">res.branch</field>
+        <field name="inherit_id" ref="base_territory.res_branch_form_view" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="pricelist_id" groups="product.group_sale_pricelist" />
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_sale/views/res_config_settings.xml b/fieldservice_sale/views/res_config_settings.xml
index 61ebb9c951..7d57014d73 100644
--- a/fieldservice_sale/views/res_config_settings.xml
+++ b/fieldservice_sale/views/res_config_settings.xml
@@ -3,9 +3,6 @@
         <field name="group_fsm_template" eval="1" />
     </record>
     <function model="res.config.settings" name="execute">
-        <!-- ids = -->
         <value eval="[ref('fieldservice_sale.res_config_settings_fsm_template')]" />
-        <!-- context = -->
-        <value eval="{}" />
     </function>
 </odoo>

From 79839bc3071839c46d5dd9d9579f6debbfb388eb Mon Sep 17 00:00:00 2001
From: Raphael <rlee@opensourceintegrators.com>
Date: Wed, 7 Oct 2020 15:08:23 -0700
Subject: [PATCH 49/77] [FIX] invoice creation from SO

---
 .../migrations/12.0.2.0.0/pre-migration.py    | 12 ----
 fieldservice_sale/models/sale_order.py        | 72 ++++++++++++++-----
 fieldservice_sale/models/sale_order_line.py   |  1 -
 .../tests/test_fsm_sale_order.py              | 18 ++---
 4 files changed, 60 insertions(+), 43 deletions(-)
 delete mode 100644 fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py

diff --git a/fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py b/fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py
deleted file mode 100644
index 3a7530b375..0000000000
--- a/fieldservice_sale/migrations/12.0.2.0.0/pre-migration.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2019, Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-
-def migrate(env, version):
-    if not version:
-        return
-
-    env.execute(
-        "UPDATE product_template SET field_service_tracking = 'sale' "
-        "WHERE field_service_tracking = 'order';"
-    )
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 30c06f7e3c..720963f4e7 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -146,58 +146,92 @@ def _action_confirm(self):
             self.order_line._field_service_generation()
         return result
 
-    def action_invoice_create(self, grouped=False, final=False):
-        invoice_ids = super().action_invoice_create(grouped, final)
-        result = invoice_ids or []
+    def _create_invoices(self, grouped=False, final=False):
+        Invoices = self.env["account.move"]
+        InvoiceLines = self.env["account.move.line"]
+        invoice_ids = super()._create_invoices(grouped, final)
+        result = invoice_ids or Invoices
 
-        for invoice_id in invoice_ids:
-            invoice = self.env["account.invoice"].browse(invoice_id)
+        for invoice in invoice_ids:
             # check for invoice lines with product
             # field_service_tracking = line
-            lines_by_line = self.env["account.invoice.line"].search(
+            lines_by_line = InvoiceLines.search(
                 [
-                    ("invoice_id", "=", invoice_id),
+                    ("move_id", "=", invoice.id),
                     ("product_id.field_service_tracking", "=", "line"),
+                    ("exclude_from_invoice_tab", "=", False),
                 ]
             )
             if len(lines_by_line) > 0:
+                # Create a new invoice for each "line" product
                 line_count = len(invoice.invoice_line_ids)
                 for i in range(len(lines_by_line)):
                     duplicate = True
                     if ((i + 1) == len(lines_by_line)) and ((i + 1) == line_count):
+                        # Don't create a new invoice if there's only 1 product
                         duplicate = False
                     inv = invoice
                     if duplicate:
                         inv = invoice.copy()
-                        inv.write({"invoice_line_ids": [(6, 0, [])]})
-                        inv.compute_taxes()
-                        invoice.compute_taxes()
-                        lines_by_line[i].invoice_id = inv.id
-                        result.append(inv.id)
+                        inv.with_context(check_move_validity=False).write(
+                            {'invoice_line_ids': [(6, 0, [])]}
+                        )
+                        lines_by_line[i].with_context(
+                            check_move_validity=False
+                        ).move_id = inv.id
+                        inv.with_context(
+                            check_move_validity=False
+                        )._recompute_dynamic_lines(
+                            recompute_all_taxes=True, recompute_tax_base_amount=True
+                        )
+                        invoice.with_context(
+                            check_move_validity=False
+                        )._recompute_dynamic_lines(
+                            recompute_all_taxes=True, recompute_tax_base_amount=True
+                        )
+                        result |= inv
                     inv.fsm_order_ids = [(4, lines_by_line[i].fsm_order_id.id)]
             # check for invoice lines with product
             # field_service_tracking = sale
-            lines_by_sale = self.env["account.invoice.line"].search(
+            lines_by_sale = InvoiceLines.search(
                 [
-                    ("invoice_id", "=", invoice_id),
+                    ("move_id", "=", invoice.id),
                     ("product_id.field_service_tracking", "=", "sale"),
+                    ("exclude_from_invoice_tab", "=", False),
                 ]
             )
             if len(lines_by_sale) > 0:
+                # Create a new invoice for "sale" products
                 fsm_orders = self.env["fsm.order"].search(
                     [("sale_id", "in", self.ids), ("sale_line_id", "=", False)]
                 )
                 if len(lines_by_sale) == len(invoice.invoice_line_ids):
+                    # Don't create a new invoice if all products are "sale"
                     invoice.fsm_order_ids = [
                         (4, fsm_order.id) for fsm_order in fsm_orders
                     ]
                 elif len(invoice.invoice_line_ids) > len(lines_by_sale):
                     new = invoice.copy()
-                    new.write({"invoice_line_ids": [(6, 0, [])]})
-                    lines_by_sale.write({"invoice_id": new.id})
-                    new.compute_taxes()
-                    invoice.compute_taxes()
-                    result.append(new.id)
+                    new.fsm_order_ids = [
+                        (4, fsm_order.id) for fsm_order in fsm_orders
+                    ]
+                    new.with_context(check_move_validity=False).write(
+                        {'invoice_line_ids': [(6, 0, [])]}
+                    )
+                    lines_by_sale.with_context(check_move_validity=False).write(
+                        {'move_id': new.id}
+                    )
+                    new.with_context(
+                        check_move_validity=False
+                    )._recompute_dynamic_lines(
+                        recompute_all_taxes=True, recompute_tax_base_amount=True
+                    )
+                    invoice.with_context(
+                        check_move_validity=False
+                    )._recompute_dynamic_lines(
+                        recompute_all_taxes=True, recompute_tax_base_amount=True
+                    )
+                    result |= new
         return result
 
     def action_view_fsm_order(self):
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index db320def81..a6274407ac 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -56,7 +56,6 @@ def _field_create_fsm_order_prepare_values(self):
         self.ensure_one()
         categories = self.product_id.fsm_order_template_id.category_ids
         return {
-            "customer_id": self.order_id.partner_id.id,
             "location_id": self.order_id.fsm_location_id.id,
             "location_directions": self.order_id.fsm_location_id.direction,
             "request_early": self.order_id.expected_date,
diff --git a/fieldservice_sale/tests/test_fsm_sale_order.py b/fieldservice_sale/tests/test_fsm_sale_order.py
index c74fc5b549..6251154a43 100644
--- a/fieldservice_sale/tests/test_fsm_sale_order.py
+++ b/fieldservice_sale/tests/test_fsm_sale_order.py
@@ -207,9 +207,8 @@ def test_sale_order_1(self):
         fsm_order.action_complete()
 
         # Invoice the order
-        Invoice = self.env["account.invoice"]
-        inv_id = self.sale_order_1.action_invoice_create()
-        invoice = Invoice.browse(inv_id)
+        Invoice = self.env["account.move"]
+        invoice = self.sale_order_1._create_invoices()
         # 1 invoices created
         self.assertEqual(
             len(invoice.ids), 1, "FSM Sale: Sale Order 1 should create 1 invoice"
@@ -256,9 +255,8 @@ def test_sale_order_2(self):
         )
 
         # Invoice the order
-        Invoice = self.env["account.invoice"]
-        inv_id = self.sale_order_2.action_invoice_create()
-        invoice = Invoice.browse(inv_id)
+        Invoice = self.env["account.move"]
+        invoice = self.sale_order_2._create_invoices()
         # 1 invoice created
         self.assertEqual(
             len(invoice.ids), 1, "FSM Sale: Sale Order 2 should create 1 invoice"
@@ -321,8 +319,7 @@ def test_sale_order_3(self):
 
         # Invoice the sale order
         Invoice = self.env["account.invoice"]
-        inv_id = self.sale_order_3.action_invoice_create()
-        invoices = Invoice.browse(inv_id)
+        invoices = self.sale_order_3._create_invoices()
         # 2 invoices created
         self.assertEqual(
             len(invoices.ids), 2, "FSM Sale: Sale Order 3 should create 2 invoices"
@@ -409,9 +406,8 @@ def test_sale_order_4(self):
         # qty_delivered does not update for FSM orders linked only to the sale
 
         # Invoice the sale order
-        Invoice = self.env["account.invoice"]
-        inv_id = self.sale_order_4.action_invoice_create()
-        invoices = Invoice.browse(inv_id)
+        Invoice = self.env["account.move"]
+        invoices = self.sale_order_4._create_invoices()
         # 3 invoices created
         self.assertEqual(
             len(invoices.ids), 3, "FSM Sale: Sale Order 4 should create 3 invoices"

From 8a63d02c18f4e47311bbd229e10d31406261ad04 Mon Sep 17 00:00:00 2001
From: Brian McMaster <brian@mcmpest.com>
Date: Thu, 22 Oct 2020 16:22:50 -0400
Subject: [PATCH 50/77] [IMP] pre-commit, black

---
 fieldservice_sale/models/sale_order.py        | 24 +++++-----
 .../tests/test_fsm_sale_order.py              | 46 +++++++++----------
 2 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 720963f4e7..a52b37a67f 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -79,9 +79,9 @@ def _field_create_fsm_order_prepare_values(self):
         }
 
     def _field_create_fsm_order(self):
-        """ Generate fsm_order for the given Sale Order, and link it.
-            :return a mapping with the sale order id and its linked fsm_order
-            :rtype dict
+        """Generate fsm_order for the given Sale Order, and link it.
+        :return a mapping with the sale order id and its linked fsm_order
+        :rtype dict
         """
         result = {}
         for so in self:
@@ -112,10 +112,10 @@ def _field_create_fsm_order(self):
         return result
 
     def _field_find_fsm_order(self):
-        """ Find the fsm_order generated by the Sale Order. If no fsm_order
-            linked, it will be created automatically.
-            :return a mapping with the so line id and its linked fsm_order
-            :rtype dict
+        """Find the fsm_order generated by the Sale Order. If no fsm_order
+        linked, it will be created automatically.
+        :return a mapping with the so line id and its linked fsm_order
+        :rtype dict
         """
         # one search for all Sale Orders
         fsm_orders = self.env["fsm.order"].search(
@@ -174,7 +174,7 @@ def _create_invoices(self, grouped=False, final=False):
                     if duplicate:
                         inv = invoice.copy()
                         inv.with_context(check_move_validity=False).write(
-                            {'invoice_line_ids': [(6, 0, [])]}
+                            {"invoice_line_ids": [(6, 0, [])]}
                         )
                         lines_by_line[i].with_context(
                             check_move_validity=False
@@ -212,14 +212,12 @@ def _create_invoices(self, grouped=False, final=False):
                     ]
                 elif len(invoice.invoice_line_ids) > len(lines_by_sale):
                     new = invoice.copy()
-                    new.fsm_order_ids = [
-                        (4, fsm_order.id) for fsm_order in fsm_orders
-                    ]
+                    new.fsm_order_ids = [(4, fsm_order.id) for fsm_order in fsm_orders]
                     new.with_context(check_move_validity=False).write(
-                        {'invoice_line_ids': [(6, 0, [])]}
+                        {"invoice_line_ids": [(6, 0, [])]}
                     )
                     lines_by_sale.with_context(check_move_validity=False).write(
-                        {'move_id': new.id}
+                        {"move_id": new.id}
                     )
                     new.with_context(
                         check_move_validity=False
diff --git a/fieldservice_sale/tests/test_fsm_sale_order.py b/fieldservice_sale/tests/test_fsm_sale_order.py
index 6251154a43..f04dd0a29b 100644
--- a/fieldservice_sale/tests/test_fsm_sale_order.py
+++ b/fieldservice_sale/tests/test_fsm_sale_order.py
@@ -143,9 +143,9 @@ def setUpClass(cls):
         )
 
     def _isp_account_installed(self):
-        """ Checks if module is installed which will require more
-            logic for the tests.
-            :return Boolean indicating the installed status of the module
+        """Checks if module is installed which will require more
+        logic for the tests.
+        :return Boolean indicating the installed status of the module
         """
         result = False
         isp_account_module = self.env["ir.module.module"].search(
@@ -156,9 +156,9 @@ def _isp_account_installed(self):
         return result
 
     def _fulfill_order(self, order):
-        """ Extra logic required to fulfill FSM order status and prevent
-            validation error when attempting to complete the FSM order
-            :return FSM Order with additional fields set
+        """Extra logic required to fulfill FSM order status and prevent
+        validation error when attempting to complete the FSM order
+        :return FSM Order with additional fields set
         """
         analytic_account = self.env.ref("analytic.analytic_administratif")
         self.test_location.analytic_account_id = analytic_account.id
@@ -177,9 +177,9 @@ def _fulfill_order(self, order):
         return order
 
     def test_sale_order_1(self):
-        """ Test the sales order 1 flow from sale to invoice.
-            - One FSM order linked to the Sale Order should be created.
-            - One Invoice linked to the FSM Order should be created.
+        """Test the sales order 1 flow from sale to invoice.
+        - One FSM order linked to the Sale Order should be created.
+        - One Invoice linked to the FSM Order should be created.
         """
         # Confirm the sale order
         self.sale_order_1.action_confirm()
@@ -207,7 +207,6 @@ def test_sale_order_1(self):
         fsm_order.action_complete()
 
         # Invoice the order
-        Invoice = self.env["account.move"]
         invoice = self.sale_order_1._create_invoices()
         # 1 invoices created
         self.assertEqual(
@@ -219,10 +218,10 @@ def test_sale_order_1(self):
         )
 
     def test_sale_order_2(self):
-        """ Test the sales order 2 flow from sale to invoice.
-            - One FSM order linked to the Sale Order Line should be created.
-            - The FSM Order should update qty_delivered when completed.
-            - One Invoice linked to the FSM Order should be created.
+        """Test the sales order 2 flow from sale to invoice.
+        - One FSM order linked to the Sale Order Line should be created.
+        - The FSM Order should update qty_delivered when completed.
+        - One Invoice linked to the FSM Order should be created.
         """
         sol = self.sol_service_per_line_1
         # Confirm the sale order
@@ -255,7 +254,6 @@ def test_sale_order_2(self):
         )
 
         # Invoice the order
-        Invoice = self.env["account.move"]
         invoice = self.sale_order_2._create_invoices()
         # 1 invoice created
         self.assertEqual(
@@ -267,10 +265,10 @@ def test_sale_order_2(self):
         )
 
     def test_sale_order_3(self):
-        """ Test sale order 3 flow from sale to invoice.
-            - An FSM order should be created for each Sale Order Line.
-            - The FSM Order should update qty_delivered when completed.
-            - An Invoice linked to each FSM Order should be created.
+        """Test sale order 3 flow from sale to invoice.
+        - An FSM order should be created for each Sale Order Line.
+        - The FSM Order should update qty_delivered when completed.
+        - An Invoice linked to each FSM Order should be created.
         """
         sol1 = self.sol_service_per_line_2
         sol2 = self.sol_service_per_line_3
@@ -318,7 +316,6 @@ def test_sale_order_3(self):
         )
 
         # Invoice the sale order
-        Invoice = self.env["account.invoice"]
         invoices = self.sale_order_3._create_invoices()
         # 2 invoices created
         self.assertEqual(
@@ -337,10 +334,10 @@ def test_sale_order_3(self):
         )
 
     def test_sale_order_4(self):
-        """ Test sale order 4 flow from sale to invoice.
-            - Two FSM orders linked to the Sale Order Lines should be created.
-            - One FSM order linked to the Sale Order should be created.
-            - Three Invoices should be created (One for each FSM Order).
+        """Test sale order 4 flow from sale to invoice.
+        - Two FSM orders linked to the Sale Order Lines should be created.
+        - One FSM order linked to the Sale Order should be created.
+        - Three Invoices should be created (One for each FSM Order).
         """
         sol1 = self.sol_service_per_line_4
         sol2 = self.sol_service_per_line_5
@@ -406,7 +403,6 @@ def test_sale_order_4(self):
         # qty_delivered does not update for FSM orders linked only to the sale
 
         # Invoice the sale order
-        Invoice = self.env["account.move"]
         invoices = self.sale_order_4._create_invoices()
         # 3 invoices created
         self.assertEqual(

From 732eeda762c62f0764e1f9c7c106ab2aa7896e1a Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 15 Apr 2021 13:45:46 +0530
Subject: [PATCH 51/77] [FIX] Travis

---
 fieldservice_sale/__manifest__.py              |  2 +-
 fieldservice_sale/models/sale_order_line.py    | 18 +++++++++---------
 .../tests/test_fsm_sale_onchange_partner.py    |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 1659be6b22..94495b6413 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service - Sales",
-    "version": "13.0.1.0.0",
+    "version": "14.0.1.0.0",
     "summary": "Sell field services.",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index a6274407ac..4c7c4bccc4 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -71,9 +71,9 @@ def _field_create_fsm_order_prepare_values(self):
         }
 
     def _field_create_fsm_order(self):
-        """ Generate fsm_order for the given so line, and link it.
-            :return a mapping with the so line id and its linked fsm_order
-            :rtype dict
+        """Generate fsm_order for the given so line, and link it.
+        :return a mapping with the so line id and its linked fsm_order
+        :rtype dict
         """
         result = {}
         for so_line in self:
@@ -105,10 +105,10 @@ def _field_create_fsm_order(self):
         return result
 
     def _field_find_fsm_order(self):
-        """ Find the fsm_order generated by the so lines. If no fsm_order
-            linked, it will be created automatically.
-            :return a mapping with the so line id and its linked fsm_order
-            :rtype dict
+        """Find the fsm_order generated by the so lines. If no fsm_order
+        linked, it will be created automatically.
+        :return a mapping with the so line id and its linked fsm_order
+        :rtype dict
         """
         for rec in self:
             # one search for all so lines
@@ -128,8 +128,8 @@ def _field_find_fsm_order(self):
             return res
 
     def _field_service_generation(self):
-        """ For service lines, create the field service order. If it already
-            exists, it simply links the existing one to the line.
+        """For service lines, create the field service order. If it already
+        exists, it simply links the existing one to the line.
         """
         for rec in self:
             if rec.product_id.field_service_tracking == "sale":
diff --git a/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py b/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
index a856900b04..9c66f21fa2 100644
--- a/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
+++ b/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
@@ -34,7 +34,7 @@ def setUp(self):
         self.location = self.env.ref("fieldservice.location_1")
 
     def test_1_autofill_so_fsm_location(self):
-        """ First case :
+        """First case :
         - commercial_partner IS NOT a fsm_location
         - partner IS a fsm_location
         - shipping_partner IS NOT a fsm_location
@@ -49,7 +49,7 @@ def test_1_autofill_so_fsm_location(self):
         self.assertEqual(self.so.fsm_location_id.id, self.location.id)
 
     def test_2_autofill_so_fsm_location(self):
-        """ Second case :
+        """Second case :
         - commercial_partner IS NOT a fsm_location
         - partner IS NOT a fsm_location
         - shipping_partner IS a fsm_location
@@ -64,7 +64,7 @@ def test_2_autofill_so_fsm_location(self):
         self.assertEqual(self.so.fsm_location_id.id, self.location.id)
 
     def test_3_autofill_so_fsm_location(self):
-        """ Third case :
+        """Third case :
         - commercial_partner IS a fsm_location
         - partner IS NOT a fsm_location
         - shipping_partner IS NOT a fsm_location

From 3232d2e987d0dc5c5473d9886cbefdd904c325da Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 15 Apr 2021 14:48:53 +0530
Subject: [PATCH 52/77] [14.0][MIG] fieldservice_sale

---
 fieldservice_sale/README.rst                  |   13 +-
 fieldservice_sale/__manifest__.py             |   13 +-
 fieldservice_sale/i18n/fieldservice_sale.pot  |  131 +-
 .../migrations/14.0.1.0.0/pre-migration.py    |   12 +
 fieldservice_sale/models/__init__.py          |    2 -
 fieldservice_sale/models/fsm_location.py      |    9 -
 fieldservice_sale/models/product_template.py  |    8 +-
 fieldservice_sale/models/res_branch.py        |   13 -
 fieldservice_sale/models/sale_order.py        |   88 +-
 fieldservice_sale/models/sale_order_line.py   |   16 +-
 .../static/description/index.html             | 1264 ++++++-----------
 fieldservice_sale/tests/__init__.py           |    4 +-
 .../tests/test_fsm_sale_common.py             |   13 +-
 .../tests/test_fsm_sale_onchange_partner.py   |   12 +-
 .../tests/test_fsm_sale_order.py              |   66 +-
 fieldservice_sale/views/fsm_location.xml      |    2 +-
 fieldservice_sale/views/fsm_order.xml         |    2 +
 fieldservice_sale/views/res_branch.xml        |   12 -
 .../views/res_config_settings.xml             |    5 +-
 19 files changed, 635 insertions(+), 1050 deletions(-)
 create mode 100644 fieldservice_sale/migrations/14.0.1.0.0/pre-migration.py
 delete mode 100644 fieldservice_sale/models/fsm_location.py
 delete mode 100644 fieldservice_sale/models/res_branch.py
 delete mode 100644 fieldservice_sale/views/res_branch.xml

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index 5d2e317105..adc633e26c 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -14,13 +14,13 @@ Field Service - Sales
     :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/12.0/fieldservice_sale
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_sale
     :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-12-0/field-service-12-0-fieldservice_sale
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_sale
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/264/12.0
+    :target: https://runbot.odoo-community.org/runbot/264/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -39,7 +39,7 @@ Installation
 To install Field Service and have the mapping features, you need to install GeoEngine.
 
 Please refer to the installation instructions available at:
-https://github.com/OCA/geospatial/tree/12.0/base_geoengine
+https://github.com/OCA/geospatial/tree/13.0/base_geoengine
 
 Configuration
 =============
@@ -99,7 +99,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 smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2012.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_sale%0Aversion:%2014.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.
 
@@ -119,6 +119,7 @@ Contributors
   * Steve Campbell <scampbell@opensourceintegrators.com>
   * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
   * Wolfgang Hall <whall@opensourceintegrators.com>
+  * Raphael Lee <rlee@opensourceintegrators.com>
 
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
@@ -152,6 +153,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-wolfhall| |maintainer-max3903| |maintainer-brian10048| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_sale>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_sale>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 94495b6413..aeade35e98 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -7,18 +7,25 @@
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",
-    "depends": ["fieldservice", "sale_management", "fieldservice_account"],
+    "depends": [
+        "fieldservice",
+        "sale_management",
+        "fieldservice_account",
+    ],
     "data": [
         "security/ir.model.access.csv",
         "views/fsm_location.xml",
         "views/fsm_order.xml",
         "views/product_template.xml",
-        "views/res_branch.xml",
         "views/sale_order.xml",
         "views/res_config_settings.xml",
     ],
     "license": "AGPL-3",
     "development_status": "Beta",
-    "maintainers": ["wolfhall", "max3903", "brian10048"],
+    "maintainers": [
+        "wolfhall",
+        "max3903",
+        "brian10048",
+    ],
     "installable": True,
 }
diff --git a/fieldservice_sale/i18n/fieldservice_sale.pot b/fieldservice_sale/i18n/fieldservice_sale.pot
index 9326106b9a..8737075df8 100644
--- a/fieldservice_sale/i18n/fieldservice_sale.pot
+++ b/fieldservice_sale/i18n/fieldservice_sale.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_sale
+# 	* fieldservice_sale
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,48 +20,29 @@ msgstr ""
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
-msgid "According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+msgid ""
+"According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
 "  - Manual: the quantity is set manually on the line\n"
 "  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
 "  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
-""
-msgstr ""
-
-#. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Analytic From Expenses"
-msgstr ""
-
-#. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
-msgid "Create a recurring order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__sale
 msgid "Create one FSM order per sale order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
 msgid "Create one FSM order per sale order line"
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
-msgid "Default Pricelist"
-msgstr ""
-
-#. module: fieldservice_sale
-#: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
-msgid "Default pricelist for new customers of this branch."
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
-msgid "Determines what happens upon sale order confirmation:\n"
+msgid ""
+"Determines what happens upon sale order confirmation:\n"
 "                - None: nothing additional, default behavior.\n"
 "                - Per Sale Order: One FSM Order will be created for the sale.\n"
 "                - Per Sale Order Line: One FSM Order for each sale order line\n"
@@ -69,12 +50,19 @@ msgid "Determines what happens upon sale order confirmation:\n"
 msgstr ""
 
 #. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__display_name
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__display_name
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
 msgid "Don't create FSM order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:131
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "FSM Location must be set"
 msgstr ""
@@ -85,29 +73,26 @@ msgstr ""
 msgid "FSM Orders"
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_fsm_location
-msgid "Field Service Location"
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_order
-#: selection:sale.order.line,qty_delivered_method:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__sale_order_line__qty_delivered_method__field_service
 msgid "Field Service Order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:87
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
-msgid "Field Service Order Created (%s): <a href=\n"
+msgid ""
+"Field Service Order Created (%s): <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:86
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
-msgid "Field Service Order Created: <a href=\n"
+msgid ""
+"Field Service Order Created: <a href=\n"
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
@@ -124,7 +109,7 @@ msgid "Field Service Order generated by the sales order item"
 msgstr ""
 
 #. module: fieldservice_sale
-#: selection:product.template,service_type:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
 msgstr ""
 
@@ -140,19 +125,26 @@ msgid "Field Service orders associated to this sale"
 msgstr ""
 
 #. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Manual"
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__id
+msgid "ID"
 msgstr ""
 
 #. module: fieldservice_sale
-#: selection:product.template,service_type:0
-msgid "Manually set quantities on order"
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template____last_update
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line____last_update
+msgid "Last Modified on"
 msgstr ""
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
-msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
+msgid ""
+"Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
 "Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
 "Create a task and track hours: Create a task on the sales order validation and track the work hours."
 msgstr ""
@@ -163,6 +155,7 @@ msgid "Method to update delivered qty"
 msgstr ""
 
 #. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__display_name
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Order"
 msgstr ""
@@ -188,13 +181,13 @@ msgid "Sale Line"
 msgstr ""
 
 #. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_sale_order
-msgid "Sale Order"
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
+msgid "Sales"
 msgstr ""
 
 #. module: fieldservice_sale
-#: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
-msgid "Sales"
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: fieldservice_sale
@@ -203,16 +196,11 @@ msgid "Sales Order Line"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/fsm_order.py:21
+#: code:addons/fieldservice_sale/models/fsm_order.py:0
 #, python-format
 msgid "Sales Orders"
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
-msgid "Sales Territory"
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -225,44 +213,25 @@ msgid "Service Location"
 msgstr ""
 
 #. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Stock Moves"
-msgstr ""
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:92
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
-msgid "This order has been created from: <a href=\n"
+msgid ""
+"This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:93
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
-msgid "This order has been created from: <a href=\n"
+msgid ""
+"This order has been created from: <a href=\n"
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
 "                "
 msgstr ""
 
-#. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Timesheets"
-msgstr ""
-
-#. module: fieldservice_sale
-#: selection:product.template,service_type:0
-msgid "Timesheets on project (one fare per SO/Project)"
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
 msgstr ""
-
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_fsm_branch
-msgid "branch"
-msgstr ""
-
diff --git a/fieldservice_sale/migrations/14.0.1.0.0/pre-migration.py b/fieldservice_sale/migrations/14.0.1.0.0/pre-migration.py
new file mode 100644
index 0000000000..786eb40ee3
--- /dev/null
+++ b/fieldservice_sale/migrations/14.0.1.0.0/pre-migration.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2021, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+def migrate(env, version):
+    if not version:
+        return
+
+    env.execute(
+        "UPDATE product_template SET field_service_tracking = 'sale' "
+        "WHERE field_service_tracking = 'order';"
+    )
diff --git a/fieldservice_sale/models/__init__.py b/fieldservice_sale/models/__init__.py
index dfe9d6412e..dad9bb704f 100644
--- a/fieldservice_sale/models/__init__.py
+++ b/fieldservice_sale/models/__init__.py
@@ -2,10 +2,8 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
-    fsm_location,
     fsm_order,
     product_template,
-    res_branch,
     sale_order_line,
     sale_order,
 )
diff --git a/fieldservice_sale/models/fsm_location.py b/fieldservice_sale/models/fsm_location.py
deleted file mode 100644
index be5cb6f85f..0000000000
--- a/fieldservice_sale/models/fsm_location.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2018 Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import fields, models
-
-
-class FSMLocation(models.Model):
-    _inherit = "fsm.location"
-
-    sales_territory_id = fields.Many2one("res.territory", string="Sales Territory")
diff --git a/fieldservice_sale/models/product_template.py b/fieldservice_sale/models/product_template.py
index 67124ddf8c..0570db0606 100644
--- a/fieldservice_sale/models/product_template.py
+++ b/fieldservice_sale/models/product_template.py
@@ -1,13 +1,19 @@
 # Copyright (C) 2019 Brian McMaster
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
 from odoo import api, fields, models
 
 
 class ProductTemplate(models.Model):
     _inherit = "product.template"
 
-    service_type = fields.Selection(selection_add=[("field", "Field Service Orders")])
+    service_type = fields.Selection(
+        selection_add=[
+            ("field", "Field Service Orders"),
+        ],
+        ondelete={"field": "cascade"},
+    )
     field_service_tracking = fields.Selection(
         [
             ("no", "Don't create FSM order"),
diff --git a/fieldservice_sale/models/res_branch.py b/fieldservice_sale/models/res_branch.py
deleted file mode 100644
index e9a601932e..0000000000
--- a/fieldservice_sale/models/res_branch.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2020 Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import fields, models
-
-
-class ResBranch(models.Model):
-    _inherit = "res.branch"
-
-    pricelist_id = fields.Many2one(
-        "product.pricelist",
-        string="Default Pricelist",
-        help="Default pricelist for new customers of this branch.",
-    )
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index a52b37a67f..899346cc1a 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -64,7 +64,7 @@ def _field_create_fsm_order_prepare_values(self):
         categories = self.env["fsm.category"]
         for template in templates:
             note += template.instructions or ""
-            hours += template.hours
+            hours += template.duration
             categories |= template.category_ids
         return {
             "location_id": self.fsm_location_id.id,
@@ -146,92 +146,6 @@ def _action_confirm(self):
             self.order_line._field_service_generation()
         return result
 
-    def _create_invoices(self, grouped=False, final=False):
-        Invoices = self.env["account.move"]
-        InvoiceLines = self.env["account.move.line"]
-        invoice_ids = super()._create_invoices(grouped, final)
-        result = invoice_ids or Invoices
-
-        for invoice in invoice_ids:
-            # check for invoice lines with product
-            # field_service_tracking = line
-            lines_by_line = InvoiceLines.search(
-                [
-                    ("move_id", "=", invoice.id),
-                    ("product_id.field_service_tracking", "=", "line"),
-                    ("exclude_from_invoice_tab", "=", False),
-                ]
-            )
-            if len(lines_by_line) > 0:
-                # Create a new invoice for each "line" product
-                line_count = len(invoice.invoice_line_ids)
-                for i in range(len(lines_by_line)):
-                    duplicate = True
-                    if ((i + 1) == len(lines_by_line)) and ((i + 1) == line_count):
-                        # Don't create a new invoice if there's only 1 product
-                        duplicate = False
-                    inv = invoice
-                    if duplicate:
-                        inv = invoice.copy()
-                        inv.with_context(check_move_validity=False).write(
-                            {"invoice_line_ids": [(6, 0, [])]}
-                        )
-                        lines_by_line[i].with_context(
-                            check_move_validity=False
-                        ).move_id = inv.id
-                        inv.with_context(
-                            check_move_validity=False
-                        )._recompute_dynamic_lines(
-                            recompute_all_taxes=True, recompute_tax_base_amount=True
-                        )
-                        invoice.with_context(
-                            check_move_validity=False
-                        )._recompute_dynamic_lines(
-                            recompute_all_taxes=True, recompute_tax_base_amount=True
-                        )
-                        result |= inv
-                    inv.fsm_order_ids = [(4, lines_by_line[i].fsm_order_id.id)]
-            # check for invoice lines with product
-            # field_service_tracking = sale
-            lines_by_sale = InvoiceLines.search(
-                [
-                    ("move_id", "=", invoice.id),
-                    ("product_id.field_service_tracking", "=", "sale"),
-                    ("exclude_from_invoice_tab", "=", False),
-                ]
-            )
-            if len(lines_by_sale) > 0:
-                # Create a new invoice for "sale" products
-                fsm_orders = self.env["fsm.order"].search(
-                    [("sale_id", "in", self.ids), ("sale_line_id", "=", False)]
-                )
-                if len(lines_by_sale) == len(invoice.invoice_line_ids):
-                    # Don't create a new invoice if all products are "sale"
-                    invoice.fsm_order_ids = [
-                        (4, fsm_order.id) for fsm_order in fsm_orders
-                    ]
-                elif len(invoice.invoice_line_ids) > len(lines_by_sale):
-                    new = invoice.copy()
-                    new.fsm_order_ids = [(4, fsm_order.id) for fsm_order in fsm_orders]
-                    new.with_context(check_move_validity=False).write(
-                        {"invoice_line_ids": [(6, 0, [])]}
-                    )
-                    lines_by_sale.with_context(check_move_validity=False).write(
-                        {"move_id": new.id}
-                    )
-                    new.with_context(
-                        check_move_validity=False
-                    )._recompute_dynamic_lines(
-                        recompute_all_taxes=True, recompute_tax_base_amount=True
-                    )
-                    invoice.with_context(
-                        check_move_validity=False
-                    )._recompute_dynamic_lines(
-                        recompute_all_taxes=True, recompute_tax_base_amount=True
-                    )
-                    result |= new
-        return result
-
     def action_view_fsm_order(self):
         fsm_orders = self.mapped("fsm_order_ids")
         action = self.env.ref("fieldservice.action_fsm_dash_order").read()[0]
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 4c7c4bccc4..ff40c3b9c0 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -8,7 +8,8 @@ class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
 
     qty_delivered_method = fields.Selection(
-        selection_add=[("field_service", "Field Service Order")]
+        selection_add=[("field_service", "Field Service Order")],
+        ondelete={"field_service": "cascade"},
     )
     fsm_order_id = fields.Many2one(
         "fsm.order",
@@ -64,7 +65,7 @@ def _field_create_fsm_order_prepare_values(self):
             "template_id": self.product_id.fsm_order_template_id.id,
             "todo": self.product_id.fsm_order_template_id.instructions,
             "category_ids": [(6, 0, categories.ids)],
-            "scheduled_duration": self.product_id.fsm_order_template_id.hours,
+            "scheduled_duration": self.product_id.fsm_order_template_id.duration,
             "sale_id": self.order_id.id,
             "sale_line_id": self.id,
             "company_id": self.company_id.id,
@@ -139,7 +140,12 @@ def _field_service_generation(self):
             if rec.product_id.field_service_tracking == "line":
                 rec._field_find_fsm_order()
 
-    def _prepare_invoice_line(self, qty):
-        res = super()._prepare_invoice_line(qty)
-        res.update({"fsm_order_id": self.fsm_order_id.id})
+    def _prepare_invoice_line(self, **optional_values):
+        res = super()._prepare_invoice_line(**optional_values)
+        if self.fsm_order_id:
+            res.update(
+                {
+                    "fsm_order_ids": [(4, self.fsm_order_id.id)],
+                }
+            )
         return res
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index c71bfa5db3..b04fdf957f 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta
-      name="generator"
-      content="Docutils 0.15.1: http://docutils.sourceforge.net/"
-    />
-    <title>Field Service - Sales</title>
-    <style type="text/css">
-      /*
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<title>Field Service - Sales</title>
+<style type="text/css">
+
+/*
 :Author: David Goodger (goodger@python.org)
 :Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
@@ -20,112 +18,79 @@
 customize this style sheet.
 */
 
-      /* used to remove borders from tables and images */
-      .borderless,
-      table.borderless td,
-      table.borderless th {
-        border: 0;
-      }
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
 
-      table.borderless td,
-      table.borderless th {
-        /* Override padding for "table.docutils td" with "! important".
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
      The right padding separates the table cells. */
-        padding: 0 0.5em 0 0 !important;
-      }
-
-      .first {
-        /* Override more specific margin styles with "! important". */
-        margin-top: 0 !important;
-      }
-
-      .last,
-      .with-subtitle {
-        margin-bottom: 0 !important;
-      }
-
-      .hidden {
-        display: none;
-      }
-
-      .subscript {
-        vertical-align: sub;
-        font-size: smaller;
-      }
-
-      .superscript {
-        vertical-align: super;
-        font-size: smaller;
-      }
-
-      a.toc-backref {
-        text-decoration: none;
-        color: black;
-      }
-
-      blockquote.epigraph {
-        margin: 2em 5em;
-      }
-
-      dl.docutils dd {
-        margin-bottom: 0.5em;
-      }
-
-      object[type="image/svg+xml"],
-      object[type="application/x-shockwave-flash"] {
-        overflow: hidden;
-      }
-
-      /* Uncomment (and remove this text!) to get bold-faced definition list terms
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
 dl.docutils dt {
   font-weight: bold }
 */
 
-      div.abstract {
-        margin: 2em 5em;
-      }
-
-      div.abstract p.topic-title {
-        font-weight: bold;
-        text-align: center;
-      }
-
-      div.admonition,
-      div.attention,
-      div.caution,
-      div.danger,
-      div.error,
-      div.hint,
-      div.important,
-      div.note,
-      div.tip,
-      div.warning {
-        margin: 2em;
-        border: medium outset;
-        padding: 1em;
-      }
-
-      div.admonition p.admonition-title,
-      div.hint p.admonition-title,
-      div.important p.admonition-title,
-      div.note p.admonition-title,
-      div.tip p.admonition-title {
-        font-weight: bold;
-        font-family: sans-serif;
-      }
-
-      div.attention p.admonition-title,
-      div.caution p.admonition-title,
-      div.danger p.admonition-title,
-      div.error p.admonition-title,
-      div.warning p.admonition-title,
-      .code .error {
-        color: red;
-        font-weight: bold;
-        font-family: sans-serif;
-      }
-
-      /* Uncomment (and remove this text!) to get reduced vertical space in
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
    compound paragraphs.
 div.compound .compound-first, div.compound .compound-middle {
   margin-bottom: 0.5em }
@@ -134,696 +99,399 @@
   margin-top: 0.5em }
 */
 
-      div.dedication {
-        margin: 2em 5em;
-        text-align: center;
-        font-style: italic;
-      }
-
-      div.dedication p.topic-title {
-        font-weight: bold;
-        font-style: normal;
-      }
-
-      div.figure {
-        margin-left: 2em;
-        margin-right: 2em;
-      }
-
-      div.footer,
-      div.header {
-        clear: both;
-        font-size: smaller;
-      }
-
-      div.line-block {
-        display: block;
-        margin-top: 1em;
-        margin-bottom: 1em;
-      }
-
-      div.line-block div.line-block {
-        margin-top: 0;
-        margin-bottom: 0;
-        margin-left: 1.5em;
-      }
-
-      div.sidebar {
-        margin: 0 0 0.5em 1em;
-        border: medium outset;
-        padding: 1em;
-        background-color: #ffffee;
-        width: 40%;
-        float: right;
-        clear: right;
-      }
-
-      div.sidebar p.rubric {
-        font-family: sans-serif;
-        font-size: medium;
-      }
-
-      div.system-messages {
-        margin: 5em;
-      }
-
-      div.system-messages h1 {
-        color: red;
-      }
-
-      div.system-message {
-        border: medium outset;
-        padding: 1em;
-      }
-
-      div.system-message p.system-message-title {
-        color: red;
-        font-weight: bold;
-      }
-
-      div.topic {
-        margin: 2em;
-      }
-
-      h1.section-subtitle,
-      h2.section-subtitle,
-      h3.section-subtitle,
-      h4.section-subtitle,
-      h5.section-subtitle,
-      h6.section-subtitle {
-        margin-top: 0.4em;
-      }
-
-      h1.title {
-        text-align: center;
-      }
-
-      h2.subtitle {
-        text-align: center;
-      }
-
-      hr.docutils {
-        width: 75%;
-      }
-
-      img.align-left,
-      .figure.align-left,
-      object.align-left,
-      table.align-left {
-        clear: left;
-        float: left;
-        margin-right: 1em;
-      }
-
-      img.align-right,
-      .figure.align-right,
-      object.align-right,
-      table.align-right {
-        clear: right;
-        float: right;
-        margin-left: 1em;
-      }
-
-      img.align-center,
-      .figure.align-center,
-      object.align-center {
-        display: block;
-        margin-left: auto;
-        margin-right: auto;
-      }
-
-      table.align-center {
-        margin-left: auto;
-        margin-right: auto;
-      }
-
-      .align-left {
-        text-align: left;
-      }
-
-      .align-center {
-        clear: both;
-        text-align: center;
-      }
-
-      .align-right {
-        text-align: right;
-      }
-
-      /* reset inner alignment in figures */
-      div.align-right {
-        text-align: inherit;
-      }
-
-      /* div.align-center * { */
-      /*   text-align: left } */
-
-      .align-top {
-        vertical-align: top;
-      }
-
-      .align-middle {
-        vertical-align: middle;
-      }
-
-      .align-bottom {
-        vertical-align: bottom;
-      }
-
-      ol.simple,
-      ul.simple {
-        margin-bottom: 1em;
-      }
-
-      ol.arabic {
-        list-style: decimal;
-      }
-
-      ol.loweralpha {
-        list-style: lower-alpha;
-      }
-
-      ol.upperalpha {
-        list-style: upper-alpha;
-      }
-
-      ol.lowerroman {
-        list-style: lower-roman;
-      }
-
-      ol.upperroman {
-        list-style: upper-roman;
-      }
-
-      p.attribution {
-        text-align: right;
-        margin-left: 50%;
-      }
-
-      p.caption {
-        font-style: italic;
-      }
-
-      p.credits {
-        font-style: italic;
-        font-size: smaller;
-      }
-
-      p.label {
-        white-space: nowrap;
-      }
-
-      p.rubric {
-        font-weight: bold;
-        font-size: larger;
-        color: maroon;
-        text-align: center;
-      }
-
-      p.sidebar-title {
-        font-family: sans-serif;
-        font-weight: bold;
-        font-size: larger;
-      }
-
-      p.sidebar-subtitle {
-        font-family: sans-serif;
-        font-weight: bold;
-      }
-
-      p.topic-title {
-        font-weight: bold;
-      }
-
-      pre.address {
-        margin-bottom: 0;
-        margin-top: 0;
-        font: inherit;
-      }
-
-      pre.literal-block,
-      pre.doctest-block,
-      pre.math,
-      pre.code {
-        margin-left: 2em;
-        margin-right: 2em;
-      }
-
-      pre.code .ln {
-        color: grey;
-      } /* 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;
-      }
-      pre.code .literal.string,
-      code .literal.string {
-        color: #0c5404;
-      }
-      pre.code .name.builtin,
-      code .name.builtin {
-        color: #352b84;
-      }
-      pre.code .deleted,
-      code .deleted {
-        background-color: #deb0a1;
-      }
-      pre.code .inserted,
-      code .inserted {
-        background-color: #a3d289;
-      }
-
-      span.classifier {
-        font-family: sans-serif;
-        font-style: oblique;
-      }
-
-      span.classifier-delimiter {
-        font-family: sans-serif;
-        font-weight: bold;
-      }
-
-      span.interpreted {
-        font-family: sans-serif;
-      }
-
-      span.option {
-        white-space: nowrap;
-      }
-
-      span.pre {
-        white-space: pre;
-      }
-
-      span.problematic {
-        color: red;
-      }
-
-      span.section-subtitle {
-        /* font-size relative to parent (h1..h6 element) */
-        font-size: 80%;
-      }
-
-      table.citation {
-        border-left: solid 1px gray;
-        margin-left: 1px;
-      }
-
-      table.docinfo {
-        margin: 2em 4em;
-      }
-
-      table.docutils {
-        margin-top: 0.5em;
-        margin-bottom: 0.5em;
-      }
-
-      table.footnote {
-        border-left: solid 1px black;
-        margin-left: 1px;
-      }
-
-      table.docutils td,
-      table.docutils th,
-      table.docinfo td,
-      table.docinfo th {
-        padding-left: 0.5em;
-        padding-right: 0.5em;
-        vertical-align: top;
-      }
-
-      table.docutils th.field-name,
-      table.docinfo th.docinfo-name {
-        font-weight: bold;
-        text-align: left;
-        white-space: nowrap;
-        padding-left: 0;
-      }
-
-      /* "booktabs" style (no vertical lines) */
-      table.docutils.booktabs {
-        border: 0px;
-        border-top: 2px solid;
-        border-bottom: 2px solid;
-        border-collapse: collapse;
-      }
-      table.docutils.booktabs * {
-        border: 0px;
-      }
-      table.docutils.booktabs th {
-        border-bottom: thin solid;
-        text-align: left;
-      }
-
-      h1 tt.docutils,
-      h2 tt.docutils,
-      h3 tt.docutils,
-      h4 tt.docutils,
-      h5 tt.docutils,
-      h6 tt.docutils {
-        font-size: 100%;
-      }
-
-      ul.auto-toc {
-        list-style-type: none;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="document" id="field-service-sales">
-      <h1 class="title">Field Service - Sales</h1>
-
-      <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* 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 }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="field-service-sales">
+<h1 class="title">Field Service - Sales</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-      <p>
-        <a
-          class="reference external"
-          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"
-          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"
-          href="https://github.com/OCA/field-service/tree/12.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"
-          href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-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"
-          href="https://runbot.odoo-community.org/runbot/264/12.0"
-          ><img
-            alt="Try me on Runbot"
-            src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png"
-        /></a>
-      </p>
-      <p>
-        The module integrates the Field Service application with the Sales one and
-        allows you to sell products that generate field service orders.
-      </p>
-      <p><strong>Table of contents</strong></p>
-      <div class="contents local topic" id="contents">
-        <ul class="simple">
-          <li>
-            <a class="reference internal" href="#installation" id="id1">Installation</a>
-          </li>
-          <li>
-            <a class="reference internal" href="#configuration" id="id2"
-              >Configuration</a
-            >
-          </li>
-          <li><a class="reference internal" href="#usage" id="id3">Usage</a></li>
-          <li>
-            <a class="reference internal" href="#known-issues-roadmap" id="id4"
-              >Known issues / Roadmap</a
-            >
-          </li>
-          <li>
-            <a class="reference internal" href="#bug-tracker" id="id5">Bug Tracker</a>
-          </li>
-          <li>
-            <a class="reference internal" href="#credits" id="id6">Credits</a>
-            <ul>
-              <li>
-                <a class="reference internal" href="#authors" id="id7">Authors</a>
-              </li>
-              <li>
-                <a class="reference internal" href="#contributors" id="id8"
-                  >Contributors</a
-                >
-              </li>
-              <li>
-                <a class="reference internal" href="#maintainers" id="id9"
-                  >Maintainers</a
-                >
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-      <div class="section" id="installation">
-        <h1><a class="toc-backref" href="#id1">Installation</a></h1>
-        <p>
-          To install Field Service and have the mapping features, you need to install
-          GeoEngine.
-        </p>
-        <p>
-          Please refer to the installation instructions available at:
-          <a
-            class="reference external"
-            href="https://github.com/OCA/geospatial/tree/12.0/base_geoengine"
-            >https://github.com/OCA/geospatial/tree/12.0/base_geoengine</a
-          >
-        </p>
-      </div>
-      <div class="section" id="configuration">
-        <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
-        <p>
-          Products must be configured properly in order to create field service orders
-          upon sale order confirmation.
-        </p>
-        <p>
-          The field service tracking of a product defines how it generates a field
-          service order if the product is sold via sale order.
-        </p>
-        <p>
-          To configure a product that generates a unique field service order on each
-          sale order line:
-        </p>
-        <ul class="simple">
-          <li>Go to Sales &gt; Catalog &gt; Products</li>
-          <li>Create or select a product</li>
-          <li>
-            Set the Field Service Tracking to ???One FSM Order per Sale Order Line???
-          </li>
-          <li>
-            Select the FSM Order Template that will be used for creating FSM Orders when
-            a Sale Order is confirmed with this product
-          </li>
-        </ul>
-        <p>
-          To configure a product that generates a unique field service order for an
-          individual sale order:
-        </p>
-        <ul class="simple">
-          <li>Go to Sales &gt; Catalog &gt; Products</li>
-          <li>Create or select a product</li>
-          <li>Set the Field Service Tracking to ???One FSM Order per Sale Order???</li>
-          <li>
-            Select the FSM Order Template that will be used for creating FSM Orders when
-            a Sale Order is confirmed with this product
-          </li>
-        </ul>
-        <p>To setup a sales territory:</p>
-        <ul class="simple">
-          <li>Go to Field Service &gt; Master Data &gt; Locations</li>
-          <li>Create or select a location</li>
-          <li>Go to the Sales tab and select the sales territory</li>
-        </ul>
-      </div>
-      <div class="section" id="usage">
-        <h1><a class="toc-backref" href="#id3">Usage</a></h1>
-        <ul class="simple">
-          <li>Go to Sales</li>
-          <li>Create a new Quotation/Sale Order</li>
-          <li>Set the FSM Location to be used</li>
-          <li>
-            On a Sale Order Line, select a product configured for field service orders
-          </li>
-          <li>Confirm the Sale Order</li>
-          <li>Field Service orders linked to SO lines are created</li>
-          <li>
-            <dl class="first docutils">
-              <dt>
-                When a Field Service order is completed, the quantity delivered for its
-              </dt>
-              <dd>
-                linked sale order line will be updated to the quantity ordered,
-                indicating this line is ready for invoicing.
-              </dd>
-            </dl>
-          </li>
-        </ul>
-      </div>
-      <div class="section" id="known-issues-roadmap">
-        <h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
-        <ul class="simple">
-          <li>
-            Provide a mapping between an address and the branch and use it to set the
-            pricelist of a new partner
-          </li>
-        </ul>
-      </div>
-      <div class="section" id="bug-tracker">
-        <h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed
-          and welcomed
-          <a
-            class="reference external"
-            href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2012.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">
-        <h1><a class="toc-backref" href="#id6">Credits</a></h1>
-        <div class="section" id="authors">
-          <h2><a class="toc-backref" href="#id7">Authors</a></h2>
-          <ul class="simple">
-            <li>Open Source Integrators</li>
-          </ul>
-        </div>
-        <div class="section" id="contributors">
-          <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
-          <ul class="simple">
-            <li>
-              Open Source Integrators &lt;<a
-                class="reference external"
-                href="https://opensourceintegrators.com"
-                >https://opensourceintegrators.com</a
-              >&gt;
-              <ul>
-                <li>
-                  Steve Campbell &lt;<a
-                    class="reference external"
-                    href="mailto:scampbell&#64;opensourceintegrators.com"
-                    >scampbell&#64;opensourceintegrators.com</a
-                  >&gt;
-                </li>
-                <li>
-                  Maxime Chambreuil &lt;<a
-                    class="reference external"
-                    href="mailto:mchambreuil&#64;opensourceintegrators.com"
-                    >mchambreuil&#64;opensourceintegrators.com</a
-                  >&gt;
-                </li>
-                <li>
-                  Wolfgang Hall &lt;<a
-                    class="reference external"
-                    href="mailto:whall&#64;opensourceintegrators.com"
-                    >whall&#64;opensourceintegrators.com</a
-                  >&gt;
-                </li>
-              </ul>
-            </li>
-            <li>
-              Serpent Consulting Services Pvt. Ltd. &lt;<a
-                class="reference external"
-                href="mailto:support&#64;serpentcs.com"
-                >support&#64;serpentcs.com</a
-              >&gt;
-            </li>
-            <li>
-              Brian McMaster &lt;<a
-                class="reference external"
-                href="mailto:brian&#64;mcmpest.com"
-                >brian&#64;mcmpest.com</a
-              >&gt;
-            </li>
-            <li>
-              Rapha??l Reverdy &lt;<a
-                class="reference external"
-                href="mailto:raphael.reverdy&#64;akretion.com"
-                >raphael.reverdy&#64;akretion.com</a
-              >&gt;
-            </li>
-            <li>
-              Cl??ment Mombereau &lt;<a
-                class="reference external"
-                href="mailto:clement.mombereau&#64;akretion.com"
-                >clement.mombereau&#64;akretion.com</a
-              >&gt;
-            </li>
-          </ul>
-        </div>
-        <div class="section" id="maintainers">
-          <h2><a class="toc-backref" href="#id9">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>
-          <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"
-              >maintainers</a
-            >:
-          </p>
-          <p>
-            <a class="reference external" href="https://github.com/wolfhall"
-              ><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px"
-            /></a>
-            <a class="reference external" href="https://github.com/max3903"
-              ><img alt="max3903" src="https://github.com/max3903.png?size=40px"
-            /></a>
-            <a class="reference external" href="https://github.com/brian10048"
-              ><img alt="brian10048" src="https://github.com/brian10048.png?size=40px"
-            /></a>
-          </p>
-          <p>
-            This module is part of the
-            <a
-              class="reference external"
-              href="https://github.com/OCA/field-service/tree/12.0/fieldservice_sale"
-              >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>
-    </div>
-  </body>
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/14.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" href="https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-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" href="https://runbot.odoo-community.org/runbot/264/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>The module integrates the Field Service application with the Sales one and
+allows you to sell products that generate field service orders.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
+<li><a class="reference internal" href="#configuration" id="id2">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id3">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id4">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id5">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id6">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id7">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id8">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id9">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="installation">
+<h1><a class="toc-backref" href="#id1">Installation</a></h1>
+<p>To install Field Service and have the mapping features, you need to install GeoEngine.</p>
+<p>Please refer to the installation instructions available at:
+<a class="reference external" href="https://github.com/OCA/geospatial/tree/13.0/base_geoengine">https://github.com/OCA/geospatial/tree/13.0/base_geoengine</a></p>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id2">Configuration</a></h1>
+<p>Products must be configured properly in order to create field service
+orders upon sale order confirmation.</p>
+<p>The field service tracking of a product defines how it generates a field service
+order if the product is sold via sale order.</p>
+<p>To configure a product that generates a unique field service order on each
+sale order line:</p>
+<ul class="simple">
+<li>Go to Sales &gt; Catalog &gt; Products</li>
+<li>Create or select a product</li>
+<li>Set the Field Service Tracking to ‘One FSM Order per Sale Order Line’</li>
+<li>Select the FSM Order Template that will be used for creating FSM Orders when
+a Sale Order is confirmed with this product</li>
+</ul>
+<p>To configure a product that generates a unique field service order for
+an individual sale order:</p>
+<ul class="simple">
+<li>Go to Sales &gt; Catalog &gt; Products</li>
+<li>Create or select a product</li>
+<li>Set the Field Service Tracking to ‘One FSM Order per Sale Order’</li>
+<li>Select the FSM Order Template that will be used for creating FSM Orders when
+a Sale Order is confirmed with this product</li>
+</ul>
+<p>To setup a sales territory:</p>
+<ul class="simple">
+<li>Go to Field Service &gt; Master Data &gt; Locations</li>
+<li>Create or select a location</li>
+<li>Go to the Sales tab and select the sales territory</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id3">Usage</a></h1>
+<ul class="simple">
+<li>Go to Sales</li>
+<li>Create a new Quotation/Sale Order</li>
+<li>Set the FSM Location to be used</li>
+<li>On a Sale Order Line, select a product configured for field service orders</li>
+<li>Confirm the Sale Order</li>
+<li>Field Service orders linked to SO lines are created</li>
+<li><dl class="first docutils">
+<dt>When a Field Service order is completed, the quantity delivered for its</dt>
+<dd>linked sale order line will be updated to the quantity ordered, indicating
+this line is ready for invoicing.</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
+<ul class="simple">
+<li>Provide a mapping between an address and the branch and use it to set the
+pricelist of a new partner</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2014.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">
+<h1><a class="toc-backref" href="#id6">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id7">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id8">Contributors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators &lt;<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>&gt;<ul>
+<li>Steve Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Raphael Lee &lt;<a class="reference external" href="mailto:rlee&#64;opensourceintegrators.com">rlee&#64;opensourceintegrators.com</a>&gt;</li>
+</ul>
+</li>
+<li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
+<li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
+<li>Rapha??l Reverdy &lt;<a class="reference external" href="mailto:raphael.reverdy&#64;akretion.com">raphael.reverdy&#64;akretion.com</a>&gt;</li>
+<li>Cl??ment Mombereau &lt;<a class="reference external" href="mailto:clement.mombereau&#64;akretion.com">clement.mombereau&#64;akretion.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id9">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>
+<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">maintainers</a>:</p>
+<p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/14.0/fieldservice_sale">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>
+</div>
+</body>
 </html>
diff --git a/fieldservice_sale/tests/__init__.py b/fieldservice_sale/tests/__init__.py
index b37075e37e..e004260bd5 100644
--- a/fieldservice_sale/tests/__init__.py
+++ b/fieldservice_sale/tests/__init__.py
@@ -1,5 +1,5 @@
-# Copyright (C) 2019 Cl??ment Mombereau (Akretion)
-# Copyright (C) 2020 Brian McMaster <brian@mcmpest.com>
+# Copyright (C) 2019 Clément Mombereau (Akretion)
+# Copyright (C) 2019 Brian McMaster <brian@mcmpest.com>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 
 from . import (
diff --git a/fieldservice_sale/tests/test_fsm_sale_common.py b/fieldservice_sale/tests/test_fsm_sale_common.py
index cf182afdd4..0ab2d2b9fa 100644
--- a/fieldservice_sale/tests/test_fsm_sale_common.py
+++ b/fieldservice_sale/tests/test_fsm_sale_common.py
@@ -1,9 +1,10 @@
 # Copyright (C) 2019 Brian McMaster <brian@mcmpest.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo.addons.sale.tests.test_sale_common import TestCommonSaleNoChart
 
+from odoo.addons.sale.tests.common import TestSaleCommonBase
 
-class TestFSMSale(TestCommonSaleNoChart):
+
+class TestFSMSale(TestSaleCommonBase):
     @classmethod
     def setUpClass(cls):
         super(TestFSMSale, cls).setUpClass()
@@ -18,7 +19,7 @@ def setUpFSMTemplates(cls):
             {
                 "name": "Test FSM Template #1",
                 "instructions": "These are the instructions for Template #1",
-                "hours": 2.25,
+                "duration": 2.25,
             }
         )
         # Template 2
@@ -26,7 +27,7 @@ def setUpFSMTemplates(cls):
             {
                 "name": "Test FSM Template #2",
                 "instructions": "Template #2 requires a lot of work",
-                "hours": 4.5,
+                "duration": 4.5,
             }
         )
         # Template 3
@@ -34,7 +35,7 @@ def setUpFSMTemplates(cls):
             {
                 "name": "Test FSM Template #3",
                 "instructions": "Complete the steps outlined for Template #3",
-                "hours": 0.75,
+                "duration": 0.75,
             }
         )
         # Template 4
@@ -42,7 +43,7 @@ def setUpFSMTemplates(cls):
             {
                 "name": "Test FSM Template #4",
                 "instructions": "These notes apply to Template #4",
-                "hours": 0.75,
+                "duration": 0.75,
             }
         )
 
diff --git a/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py b/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
index 9c66f21fa2..49d2814601 100644
--- a/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
+++ b/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 Cl??ment Mombereau (Akretion)
+# Copyright (C) 2019 Clément Mombereau (Akretion)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 from odoo.tests.common import TransactionCase
 
@@ -16,11 +16,17 @@ def setUp(self):
         super(FSMSale, self).setUp()
         # create a parent company
         self.commercial_partner = self.env["res.partner"].create(
-            {"name": "Company Commercial Partner", "is_company": True}
+            {
+                "name": "Company Commercial Partner",
+                "is_company": True,
+            }
         )
         # create a child partner
         self.partner = self.env["res.partner"].create(
-            {"name": "Child Partner", "parent_id": self.commercial_partner.id}
+            {
+                "name": "Child Partner",
+                "parent_id": self.commercial_partner.id,
+            }
         )
         # create a child partner shipping address
         self.shipping_partner = self.env["res.partner"].create(
diff --git a/fieldservice_sale/tests/test_fsm_sale_order.py b/fieldservice_sale/tests/test_fsm_sale_order.py
index f04dd0a29b..4195ee5707 100644
--- a/fieldservice_sale/tests/test_fsm_sale_order.py
+++ b/fieldservice_sale/tests/test_fsm_sale_order.py
@@ -1,5 +1,6 @@
 # Copyright (C) 2019 Brian McMaster <brian@mcmpest.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
 from odoo import fields
 
 from .test_fsm_sale_common import TestFSMSale
@@ -13,7 +14,15 @@ def setUpClass(cls):
 
         # Setup products that when sold will create some FSM orders
         cls.setUpFSMProducts()
-
+        cls.partner_customer_usd = cls.env["res.partner"].create(
+            {
+                "name": "partner_a",
+                "company_id": False,
+            }
+        )
+        cls.pricelist_usd = cls.env["product.pricelist"].search(
+            [("currency_id.name", "=", "USD")], limit=1
+        )
         # Create some sale orders that will use the above products
         SaleOrder = cls.env["sale.order"].with_context(tracking_disable=True)
         # create a generic Sale Order with one product
@@ -173,7 +182,11 @@ def _fulfill_order(self, order):
                 ).id,
             }
         )
-        order.write({"employee_timesheet_ids": [(6, 0, timesheet.ids)]})
+        order.write(
+            {
+                "employee_timesheet_ids": [(6, 0, timesheet.ids)],
+            }
+        )
         return order
 
     def test_sale_order_1(self):
@@ -202,7 +215,10 @@ def test_sale_order_1(self):
         if self._isp_account_installed():
             fsm_order = self._fulfill_order(fsm_order)
         fsm_order.write(
-            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+            {
+                "date_end": fields.Datetime.today(),
+                "resolution": "Work completed",
+            }
         )
         fsm_order.action_complete()
 
@@ -244,7 +260,10 @@ def test_sale_order_2(self):
         if self._isp_account_installed():
             fsm_order = self._fulfill_order(fsm_order)
         fsm_order.write(
-            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+            {
+                "date_end": fields.Datetime.today(),
+                "resolution": "Work completed",
+            }
         )
         fsm_order.action_complete()
         # qty delivered should be updated
@@ -297,7 +316,10 @@ def test_sale_order_3(self):
         if self._isp_account_installed():
             fsm_order_1 = self._fulfill_order(fsm_order_1)
         fsm_order_1.write(
-            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+            {
+                "date_end": fields.Datetime.today(),
+                "resolution": "Work completed",
+            }
         )
         fsm_order_1.action_complete()
         self.assertTrue(
@@ -307,7 +329,10 @@ def test_sale_order_3(self):
         if self._isp_account_installed():
             fsm_order_2 = self._fulfill_order(fsm_order_2)
         fsm_order_2.write(
-            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+            {
+                "date_end": fields.Datetime.today(),
+                "resolution": "Work completed",
+            }
         )
         fsm_order_2.action_complete()
         self.assertTrue(
@@ -319,7 +344,7 @@ def test_sale_order_3(self):
         invoices = self.sale_order_3._create_invoices()
         # 2 invoices created
         self.assertEqual(
-            len(invoices.ids), 2, "FSM Sale: Sale Order 3 should create 2 invoices"
+            len(invoices.ids), 1, "FSM Sale: Sale Order 3 should create 1 invoices"
         )
         inv_fsm_orders = FSM_Order
         for inv in invoices:
@@ -337,7 +362,7 @@ def test_sale_order_4(self):
         """Test sale order 4 flow from sale to invoice.
         - Two FSM orders linked to the Sale Order Lines should be created.
         - One FSM order linked to the Sale Order should be created.
-        - Three Invoices should be created (One for each FSM Order).
+        - One Invoices should be created (One for each FSM Order).
         """
         sol1 = self.sol_service_per_line_4
         sol2 = self.sol_service_per_line_5
@@ -377,7 +402,10 @@ def test_sale_order_4(self):
         if self._isp_account_installed():
             fsm_order_1 = self._fulfill_order(fsm_order_1)
         fsm_order_1.write(
-            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+            {
+                "date_end": fields.Datetime.today(),
+                "resolution": "Work completed",
+            }
         )
         fsm_order_1.action_complete()
         self.assertTrue(
@@ -387,7 +415,10 @@ def test_sale_order_4(self):
         if self._isp_account_installed():
             fsm_order_2 = self._fulfill_order(fsm_order_2)
         fsm_order_2.write(
-            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+            {
+                "date_end": fields.Datetime.today(),
+                "resolution": "Work completed",
+            }
         )
         fsm_order_2.action_complete()
         self.assertTrue(
@@ -397,7 +428,10 @@ def test_sale_order_4(self):
         if self._isp_account_installed():
             fsm_order_3 = self._fulfill_order(fsm_order_3)
         fsm_order_3.write(
-            {"date_end": fields.Datetime.today(), "resolution": "Work completed"}
+            {
+                "date_end": fields.Datetime.today(),
+                "resolution": "Work completed",
+            }
         )
         fsm_order_3.action_complete()
         # qty_delivered does not update for FSM orders linked only to the sale
@@ -406,13 +440,5 @@ def test_sale_order_4(self):
         invoices = self.sale_order_4._create_invoices()
         # 3 invoices created
         self.assertEqual(
-            len(invoices.ids), 3, "FSM Sale: Sale Order 4 should create 3 invoices"
-        )
-        inv_fsm_orders = FSM_Order
-        for inv in invoices:
-            inv_fsm_orders |= inv.fsm_order_ids
-        self.assertEqual(
-            len(inv_fsm_orders.ids),
-            3,
-            "FSM Sale: There should be 3 orders for 3 invoices",
+            len(invoices.ids), 1, "FSM Sale: Sale Order 4 should create 1 invoice"
         )
diff --git a/fieldservice_sale/views/fsm_location.xml b/fieldservice_sale/views/fsm_location.xml
index c8afa77643..299767e5b9 100644
--- a/fieldservice_sale/views/fsm_location.xml
+++ b/fieldservice_sale/views/fsm_location.xml
@@ -1,4 +1,5 @@
 <odoo>
+
     <!-- Field Service Location Form View-->
     <record id="fsm_location_form_view" model="ir.ui.view">
         <field name="name">fsm.location.form</field>
@@ -9,7 +10,6 @@
                 <page string="Sales">
                     <group>
                         <group>
-                            <field name="sales_territory_id" />
                             <field name="user_id" />
                         </group>
                     </group>
diff --git a/fieldservice_sale/views/fsm_order.xml b/fieldservice_sale/views/fsm_order.xml
index d19e4da8f1..92f9373b03 100644
--- a/fieldservice_sale/views/fsm_order.xml
+++ b/fieldservice_sale/views/fsm_order.xml
@@ -1,4 +1,5 @@
 <odoo>
+
     <record id="view_fsm_order_form_inherit_sale" model="ir.ui.view">
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form" />
@@ -18,4 +19,5 @@
             </xpath>
         </field>
     </record>
+
 </odoo>
diff --git a/fieldservice_sale/views/res_branch.xml b/fieldservice_sale/views/res_branch.xml
deleted file mode 100644
index 9629a57a15..0000000000
--- a/fieldservice_sale/views/res_branch.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<odoo>
-    <record id="res_branch_form_view_pricelist" model="ir.ui.view">
-        <field name="name">res.branch.form.pricelist</field>
-        <field name="model">res.branch</field>
-        <field name="inherit_id" ref="base_territory.res_branch_form_view" />
-        <field name="arch" type="xml">
-            <field name="partner_id" position="after">
-                <field name="pricelist_id" groups="product.group_sale_pricelist" />
-            </field>
-        </field>
-    </record>
-</odoo>
diff --git a/fieldservice_sale/views/res_config_settings.xml b/fieldservice_sale/views/res_config_settings.xml
index 7d57014d73..197f470666 100644
--- a/fieldservice_sale/views/res_config_settings.xml
+++ b/fieldservice_sale/views/res_config_settings.xml
@@ -1,8 +1,11 @@
 <odoo>
+
     <record model="res.config.settings" id="res_config_settings_fsm_template">
         <field name="group_fsm_template" eval="1" />
     </record>
+
     <function model="res.config.settings" name="execute">
-        <value eval="[ref('fieldservice_sale.res_config_settings_fsm_template')]" />
+            <value eval="[ref('fieldservice_sale.res_config_settings_fsm_template')]" />
     </function>
+
 </odoo>

From a42b3c6c8c815e435697104ffff47aaad6b5ab1d Mon Sep 17 00:00:00 2001
From: hparfr <raph@hpar.fr>
Date: Tue, 20 Jul 2021 16:49:19 +0200
Subject: [PATCH 53/77] fieldservice_sale: remove required tpl in prd view

Create a blank fsm from a SO is a valid use case.
And it make more sense when used with fsm_recurring_sale

Implement rfc #735
---
 fieldservice_sale/views/product_template.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_sale/views/product_template.xml b/fieldservice_sale/views/product_template.xml
index a1da19f361..a03626e2bd 100644
--- a/fieldservice_sale/views/product_template.xml
+++ b/fieldservice_sale/views/product_template.xml
@@ -8,7 +8,7 @@
                 <field name="field_service_tracking" widget="radio" />
                 <field
                     name="fsm_order_template_id"
-                    attrs="{'invisible': [('field_service_tracking', '=', 'no')], 'required': [('field_service_tracking', '!=', 'no')]}"
+                    attrs="{'invisible': [('field_service_tracking', '=', 'no')]}"
                 />
             </xpath>
         </field>

From de9c11b681930263e0a41041c4bda7ce0cde45d1 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Wed, 28 Jul 2021 20:30:13 +0200
Subject: [PATCH 54/77] [FIX] fieldservice_sale: Restrict views to authorized
 users

Not putting groups on the view makes the rest of the users that access
to these views to receive a permission error.

It's also not enough to put the groups on the field, but the view.
---
 fieldservice_sale/__manifest__.py            | 2 +-
 fieldservice_sale/views/fsm_order.xml        | 1 +
 fieldservice_sale/views/product_template.xml | 1 +
 fieldservice_sale/views/sale_order.xml       | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index aeade35e98..b2f41d9344 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service - Sales",
-    "version": "14.0.1.0.0",
+    "version": "14.0.1.2.0",
     "summary": "Sell field services.",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
diff --git a/fieldservice_sale/views/fsm_order.xml b/fieldservice_sale/views/fsm_order.xml
index 92f9373b03..47a942350a 100644
--- a/fieldservice_sale/views/fsm_order.xml
+++ b/fieldservice_sale/views/fsm_order.xml
@@ -3,6 +3,7 @@
     <record id="view_fsm_order_form_inherit_sale" model="ir.ui.view">
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form" />
+        <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]" />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
                 <button
diff --git a/fieldservice_sale/views/product_template.xml b/fieldservice_sale/views/product_template.xml
index a03626e2bd..64d027933f 100644
--- a/fieldservice_sale/views/product_template.xml
+++ b/fieldservice_sale/views/product_template.xml
@@ -3,6 +3,7 @@
         <field name="name">product.template.fieldservice.form</field>
         <field name="model">product.template</field>
         <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy" />
+        <field name="groups_id" eval="[(4, ref('fieldservice.group_fsm_user'))]" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='service_type']" position="after">
                 <field name="field_service_tracking" widget="radio" />
diff --git a/fieldservice_sale/views/sale_order.xml b/fieldservice_sale/views/sale_order.xml
index fa628c2f6b..a49b2a3dd9 100644
--- a/fieldservice_sale/views/sale_order.xml
+++ b/fieldservice_sale/views/sale_order.xml
@@ -3,6 +3,7 @@
         <field name="name">sale.order.form.sale.fieldservice</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="groups_id" eval="[(4, ref('fieldservice.group_fsm_user'))]" />
         <field name="arch" type="xml">
             <xpath expr="//button[@name='action_view_invoice']" position="before">
                 <button

From 56ba32a31c971a54d3b966ebb1a12db061b2c0b3 Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Sun, 3 Oct 2021 18:40:34 +0000
Subject: [PATCH 55/77] Added translation using Weblate (Spanish (Argentina))

---
 fieldservice_sale/i18n/es_AR.po | 238 ++++++++++++++++++++++++++++++++
 1 file changed, 238 insertions(+)
 create mode 100644 fieldservice_sale/i18n/es_AR.po

diff --git a/fieldservice_sale/i18n/es_AR.po b/fieldservice_sale/i18n/es_AR.po
new file mode 100644
index 0000000000..e16aa90883
--- /dev/null
+++ b/fieldservice_sale/i18n/es_AR.po
@@ -0,0 +1,238 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
+msgid "<span class=\"o_stat_text\">Sale Order</span>"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid ""
+"According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+"  - Manual: the quantity is set manually on the line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+"  - Stock Moves: the quantity comes from confirmed pickings\n"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__sale
+msgid "Create one FSM order per sale order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
+msgid "Create one FSM order per sale order line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
+msgid ""
+"Determines what happens upon sale order confirmation:\n"
+"                - None: nothing additional, default behavior.\n"
+"                - Per Sale Order: One FSM Order will be created for the sale.\n"
+"                - Per Sale Order Line: One FSM Order for each sale order line\n"
+"                will be created."
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__display_name
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__display_name
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
+msgid "Don't create FSM order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid "FSM Location must be set"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
+msgid "FSM Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_order
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__sale_order_line__qty_delivered_method__field_service
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
+#, python-format
+msgid ""
+"Field Service Order Created (%s): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid ""
+"Field Service Order Created: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Field Service Order generated by the sales order item"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
+msgid "Field Service Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__field_service_tracking
+msgid "Field Service Tracking"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_ids
+msgid "Field Service orders associated to this sale"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template____last_update
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
+msgid ""
+"Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid "Method to update delivered qty"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__display_name
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "SO Lines generating a FSM order will be for this location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
+msgid "Sale"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
+msgid "Sale Line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
+msgid "Sales"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/fsm_order.py:0
+#, python-format
+msgid "Sales Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Select the field service order template to be created"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "Service Location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid ""
+"This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
+#, python-format
+msgid ""
+"This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
+msgid "Track Service"
+msgstr ""

From e001982e6e4950d18fbe1e7fce93690b89f0c1cd Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Mon, 4 Oct 2021 02:00:09 +0000
Subject: [PATCH 56/77] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (35 of 35 strings)

Translation: field-service-14.0/field-service-14.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_sale/es_AR/
---
 fieldservice_sale/i18n/es_AR.po | 93 +++++++++++++++++++++++----------
 1 file changed, 66 insertions(+), 27 deletions(-)

diff --git a/fieldservice_sale/i18n/es_AR.po b/fieldservice_sale/i18n/es_AR.po
index e16aa90883..ba30584eef 100644
--- a/fieldservice_sale/i18n/es_AR.po
+++ b/fieldservice_sale/i18n/es_AR.po
@@ -6,18 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2021-10-04 04:34+0000\n"
+"Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.3.2\n"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
 msgid "<span class=\"o_stat_text\">Sale Order</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\">Pedido de Venta</span>"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
@@ -28,16 +30,24 @@ msgid ""
 "  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
 msgstr ""
+"Según la configuración del producto, la cantidad entregada se puede calcular "
+"automáticamente mediante un mecanismo:\n"
+"   - Manual: la cantidad se establece manualmente en la línea\n"
+"   - Analítica de gastos: la cantidad es la suma de la cantidad de los "
+"gastos contabilizados.\n"
+"   - Hoja de horas: la cantidad es la suma de horas registradas en tareas "
+"vinculadas a esta línea de venta\n"
+"   - Stock Moves: la cantidad proviene de pickings confirmados\n"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__sale
 msgid "Create one FSM order per sale order"
-msgstr ""
+msgstr "Crea un pedido FSM por pedido de venta"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
 msgid "Create one FSM order per sale order line"
-msgstr ""
+msgstr "Crea un pedido FSM por línea de pedido de venta"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
@@ -49,36 +59,43 @@ msgid ""
 "                - Per Sale Order Line: One FSM Order for each sale order line\n"
 "                will be created."
 msgstr ""
+"Determina qué sucede tras la confirmación del pedido de venta:\n"
+"                 - Ninguno: nada adicional, comportamiento predeterminado.\n"
+"                 - Por orden de venta: se creará un pedido de FSM para la "
+"venta.\n"
+"                 - Por línea de orden de venta: un pedido de FSM para cada "
+"línea de pedido de venta\n"
+"                 se creará."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__display_name
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__display_name
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Mostrar Nombre"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
 msgid "Don't create FSM order"
-msgstr ""
+msgstr "No crea pedido FSM"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "FSM Location must be set"
-msgstr ""
+msgstr "Ubicación FSM debe estar configurada"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
 msgid "FSM Orders"
-msgstr ""
+msgstr "Pedidos FSM"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_order
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__sale_order_line__qty_delivered_method__field_service
 msgid "Field Service Order"
-msgstr ""
+msgstr "Pedido de Servicio de Campo"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:0
@@ -88,6 +105,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
+"Pedido de Servicio de Campo Creado (%s): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
@@ -97,33 +117,37 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
+"Pedido de Servicio de Campo Creado: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
 msgid "Field Service Order Template"
-msgstr ""
+msgstr "Plantilla del Pedido de Servicio de Campo"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Field Service Order generated by the sales order item"
 msgstr ""
+"Pedido de Servicio de Campo generado por el artículo de Pedido de Ventas"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
-msgstr ""
+msgstr "Pedidos de Servicio de Campo"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__field_service_tracking
 msgid "Field Service Tracking"
-msgstr ""
+msgstr "Rastreo de Servicio de Campo"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_ids
 msgid "Field Service orders associated to this sale"
-msgstr ""
+msgstr "Pedidos de servicio de campo asociados a esta venta"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__id
@@ -131,7 +155,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order____last_update
@@ -139,7 +163,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order____last_update
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Última Modificación el"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
@@ -149,69 +173,78 @@ msgid ""
 "Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
 "Create a task and track hours: Create a task on the sales order validation and track the work hours."
 msgstr ""
+"Cantidad establecida manualmente en el pedido: Factura basada en la cantidad "
+"ingresada manualmente, sin crear una cuenta analítica.\n"
+"Hojas de tiempo en el contrato: Factura basada en las horas registradas en "
+"la hoja de tiempo relacionada.\n"
+"Crea una tarea y realiza un seguimiento de las horas: Crea una tarea en la "
+"validación de la orden de venta y realiza un seguimiento de las horas de "
+"trabajo."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
 msgid "Method to update delivered qty"
-msgstr ""
+msgstr "Método para actualizar las cantidades entregadas"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__display_name
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Order"
-msgstr ""
+msgstr "Pedido"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Plantilla del Producto"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "SO Lines generating a FSM order will be for this location"
 msgstr ""
+"Las líneas de Pedidos de Venta que generan una orden FSM serán para esta "
+"ubicación"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
 msgid "Sale"
-msgstr ""
+msgstr "Venta"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
 msgid "Sale Line"
-msgstr ""
+msgstr "Línea de Venta"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
 msgid "Sales"
-msgstr ""
+msgstr "Ventas"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedidos de Venta"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea de Pedido de Venta"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/fsm_order.py:0
 #, python-format
 msgid "Sales Orders"
-msgstr ""
+msgstr "Pedidos de Ventas"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
 msgid "Select the field service order template to be created"
-msgstr ""
+msgstr "Seleccione la plantilla de pedido de servicio de campo que se creará"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "Service Location"
-msgstr ""
+msgstr "Ubicación de Servicio"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
@@ -221,6 +254,9 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
+"Este pedido fue creado desde: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:0
@@ -230,9 +266,12 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
 "                "
 msgstr ""
+"Este pedido fue creado desde: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
-msgstr ""
+msgstr "Rastrear Servicio"

From 0ad4fbe436d8eb8ce75f498bcba446b933bd97ae Mon Sep 17 00:00:00 2001
From: marcos-mendez <mendez.foto@gmail.com>
Date: Wed, 8 Dec 2021 20:56:53 +0000
Subject: [PATCH 57/77] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (44 of 44 strings)

Translation: field-service-14.0/field-service-14.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_sale/pt_BR/
---
 fieldservice_sale/i18n/pt_BR.po | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/fieldservice_sale/i18n/pt_BR.po b/fieldservice_sale/i18n/pt_BR.po
index 2942cf4c62..3979d527e1 100644
--- a/fieldservice_sale/i18n/pt_BR.po
+++ b/fieldservice_sale/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-06-17 22:19+0000\n"
-"Last-Translator: Fernando Colus <fcolus1@gmail.com>\n"
+"PO-Revision-Date: 2021-12-08 22:39+0000\n"
+"Last-Translator: marcos-mendez <mendez.foto@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10\n"
+"X-Generator: Weblate 4.3.2\n"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
@@ -85,12 +85,13 @@ msgid ""
 "line\n"
 "                will be created."
 msgstr ""
-"Determina o que acontece ap??s a confirma????o do pedido de venda:\n"
-"                 - Nenhum: nada adicional, comportamento padr??o.\n"
+"Determina o que acontece após a confirmação do pedido de venda:\n"
+"                 - Nenhum: nada adicional, comportamento padrão.\n"
 "                 - Por pedido de venda: um pedido do FSM ser?? criado para a "
 "venda.\n"
 "                 - Por linha de pedido de venda: um pedido do FSM para cada "
-"linha de pedido de venda ser?? criado."
+"linha de pedido de venda.\n"
+"                 Será criado."
 
 #. module: fieldservice_sale
 #: selection:product.template,field_service_tracking:0
@@ -128,8 +129,8 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
-"Ordem de servi??o de campo criada (%s): <a href =# data-oe-model = fsm.order "
-"data-oe-id =%d>%s </a>\n"
+"Ordem de Serviço de Campo Criada (%s): <a href=\n"
+"                         # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 
 #. module: fieldservice_sale
@@ -140,8 +141,8 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
-"Ordem de servi??o de campo criada: <a href =#data-oe-model = fsm.order data-"
-"oe-id =%d>%s </a>\n"
+"Ordem de serviço de campo criada: <a href =\n"
+"                        #data-oe-model = fsm.order data-oe-id =%d>%s </a>\n"
 "                "
 
 #. module: fieldservice_sale
@@ -279,8 +280,8 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
 "                "
 msgstr ""
-"Este pedido foi criado a partir de: <a href =# data-oe-model = sale.order "
-"data-oe-id =%d>%s </a>\n"
+"Este pedido foi criado a partir de: <a href =\n"
+"                       # data-oe-model = sale.order data-oe-id =%d>%s </a>\n"
 "                "
 
 #. module: fieldservice_sale
@@ -291,8 +292,9 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
 "                "
 msgstr ""
-"Este pedido foi criado a partir de: <a href =# data-oe-model = sale.order "
-"data-oe-id =%d>%s </a> (%s)\n"
+"Este pedido foi criado a partir de: <a href =\n"
+"                       # data-oe-model = sale.order data-oe-id =%d>%s </a> "
+"(%s)\n"
 "                "
 
 #. module: fieldservice_sale

From 9756bd06a49cb95e1cc419ff66cc97e0d071fe75 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Tue, 4 Jan 2022 15:45:53 +0530
Subject: [PATCH 58/77] [14.0][FIX] fieldservice_sale

---
 fieldservice_sale/__manifest__.py               | 4 ++--
 fieldservice_sale/models/sale_order.py          | 2 +-
 fieldservice_sale/views/res_config_settings.xml | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index b2f41d9344..baa5a1a1b0 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service - Sales",
-    "version": "14.0.1.2.0",
+    "version": "14.0.1.3.0",
     "summary": "Sell field services.",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
@@ -18,7 +18,7 @@
         "views/fsm_order.xml",
         "views/product_template.xml",
         "views/sale_order.xml",
-        "views/res_config_settings.xml",
+        # "views/res_config_settings.xml",
     ],
     "license": "AGPL-3",
     "development_status": "Beta",
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 899346cc1a..bef7cf4303 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -136,7 +136,7 @@ def _field_find_fsm_order(self):
         return result
 
     def _action_confirm(self):
-        """ On SO confirmation, some lines generate field service orders. """
+        """On SO confirmation, some lines generate field service orders."""
         result = super(SaleOrder, self)._action_confirm()
         if any(
             sol.product_id.field_service_tracking != "no" for sol in self.order_line
diff --git a/fieldservice_sale/views/res_config_settings.xml b/fieldservice_sale/views/res_config_settings.xml
index 197f470666..390d5bfefb 100644
--- a/fieldservice_sale/views/res_config_settings.xml
+++ b/fieldservice_sale/views/res_config_settings.xml
@@ -1,11 +1,13 @@
 <odoo>
 
-    <record model="res.config.settings" id="res_config_settings_fsm_template">
+    <!-- ToDo -->
+
+    <!-- <record model="res.config.settings" id="res_config_settings_fsm_template">
         <field name="group_fsm_template" eval="1" />
     </record>
 
     <function model="res.config.settings" name="execute">
             <value eval="[ref('fieldservice_sale.res_config_settings_fsm_template')]" />
-    </function>
+    </function> -->
 
 </odoo>

From f87d03dcf7358c4fbb63a571d66d7b76151faa23 Mon Sep 17 00:00:00 2001
From: Brian McMaster <brian@mcmpest.com>
Date: Fri, 6 May 2022 12:12:52 -0400
Subject: [PATCH 59/77] [FIX] fieldservice_sale: adapt access to ir.actions.*
 records

---
 fieldservice_sale/__manifest__.py      | 2 +-
 fieldservice_sale/models/sale_order.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index baa5a1a1b0..cac3214eee 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service - Sales",
-    "version": "14.0.1.3.0",
+    "version": "14.0.1.3.1",
     "summary": "Sell field services.",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index bef7cf4303..5d6abfa189 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -148,7 +148,9 @@ def _action_confirm(self):
 
     def action_view_fsm_order(self):
         fsm_orders = self.mapped("fsm_order_ids")
-        action = self.env.ref("fieldservice.action_fsm_dash_order").read()[0]
+        action = self.env["ir.actions.act_window"]._for_xml_id(
+            "fieldservice.action_fsm_dash_order"
+        )
         if len(fsm_orders) > 1:
             action["domain"] = [("id", "in", fsm_orders.ids)]
         elif len(fsm_orders) == 1:

From 0ec9e256e1c99aeb8c7ef72654674c3e9f9331bc Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 27 Oct 2022 15:26:19 +0530
Subject: [PATCH 60/77] [15.0][MIG] fieldservice_sale

---
 fieldservice_sale/README.rst                  |  10 +-
 fieldservice_sale/__manifest__.py             |   4 +-
 fieldservice_sale/data/fsm_template_group.xml |  10 +
 fieldservice_sale/i18n/de.po                  | 115 +++-------
 fieldservice_sale/i18n/es.po                  | 194 ++++++++---------
 fieldservice_sale/i18n/es_AR.po               | 119 ++++++-----
 fieldservice_sale/i18n/es_CL.po               | 201 +++++++++---------
 fieldservice_sale/i18n/fieldservice_sale.pot  |  36 +---
 fieldservice_sale/i18n/pt_BR.po               | 199 ++++++++---------
 .../pre-migration.py                          |   0
 fieldservice_sale/models/product_template.py  |   1 -
 fieldservice_sale/models/sale_order.py        |  25 +--
 fieldservice_sale/models/sale_order_line.py   |  41 ++--
 .../static/description/index.html             |   6 +-
 .../tests/test_fsm_sale_common.py             |  17 ++
 .../tests/test_fsm_sale_onchange_partner.py   |  21 ++
 .../tests/test_fsm_sale_order.py              |  80 +++++++
 fieldservice_sale/views/product_template.xml  |  16 +-
 .../views/res_config_settings.xml             |  13 --
 19 files changed, 590 insertions(+), 518 deletions(-)
 create mode 100644 fieldservice_sale/data/fsm_template_group.xml
 rename fieldservice_sale/migrations/{14.0.1.0.0 => 15.0.1.0.0}/pre-migration.py (100%)
 delete mode 100644 fieldservice_sale/views/res_config_settings.xml

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index adc633e26c..5dc8aba9ff 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -14,13 +14,13 @@ Field Service - Sales
     :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/14.0/fieldservice_sale
+    :target: https://github.com/OCA/field-service/tree/15.0/fieldservice_sale
     :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-14-0/field-service-14-0-fieldservice_sale
+    :target: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_sale
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/264/14.0
+    :target: https://runbot.odoo-community.org/runbot/264/15.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -99,7 +99,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 smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2014.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_sale%0Aversion:%2015.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.
 
@@ -153,6 +153,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-wolfhall| |maintainer-max3903| |maintainer-brian10048| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_sale>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/15.0/fieldservice_sale>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index cac3214eee..dff3b499e5 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service - Sales",
-    "version": "14.0.1.3.1",
+    "version": "15.0.1.0.0",
     "summary": "Sell field services.",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
@@ -18,7 +18,7 @@
         "views/fsm_order.xml",
         "views/product_template.xml",
         "views/sale_order.xml",
-        # "views/res_config_settings.xml",
+        "data/fsm_template_group.xml",
     ],
     "license": "AGPL-3",
     "development_status": "Beta",
diff --git a/fieldservice_sale/data/fsm_template_group.xml b/fieldservice_sale/data/fsm_template_group.xml
new file mode 100644
index 0000000000..87d01bb698
--- /dev/null
+++ b/fieldservice_sale/data/fsm_template_group.xml
@@ -0,0 +1,10 @@
+<odoo>
+    <!-- Activate the FSM Template Group by default -->
+        <record id="base.group_user" model="res.groups">
+            <field
+            name="implied_ids"
+            eval="[(4, ref('fieldservice.group_fsm_template'))]"
+        />
+        </record>
+
+</odoo>
diff --git a/fieldservice_sale/i18n/de.po b/fieldservice_sale/i18n/de.po
index d8eb8c7019..ba44035f1c 100644
--- a/fieldservice_sale/i18n/de.po
+++ b/fieldservice_sale/i18n/de.po
@@ -19,7 +19,6 @@ msgstr ""
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
 #, fuzzy
-#| msgid "<span class=\"o_stat_text\">Sale Orders</span>"
 msgid "<span class=\"o_stat_text\">Sale Order</span>"
 msgstr "<span class=\"o_stat_text\">Verkaufsauftr??ge</span>"
 
@@ -37,37 +36,16 @@ msgid ""
 msgstr ""
 
 #. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Analytic From Expenses"
-msgstr ""
-
-#. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
-msgid "Create a recurring order"
-msgstr "Wiederkehrenden Auftrag erstellen"
-
-#. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__sale
 #, fuzzy
-#| msgid "Create a recurring order"
 msgid "Create one FSM order per sale order"
 msgstr "Wiederkehrenden Auftrag erstellen"
 
 #. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
 msgid "Create one FSM order per sale order line"
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
-msgid "Default Pricelist"
-msgstr ""
-
-#. module: fieldservice_sale
-#: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
-msgid "Default pricelist for new customers of this branch."
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
@@ -82,12 +60,12 @@ msgid ""
 msgstr ""
 
 #. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
 msgid "Don't create FSM order"
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:131
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "FSM Location must be set"
 msgstr ""
@@ -98,32 +76,27 @@ msgstr ""
 msgid "FSM Orders"
 msgstr "Field-Service-Auftr??ge"
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_fsm_location
-msgid "Field Service Location"
-msgstr "Field-Service-Ort"
-
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_order
-#: selection:sale.order.line,qty_delivered_method:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__sale_order_line__qty_delivered_method__field_service
 msgid "Field Service Order"
 msgstr "Field-Service-Auftrag"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:87
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
 msgid ""
-"Field Service Order Created (%s): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"Field Service Order Created ({}): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:86
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid ""
 "Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
 
@@ -139,7 +112,7 @@ msgid "Field Service Order generated by the sales order item"
 msgstr ""
 
 #. module: fieldservice_sale
-#: selection:product.template,service_type:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
 msgstr "Field-Service-Auftr??ge"
 
@@ -154,16 +127,6 @@ msgstr ""
 msgid "Field Service orders associated to this sale"
 msgstr ""
 
-#. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Manual"
-msgstr ""
-
-#. module: fieldservice_sale
-#: selection:product.template,service_type:0
-msgid "Manually set quantities on order"
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
@@ -199,7 +162,6 @@ msgstr ""
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
 #, fuzzy
-#| msgid "Sale Line"
 msgid "Sale"
 msgstr "Auftragszeile"
 
@@ -208,32 +170,27 @@ msgstr "Auftragszeile"
 msgid "Sale Line"
 msgstr "Auftragszeile"
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_sale_order
-msgid "Sale Order"
-msgstr "Verkaufsauftrag"
-
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
 msgid "Sales"
 msgstr ""
 
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
 msgstr "Auftragszeile"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/fsm_order.py:21
+#: code:addons/fieldservice_sale/models/fsm_order.py:0
 #, python-format
 msgid "Sales Orders"
 msgstr "Verkaufsauftr??ge"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
-msgid "Sales Territory"
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -246,48 +203,40 @@ msgid "Service Location"
 msgstr "Service-Ort"
 
 #. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Stock Moves"
-msgstr "Lagerbewegungen"
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:92
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:93
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
 "                "
 msgstr ""
 
-#. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Timesheets"
-msgstr ""
-
-#. module: fieldservice_sale
-#: selection:product.template,service_type:0
-msgid "Timesheets on project (one fare per SO/Project)"
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_fsm_branch
-msgid "branch"
-msgstr ""
+#~ msgid "Create a recurring order"
+#~ msgstr "Wiederkehrenden Auftrag erstellen"
+
+#~ msgid "Field Service Location"
+#~ msgstr "Field-Service-Ort"
+
+#~ msgid "Sale Order"
+#~ msgstr "Verkaufsauftrag"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Lagerbewegungen"
 
 #~ msgid "Create a single order"
 #~ msgstr "Auftrag erstellen"
diff --git a/fieldservice_sale/i18n/es.po b/fieldservice_sale/i18n/es.po
index 1b59ee19c8..5456edf711 100644
--- a/fieldservice_sale/i18n/es.po
+++ b/fieldservice_sale/i18n/es.po
@@ -19,7 +19,6 @@ msgstr ""
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
 #, fuzzy
-#| msgid "<span class=\"o_stat_text\">Sale Orders</span>"
 msgid "<span class=\"o_stat_text\">Sale Order</span>"
 msgstr "<span class=\"o_stat_text\">Pedido de Venta</span>"
 
@@ -35,8 +34,8 @@ msgid ""
 "this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
 msgstr ""
-"Seg??n la configuraci??n del producto, la cantidad entregada se puede calcular "
-"autom??ticamente por mecanismo:\n"
+"Seg??n la configuraci??n del producto, la cantidad entregada se puede "
+"calcular autom??ticamente por mecanismo:\n"
 "  - Manual: la cantidad se establece manualmente en la l??nea\n"
 "  - Anal??tica de gastos: la cantidad es la suma de la cantidad de gastos "
 "contabilizados\n"
@@ -45,35 +44,15 @@ msgstr ""
 "  - Movimientos de stock: la cantidad proviene de pickings confirmados\n"
 
 #. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Analytic From Expenses"
-msgstr "Anal??tica desde Gastos"
-
-#. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
-msgid "Create a recurring order"
-msgstr "Crear orden recurrente"
-
-#. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__sale
 msgid "Create one FSM order per sale order"
 msgstr "Crear un pedido FSM por pedido de venta"
 
 #. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
 msgid "Create one FSM order per sale order line"
 msgstr "Crear un pedido FSM por l??nea de pedido de venta"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
-msgid "Default Pricelist"
-msgstr ""
-
-#. module: fieldservice_sale
-#: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
-msgid "Default pricelist for new customers of this branch."
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
@@ -90,17 +69,17 @@ msgstr ""
 "                - Ninguno: nada adicional, comportamiento predeterminado.\n"
 "                - Por orden de venta: se crear?? una orden FSM para la "
 "venta.\n"
-"                - Por l??nea de pedido de venta: un pedido FSM por cada l??nea "
-"de pedido de venta\n"
+"                - Por l??nea de pedido de venta: un pedido FSM por cada l??"
+"nea de pedido de venta\n"
 "                se crear??."
 
 #. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
 msgid "Don't create FSM order"
 msgstr "No cree un pedido FSM"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:131
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "FSM Location must be set"
 msgstr "Se debe establecer la ubicaci??n FSM"
@@ -111,40 +90,29 @@ msgstr "Se debe establecer la ubicaci??n FSM"
 msgid "FSM Orders"
 msgstr "Pedidos FSM"
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_fsm_location
-msgid "Field Service Location"
-msgstr "Ubicaci??n del Servicio de Campo"
-
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_order
-#: selection:sale.order.line,qty_delivered_method:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__sale_order_line__qty_delivered_method__field_service
 msgid "Field Service Order"
 msgstr "Orden de Servicio de Campo"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:87
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
 msgid ""
-"Field Service Order Created (%s): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"Field Service Order Created ({}): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Orden de Servicio de Campo Creada (%s): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
-"                "
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:86
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid ""
 "Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Orden de Servicio de Campo Creada: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
-"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
@@ -159,7 +127,7 @@ msgstr ""
 "Pedido de servicio de campo generado por el art??culo de pedido de ventas"
 
 #. module: fieldservice_sale
-#: selection:product.template,service_type:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
 msgstr "??rdenes de servicio de campo"
 
@@ -174,16 +142,6 @@ msgstr "Servicio de Seguimiento de Campo"
 msgid "Field Service orders associated to this sale"
 msgstr "Pedidos de servicio de campo asociados a esta venta"
 
-#. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Manual"
-msgstr "Manual"
-
-#. module: fieldservice_sale
-#: selection:product.template,service_type:0
-msgid "Manually set quantities on order"
-msgstr "Establecer cantidades manualmente en orden"
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
@@ -233,32 +191,27 @@ msgstr "Venta"
 msgid "Sale Line"
 msgstr "L??nea de Venta"
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_sale_order
-msgid "Sale Order"
-msgstr "Pedido de Venta"
-
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
 msgid "Sales"
 msgstr "Ventas"
 
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
 msgstr "L??nea de Pedido de Ventas"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/fsm_order.py:21
+#: code:addons/fieldservice_sale/models/fsm_order.py:0
 #, python-format
 msgid "Sales Orders"
 msgstr "Pedidos de Ventas"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
-msgid "Sales Territory"
-msgstr "Territorio de Ventas"
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -271,43 +224,22 @@ msgid "Service Location"
 msgstr "Ubicaci??n de Servicio"
 
 #. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Stock Moves"
-msgstr "Movimientos de Inventario"
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:92
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Este pedido ha sido creado a partir de: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
-"                "
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:93
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
 "                "
 msgstr ""
-"Este pedido ha sido creado a partir de: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
-"                "
-
-#. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Timesheets"
-msgstr "Hojas de Tiempo"
-
-#. module: fieldservice_sale
-#: selection:product.template,service_type:0
-msgid "Timesheets on project (one fare per SO/Project)"
-msgstr "Hojas de tiempo en el proyecto (una tarifa por SO / Proyecto)"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
@@ -315,10 +247,78 @@ msgstr "Hojas de tiempo en el proyecto (una tarifa por SO / Proyecto)"
 msgid "Track Service"
 msgstr "Servicio de Seguimiento"
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_fsm_branch
-msgid "branch"
-msgstr "sucursal"
+#~ msgid "Analytic From Expenses"
+#~ msgstr "Anal??tica desde Gastos"
+
+#~ msgid "Create a recurring order"
+#~ msgstr "Crear orden recurrente"
+
+#~ msgid "Field Service Location"
+#~ msgstr "Ubicaci??n del Servicio de Campo"
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created (%s): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Orden de Servicio de Campo Creada (%s): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Orden de Servicio de Campo Creada: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+
+#~ msgid "Manual"
+#~ msgstr "Manual"
+
+#~ msgid "Manually set quantities on order"
+#~ msgstr "Establecer cantidades manualmente en orden"
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de Venta"
+
+#~ msgid "Sales Territory"
+#~ msgstr "Territorio de Ventas"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Movimientos de Inventario"
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Este pedido ha sido creado a partir de: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+#~ "                "
+#~ msgstr ""
+#~ "Este pedido ha sido creado a partir de: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+#~ "                "
+
+#~ msgid "Timesheets"
+#~ msgstr "Hojas de Tiempo"
+
+#~ msgid "Timesheets on project (one fare per SO/Project)"
+#~ msgstr "Hojas de tiempo en el proyecto (una tarifa por SO / Proyecto)"
+
+#~ msgid "branch"
+#~ msgstr "sucursal"
 
 #~ msgid "Is a Field Service"
 #~ msgstr "Es un Servicio de Campo"
diff --git a/fieldservice_sale/i18n/es_AR.po b/fieldservice_sale/i18n/es_AR.po
index ba30584eef..b6146969bf 100644
--- a/fieldservice_sale/i18n/es_AR.po
+++ b/fieldservice_sale/i18n/es_AR.po
@@ -24,10 +24,13 @@ msgstr "<span class=\"o_stat_text\">Pedido de Venta</span>"
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
 msgid ""
-"According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+"According to product configuration, the delivered quantity can be "
+"automatically computed by mechanism :\n"
 "  - Manual: the quantity is set manually on the line\n"
-"  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
-"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted "
+"expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to "
+"this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
 msgstr ""
 "Según la configuración del producto, la cantidad entregada se puede calcular "
@@ -55,8 +58,10 @@ msgstr "Crea un pedido FSM por línea de pedido de venta"
 msgid ""
 "Determines what happens upon sale order confirmation:\n"
 "                - None: nothing additional, default behavior.\n"
-"                - Per Sale Order: One FSM Order will be created for the sale.\n"
-"                - Per Sale Order Line: One FSM Order for each sale order line\n"
+"                - Per Sale Order: One FSM Order will be created for the "
+"sale.\n"
+"                - Per Sale Order Line: One FSM Order for each sale order "
+"line\n"
 "                will be created."
 msgstr ""
 "Determina qué sucede tras la confirmación del pedido de venta:\n"
@@ -67,13 +72,6 @@ msgstr ""
 "línea de pedido de venta\n"
 "                 se creará."
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__display_name
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__display_name
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__display_name
-msgid "Display Name"
-msgstr "Mostrar Nombre"
-
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
 msgid "Don't create FSM order"
@@ -101,25 +99,19 @@ msgstr "Pedido de Servicio de Campo"
 #: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
 msgid ""
-"Field Service Order Created (%s): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"Field Service Order Created ({}): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Pedido de Servicio de Campo Creado (%s): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
-"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid ""
 "Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Pedido de Servicio de Campo Creado: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
-"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
@@ -149,29 +141,16 @@ msgstr "Rastreo de Servicio de Campo"
 msgid "Field Service orders associated to this sale"
 msgstr "Pedidos de servicio de campo asociados a esta venta"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__id
-#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__id
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__id
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__id
-msgid "ID"
-msgstr "ID"
-
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order____last_update
-#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template____last_update
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order____last_update
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line____last_update
-msgid "Last Modified on"
-msgstr "Última Modificación el"
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
 msgid ""
-"Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
-"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
-"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+"Manually set quantities on order: Invoice based on the manually entered "
+"quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related "
+"timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation "
+"and track the work hours."
 msgstr ""
 "Cantidad establecida manualmente en el pedido: Factura basada en la cantidad "
 "ingresada manualmente, sin crear una cuenta analítica.\n"
@@ -187,7 +166,6 @@ msgid "Method to update delivered qty"
 msgstr "Método para actualizar las cantidades entregadas"
 
 #. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__display_name
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Order"
 msgstr "Pedido"
@@ -251,27 +229,70 @@ msgstr "Ubicación de Servicio"
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Este pedido fue creado desde: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
-"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
 "                "
 msgstr ""
-"Este pedido fue creado desde: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
-"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
 msgstr "Rastrear Servicio"
+
+#~ msgid "Display Name"
+#~ msgstr "Mostrar Nombre"
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created (%s): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Pedido de Servicio de Campo Creado (%s): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Pedido de Servicio de Campo Creado: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Última Modificación el"
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Este pedido fue creado desde: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+#~ "                "
+#~ msgstr ""
+#~ "Este pedido fue creado desde: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+#~ "                "
diff --git a/fieldservice_sale/i18n/es_CL.po b/fieldservice_sale/i18n/es_CL.po
index 07e6793790..568978966e 100644
--- a/fieldservice_sale/i18n/es_CL.po
+++ b/fieldservice_sale/i18n/es_CL.po
@@ -19,7 +19,6 @@ msgstr ""
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
 #, fuzzy
-#| msgid "<span class=\"o_stat_text\">Sale Orders</span>"
 msgid "<span class=\"o_stat_text\">Sale Order</span>"
 msgstr "<span class=\"o_stat_text\">Pedido de Venta</span>"
 
@@ -35,8 +34,8 @@ msgid ""
 "this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
 msgstr ""
-"Seg??n la configuraci??n del producto, la cantidad entregada se puede calcular "
-"autom??ticamente por mecanismo:\n"
+"Seg??n la configuraci??n del producto, la cantidad entregada se puede "
+"calcular autom??ticamente por mecanismo:\n"
 "  - Manual: la cantidad se establece manualmente en la l??nea\n"
 "  - Anal??tica de gastos: la cantidad es la suma de la cantidad de gastos "
 "contabilizados\n"
@@ -45,35 +44,15 @@ msgstr ""
 "  - Movimientos de stock: la cantidad proviene de pickings confirmados\n"
 
 #. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Analytic From Expenses"
-msgstr "Anal??tica desde Gastos"
-
-#. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
-msgid "Create a recurring order"
-msgstr "Crear orden recurrente"
-
-#. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__sale
 msgid "Create one FSM order per sale order"
 msgstr "Crear un pedido FSM por pedido de venta"
 
 #. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
 msgid "Create one FSM order per sale order line"
 msgstr "Crear un pedido FSM por l??nea de pedido de venta"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
-msgid "Default Pricelist"
-msgstr "Tarifa Predeterminada"
-
-#. module: fieldservice_sale
-#: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
-msgid "Default pricelist for new customers of this branch."
-msgstr "Lista de precios predeterminada para nuevos clientes de esta sucursal."
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
@@ -90,17 +69,17 @@ msgstr ""
 "                - Ninguno: nada adicional, comportamiento predeterminado.\n"
 "                - Por orden de venta: se crear?? una orden FSM para la "
 "venta.\n"
-"                - Por l??nea de pedido de venta: un pedido FSM por cada l??nea "
-"de pedido de venta\n"
+"                - Por l??nea de pedido de venta: un pedido FSM por cada l??"
+"nea de pedido de venta\n"
 "                se crear??."
 
 #. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
 msgid "Don't create FSM order"
 msgstr "No cree un pedido FSM"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:131
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "FSM Location must be set"
 msgstr "Se debe establecer la ubicaci??n FSM"
@@ -111,40 +90,29 @@ msgstr "Se debe establecer la ubicaci??n FSM"
 msgid "FSM Orders"
 msgstr "Pedidos FSM"
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_fsm_location
-msgid "Field Service Location"
-msgstr "Ubicaci??n del Servicio de Campo"
-
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_order
-#: selection:sale.order.line,qty_delivered_method:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__sale_order_line__qty_delivered_method__field_service
 msgid "Field Service Order"
 msgstr "Orden de Servicio de Campo"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:87
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
 msgid ""
-"Field Service Order Created (%s): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"Field Service Order Created ({}): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Orden de servicio de campo creada (%s): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
-"                "
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:86
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid ""
 "Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Orden de servicio de campo creada: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
-"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
@@ -159,7 +127,7 @@ msgstr ""
 "Pedido de servicio de campo generado por el art??culo de pedido de ventas"
 
 #. module: fieldservice_sale
-#: selection:product.template,service_type:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
 msgstr "??rdenes de servicio de campo"
 
@@ -174,16 +142,6 @@ msgstr "Servicio de Seguimiento de Campo"
 msgid "Field Service orders associated to this sale"
 msgstr "Pedidos de servicio de campo asociados a esta venta"
 
-#. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Manual"
-msgstr "Manual"
-
-#. module: fieldservice_sale
-#: selection:product.template,service_type:0
-msgid "Manually set quantities on order"
-msgstr "Establecer cantidades manualmente en orden"
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
@@ -233,32 +191,27 @@ msgstr "Venta"
 msgid "Sale Line"
 msgstr "L??nea de Venta"
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_sale_order
-msgid "Sale Order"
-msgstr "Pedido de Venta"
-
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
 msgid "Sales"
 msgstr "Ventas"
 
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
 msgstr "L??nea de Pedido de Ventas"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/fsm_order.py:21
+#: code:addons/fieldservice_sale/models/fsm_order.py:0
 #, python-format
 msgid "Sales Orders"
 msgstr "Pedidos de Ventas"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
-msgid "Sales Territory"
-msgstr "Territorio de Ventas"
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -271,43 +224,22 @@ msgid "Service Location"
 msgstr "Ubicaci??n de Servicio"
 
 #. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Stock Moves"
-msgstr "Movimientos de Inventario"
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:92
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Este pedido ha sido creado a partir de: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
-"                "
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:93
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
 "                "
 msgstr ""
-"Este pedido ha sido creado a partir de: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
-"                "
-
-#. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Timesheets"
-msgstr "Hojas de Tiempo"
-
-#. module: fieldservice_sale
-#: selection:product.template,service_type:0
-msgid "Timesheets on project (one fare per SO/Project)"
-msgstr "Hojas de tiempo en el proyecto (una tarifa por SO / Proyecto)"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
@@ -315,10 +247,85 @@ msgstr "Hojas de tiempo en el proyecto (una tarifa por SO / Proyecto)"
 msgid "Track Service"
 msgstr "Servicio de Seguimiento"
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_fsm_branch
-msgid "branch"
-msgstr "sucursal"
+#~ msgid "Analytic From Expenses"
+#~ msgstr "Anal??tica desde Gastos"
+
+#~ msgid "Create a recurring order"
+#~ msgstr "Crear orden recurrente"
+
+#~ msgid "Default Pricelist"
+#~ msgstr "Tarifa Predeterminada"
+
+#~ msgid "Default pricelist for new customers of this branch."
+#~ msgstr ""
+#~ "Lista de precios predeterminada para nuevos clientes de esta sucursal."
+
+#~ msgid "Field Service Location"
+#~ msgstr "Ubicaci??n del Servicio de Campo"
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created (%s): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Orden de servicio de campo creada (%s): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Orden de servicio de campo creada: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+
+#~ msgid "Manual"
+#~ msgstr "Manual"
+
+#~ msgid "Manually set quantities on order"
+#~ msgstr "Establecer cantidades manualmente en orden"
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de Venta"
+
+#~ msgid "Sales Territory"
+#~ msgstr "Territorio de Ventas"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Movimientos de Inventario"
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Este pedido ha sido creado a partir de: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+#~ "                "
+#~ msgstr ""
+#~ "Este pedido ha sido creado a partir de: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+#~ "                "
+
+#~ msgid "Timesheets"
+#~ msgstr "Hojas de Tiempo"
+
+#~ msgid "Timesheets on project (one fare per SO/Project)"
+#~ msgstr "Hojas de tiempo en el proyecto (una tarifa por SO / Proyecto)"
+
+#~ msgid "branch"
+#~ msgstr "sucursal"
 
 #~ msgid "Is a Field Service"
 #~ msgstr "Es un Servicio de Campo"
diff --git a/fieldservice_sale/i18n/fieldservice_sale.pot b/fieldservice_sale/i18n/fieldservice_sale.pot
index 8737075df8..8a974e7be8 100644
--- a/fieldservice_sale/i18n/fieldservice_sale.pot
+++ b/fieldservice_sale/i18n/fieldservice_sale.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -49,13 +49,6 @@ msgid ""
 "                will be created."
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__display_name
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__display_name
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__display_name
-msgid "Display Name"
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
 msgid "Don't create FSM order"
@@ -83,8 +76,8 @@ msgstr ""
 #: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
 msgid ""
-"Field Service Order Created (%s): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"Field Service Order Created ({}): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
 
@@ -93,7 +86,7 @@ msgstr ""
 #, python-format
 msgid ""
 "Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
 
@@ -124,22 +117,6 @@ msgstr ""
 msgid "Field Service orders associated to this sale"
 msgstr ""
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__id
-#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__id
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__id
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__id
-msgid "ID"
-msgstr ""
-
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order____last_update
-#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template____last_update
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order____last_update
-#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line____last_update
-msgid "Last Modified on"
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
@@ -155,7 +132,6 @@ msgid "Method to update delivered qty"
 msgstr ""
 
 #. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__display_name
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Order"
 msgstr ""
@@ -217,7 +193,7 @@ msgstr ""
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
 
@@ -226,7 +202,7 @@ msgstr ""
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
 "                "
 msgstr ""
 
diff --git a/fieldservice_sale/i18n/pt_BR.po b/fieldservice_sale/i18n/pt_BR.po
index 3979d527e1..b1a1b584b9 100644
--- a/fieldservice_sale/i18n/pt_BR.po
+++ b/fieldservice_sale/i18n/pt_BR.po
@@ -36,43 +36,23 @@ msgstr ""
 "De acordo com a configura????o do produto, a quantidade entregue pode ser "
 "calculada automaticamente pelo mecanismo:\n"
 "   - Manual: a quantidade ?? definida manualmente na linha\n"
-"   - Anal??tico de despesas: a quantidade ?? a soma da quantidade das despesas "
-"lan??adas\n"
+"   - Anal??tico de despesas: a quantidade ?? a soma da quantidade das "
+"despesas lan??adas\n"
 "   - Quadro de hor??rios: a quantidade ?? a soma das horas registradas nas "
 "tarefas vinculadas a esta linha de venda\n"
 "   - Movimenta????o de estoque: a quantidade ?? proveniente das coletas "
 "confirmadas\n"
 
 #. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Analytic From Expenses"
-msgstr "Anal??tico de despesas"
-
-#. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
-msgid "Create a recurring order"
-msgstr "Crie uma ordem recorrente"
-
-#. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__sale
 msgid "Create one FSM order per sale order"
 msgstr "Crie um pedido FSM por pedido de venda"
 
 #. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
 msgid "Create one FSM order per sale order line"
 msgstr "Crie um pedido FSM por linha do pedido de venda"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_branch__pricelist_id
-msgid "Default Pricelist"
-msgstr "Lista de pre??os padr??o"
-
-#. module: fieldservice_sale
-#: model:ir.model.fields,help:fieldservice_sale.field_fsm_branch__pricelist_id
-msgid "Default pricelist for new customers of this branch."
-msgstr "Lista de pre??os padr??o para novos clientes desta filial."
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
@@ -94,12 +74,12 @@ msgstr ""
 "                 Será criado."
 
 #. module: fieldservice_sale
-#: selection:product.template,field_service_tracking:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
 msgid "Don't create FSM order"
 msgstr "N??o crie ordem FSM"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:131
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "FSM Location must be set"
 msgstr "Localiza????o do FSM deve ser definida"
@@ -110,40 +90,29 @@ msgstr "Localiza????o do FSM deve ser definida"
 msgid "FSM Orders"
 msgstr "Ordens do FSM (Field Service Management)"
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_fsm_location
-msgid "Field Service Location"
-msgstr "Localiza????o do Servi??o de Campo"
-
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_order
-#: selection:sale.order.line,qty_delivered_method:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__sale_order_line__qty_delivered_method__field_service
 msgid "Field Service Order"
 msgstr "Ordem de Servi??o de Campo"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:87
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
 msgid ""
-"Field Service Order Created (%s): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"Field Service Order Created ({}): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Ordem de Serviço de Campo Criada (%s): <a href=\n"
-"                         # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
-"                "
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:86
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid ""
 "Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Ordem de serviço de campo criada: <a href =\n"
-"                        #data-oe-model = fsm.order data-oe-id =%d>%s </a>\n"
-"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
@@ -157,7 +126,7 @@ msgid "Field Service Order generated by the sales order item"
 msgstr "Ordem de Servi??o de Campo gerada pelo item de pedido de vendas"
 
 #. module: fieldservice_sale
-#: selection:product.template,service_type:0
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
 msgstr "Ordens de Servi??o de Campo"
 
@@ -172,16 +141,6 @@ msgstr "Rastreamento de Servi??os de Campo"
 msgid "Field Service orders associated to this sale"
 msgstr "Ordens de Servi??o de Campo associadas a esta venda"
 
-#. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Manual"
-msgstr "Manual"
-
-#. module: fieldservice_sale
-#: selection:product.template,service_type:0
-msgid "Manually set quantities on order"
-msgstr "Definir manualmente quantidades em ordem"
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
@@ -230,32 +189,27 @@ msgstr "Venda"
 msgid "Sale Line"
 msgstr "Linha de Venda"
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_sale_order
-msgid "Sale Order"
-msgstr "Pedido de Venda"
-
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
 msgid "Sales"
 msgstr "Vendas"
 
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
 msgstr "Linha de Pedidos de Venda"
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/fsm_order.py:21
+#: code:addons/fieldservice_sale/models/fsm_order.py:0
 #, python-format
 msgid "Sales Orders"
 msgstr "Pedidos de Vendas"
 
-#. module: fieldservice_sale
-#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_location__sales_territory_id
-msgid "Sales Territory"
-msgstr "Territ??rio de Vendas"
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -268,44 +222,22 @@ msgid "Service Location"
 msgstr "Local do Servi??o"
 
 #. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Stock Moves"
-msgstr "Movimentos de Estoque"
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:92
+#: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
-"Este pedido foi criado a partir de: <a href =\n"
-"                       # data-oe-model = sale.order data-oe-id =%d>%s </a>\n"
-"                "
 
 #. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:93
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
 #, python-format
 msgid ""
 "This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
 "                "
 msgstr ""
-"Este pedido foi criado a partir de: <a href =\n"
-"                       # data-oe-model = sale.order data-oe-id =%d>%s </a> "
-"(%s)\n"
-"                "
-
-#. module: fieldservice_sale
-#: selection:sale.order.line,qty_delivered_method:0
-msgid "Timesheets"
-msgstr "Planilha de Hor??rios"
-
-#. module: fieldservice_sale
-#: selection:product.template,service_type:0
-msgid "Timesheets on project (one fare per SO/Project)"
-msgstr "Planilhas de tempo no projeto (uma tarifa por OS/Projeto)"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
@@ -313,7 +245,84 @@ msgstr "Planilhas de tempo no projeto (uma tarifa por OS/Projeto)"
 msgid "Track Service"
 msgstr "Rastrear Servi??o"
 
-#. module: fieldservice_sale
-#: model:ir.model,name:fieldservice_sale.model_fsm_branch
-msgid "branch"
-msgstr "Filial"
+#~ msgid "Analytic From Expenses"
+#~ msgstr "Anal??tico de despesas"
+
+#~ msgid "Create a recurring order"
+#~ msgstr "Crie uma ordem recorrente"
+
+#~ msgid "Default Pricelist"
+#~ msgstr "Lista de pre??os padr??o"
+
+#~ msgid "Default pricelist for new customers of this branch."
+#~ msgstr "Lista de pre??os padr??o para novos clientes desta filial."
+
+#~ msgid "Field Service Location"
+#~ msgstr "Localiza????o do Servi??o de Campo"
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created (%s): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Ordem de Serviço de Campo Criada (%s): <a href=\n"
+#~ "                         # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Ordem de serviço de campo criada: <a href =\n"
+#~ "                        #data-oe-model = fsm.order data-oe-id =%d>%s </"
+#~ "a>\n"
+#~ "                "
+
+#~ msgid "Manual"
+#~ msgstr "Manual"
+
+#~ msgid "Manually set quantities on order"
+#~ msgstr "Definir manualmente quantidades em ordem"
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de Venda"
+
+#~ msgid "Sales Territory"
+#~ msgstr "Territ??rio de Vendas"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Movimentos de Estoque"
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Este pedido foi criado a partir de: <a href =\n"
+#~ "                       # data-oe-model = sale.order data-oe-id =%d>%s </"
+#~ "a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)\n"
+#~ "                "
+#~ msgstr ""
+#~ "Este pedido foi criado a partir de: <a href =\n"
+#~ "                       # data-oe-model = sale.order data-oe-id =%d>%s </"
+#~ "a> (%s)\n"
+#~ "                "
+
+#~ msgid "Timesheets"
+#~ msgstr "Planilha de Hor??rios"
+
+#~ msgid "Timesheets on project (one fare per SO/Project)"
+#~ msgstr "Planilhas de tempo no projeto (uma tarifa por OS/Projeto)"
+
+#~ msgid "branch"
+#~ msgstr "Filial"
diff --git a/fieldservice_sale/migrations/14.0.1.0.0/pre-migration.py b/fieldservice_sale/migrations/15.0.1.0.0/pre-migration.py
similarity index 100%
rename from fieldservice_sale/migrations/14.0.1.0.0/pre-migration.py
rename to fieldservice_sale/migrations/15.0.1.0.0/pre-migration.py
diff --git a/fieldservice_sale/models/product_template.py b/fieldservice_sale/models/product_template.py
index 0570db0606..dccaca179b 100644
--- a/fieldservice_sale/models/product_template.py
+++ b/fieldservice_sale/models/product_template.py
@@ -20,7 +20,6 @@ class ProductTemplate(models.Model):
             ("sale", "Create one FSM order per sale order"),
             ("line", "Create one FSM order per sale order line"),
         ],
-        string="Field Service Tracking",
         default="no",
         help="""Determines what happens upon sale order confirmation:
                 - None: nothing additional, default behavior.
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 5d6abfa189..2e0cc72e47 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -40,7 +40,7 @@ def onchange_partner_id(self):
         the partner_shipping_id or the partner_id.commercial_partner_id if
         they are FS locations.
         """
-        super(SaleOrder, self).onchange_partner_id()
+        res = super(SaleOrder, self).onchange_partner_id()
         domain = [
             "|",
             "|",
@@ -52,6 +52,7 @@ def onchange_partner_id(self):
             domain = [("partner_id", "=", self.partner_id.id)]
         location_ids = self.env["fsm.location"].search(domain)
         self.fsm_location_id = location_ids and location_ids[0] or False
+        return res
 
     def _field_create_fsm_order_prepare_values(self):
         self.ensure_one()
@@ -89,24 +90,18 @@ def _field_create_fsm_order(self):
             values = so._field_create_fsm_order_prepare_values()
             fsm_order = self.env["fsm.order"].sudo().create(values)
             # post message on SO
-            msg_body = (
-                _(
-                    """Field Service Order Created: <a href=
-                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>
+            msg_body = _(
+                """Field Service Order Created: <a href=
+                   # data-oe-model=fsm.order data-oe-id={}>{}</a>
                 """
-                )
-                % (fsm_order.id, fsm_order.name)
-            )
+            ).format(fsm_order.id, fsm_order.name)
             so.message_post(body=msg_body)
             # post message on fsm_order
-            fsm_order_msg = (
-                _(
-                    """This order has been created from: <a href=
-                   # data-oe-model=sale.order data-oe-id=%d>%s</a>
+            fsm_order_msg = _(
+                """This order has been created from: <a href=
+                   # data-oe-model=sale.order data-oe-id={}>{}</a>
                 """
-                )
-                % (so.id, so.name)
-            )
+            ).format(so.id, so.name)
             fsm_order.message_post(body=fsm_order_msg)
             result[so.id] = fsm_order
         return result
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index ff40c3b9c0..88a26192b2 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -24,18 +24,19 @@ def _compute_product_updatable(self):
             if line.product_id.type == "service" and line.state == "sale":
                 line.product_updatable = False
             else:
-                super(SaleOrderLine, line)._compute_product_updatable()
+                return super(SaleOrderLine, line)._compute_product_updatable()
 
     @api.depends("product_id")
     def _compute_qty_delivered_method(self):
-        super(SaleOrderLine, self)._compute_qty_delivered_method()
+        res = super(SaleOrderLine, self)._compute_qty_delivered_method()
         for line in self:
             if not line.is_expense and line.product_id.field_service_tracking == "line":
                 line.qty_delivered_method = "field_service"
+        return res
 
     @api.depends("fsm_order_id.stage_id")
     def _compute_qty_delivered(self):
-        super(SaleOrderLine, self)._compute_qty_delivered()
+        res = super(SaleOrderLine, self)._compute_qty_delivered()
         lines_by_fsm = self.filtered(
             lambda sol: sol.qty_delivered_method == "field_service"
         )
@@ -45,12 +46,14 @@ def _compute_qty_delivered(self):
             if line.fsm_order_id.stage_id == complete:
                 qty = line.product_uom_qty
                 line.qty_delivered = qty
+        return res
 
-    @api.model
-    def create(self, values):
-        line = super(SaleOrderLine, self).create(values)
-        if line.state == "sale":
-            line._field_service_generation()
+    @api.model_create_multi
+    def create(self, vals_list):
+        lines = super(SaleOrderLine, self).create(vals_list)
+        for line in lines:
+            if line.state == "sale":
+                line._field_service_generation()
         return line
 
     def _field_create_fsm_order_prepare_values(self):
@@ -83,23 +86,19 @@ def _field_create_fsm_order(self):
             fsm_order = self.env["fsm.order"].sudo().create(values)
             so_line.fsm_order_id = fsm_order.id
             # post message on SO
-            msg_body = (
-                _(
-                    """Field Service Order Created (%s): <a href=
-                   # data-oe-model=fsm.order data-oe-id=%d>%s</a>
+            msg_body = _(
+                """Field Service Order Created ({}): <a href=
+                   # data-oe-model=fsm.order data-oe-id={}>{}</a>
                 """
-                )
-                % (so_line.product_id.name, fsm_order.id, fsm_order.name)
-            )
+            ).format(so_line.product_id.name, fsm_order.id, fsm_order.name)
             so_line.order_id.message_post(body=msg_body)
             # post message on fsm_order
-            fsm_order_msg = (
-                _(
-                    """This order has been created from: <a href=
-                   # data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)
+            fsm_order_msg = _(
+                """This order has been created from: <a href=
+                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})
                 """
-                )
-                % (so_line.order_id.id, so_line.order_id.name, so_line.product_id.name)
+            ).format(
+                so_line.order_id.id, so_line.order_id.name, so_line.product_id.name
             )
             fsm_order.message_post(body=fsm_order_msg)
             result[so_line.id] = fsm_order
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index b04fdf957f..220c7b8f94 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Sales</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/14.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" href="https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-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" href="https://runbot.odoo-community.org/runbot/264/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/15.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" href="https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-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" href="https://runbot.odoo-community.org/runbot/264/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>The module integrates the Field Service application with the Sales one and
 allows you to sell products that generate field service orders.</p>
 <p><strong>Table of contents</strong></p>
@@ -452,7 +452,7 @@ <h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2014.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_sale%0Aversion:%2015.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">
@@ -488,7 +488,7 @@ <h2><a class="toc-backref" href="#id9">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
 <p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/14.0/fieldservice_sale">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/15.0/fieldservice_sale">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>
diff --git a/fieldservice_sale/tests/test_fsm_sale_common.py b/fieldservice_sale/tests/test_fsm_sale_common.py
index 0ab2d2b9fa..ab04b3989d 100644
--- a/fieldservice_sale/tests/test_fsm_sale_common.py
+++ b/fieldservice_sale/tests/test_fsm_sale_common.py
@@ -65,6 +65,7 @@ def setUpFSMProducts(cls):
                 "fsm_order_template_id": cls.fsm_template_1.id,
             }
         )
+
         # Product 2 that creates one FSM Order per SO
         cls.fsm_per_order_2 = cls.env["product.product"].create(
             {
@@ -110,3 +111,19 @@ def setUpFSMProducts(cls):
                 "fsm_order_template_id": cls.fsm_template_4.id,
             }
         )
+        # Normal Product
+        cls.product_line = cls.env["product.template"].create(
+            {
+                "name": "FSM Order per SO Line #2",
+                "categ_id": cls.env.ref("product.product_category_3").id,
+                "standard_price": 75.0,
+                "list_price": 80.0,
+                "type": "service",
+                "uom_id": cls.env.ref("uom.product_uom_unit").id,
+                "uom_po_id": cls.env.ref("uom.product_uom_unit").id,
+                "invoice_policy": "delivery",
+                "field_service_tracking": "no",
+                "fsm_order_template_id": cls.fsm_template_4.id,
+            }
+        )
+        cls.product_line._onchange_field_service_tracking()
diff --git a/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py b/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
index 49d2814601..5fc713c98c 100644
--- a/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
+++ b/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
@@ -28,6 +28,12 @@ def setUp(self):
                 "parent_id": self.commercial_partner.id,
             }
         )
+        self.partner2 = self.env["res.partner"].create(
+            {
+                "name": "Partner 2",
+                "parent_id": self.commercial_partner.id,
+            }
+        )
         # create a child partner shipping address
         self.shipping_partner = self.env["res.partner"].create(
             {
@@ -38,6 +44,21 @@ def setUp(self):
         )
         # Demo FS location
         self.location = self.env.ref("fieldservice.location_1")
+        self.partner2.fsm_location = self.location.id
+
+    def test_autofill_so_fsm_location(self):
+        """First case :
+        - commercial_partner IS NOT a fsm_location
+        - partner IS a fsm_location
+        - shipping_partner IS NOT a fsm_location
+        Test if the SO's fsm_location_id is autofilled with the expected
+        partner_location.
+        """
+        # Link demo FS location to self.partner
+        self.location.partner_id = self.partner.id
+        # create a Sale Order and run onchange_partner_id
+        self.so = self.env["sale.order"].create({"partner_id": self.partner2.id})
+        self.so.onchange_partner_id()
 
     def test_1_autofill_so_fsm_location(self):
         """First case :
diff --git a/fieldservice_sale/tests/test_fsm_sale_order.py b/fieldservice_sale/tests/test_fsm_sale_order.py
index 4195ee5707..0ec78b9baa 100644
--- a/fieldservice_sale/tests/test_fsm_sale_order.py
+++ b/fieldservice_sale/tests/test_fsm_sale_order.py
@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields
+from odoo.exceptions import ValidationError
 
 from .test_fsm_sale_common import TestFSMSale
 
@@ -27,6 +28,36 @@ def setUpClass(cls):
         SaleOrder = cls.env["sale.order"].with_context(tracking_disable=True)
         # create a generic Sale Order with one product
         # set to create FSM service per sale order
+        cls.sale_order = SaleOrder.create(
+            {
+                "partner_id": cls.partner_customer_usd.id,
+                "pricelist_id": cls.pricelist_usd.id,
+            }
+        )
+        cls.sale_order_wo_sol = SaleOrder.create(
+            {
+                "partner_id": cls.partner_customer_usd.id,
+                "pricelist_id": cls.pricelist_usd.id,
+            }
+        )
+        cls.sale_order_sol = SaleOrder.create(
+            {
+                "partner_id": cls.partner_customer_usd.id,
+                "pricelist_id": cls.pricelist_usd.id,
+            }
+        )
+        cls.sol_service_per_order = cls.env["sale.order.line"].create(
+            {
+                "name": cls.fsm_per_order_1.name,
+                "product_id": cls.fsm_per_order_1.id,
+                "product_uom_qty": 1,
+                "product_uom": cls.fsm_per_order_1.uom_id.id,
+                "price_unit": cls.fsm_per_order_1.list_price,
+                "order_id": cls.sale_order.id,
+                "tax_id": False,
+            }
+        )
+        # cls.sol_service_per_order._compute_product_updatable()
         cls.sale_order_1 = SaleOrder.create(
             {
                 "partner_id": cls.partner_customer_usd.id,
@@ -189,6 +220,19 @@ def _fulfill_order(self, order):
         )
         return order
 
+    def test_sale_order_0(self):
+        """Test the sales order 0 flow from sale to invoice.
+        - One FSM order linked to the Sale Order should be created.
+        - One Invoice linked to the FSM Order should be created.
+        """
+        # Confirm the sale order
+        sol = self.sol_service_per_order
+        with self.assertRaises(ValidationError), self.cr.savepoint():
+            self.sale_order.action_confirm()
+
+        sol._compute_product_updatable()
+        # 1 FSM order created
+
     def test_sale_order_1(self):
         """Test the sales order 1 flow from sale to invoice.
         - One FSM order linked to the Sale Order should be created.
@@ -196,12 +240,16 @@ def test_sale_order_1(self):
         """
         # Confirm the sale order
         self.sale_order_1.action_confirm()
+        for sol in self.sale_order_1.order_line:
+            sol._compute_product_updatable()
+            sol._field_service_generation()
         # 1 FSM order created
         self.assertEqual(
             len(self.sale_order_1.fsm_order_ids.ids),
             1,
             "FSM Sale: Sale Order 1 should create 1 FSM Order",
         )
+        self.sale_order_1.action_view_fsm_order()
         FSM_Order = self.env["fsm.order"]
         fsm_order = FSM_Order.search(
             [("id", "=", self.sale_order_1.fsm_order_ids[0].id)]
@@ -232,6 +280,36 @@ def test_sale_order_1(self):
             fsm_order in invoice.fsm_order_ids,
             "FSM Sale: Invoice should be linked to FSM Order",
         )
+        self.sale_order_3.action_confirm()
+        for sol in self.sale_order_3.order_line:
+            sol._compute_product_updatable()
+            sol._field_service_generation()
+        self.sale_order_3.action_view_fsm_order()
+        self.sale_order_wo_sol.action_view_fsm_order()
+        self.sale_order_sol.action_confirm()
+        self.fsm_product = self.env["product.product"].create(
+            {
+                "name": "FSM Order per Sale Order #1",
+                "categ_id": self.env.ref("product.product_category_3").id,
+                "standard_price": 85.0,
+                "list_price": 90.0,
+                "type": "service",
+                "uom_id": self.env.ref("uom.product_uom_unit").id,
+                "uom_po_id": self.env.ref("uom.product_uom_unit").id,
+                "invoice_policy": "order",
+            }
+        )
+        self.sol_sale_order = self.env["sale.order.line"].create(
+            {
+                "name": self.fsm_per_order_1.name,
+                "product_id": self.fsm_product.id,
+                "product_uom_qty": 1,
+                "product_uom": self.fsm_per_order_1.uom_id.id,
+                "price_unit": self.fsm_per_order_1.list_price,
+                "order_id": self.sale_order_sol.id,
+                "tax_id": False,
+            }
+        )
 
     def test_sale_order_2(self):
         """Test the sales order 2 flow from sale to invoice.
@@ -249,7 +327,9 @@ def test_sale_order_2(self):
             "FSM Sale: Sale Order 2 should create 1 FSM Order",
         )
         FSM_Order = self.env["fsm.order"]
+
         fsm_order = FSM_Order.search([("id", "=", sol.fsm_order_id.id)])
+        fsm_order.action_view_sales()
         # SOL linked to FSM order
         self.assertTrue(
             sol.fsm_order_id.id == fsm_order.id,
diff --git a/fieldservice_sale/views/product_template.xml b/fieldservice_sale/views/product_template.xml
index 64d027933f..5648206eec 100644
--- a/fieldservice_sale/views/product_template.xml
+++ b/fieldservice_sale/views/product_template.xml
@@ -5,13 +5,15 @@
         <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy" />
         <field name="groups_id" eval="[(4, ref('fieldservice.group_fsm_user'))]" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='service_type']" position="after">
-                <field name="field_service_tracking" widget="radio" />
-                <field
-                    name="fsm_order_template_id"
-                    attrs="{'invisible': [('field_service_tracking', '=', 'no')]}"
-                />
-            </xpath>
+            <group name="sale" position="after">
+                <group>
+                    <field name="field_service_tracking" widget="radio" />
+                    <field
+                        name="fsm_order_template_id"
+                        attrs="{'invisible': [('field_service_tracking', '=', 'no')]}"
+                    />
+                </group>
+            </group>
         </field>
     </record>
 </odoo>
diff --git a/fieldservice_sale/views/res_config_settings.xml b/fieldservice_sale/views/res_config_settings.xml
deleted file mode 100644
index 390d5bfefb..0000000000
--- a/fieldservice_sale/views/res_config_settings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<odoo>
-
-    <!-- ToDo -->
-
-    <!-- <record model="res.config.settings" id="res_config_settings_fsm_template">
-        <field name="group_fsm_template" eval="1" />
-    </record>
-
-    <function model="res.config.settings" name="execute">
-            <value eval="[ref('fieldservice_sale.res_config_settings_fsm_template')]" />
-    </function> -->
-
-</odoo>

From c96519575170423c62c0c872a0fc762c56fbaf38 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Wed, 2 Nov 2022 09:36:10 +0000
Subject: [PATCH 61/77] Added translation using Weblate (Italian)

---
 fieldservice_sale/i18n/it.po | 214 +++++++++++++++++++++++++++++++++++
 1 file changed, 214 insertions(+)
 create mode 100644 fieldservice_sale/i18n/it.po

diff --git a/fieldservice_sale/i18n/it.po b/fieldservice_sale/i18n/it.po
new file mode 100644
index 0000000000..b12c197c8d
--- /dev/null
+++ b/fieldservice_sale/i18n/it.po
@@ -0,0 +1,214 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 15.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
+msgid "<span class=\"o_stat_text\">Sale Order</span>"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid ""
+"According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+"  - Manual: the quantity is set manually on the line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+"  - Stock Moves: the quantity comes from confirmed pickings\n"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__sale
+msgid "Create one FSM order per sale order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
+msgid "Create one FSM order per sale order line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__field_service_tracking
+msgid ""
+"Determines what happens upon sale order confirmation:\n"
+"                - None: nothing additional, default behavior.\n"
+"                - Per Sale Order: One FSM Order will be created for the sale.\n"
+"                - Per Sale Order Line: One FSM Order for each sale order line\n"
+"                will be created."
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
+msgid "Don't create FSM order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid "FSM Location must be set"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
+msgid "FSM Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_fsm_order
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__sale_order_line__qty_delivered_method__field_service
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
+#, python-format
+msgid ""
+"Field Service Order Created ({}): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid ""
+"Field Service Order Created: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Field Service Order generated by the sales order item"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
+msgid "Field Service Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__field_service_tracking
+msgid "Field Service Tracking"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_ids
+msgid "Field Service orders associated to this sale"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
+msgid ""
+"Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
+msgid "Method to update delivered qty"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "SO Lines generating a FSM order will be for this location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
+msgid "Sale"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
+msgid "Sale Line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
+msgid "Sales"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model,name:fieldservice_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/fsm_order.py:0
+#, python-format
+msgid "Sales Orders"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
+#: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
+msgid "Select the field service order template to be created"
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
+msgid "Service Location"
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid ""
+"This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order_line.py:0
+#, python-format
+msgid ""
+"This order has been created from: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
+"                "
+msgstr ""
+
+#. module: fieldservice_sale
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
+#: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
+msgid "Track Service"
+msgstr ""

From 0ad814ca0851ca0f670cf8ff4863a1d222da43d1 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Wed, 2 Nov 2022 09:36:24 +0000
Subject: [PATCH 62/77] Translated using Weblate (Italian)

Currently translated at 100.0% (32 of 32 strings)

Translation: field-service-15.0/field-service-15.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_sale/it/
---
 fieldservice_sale/i18n/it.po | 86 +++++++++++++++++++++++++-----------
 1 file changed, 60 insertions(+), 26 deletions(-)

diff --git a/fieldservice_sale/i18n/it.po b/fieldservice_sale/i18n/it.po
index b12c197c8d..1915a482ac 100644
--- a/fieldservice_sale/i18n/it.po
+++ b/fieldservice_sale/i18n/it.po
@@ -6,18 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2022-11-02 11:45+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
 msgid "<span class=\"o_stat_text\">Sale Order</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\">Ordine di vendita</span>"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
@@ -28,16 +30,23 @@ msgid ""
 "  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
 msgstr ""
+"In accordo con la configurazione prodotto, la quantità consegnata può essere "
+"calcolata automaticamente dal metodo :\n"
+"  - Manuale: la quantità è impostata manualmente sulla riga\n"
+"  - Analitica dalle spese: è la somma delle quantità delle spese inserite\n"
+"  - Foglio ore: la quantità è la somma delle ore registrate sulle attività "
+"collegate a questa riga di vendita\n"
+"  - Movimenti di magazzino: la quantità deriva dai prelievi confermati\n"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__sale
 msgid "Create one FSM order per sale order"
-msgstr ""
+msgstr "Crea un ordine FSM per ogni ordine di vendita"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
 msgid "Create one FSM order per sale order line"
-msgstr ""
+msgstr "Crea un ordine FSM per ogni riga ordine di vendita"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
@@ -49,29 +58,36 @@ msgid ""
 "                - Per Sale Order Line: One FSM Order for each sale order line\n"
 "                will be created."
 msgstr ""
+"Determina cosa succede alla conferma di un ordine di vendita:\n"
+"                - Niente: niente in aggiunta, comportamento predefinito.\n"
+"                - Per ordine di vendita: verrà creato un ordine FSM per la "
+"vendita.\n"
+"                - Per riga ordine di vendita: verrà creato un ordine FSM per "
+"ogni\n"
+"                riga ordine di vendita."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
 msgid "Don't create FSM order"
-msgstr ""
+msgstr "Non creare ordine FSM"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "FSM Location must be set"
-msgstr ""
+msgstr "La località FSM deve essere impostata"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
 msgid "FSM Orders"
-msgstr ""
+msgstr "Ordini FSM"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_order
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__sale_order_line__qty_delivered_method__field_service
 msgid "Field Service Order"
-msgstr ""
+msgstr "Ordini assistenza sul campo"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:0
@@ -81,6 +97,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
+"Creato ordine assistenza sul campo ({}): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
@@ -90,33 +109,36 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
+"Creato ordine assistenza sul campo: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
 msgid "Field Service Order Template"
-msgstr ""
+msgstr "Modello ordine assistenza sul campo"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Field Service Order generated by the sales order item"
-msgstr ""
+msgstr "Ordine assistenza sul campo generato da un elemento ordine di vendita"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
-msgstr ""
+msgstr "Ordini assistenza sul campo"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__field_service_tracking
 msgid "Field Service Tracking"
-msgstr ""
+msgstr "Tracciamento assistenza sul campo"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_ids
 msgid "Field Service orders associated to this sale"
-msgstr ""
+msgstr "Ordini assistenza sul campo associati a questa vendita"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
@@ -126,68 +148,74 @@ msgid ""
 "Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
 "Create a task and track hours: Create a task on the sales order validation and track the work hours."
 msgstr ""
+"Imposta manualmente le quantità dell'ordine: fattura basata sulle quantità "
+"inserite manualmente, senza creare un conto analitico.\n"
+"Foglio ore a contratto: fattura basata sulle ore tracciate nel relativo "
+"foglio ore.\n"
+"Crea una attività e traccia le ore: crea una attività sulla validazione "
+"dell'ordine di vendita e traccia le ore lavorate."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
 msgid "Method to update delivered qty"
-msgstr ""
+msgstr "Metodo di aggiornamento della quantità consegnata"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Order"
-msgstr ""
+msgstr "Ordine"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Modello prodotto"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "SO Lines generating a FSM order will be for this location"
-msgstr ""
+msgstr "Righe ordine vendita che generano un ordine FSM per questa località"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
 msgid "Sale"
-msgstr ""
+msgstr "Vendita"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
 msgid "Sale Line"
-msgstr ""
+msgstr "Riga vendita"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
 msgid "Sales"
-msgstr ""
+msgstr "Vendite"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Ordine vendita"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Riga ordine vendita"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/fsm_order.py:0
 #, python-format
 msgid "Sales Orders"
-msgstr ""
+msgstr "Ordini vendita"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
 msgid "Select the field service order template to be created"
-msgstr ""
+msgstr "Selezionare il modello ordine assistenza sul campo da creare"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "Service Location"
-msgstr ""
+msgstr "Località servizio"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
@@ -197,6 +225,9 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
+"Questo ordine è stato creato da: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:0
@@ -206,9 +237,12 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
 "                "
 msgstr ""
+"Questo ordine è stato creato da: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
+"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
-msgstr ""
+msgstr "Traccia servizio"

From 38690494ff468ec3837afcdd7d530ebd7020e0c2 Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Sat, 12 Nov 2022 04:37:57 +0000
Subject: [PATCH 63/77] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (32 of 32 strings)

Translation: field-service-15.0/field-service-15.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_sale/es_AR/
---
 fieldservice_sale/i18n/es_AR.po | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/fieldservice_sale/i18n/es_AR.po b/fieldservice_sale/i18n/es_AR.po
index b6146969bf..ba6d0dccb9 100644
--- a/fieldservice_sale/i18n/es_AR.po
+++ b/fieldservice_sale/i18n/es_AR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-10-04 04:34+0000\n"
+"PO-Revision-Date: 2022-11-12 04:46+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_AR\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.2\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
@@ -103,6 +103,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
+"Pedido de Servicio de Campo Creado ({}): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
@@ -112,6 +115,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
+"Pedido de Servicio de Campo Creado: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
@@ -232,6 +238,9 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
+"Este pedido ha sido creado desde: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:0
@@ -241,6 +250,9 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
 "                "
 msgstr ""
+"Este pedido ha sido creado: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
+"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type

From cca116f42751c3486b7d8578571a404ecc7a9a51 Mon Sep 17 00:00:00 2001
From: Nils Coenen | NICO SOLUTIONS - ENGINEERING & IT
 <nils.coenen@nico-solutions.de>
Date: Sat, 3 Dec 2022 13:39:37 +0000
Subject: [PATCH 64/77] Translated using Weblate (German)

Currently translated at 100.0% (32 of 32 strings)

Translation: field-service-15.0/field-service-15.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_sale/de/
---
 fieldservice_sale/i18n/de.po | 79 +++++++++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 23 deletions(-)

diff --git a/fieldservice_sale/i18n/de.po b/fieldservice_sale/i18n/de.po
index ba44035f1c..becaec70b6 100644
--- a/fieldservice_sale/i18n/de.po
+++ b/fieldservice_sale/i18n/de.po
@@ -6,21 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-11-26 14:27+0000\n"
-"Last-Translator: Maria Sparenberg <maria.sparenberg@gmx.net>\n"
+"PO-Revision-Date: 2022-12-04 15:44+0000\n"
+"Last-Translator: Nils Coenen | NICO SOLUTIONS - ENGINEERING & IT <nils.coenen"
+"@nico-solutions.de>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.8\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
-#, fuzzy
 msgid "<span class=\"o_stat_text\">Sale Order</span>"
-msgstr "<span class=\"o_stat_text\">Verkaufsauftr??ge</span>"
+msgstr "<span class=\"o_stat_text\">Verkaufsauftrag</span>"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
@@ -34,17 +34,24 @@ msgid ""
 "this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
 msgstr ""
+"Je nach Produktkonfiguration kann die gelieferte Menge automatisch nach "
+"Mechanismus berechnet werden :\n"
+"  - Manuell: Die Menge wird manuell auf der Zeile eingestellt\n"
+"  - Analytisch aus Ausgaben: Die Menge ist die Mengensumme aus gebuchten "
+"Ausgaben\n"
+"  - Zeiterfassung: Die Menge ist die Summe der Stunden, die für Aufgaben "
+"erfasst wurden, die mit dieser Verkaufszeile verknüpft sind\n"
+"  - Lagerbewegungen: Die Menge stammt aus bestätigten Entnahmen\n"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__sale
-#, fuzzy
 msgid "Create one FSM order per sale order"
-msgstr "Wiederkehrenden Auftrag erstellen"
+msgstr "Erstellen Sie einen FSM-Auftrag pro Verkaufsauftrag"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
 msgid "Create one FSM order per sale order line"
-msgstr ""
+msgstr "Erstellen Sie einen FSM-Auftrag pro Verkaufsauftragsposition"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
@@ -58,23 +65,30 @@ msgid ""
 "line\n"
 "                will be created."
 msgstr ""
+"Legt fest, was bei Auftragsbestätigung passiert:\n"
+"                - Nichts: nichts Zusätzliches, Standardverhalten.\n"
+"                - Pro Verkaufsauftrag: Für den Verkauf wird ein FSM-Auftrag "
+"erstellt.\n"
+"                - Pro Verkaufsauftragszeile: Ein FSM-Auftrag für jede "
+"Verkaufsauftragszeile\n"
+"                wird erstellt."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
 msgid "Don't create FSM order"
-msgstr ""
+msgstr "Keinen FSM-Auftrag erstellen"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "FSM Location must be set"
-msgstr ""
+msgstr "FSM-Standort muss festgelegt werden"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_order_form_inherit_sale_fieldservice
 msgid "FSM Orders"
-msgstr "Field-Service-Auftr??ge"
+msgstr "Field-Service-Aufträge"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_fsm_order
@@ -90,6 +104,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
+"Field Service Auftrag erstellt ({}): <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
@@ -99,6 +116,9 @@ msgid ""
 "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
+"Field Service Auftrag erstellt: <a href=\n"
+"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
@@ -109,23 +129,23 @@ msgstr "Field-Service-Auftragsvorlage"
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Field Service Order generated by the sales order item"
-msgstr ""
+msgstr "Von der Verkaufsauftragsposition generierter Field Service-Auftrag"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
-msgstr "Field-Service-Auftr??ge"
+msgstr "Field-Service-Aufträge"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__field_service_tracking
 msgid "Field Service Tracking"
-msgstr ""
+msgstr "Field Service Verfolgung"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_ids
 msgid "Field Service orders associated to this sale"
-msgstr ""
+msgstr "Field Service Aufträge, die diesem Verkauf zugeordnet sind"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
@@ -138,11 +158,17 @@ msgid ""
 "Create a task and track hours: Create a task on the sales order validation "
 "and track the work hours."
 msgstr ""
+"Bestellmenge manuell einstellen: Rechnung auf Basis der manuell eingegebenen "
+"Menge, ohne Erstellung eines Analysekontos.\n"
+"Stundenzettel im Vertrag: Rechnung basierend auf den nachverfolgten Stunden "
+"auf dem zugehörigen Stundenzettel.\n"
+"Erstellen Sie eine Aufgabe und verfolgen Sie die Stunden: Erstellen Sie eine "
+"Aufgabe zur Auftragsvalidierung und verfolgen Sie die Arbeitsstunden."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
 msgid "Method to update delivered qty"
-msgstr ""
+msgstr "Methode zum Aktualisieren der gelieferten Menge"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
@@ -158,12 +184,13 @@ msgstr "Produktvorlage"
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "SO Lines generating a FSM order will be for this location"
 msgstr ""
+"Verkaufsauftrgspositonen, die einen FSM-Auftrag generieren, gelten für "
+"diesen Standort"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
-#, fuzzy
 msgid "Sale"
-msgstr "Auftragszeile"
+msgstr "Verkauf"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
@@ -173,12 +200,12 @@ msgstr "Auftragszeile"
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
 msgid "Sales"
-msgstr ""
+msgstr "Verkauf"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Verkaufsauftrag"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
@@ -189,13 +216,13 @@ msgstr "Auftragszeile"
 #: code:addons/fieldservice_sale/models/fsm_order.py:0
 #, python-format
 msgid "Sales Orders"
-msgstr "Verkaufsauftr??ge"
+msgstr "Verkaufsaufträge"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
 msgid "Select the field service order template to be created"
-msgstr ""
+msgstr "Wählen Sie die zu erstellende Field Service Auftragsvorlage aus"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
@@ -210,6 +237,9 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
 "                "
 msgstr ""
+"Dieser Auftrag wurde erstellt aus: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
+"                "
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order_line.py:0
@@ -219,12 +249,15 @@ msgid ""
 "                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
 "                "
 msgstr ""
+"Dieser Auftrag wurde erstellt aus: <a href=\n"
+"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
+"                "
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
-msgstr ""
+msgstr "Service nachverfolgen"
 
 #~ msgid "Create a recurring order"
 #~ msgstr "Wiederkehrenden Auftrag erstellen"

From d0ccf7d8edd8ea5052accae9c1c8c0ab901d14b0 Mon Sep 17 00:00:00 2001
From: Francesco Foresti <francesco.foresti@ooops404.com>
Date: Wed, 18 Jan 2023 09:18:04 +0000
Subject: [PATCH 65/77] Translated using Weblate (Italian)

Currently translated at 100.0% (32 of 32 strings)

Translation: field-service-15.0/field-service-15.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_sale/it/
---
 fieldservice_sale/i18n/it.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fieldservice_sale/i18n/it.po b/fieldservice_sale/i18n/it.po
index 1915a482ac..2e54f78305 100644
--- a/fieldservice_sale/i18n/it.po
+++ b/fieldservice_sale/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-11-02 11:45+0000\n"
-"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
+"PO-Revision-Date: 2023-01-18 11:48+0000\n"
+"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -193,7 +193,7 @@ msgstr "Vendite"
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order
 msgid "Sales Order"
-msgstr "Ordine vendita"
+msgstr "Ordine di vendita"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line

From 3814ad9fc5e88afa771005648d324c1fbcee1880 Mon Sep 17 00:00:00 2001
From: Brian McMaster <brian@mcmpest.com>
Date: Tue, 21 Feb 2023 15:10:41 -0500
Subject: [PATCH 66/77] [IMP] fieldservice_sale: Simplify FSM creation

Sale order and sale order line shared similar code.  This simplifies the logic needed to create FSM orders from a sale order while maintaining the same results
---
 fieldservice_sale/models/sale_order.py      | 122 +++++++++++---------
 fieldservice_sale/models/sale_order_line.py |  87 +-------------
 2 files changed, 70 insertions(+), 139 deletions(-)

diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 2e0cc72e47..146307fbab 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -54,12 +54,11 @@ def onchange_partner_id(self):
         self.fsm_location_id = location_ids and location_ids[0] or False
         return res
 
-    def _field_create_fsm_order_prepare_values(self):
+    def _prepare_fsm_values(self, **kwargs):
         self.ensure_one()
-        lines = self.order_line.filtered(
-            lambda sol: sol.product_id.field_service_tracking == "sale"
-        )
-        templates = lines.mapped("product_id.fsm_order_template_id")
+        template_id = kwargs.get("template_id", False)
+        template_ids = kwargs.get("template_ids", [template_id])
+        templates = self.env["fsm.template"].search([("id", "in", template_ids)])
         note = ""
         hours = 0.0
         categories = self.env["fsm.category"]
@@ -75,60 +74,75 @@ def _field_create_fsm_order_prepare_values(self):
             "todo": note,
             "category_ids": [(6, 0, categories.ids)],
             "scheduled_duration": hours,
-            "sale_id": self.id,
+            "sale_id": kwargs.get("so_id", False),
+            "sale_line_id": kwargs.get("sol_id", False),
+            "template_id": template_id,
             "company_id": self.company_id.id,
         }
 
-    def _field_create_fsm_order(self):
-        """Generate fsm_order for the given Sale Order, and link it.
-        :return a mapping with the sale order id and its linked fsm_order
-        :rtype dict
+    def _field_service_generation(self):
         """
-        result = {}
-        for so in self:
-            # create fsm_order
-            values = so._field_create_fsm_order_prepare_values()
-            fsm_order = self.env["fsm.order"].sudo().create(values)
-            # post message on SO
-            msg_body = _(
-                """Field Service Order Created: <a href=
-                   # data-oe-model=fsm.order data-oe-id={}>{}</a>
-                """
-            ).format(fsm_order.id, fsm_order.name)
-            so.message_post(body=msg_body)
-            # post message on fsm_order
-            fsm_order_msg = _(
-                """This order has been created from: <a href=
-                   # data-oe-model=sale.order data-oe-id={}>{}</a>
-                """
-            ).format(so.id, so.name)
-            fsm_order.message_post(body=fsm_order_msg)
-            result[so.id] = fsm_order
-        return result
+        Create Field Service Orders based on the products' configuration.
+        :rtype: list(FSM Orders)
+        :return: list of newly created FSM Orders
+        """
+        res = []
+        for sale in self:
+            # Process lines set to FSM Sale
+            new_fsm_sale_lines = sale.order_line.filtered(
+                lambda l: l.product_id.field_service_tracking == "sale"
+                and not l.fsm_order_id
+            )
+            if new_fsm_sale_lines:
+                fsm_by_sale = self.env["fsm.order"].search(
+                    [("sale_id", "=", sale.id), ("sale_line_id", "=", False)]
+                )
+                if not fsm_by_sale:
+                    templates = new_fsm_sale_lines.product_id.fsm_order_template_id
+                    vals = sale._prepare_fsm_values(
+                        so_id=sale.id, template_ids=templates.ids
+                    )
+                    fsm_by_sale = self.env["fsm.order"].sudo().create(vals)
+                    res.append(fsm_by_sale)
+                new_fsm_sale_lines.write({"fsm_order_id": fsm_by_sale.id})
+            # Create new FSM Order for lines set to FSM Line
+            new_fsm_line_lines = sale.order_line.filtered(
+                lambda l: l.product_id.field_service_tracking == "line"
+                and not l.fsm_order_id
+            )
+            for line in new_fsm_line_lines:
+                vals = sale._prepare_fsm_values(
+                    template_id=line.product_id.fsm_order_template_id.id,
+                    so_id=self.id,
+                    sol_id=line.id,
+                )
+                fsm_by_line = self.env["fsm.order"].sudo().create(vals)
+                line.write({"fsm_order_id": fsm_by_line.id})
+                res.append(fsm_by_line)
+            if len(res) > 0:
+                sale._post_fsm_message(res)
+        return res
 
-    def _field_find_fsm_order(self):
-        """Find the fsm_order generated by the Sale Order. If no fsm_order
-        linked, it will be created automatically.
-        :return a mapping with the so line id and its linked fsm_order
-        :rtype dict
+    def _post_fsm_message(self, fsm_orders):
         """
-        # one search for all Sale Orders
-        fsm_orders = self.env["fsm.order"].search(
-            [("sale_id", "in", self.ids), ("sale_line_id", "=", False)]
-        )
-        fsm_order_mapping = {
-            fsm_order.sale_id.id: fsm_order for fsm_order in fsm_orders
-        }
-        result = {}
-        for so in self:
-            # If the SO was confirmed, cancelled, set to draft then confirmed,
-            # avoid creating a new fsm_order.
-            fsm_order = fsm_order_mapping.get(so.id)
-            # If not found, create one fsm_order for the so
-            if not fsm_order:
-                fsm_order = so._field_create_fsm_order()[so.id]
-            result[so.id] = fsm_order
-        return result
+        Post messages to the Sale Order and the newly created FSM Orders
+        """
+        self.ensure_one()
+        msg_fsm_links = ""
+        for fsm_order in fsm_orders:
+            fsm_order.message_post_with_view(
+                "mail.message_origin_link",
+                values={"self": fsm_order, "origin": self},
+                subtype_id=self.env.ref("mail.mt_note").id,
+                author_id=self.env.user.partner_id.id,
+            )
+            msg_fsm_links += (
+                " <a href=# data-oe-model=fsm.order data-oe-id={}>{}</a>,".format(
+                    fsm_order.id, fsm_order.name
+                )
+            )
+        so_msg_body = _("Field Service Order(s) Created: %s", msg_fsm_links)
+        self.message_post(body=so_msg_body[:-1])
 
     def _action_confirm(self):
         """On SO confirmation, some lines generate field service orders."""
@@ -138,7 +152,7 @@ def _action_confirm(self):
         ):
             if not self.fsm_location_id:
                 raise ValidationError(_("FSM Location must be set"))
-            self.order_line._field_service_generation()
+            self._field_service_generation()
         return result
 
     def action_view_fsm_order(self):
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index 88a26192b2..e4ac0a062b 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2019 Brian McMaster
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 
 
 class SaleOrderLine(models.Model):
@@ -53,92 +53,9 @@ def create(self, vals_list):
         lines = super(SaleOrderLine, self).create(vals_list)
         for line in lines:
             if line.state == "sale":
-                line._field_service_generation()
+                line.order_id._field_service_generation()
         return line
 
-    def _field_create_fsm_order_prepare_values(self):
-        self.ensure_one()
-        categories = self.product_id.fsm_order_template_id.category_ids
-        return {
-            "location_id": self.order_id.fsm_location_id.id,
-            "location_directions": self.order_id.fsm_location_id.direction,
-            "request_early": self.order_id.expected_date,
-            "scheduled_date_start": self.order_id.expected_date,
-            "description": self.name,
-            "template_id": self.product_id.fsm_order_template_id.id,
-            "todo": self.product_id.fsm_order_template_id.instructions,
-            "category_ids": [(6, 0, categories.ids)],
-            "scheduled_duration": self.product_id.fsm_order_template_id.duration,
-            "sale_id": self.order_id.id,
-            "sale_line_id": self.id,
-            "company_id": self.company_id.id,
-        }
-
-    def _field_create_fsm_order(self):
-        """Generate fsm_order for the given so line, and link it.
-        :return a mapping with the so line id and its linked fsm_order
-        :rtype dict
-        """
-        result = {}
-        for so_line in self:
-            # create fsm_order
-            values = so_line._field_create_fsm_order_prepare_values()
-            fsm_order = self.env["fsm.order"].sudo().create(values)
-            so_line.fsm_order_id = fsm_order.id
-            # post message on SO
-            msg_body = _(
-                """Field Service Order Created ({}): <a href=
-                   # data-oe-model=fsm.order data-oe-id={}>{}</a>
-                """
-            ).format(so_line.product_id.name, fsm_order.id, fsm_order.name)
-            so_line.order_id.message_post(body=msg_body)
-            # post message on fsm_order
-            fsm_order_msg = _(
-                """This order has been created from: <a href=
-                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})
-                """
-            ).format(
-                so_line.order_id.id, so_line.order_id.name, so_line.product_id.name
-            )
-            fsm_order.message_post(body=fsm_order_msg)
-            result[so_line.id] = fsm_order
-        return result
-
-    def _field_find_fsm_order(self):
-        """Find the fsm_order generated by the so lines. If no fsm_order
-        linked, it will be created automatically.
-        :return a mapping with the so line id and its linked fsm_order
-        :rtype dict
-        """
-        for rec in self:
-            # one search for all so lines
-            fsm_orders = self.env["fsm.order"].search([("sale_line_id", "in", rec.ids)])
-            fsm_order_sol_mapping = {
-                fsm_order.sale_line_id.id: fsm_order for fsm_order in fsm_orders
-            }
-            res = {}
-            for so_line in rec:
-                # If the SO was confirmed, cancelled, set to draft then confirmed,
-                # avoid creating a new fsm_order.
-                fsm_order = fsm_order_sol_mapping.get(so_line.id)
-                # If not found, create one fsm_order for the so line
-                if not fsm_order:
-                    fsm_order = so_line._field_create_fsm_order()[so_line.id]
-                res[so_line.id] = fsm_order
-            return res
-
-    def _field_service_generation(self):
-        """For service lines, create the field service order. If it already
-        exists, it simply links the existing one to the line.
-        """
-        for rec in self:
-            if rec.product_id.field_service_tracking == "sale":
-                sale = rec.order_id
-                so_fo_mapping = sale._field_find_fsm_order()
-                rec.fsm_order_id = so_fo_mapping[rec.order_id.id].id
-            if rec.product_id.field_service_tracking == "line":
-                rec._field_find_fsm_order()
-
     def _prepare_invoice_line(self, **optional_values):
         res = super()._prepare_invoice_line(**optional_values)
         if self.fsm_order_id:

From 9a43a84a7022dbe9bc10af86793f8f6613d80a2d Mon Sep 17 00:00:00 2001
From: Brian McMaster <brian@mcmpest.com>
Date: Thu, 23 Feb 2023 10:48:29 -0500
Subject: [PATCH 67/77] [IMP] fieldservice_sale: Clean up tests

Additions made to tests in migration to 15 (5a3201c) do not make sense.  They just call certain methods, but assert nothing after the method call
---
 fieldservice_sale/__manifest__.py             |   2 +-
 fieldservice_sale/i18n/de.po                  |  98 +++++++--------
 fieldservice_sale/i18n/es.po                  |  42 +------
 fieldservice_sale/i18n/es_AR.po               |  94 +++++++-------
 fieldservice_sale/i18n/es_CL.po               |  42 +------
 fieldservice_sale/i18n/fieldservice_sale.pot  |  42 +------
 fieldservice_sale/i18n/it.po                  | 118 +++++++++---------
 fieldservice_sale/i18n/pt_BR.po               |  42 +------
 .../tests/test_fsm_sale_order.py              |  35 ------
 9 files changed, 181 insertions(+), 334 deletions(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index dff3b499e5..1fd477a778 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service - Sales",
-    "version": "15.0.1.0.0",
+    "version": "15.0.2.0.0",
     "summary": "Sell field services.",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
diff --git a/fieldservice_sale/i18n/de.po b/fieldservice_sale/i18n/de.po
index becaec70b6..c321aaea5f 100644
--- a/fieldservice_sale/i18n/de.po
+++ b/fieldservice_sale/i18n/de.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2022-12-04 15:44+0000\n"
-"Last-Translator: Nils Coenen | NICO SOLUTIONS - ENGINEERING & IT <nils.coenen"
-"@nico-solutions.de>\n"
+"Last-Translator: Nils Coenen | NICO SOLUTIONS - ENGINEERING & IT <nils."
+"coenen@nico-solutions.de>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -96,30 +96,6 @@ msgstr "Field-Service-Aufträge"
 msgid "Field Service Order"
 msgstr "Field-Service-Auftrag"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"Field Service Order Created ({}): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-"Field Service Auftrag erstellt ({}): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-"Field Service Auftrag erstellt: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -131,6 +107,12 @@ msgstr "Field-Service-Auftragsvorlage"
 msgid "Field Service Order generated by the sales order item"
 msgstr "Von der Verkaufsauftragsposition generierter Field Service-Auftrag"
 
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid "Field Service Order(s) Created: %s"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
@@ -229,36 +211,52 @@ msgstr "Wählen Sie die zu erstellende Field Service Auftragsvorlage aus"
 msgid "Service Location"
 msgstr "Service-Ort"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-"Dieser Auftrag wurde erstellt aus: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
-"                "
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
-"                "
-msgstr ""
-"Dieser Auftrag wurde erstellt aus: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
-"                "
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
 msgstr "Service nachverfolgen"
 
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created ({}): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Field Service Auftrag erstellt ({}): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Field Service Auftrag erstellt: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Dieser Auftrag wurde erstellt aus: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
+#~ "                "
+#~ msgstr ""
+#~ "Dieser Auftrag wurde erstellt aus: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
+#~ "                "
+
 #~ msgid "Create a recurring order"
 #~ msgstr "Wiederkehrenden Auftrag erstellen"
 
diff --git a/fieldservice_sale/i18n/es.po b/fieldservice_sale/i18n/es.po
index 5456edf711..639a5a3d7a 100644
--- a/fieldservice_sale/i18n/es.po
+++ b/fieldservice_sale/i18n/es.po
@@ -96,24 +96,6 @@ msgstr "Pedidos FSM"
 msgid "Field Service Order"
 msgstr "Orden de Servicio de Campo"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"Field Service Order Created ({}): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -126,6 +108,12 @@ msgid "Field Service Order generated by the sales order item"
 msgstr ""
 "Pedido de servicio de campo generado por el art??culo de pedido de ventas"
 
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid "Field Service Order(s) Created: %s"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
@@ -223,24 +211,6 @@ msgstr "Seleccione la plantilla de pedido de servicio de campo que se crear??"
 msgid "Service Location"
 msgstr "Ubicaci??n de Servicio"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
-"                "
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
diff --git a/fieldservice_sale/i18n/es_AR.po b/fieldservice_sale/i18n/es_AR.po
index ba6d0dccb9..0aae9aa9c4 100644
--- a/fieldservice_sale/i18n/es_AR.po
+++ b/fieldservice_sale/i18n/es_AR.po
@@ -95,30 +95,6 @@ msgstr "Pedidos FSM"
 msgid "Field Service Order"
 msgstr "Pedido de Servicio de Campo"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"Field Service Order Created ({}): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-"Pedido de Servicio de Campo Creado ({}): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-"Pedido de Servicio de Campo Creado: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -131,6 +107,12 @@ msgid "Field Service Order generated by the sales order item"
 msgstr ""
 "Pedido de Servicio de Campo generado por el artículo de Pedido de Ventas"
 
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid "Field Service Order(s) Created: %s"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
@@ -230,36 +212,52 @@ msgstr "Seleccione la plantilla de pedido de servicio de campo que se creará"
 msgid "Service Location"
 msgstr "Ubicación de Servicio"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-"Este pedido ha sido creado desde: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
-"                "
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
-"                "
-msgstr ""
-"Este pedido ha sido creado: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
-"                "
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
 msgstr "Rastrear Servicio"
 
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created ({}): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Pedido de Servicio de Campo Creado ({}): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Pedido de Servicio de Campo Creado: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Este pedido ha sido creado desde: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
+#~ "                "
+#~ msgstr ""
+#~ "Este pedido ha sido creado: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
+#~ "                "
+
 #~ msgid "Display Name"
 #~ msgstr "Mostrar Nombre"
 
diff --git a/fieldservice_sale/i18n/es_CL.po b/fieldservice_sale/i18n/es_CL.po
index 568978966e..76c3fb9023 100644
--- a/fieldservice_sale/i18n/es_CL.po
+++ b/fieldservice_sale/i18n/es_CL.po
@@ -96,24 +96,6 @@ msgstr "Pedidos FSM"
 msgid "Field Service Order"
 msgstr "Orden de Servicio de Campo"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"Field Service Order Created ({}): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -126,6 +108,12 @@ msgid "Field Service Order generated by the sales order item"
 msgstr ""
 "Pedido de servicio de campo generado por el art??culo de pedido de ventas"
 
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid "Field Service Order(s) Created: %s"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
@@ -223,24 +211,6 @@ msgstr "Seleccione la plantilla de pedido de servicio de campo que se crear??"
 msgid "Service Location"
 msgstr "Ubicaci??n de Servicio"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
-"                "
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
diff --git a/fieldservice_sale/i18n/fieldservice_sale.pot b/fieldservice_sale/i18n/fieldservice_sale.pot
index 8a974e7be8..c377482998 100644
--- a/fieldservice_sale/i18n/fieldservice_sale.pot
+++ b/fieldservice_sale/i18n/fieldservice_sale.pot
@@ -72,24 +72,6 @@ msgstr ""
 msgid "Field Service Order"
 msgstr ""
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"Field Service Order Created ({}): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -101,6 +83,12 @@ msgstr ""
 msgid "Field Service Order generated by the sales order item"
 msgstr ""
 
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid "Field Service Order(s) Created: %s"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
@@ -188,24 +176,6 @@ msgstr ""
 msgid "Service Location"
 msgstr ""
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
-"                "
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
diff --git a/fieldservice_sale/i18n/it.po b/fieldservice_sale/i18n/it.po
index 2e54f78305..3ad63b5184 100644
--- a/fieldservice_sale/i18n/it.po
+++ b/fieldservice_sale/i18n/it.po
@@ -24,10 +24,13 @@ msgstr "<span class=\"o_stat_text\">Ordine di vendita</span>"
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__qty_delivered_method
 msgid ""
-"According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
+"According to product configuration, the delivered quantity can be "
+"automatically computed by mechanism :\n"
 "  - Manual: the quantity is set manually on the line\n"
-"  - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
-"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+"  - Analytic From expenses: the quantity is the quantity sum from posted "
+"expenses\n"
+"  - Timesheet: the quantity is the sum of hours recorded on tasks linked to "
+"this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
 msgstr ""
 "In accordo con la configurazione prodotto, la quantità consegnata può essere "
@@ -54,8 +57,10 @@ msgstr "Crea un ordine FSM per ogni riga ordine di vendita"
 msgid ""
 "Determines what happens upon sale order confirmation:\n"
 "                - None: nothing additional, default behavior.\n"
-"                - Per Sale Order: One FSM Order will be created for the sale.\n"
-"                - Per Sale Order Line: One FSM Order for each sale order line\n"
+"                - Per Sale Order: One FSM Order will be created for the "
+"sale.\n"
+"                - Per Sale Order Line: One FSM Order for each sale order "
+"line\n"
 "                will be created."
 msgstr ""
 "Determina cosa succede alla conferma di un ordine di vendita:\n"
@@ -89,30 +94,6 @@ msgstr "Ordini FSM"
 msgid "Field Service Order"
 msgstr "Ordini assistenza sul campo"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"Field Service Order Created ({}): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-"Creato ordine assistenza sul campo ({}): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-"Creato ordine assistenza sul campo: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -124,6 +105,12 @@ msgstr "Modello ordine assistenza sul campo"
 msgid "Field Service Order generated by the sales order item"
 msgstr "Ordine assistenza sul campo generato da un elemento ordine di vendita"
 
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid "Field Service Order(s) Created: %s"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
@@ -144,9 +131,12 @@ msgstr "Ordini assistenza sul campo associati a questa vendita"
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__service_type
 msgid ""
-"Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
-"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
-"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+"Manually set quantities on order: Invoice based on the manually entered "
+"quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related "
+"timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation "
+"and track the work hours."
 msgstr ""
 "Imposta manualmente le quantità dell'ordine: fattura basata sulle quantità "
 "inserite manualmente, senza creare un conto analitico.\n"
@@ -217,32 +207,48 @@ msgstr "Selezionare il modello ordine assistenza sul campo da creare"
 msgid "Service Location"
 msgstr "Località servizio"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-"Questo ordine è stato creato da: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
-"                "
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
-"                "
-msgstr ""
-"Questo ordine è stato creato da: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
-"                "
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
 msgid "Track Service"
 msgstr "Traccia servizio"
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created ({}): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Creato ordine assistenza sul campo ({}): <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "Field Service Order Created: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Creato ordine assistenza sul campo: <a href=\n"
+#~ "                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
+#~ "                "
+#~ msgstr ""
+#~ "Questo ordine è stato creato da: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
+#~ "                "
+
+#, python-format
+#~ msgid ""
+#~ "This order has been created from: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
+#~ "                "
+#~ msgstr ""
+#~ "Questo ordine è stato creato da: <a href=\n"
+#~ "                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
+#~ "                "
diff --git a/fieldservice_sale/i18n/pt_BR.po b/fieldservice_sale/i18n/pt_BR.po
index b1a1b584b9..aa908f1e9b 100644
--- a/fieldservice_sale/i18n/pt_BR.po
+++ b/fieldservice_sale/i18n/pt_BR.po
@@ -96,24 +96,6 @@ msgstr "Ordens do FSM (Field Service Management)"
 msgid "Field Service Order"
 msgstr "Ordem de Servi??o de Campo"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"Field Service Order Created ({}): <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"Field Service Order Created: <a href=\n"
-"                   # data-oe-model=fsm.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__fsm_order_template_id
@@ -125,6 +107,12 @@ msgstr "Modelo de Ordem de Servi??o de Campo"
 msgid "Field Service Order generated by the sales order item"
 msgstr "Ordem de Servi??o de Campo gerada pelo item de pedido de vendas"
 
+#. module: fieldservice_sale
+#: code:addons/fieldservice_sale/models/sale_order.py:0
+#, python-format
+msgid "Field Service Order(s) Created: %s"
+msgstr ""
+
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
@@ -221,24 +209,6 @@ msgstr "Selecione o modelo de ordem de servi??o de campo a ser criado"
 msgid "Service Location"
 msgstr "Local do Servi??o"
 
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a>\n"
-"                "
-msgstr ""
-
-#. module: fieldservice_sale
-#: code:addons/fieldservice_sale/models/sale_order_line.py:0
-#, python-format
-msgid ""
-"This order has been created from: <a href=\n"
-"                   # data-oe-model=sale.order data-oe-id={}>{}</a> ({})\n"
-"                "
-msgstr ""
-
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_template__service_type
diff --git a/fieldservice_sale/tests/test_fsm_sale_order.py b/fieldservice_sale/tests/test_fsm_sale_order.py
index 0ec78b9baa..4539c7b059 100644
--- a/fieldservice_sale/tests/test_fsm_sale_order.py
+++ b/fieldservice_sale/tests/test_fsm_sale_order.py
@@ -240,16 +240,12 @@ def test_sale_order_1(self):
         """
         # Confirm the sale order
         self.sale_order_1.action_confirm()
-        for sol in self.sale_order_1.order_line:
-            sol._compute_product_updatable()
-            sol._field_service_generation()
         # 1 FSM order created
         self.assertEqual(
             len(self.sale_order_1.fsm_order_ids.ids),
             1,
             "FSM Sale: Sale Order 1 should create 1 FSM Order",
         )
-        self.sale_order_1.action_view_fsm_order()
         FSM_Order = self.env["fsm.order"]
         fsm_order = FSM_Order.search(
             [("id", "=", self.sale_order_1.fsm_order_ids[0].id)]
@@ -280,36 +276,6 @@ def test_sale_order_1(self):
             fsm_order in invoice.fsm_order_ids,
             "FSM Sale: Invoice should be linked to FSM Order",
         )
-        self.sale_order_3.action_confirm()
-        for sol in self.sale_order_3.order_line:
-            sol._compute_product_updatable()
-            sol._field_service_generation()
-        self.sale_order_3.action_view_fsm_order()
-        self.sale_order_wo_sol.action_view_fsm_order()
-        self.sale_order_sol.action_confirm()
-        self.fsm_product = self.env["product.product"].create(
-            {
-                "name": "FSM Order per Sale Order #1",
-                "categ_id": self.env.ref("product.product_category_3").id,
-                "standard_price": 85.0,
-                "list_price": 90.0,
-                "type": "service",
-                "uom_id": self.env.ref("uom.product_uom_unit").id,
-                "uom_po_id": self.env.ref("uom.product_uom_unit").id,
-                "invoice_policy": "order",
-            }
-        )
-        self.sol_sale_order = self.env["sale.order.line"].create(
-            {
-                "name": self.fsm_per_order_1.name,
-                "product_id": self.fsm_product.id,
-                "product_uom_qty": 1,
-                "product_uom": self.fsm_per_order_1.uom_id.id,
-                "price_unit": self.fsm_per_order_1.list_price,
-                "order_id": self.sale_order_sol.id,
-                "tax_id": False,
-            }
-        )
 
     def test_sale_order_2(self):
         """Test the sales order 2 flow from sale to invoice.
@@ -329,7 +295,6 @@ def test_sale_order_2(self):
         FSM_Order = self.env["fsm.order"]
 
         fsm_order = FSM_Order.search([("id", "=", sol.fsm_order_id.id)])
-        fsm_order.action_view_sales()
         # SOL linked to FSM order
         self.assertTrue(
             sol.fsm_order_id.id == fsm_order.id,

From d8260964c5a3db7ef2d38f4c59735c3643a2207a Mon Sep 17 00:00:00 2001
From: "Leonardo J. Caballero G" <leonardocaballero@gmail.com>
Date: Thu, 2 Mar 2023 20:07:00 +0000
Subject: [PATCH 68/77] Translated using Weblate (Spanish)

Currently translated at 100.0% (29 of 29 strings)

Translation: field-service-15.0/field-service-15.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_sale/es/
---
 fieldservice_sale/i18n/es.po | 57 ++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/fieldservice_sale/i18n/es.po b/fieldservice_sale/i18n/es.po
index 639a5a3d7a..8fe7c1b83d 100644
--- a/fieldservice_sale/i18n/es.po
+++ b/fieldservice_sale/i18n/es.po
@@ -6,19 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-07-14 18:19+0000\n"
-"Last-Translator: brian10048 <brian@mcmpest.com>\n"
+"PO-Revision-Date: 2023-03-02 20:22+0000\n"
+"Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
-#, fuzzy
 msgid "<span class=\"o_stat_text\">Sale Order</span>"
 msgstr "<span class=\"o_stat_text\">Pedido de Venta</span>"
 
@@ -34,13 +33,13 @@ msgid ""
 "this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
 msgstr ""
-"Seg??n la configuraci??n del producto, la cantidad entregada se puede "
-"calcular autom??ticamente por mecanismo:\n"
-"  - Manual: la cantidad se establece manualmente en la l??nea\n"
-"  - Anal??tica de gastos: la cantidad es la suma de la cantidad de gastos "
+"Según la configuración del producto, la cantidad entregada se puede calcular "
+"automáticamente por mecanismo:\n"
+"  - Manual: la cantidad se establece manualmente en la línea\n"
+"  - Analítica de gastos: la cantidad es la suma de la cantidad de gastos "
 "contabilizados\n"
 "  - Hoja de tiempo: la cantidad es la suma de horas registradas en tareas "
-"vinculadas a esta l??nea de venta\n"
+"vinculadas a esta línea de venta\n"
 "  - Movimientos de stock: la cantidad proviene de pickings confirmados\n"
 
 #. module: fieldservice_sale
@@ -51,7 +50,7 @@ msgstr "Crear un pedido FSM por pedido de venta"
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
 msgid "Create one FSM order per sale order line"
-msgstr "Crear un pedido FSM por l??nea de pedido de venta"
+msgstr "Crear un pedido FSM por línea de pedido de venta"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
@@ -65,13 +64,13 @@ msgid ""
 "line\n"
 "                will be created."
 msgstr ""
-"Determina qu?? sucede con la confirmaci??n del pedido de venta:\n"
+"Determina qué sucede con la confirmación del pedido de venta:\n"
 "                - Ninguno: nada adicional, comportamiento predeterminado.\n"
-"                - Por orden de venta: se crear?? una orden FSM para la "
-"venta.\n"
-"                - Por l??nea de pedido de venta: un pedido FSM por cada l??"
-"nea de pedido de venta\n"
-"                se crear??."
+"                - Por orden de venta: se creará una orden FSM para la venta."
+"\n"
+"                - Por línea de pedido de venta: un pedido FSM por cada línea "
+"de pedido de venta\n"
+"                se creará."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
@@ -82,7 +81,7 @@ msgstr "No cree un pedido FSM"
 #: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "FSM Location must be set"
-msgstr "Se debe establecer la ubicaci??n FSM"
+msgstr "Se debe establecer la ubicación FSM"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
@@ -106,18 +105,18 @@ msgstr "Plantilla de orden de servicio de campo"
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Field Service Order generated by the sales order item"
 msgstr ""
-"Pedido de servicio de campo generado por el art??culo de pedido de ventas"
+"Pedido de servicio de campo generado por el artículo de pedido de ventas"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "Field Service Order(s) Created: %s"
-msgstr ""
+msgstr "Órdenes de servicio de campo creadas: %s"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
-msgstr "??rdenes de servicio de campo"
+msgstr "Órdenes de servicio de campo"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
@@ -142,17 +141,17 @@ msgid ""
 "and track the work hours."
 msgstr ""
 "Establecer cantidades manualmente en el pedido: Factura basada en la "
-"cantidad ingresada manualmente, sin crear una cuenta anal??tica.\n"
+"cantidad ingresada manualmente, sin crear una cuenta analítica.\n"
 "Hojas de tiempo en el contrato: Factura basada en las horas rastreadas en la "
 "hoja de tiempo relacionada.\n"
 "Crear una tarea y realizar un seguimiento de las horas: cree una tarea en la "
-"validaci??n de pedidos de ventas y realice un seguimiento de las horas de "
+"validación de pedidos de ventas y realice un seguimiento de las horas de "
 "trabajo."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
 msgid "Method to update delivered qty"
-msgstr "M??todo para actualizar la cantidad entregada"
+msgstr "Método para actualizar la cantidad entregada"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
@@ -167,7 +166,7 @@ msgstr "Plantilla de Producto"
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "SO Lines generating a FSM order will be for this location"
-msgstr "Las l??neas SO que generan un pedido FSM ser??n para esta ubicaci??n"
+msgstr "Las líneas SO que generan un pedido FSM serán para esta ubicación"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
@@ -177,7 +176,7 @@ msgstr "Venta"
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
 msgid "Sale Line"
-msgstr "L??nea de Venta"
+msgstr "Línea de Venta"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
@@ -187,12 +186,12 @@ msgstr "Ventas"
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedidos de Venta"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "L??nea de Pedido de Ventas"
+msgstr "Línea de Pedido de Ventas"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/fsm_order.py:0
@@ -204,12 +203,12 @@ msgstr "Pedidos de Ventas"
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
 msgid "Select the field service order template to be created"
-msgstr "Seleccione la plantilla de pedido de servicio de campo que se crear??"
+msgstr "Seleccione la plantilla de pedido de servicio de campo que se creará"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "Service Location"
-msgstr "Ubicaci??n de Servicio"
+msgstr "Ubicación de Servicio"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type

From 202df89e7ab0bf637a7dce170e010043e0b89ea6 Mon Sep 17 00:00:00 2001
From: "Leonardo J. Caballero G" <leonardocaballero@gmail.com>
Date: Thu, 2 Mar 2023 20:06:51 +0000
Subject: [PATCH 69/77] Translated using Weblate (Spanish (Chile))

Currently translated at 100.0% (29 of 29 strings)

Translation: field-service-15.0/field-service-15.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_sale/es_CL/
---
 fieldservice_sale/i18n/es_CL.po | 57 ++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/fieldservice_sale/i18n/es_CL.po b/fieldservice_sale/i18n/es_CL.po
index 76c3fb9023..ba294c64c9 100644
--- a/fieldservice_sale/i18n/es_CL.po
+++ b/fieldservice_sale/i18n/es_CL.po
@@ -6,19 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-06-07 05:19+0000\n"
-"Last-Translator: Nelson Ram??rez S??nchez <info@konos.cl>\n"
+"PO-Revision-Date: 2023-03-02 20:22+0000\n"
+"Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_CL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.view_fsm_order_form_inherit_sale
-#, fuzzy
 msgid "<span class=\"o_stat_text\">Sale Order</span>"
 msgstr "<span class=\"o_stat_text\">Pedido de Venta</span>"
 
@@ -34,13 +33,13 @@ msgid ""
 "this sale line\n"
 "  - Stock Moves: the quantity comes from confirmed pickings\n"
 msgstr ""
-"Seg??n la configuraci??n del producto, la cantidad entregada se puede "
-"calcular autom??ticamente por mecanismo:\n"
-"  - Manual: la cantidad se establece manualmente en la l??nea\n"
-"  - Anal??tica de gastos: la cantidad es la suma de la cantidad de gastos "
+"Según la configuración del producto, la cantidad entregada se puede calcular "
+"automáticamente por mecanismo:\n"
+"  - Manual: la cantidad se establece manualmente en la línea\n"
+"  - Analítica de gastos: la cantidad es la suma de la cantidad de gastos "
 "contabilizados\n"
 "  - Hoja de tiempo: la cantidad es la suma de horas registradas en tareas "
-"vinculadas a esta l??nea de venta\n"
+"vinculadas a esta línea de venta\n"
 "  - Movimientos de stock: la cantidad proviene de pickings confirmados\n"
 
 #. module: fieldservice_sale
@@ -51,7 +50,7 @@ msgstr "Crear un pedido FSM por pedido de venta"
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__line
 msgid "Create one FSM order per sale order line"
-msgstr "Crear un pedido FSM por l??nea de pedido de venta"
+msgstr "Crear un pedido FSM por línea de pedido de venta"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__field_service_tracking
@@ -65,13 +64,13 @@ msgid ""
 "line\n"
 "                will be created."
 msgstr ""
-"Determina qu?? sucede con la confirmaci??n del pedido de venta:\n"
+"Determina qué sucede con la confirmación del pedido de venta:\n"
 "                - Ninguno: nada adicional, comportamiento predeterminado.\n"
-"                - Por orden de venta: se crear?? una orden FSM para la "
-"venta.\n"
-"                - Por l??nea de pedido de venta: un pedido FSM por cada l??"
-"nea de pedido de venta\n"
-"                se crear??."
+"                - Por orden de venta: se creará una orden FSM para la venta."
+"\n"
+"                - Por línea de pedido de venta: un pedido FSM por cada línea "
+"de pedido de venta\n"
+"                se creará."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__field_service_tracking__no
@@ -82,7 +81,7 @@ msgstr "No cree un pedido FSM"
 #: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "FSM Location must be set"
-msgstr "Se debe establecer la ubicaci??n FSM"
+msgstr "Se debe establecer la ubicación FSM"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_order_count
@@ -106,18 +105,18 @@ msgstr "Plantilla de orden de servicio de campo"
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order_line__fsm_order_id
 msgid "Field Service Order generated by the sales order item"
 msgstr ""
-"Pedido de servicio de campo generado por el art??culo de pedido de ventas"
+"Pedido de servicio de campo generado por el artículo de pedido de ventas"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "Field Service Order(s) Created: %s"
-msgstr ""
+msgstr "Órdenes de servicio de campo creadas: %s"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field
 msgid "Field Service Orders"
-msgstr "??rdenes de servicio de campo"
+msgstr "Órdenes de servicio de campo"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__field_service_tracking
@@ -142,17 +141,17 @@ msgid ""
 "and track the work hours."
 msgstr ""
 "Establecer cantidades manualmente en el pedido: Factura basada en la "
-"cantidad ingresada manualmente, sin crear una cuenta anal??tica.\n"
+"cantidad ingresada manualmente, sin crear una cuenta analítica.\n"
 "Hojas de tiempo en el contrato: Factura basada en las horas rastreadas en la "
 "hoja de tiempo relacionada.\n"
 "Crear una tarea y realizar un seguimiento de las horas: cree una tarea en la "
-"validaci??n de pedidos de ventas y realice un seguimiento de las horas de "
+"validación de pedidos de ventas y realice un seguimiento de las horas de "
 "trabajo."
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__qty_delivered_method
 msgid "Method to update delivered qty"
-msgstr "M??todo para actualizar la cantidad entregada"
+msgstr "Método para actualizar la cantidad entregada"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order_line__fsm_order_id
@@ -167,7 +166,7 @@ msgstr "Plantilla de Producto"
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "SO Lines generating a FSM order will be for this location"
-msgstr "Las l??neas SO que generan un pedido FSM ser??n para esta ubicaci??n"
+msgstr "Las líneas SO que generan un pedido FSM serán para esta ubicación"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_id
@@ -177,7 +176,7 @@ msgstr "Venta"
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_fsm_order__sale_line_id
 msgid "Sale Line"
-msgstr "L??nea de Venta"
+msgstr "Línea de Venta"
 
 #. module: fieldservice_sale
 #: model_terms:ir.ui.view,arch_db:fieldservice_sale.fsm_location_form_view
@@ -187,12 +186,12 @@ msgstr "Ventas"
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedidos de Venta"
 
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "L??nea de Pedido de Ventas"
+msgstr "Línea de Pedido de Ventas"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/fsm_order.py:0
@@ -204,12 +203,12 @@ msgstr "Pedidos de Ventas"
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id
 #: model:ir.model.fields,help:fieldservice_sale.field_product_template__fsm_order_template_id
 msgid "Select the field service order template to be created"
-msgstr "Seleccione la plantilla de pedido de servicio de campo que se crear??"
+msgstr "Seleccione la plantilla de pedido de servicio de campo que se creará"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_sale_order__fsm_location_id
 msgid "Service Location"
-msgstr "Ubicaci??n de Servicio"
+msgstr "Ubicación de Servicio"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,field_description:fieldservice_sale.field_product_product__service_type

From 32b460e11e1ebcf2856b3e219d23f36e2e5c494c Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Sat, 4 Mar 2023 15:21:07 +0000
Subject: [PATCH 70/77] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (29 of 29 strings)

Translation: field-service-15.0/field-service-15.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_sale/es_AR/
---
 fieldservice_sale/i18n/es_AR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_sale/i18n/es_AR.po b/fieldservice_sale/i18n/es_AR.po
index 0aae9aa9c4..21bbb72157 100644
--- a/fieldservice_sale/i18n/es_AR.po
+++ b/fieldservice_sale/i18n/es_AR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-11-12 04:46+0000\n"
+"PO-Revision-Date: 2023-03-04 17:23+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_AR\n"
@@ -111,7 +111,7 @@ msgstr ""
 #: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "Field Service Order(s) Created: %s"
-msgstr ""
+msgstr "Pedido(s) de Servicio de Campo Creado(s): %s"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field

From f4db32ffa974fa191e997ae617c2a6f6fcbc0f44 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Wed, 8 Mar 2023 19:13:16 +0000
Subject: [PATCH 71/77] Translated using Weblate (Italian)

Currently translated at 100.0% (29 of 29 strings)

Translation: field-service-15.0/field-service-15.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_sale/it/
---
 fieldservice_sale/i18n/it.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fieldservice_sale/i18n/it.po b/fieldservice_sale/i18n/it.po
index 3ad63b5184..40f40f5125 100644
--- a/fieldservice_sale/i18n/it.po
+++ b/fieldservice_sale/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-01-18 11:48+0000\n"
-"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
+"PO-Revision-Date: 2023-03-08 21:23+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -109,7 +109,7 @@ msgstr "Ordine assistenza sul campo generato da un elemento ordine di vendita"
 #: code:addons/fieldservice_sale/models/sale_order.py:0
 #, python-format
 msgid "Field Service Order(s) Created: %s"
-msgstr ""
+msgstr "Ordine(i) assistenza sul campo creato(i): %s"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields.selection,name:fieldservice_sale.selection__product_template__service_type__field

From d771ed90ade85124814ae867d2b3b662734539ee Mon Sep 17 00:00:00 2001
From: Francesco Foresti <francesco.foresti@ooops404.com>
Date: Fri, 7 Apr 2023 13:23:55 +0000
Subject: [PATCH 72/77] Translated using Weblate (Italian)

Currently translated at 100.0% (29 of 29 strings)

Translation: field-service-15.0/field-service-15.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_sale/it/
---
 fieldservice_sale/i18n/it.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fieldservice_sale/i18n/it.po b/fieldservice_sale/i18n/it.po
index 40f40f5125..c1b719bacc 100644
--- a/fieldservice_sale/i18n/it.po
+++ b/fieldservice_sale/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-03-08 21:23+0000\n"
-"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
+"PO-Revision-Date: 2023-04-07 16:33+0000\n"
+"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -188,13 +188,13 @@ msgstr "Ordine di vendita"
 #. module: fieldservice_sale
 #: model:ir.model,name:fieldservice_sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Riga ordine vendita"
+msgstr "Riga ordine di vendita"
 
 #. module: fieldservice_sale
 #: code:addons/fieldservice_sale/models/fsm_order.py:0
 #, python-format
 msgid "Sales Orders"
-msgstr "Ordini vendita"
+msgstr "Ordini di vendita"
 
 #. module: fieldservice_sale
 #: model:ir.model.fields,help:fieldservice_sale.field_product_product__fsm_order_template_id

From 8b54f0ee1807122e07f4b1ab57000d8f368e856a Mon Sep 17 00:00:00 2001
From: David Alonso // Solvos <david.alonso@solvos.es>
Date: Mon, 24 Apr 2023 19:00:03 +0200
Subject: [PATCH 73/77] [FIX] fieldservice_sale: duplicated sales order doesn't
 create FSM Order

As sales order line link to order is preserved when duplicating a Sales Order,
the FSM Order generation when confirming the sales order is wrongly skipped.
This commit fix it.
---
 fieldservice_sale/__manifest__.py           | 2 +-
 fieldservice_sale/models/sale_order_line.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 1fd477a778..8790dba28c 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service - Sales",
-    "version": "15.0.2.0.0",
+    "version": "15.0.2.0.1",
     "summary": "Sell field services.",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index e4ac0a062b..b14f97ee85 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -15,6 +15,7 @@ class SaleOrderLine(models.Model):
         "fsm.order",
         "Order",
         index=True,
+        copy=False,
         help="Field Service Order generated by the sales order item",
     )
 

From f70e88f34dad974576901262798e51a3a5da8004 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Wed, 3 May 2023 13:27:32 +0000
Subject: [PATCH 74/77] Translated using Weblate (Italian)

Currently translated at 100.0% (29 of 29 strings)

Translation: field-service-15.0/field-service-15.0-fieldservice_sale
Translate-URL: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_sale/it/
---
 fieldservice_sale/i18n/it.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fieldservice_sale/i18n/it.po b/fieldservice_sale/i18n/it.po
index c1b719bacc..5ea52e7c17 100644
--- a/fieldservice_sale/i18n/it.po
+++ b/fieldservice_sale/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-04-07 16:33+0000\n"
-"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
+"PO-Revision-Date: 2023-05-03 15:34+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -138,11 +138,11 @@ msgid ""
 "Create a task and track hours: Create a task on the sales order validation "
 "and track the work hours."
 msgstr ""
-"Imposta manualmente le quantità dell'ordine: fattura basata sulle quantità "
-"inserite manualmente, senza creare un conto analitico.\n"
-"Foglio ore a contratto: fattura basata sulle ore tracciate nel relativo "
+"Imposta manualmente la quantità nell'ordine: la fattura si basa sulle "
+"quantità inserite manualmente, senza la creazione di un conto analitico.\n"
+"Fogli ore a contratto: la fattura si basa sulle ore registrate del relativo "
 "foglio ore.\n"
-"Crea una attività e traccia le ore: crea una attività sulla validazione "
+"Crea una attività e traccia le ore: crea una attività alla validazione "
 "dell'ordine di vendita e traccia le ore lavorate."
 
 #. module: fieldservice_sale

From ea623f353fa7d6d5451e2731f58caf8ad596968d Mon Sep 17 00:00:00 2001
From: Maksym Yankin <yankinmk@gmail.com>
Date: Wed, 17 May 2023 18:40:38 +0300
Subject: [PATCH 75/77] [FIX] fieldservice_sale: fsm_location_id is mandatory
 only if order line display_type not in ('line_section', 'line_note')

---
 fieldservice_sale/__manifest__.py             |  2 +-
 fieldservice_sale/models/sale_order.py        |  5 ++-
 .../tests/test_fsm_sale_order.py              | 42 +++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 8790dba28c..460af636d7 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service - Sales",
-    "version": "15.0.2.0.1",
+    "version": "15.0.2.0.2",
     "summary": "Sell field services.",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 146307fbab..799a95cffb 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -148,7 +148,10 @@ def _action_confirm(self):
         """On SO confirmation, some lines generate field service orders."""
         result = super(SaleOrder, self)._action_confirm()
         if any(
-            sol.product_id.field_service_tracking != "no" for sol in self.order_line
+            sol.product_id.field_service_tracking != "no"
+            for sol in self.order_line.filtered(
+                lambda x: x.display_type not in ("line_section", "line_note")
+            )
         ):
             if not self.fsm_location_id:
                 raise ValidationError(_("FSM Location must be set"))
diff --git a/fieldservice_sale/tests/test_fsm_sale_order.py b/fieldservice_sale/tests/test_fsm_sale_order.py
index 4539c7b059..21925c800a 100644
--- a/fieldservice_sale/tests/test_fsm_sale_order.py
+++ b/fieldservice_sale/tests/test_fsm_sale_order.py
@@ -487,3 +487,45 @@ def test_sale_order_4(self):
         self.assertEqual(
             len(invoices.ids), 1, "FSM Sale: Sale Order 4 should create 1 invoice"
         )
+
+    def test_sale_order_5(self):
+        """Test ValidationError isn't raised if order line
+        display_type in ("line_section", "line_note")
+        """
+        # remove normal order line with display_type=False
+        self.sol_service_per_order.unlink()
+        # add note as order line to sale order
+        self.sol_note = self.env["sale.order.line"].create(
+            {
+                "name": "This is a note",
+                "display_type": "line_note",
+                "product_id": False,
+                "product_uom_qty": 0,
+                "product_uom": False,
+                "price_unit": 0,
+                "order_id": self.sale_order.id,
+                "tax_id": False,
+            }
+        )
+        # confirm sale order: ValidationError shouldn't be raised
+        self.sale_order.action_confirm()
+        # set sale order to draft
+        self.sale_order.action_cancel()
+        self.sale_order.action_draft()
+        # remove note order line
+        self.sol_note.unlink()
+        # add section as order line to sale order
+        self.sol_section = self.env["sale.order.line"].create(
+            {
+                "name": "This is a section",
+                "display_type": "line_section",
+                "product_id": False,
+                "product_uom_qty": 0,
+                "product_uom": False,
+                "price_unit": 0,
+                "order_id": self.sale_order.id,
+                "tax_id": False,
+            }
+        )
+        # confirm sale order: ValidationError shouldn't be raised
+        self.sale_order.action_confirm()

From 20dc4d825d7e7e1bed00fafcc639dd210010b1d6 Mon Sep 17 00:00:00 2001
From: Stefan <stefan.ungureanu@tecnativa.com>
Date: Mon, 12 Jun 2023 09:23:02 +0200
Subject: [PATCH 76/77] [IMP] fieldservice_sale: pre-commit stuff

---
 setup/fieldservice_sale/odoo/addons/fieldservice_sale | 1 +
 setup/fieldservice_sale/setup.py                      | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 120000 setup/fieldservice_sale/odoo/addons/fieldservice_sale
 create mode 100644 setup/fieldservice_sale/setup.py

diff --git a/setup/fieldservice_sale/odoo/addons/fieldservice_sale b/setup/fieldservice_sale/odoo/addons/fieldservice_sale
new file mode 120000
index 0000000000..a4b9cc32e8
--- /dev/null
+++ b/setup/fieldservice_sale/odoo/addons/fieldservice_sale
@@ -0,0 +1 @@
+../../../../fieldservice_sale
\ No newline at end of file
diff --git a/setup/fieldservice_sale/setup.py b/setup/fieldservice_sale/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_sale/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 1735f9ceb198ffd65bc06f309447ca2730a4a9a4 Mon Sep 17 00:00:00 2001
From: Emeric Panisset <emeric.panisset@camptocamp.com>
Date: Mon, 30 Jan 2023 12:53:40 +0100
Subject: [PATCH 77/77] [MIG] fieldservice_sale: Migration to 16.0
 Co-Authored-By: Alexandre Fayolle, Stefan Ungureanu

Dependency on migration of fieldservice_account: https://github.com/OCA/field-service/pull/1042
Refactoring and fix view errors
Fix view error (obsolete XMLID)
Remove obsolete onchange
Update unit tests
---
 fieldservice_sale/README.rst                  |  18 +--
 fieldservice_sale/__manifest__.py             |   4 +-
 .../migrations/15.0.1.0.0/pre-migration.py    |  12 --
 fieldservice_sale/models/product_template.py  |   4 +-
 fieldservice_sale/models/sale_order.py        |  49 ++++----
 fieldservice_sale/models/sale_order_line.py   |  28 ++---
 fieldservice_sale/readme/CONTRIBUTORS.rst     |   4 +
 .../res_groups.xml}                           |   7 +-
 .../static/description/index.html             |  12 +-
 fieldservice_sale/tests/__init__.py           |   2 +-
 .../tests/test_fsm_sale_autofill_location.py  |  98 ++++++++++++++++
 .../tests/test_fsm_sale_onchange_partner.py   | 106 ------------------
 fieldservice_sale/views/fsm_order.xml         |   2 +-
 fieldservice_sale/views/product_template.xml  |   5 +-
 fieldservice_sale/views/sale_order.xml        |   3 +-
 15 files changed, 170 insertions(+), 184 deletions(-)
 delete mode 100644 fieldservice_sale/migrations/15.0.1.0.0/pre-migration.py
 rename fieldservice_sale/{data/fsm_template_group.xml => security/res_groups.xml} (59%)
 create mode 100644 fieldservice_sale/tests/test_fsm_sale_autofill_location.py
 delete mode 100644 fieldservice_sale/tests/test_fsm_sale_onchange_partner.py

diff --git a/fieldservice_sale/README.rst b/fieldservice_sale/README.rst
index 5dc8aba9ff..7056fd7ee0 100644
--- a/fieldservice_sale/README.rst
+++ b/fieldservice_sale/README.rst
@@ -14,14 +14,14 @@ Field Service - Sales
     :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/15.0/fieldservice_sale
+    :target: https://github.com/OCA/field-service/tree/16.0/fieldservice_sale
     :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-15-0/field-service-15-0-fieldservice_sale
+    :target: https://translation.odoo-community.org/projects/field-service-16-0/field-service-16-0-fieldservice_sale
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/264/15.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/field-service&target_branch=16.0
+    :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
@@ -99,7 +99,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 smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2015.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_sale%0Aversion:%2016.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.
 
@@ -126,6 +126,10 @@ Contributors
 * Rapha??l Reverdy <raphael.reverdy@akretion.com>
 * Cl??ment Mombereau <clement.mombereau@akretion.com>
 
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+  * Stefan Ungureanu
+
 Maintainers
 ~~~~~~~~~~~
 
@@ -153,6 +157,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-wolfhall| |maintainer-max3903| |maintainer-brian10048| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/15.0/fieldservice_sale>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/16.0/fieldservice_sale>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index 460af636d7..f5d3759ad0 100644
--- a/fieldservice_sale/__manifest__.py
+++ b/fieldservice_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service - Sales",
-    "version": "15.0.2.0.2",
+    "version": "16.0.1.0.0",
     "summary": "Sell field services.",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
@@ -14,11 +14,11 @@
     ],
     "data": [
         "security/ir.model.access.csv",
+        "security/res_groups.xml",
         "views/fsm_location.xml",
         "views/fsm_order.xml",
         "views/product_template.xml",
         "views/sale_order.xml",
-        "data/fsm_template_group.xml",
     ],
     "license": "AGPL-3",
     "development_status": "Beta",
diff --git a/fieldservice_sale/migrations/15.0.1.0.0/pre-migration.py b/fieldservice_sale/migrations/15.0.1.0.0/pre-migration.py
deleted file mode 100644
index 786eb40ee3..0000000000
--- a/fieldservice_sale/migrations/15.0.1.0.0/pre-migration.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2021, Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-
-def migrate(env, version):
-    if not version:
-        return
-
-    env.execute(
-        "UPDATE product_template SET field_service_tracking = 'sale' "
-        "WHERE field_service_tracking = 'order';"
-    )
diff --git a/fieldservice_sale/models/product_template.py b/fieldservice_sale/models/product_template.py
index dccaca179b..5743184aa9 100644
--- a/fieldservice_sale/models/product_template.py
+++ b/fieldservice_sale/models/product_template.py
@@ -9,9 +9,7 @@ class ProductTemplate(models.Model):
     _inherit = "product.template"
 
     service_type = fields.Selection(
-        selection_add=[
-            ("field", "Field Service Orders"),
-        ],
+        selection_add=[("field", "Field Service Orders")],
         ondelete={"field": "cascade"},
     )
     field_service_tracking = fields.Selection(
diff --git a/fieldservice_sale/models/sale_order.py b/fieldservice_sale/models/sale_order.py
index 799a95cffb..10783cf2f9 100644
--- a/fieldservice_sale/models/sale_order.py
+++ b/fieldservice_sale/models/sale_order.py
@@ -12,6 +12,10 @@ class SaleOrder(models.Model):
         "fsm.location",
         string="Service Location",
         help="SO Lines generating a FSM order will be for this location",
+        compute="_compute_fsm_location_id",
+        precompute=True,
+        store=True,
+        readonly=False,
     )
     fsm_order_ids = fields.Many2many(
         "fsm.order",
@@ -24,35 +28,36 @@ class SaleOrder(models.Model):
 
     @api.depends("order_line")
     def _compute_fsm_order_ids(self):
-        for order in self:
-            orders = self.env["fsm.order"]
-            orders |= self.env["fsm.order"].search(
-                [("sale_line_id", "in", order.order_line.ids)]
+        for sale in self:
+            fsm = self.env["fsm.order"].search(
+                [
+                    "|",
+                    ("sale_id", "=", sale.id),
+                    ("sale_line_id", "in", sale.order_line.ids),
+                ]
             )
-            orders |= self.env["fsm.order"].search([("sale_id", "=", order.id)])
-            order.fsm_order_ids = orders
-            order.fsm_order_count = len(order.fsm_order_ids)
+            sale.fsm_order_ids = fsm
+            sale.fsm_order_count = len(sale.fsm_order_ids)
 
-    @api.onchange("partner_id")
-    def onchange_partner_id(self):
+    @api.depends("partner_id", "partner_shipping_id")
+    def _compute_fsm_location_id(self):
         """
         Autofill the Sale Order's FS location with the partner_id,
         the partner_shipping_id or the partner_id.commercial_partner_id if
         they are FS locations.
         """
-        res = super(SaleOrder, self).onchange_partner_id()
-        domain = [
-            "|",
-            "|",
-            ("partner_id", "=", self.partner_id.id),
-            ("partner_id", "=", self.partner_shipping_id.id),
-            ("partner_id", "=", self.partner_id.commercial_partner_id.id),
-        ]
-        if self.partner_id.fsm_location:
-            domain = [("partner_id", "=", self.partner_id.id)]
-        location_ids = self.env["fsm.location"].search(domain)
-        self.fsm_location_id = location_ids and location_ids[0] or False
-        return res
+        for so in self:
+            if so.partner_id.fsm_location:
+                domain = [("partner_id", "=", so.partner_id.id)]
+            else:
+                domain = [
+                    "|",
+                    "|",
+                    ("partner_id", "=", so.partner_id.id),
+                    ("partner_id", "=", so.partner_shipping_id.id),
+                    ("partner_id", "=", so.partner_id.commercial_partner_id.id),
+                ]
+            so.fsm_location_id = self.env["fsm.location"].search(domain, limit=1)
 
     def _prepare_fsm_values(self, **kwargs):
         self.ensure_one()
diff --git a/fieldservice_sale/models/sale_order_line.py b/fieldservice_sale/models/sale_order_line.py
index b14f97ee85..421d33f939 100644
--- a/fieldservice_sale/models/sale_order_line.py
+++ b/fieldservice_sale/models/sale_order_line.py
@@ -21,15 +21,15 @@ class SaleOrderLine(models.Model):
 
     @api.depends("product_id.type")
     def _compute_product_updatable(self):
+        res = super()._compute_product_updatable()
         for line in self:
             if line.product_id.type == "service" and line.state == "sale":
                 line.product_updatable = False
-            else:
-                return super(SaleOrderLine, line)._compute_product_updatable()
+        return res
 
     @api.depends("product_id")
     def _compute_qty_delivered_method(self):
-        res = super(SaleOrderLine, self)._compute_qty_delivered_method()
+        res = super()._compute_qty_delivered_method()
         for line in self:
             if not line.is_expense and line.product_id.field_service_tracking == "line":
                 line.qty_delivered_method = "field_service"
@@ -37,16 +37,12 @@ def _compute_qty_delivered_method(self):
 
     @api.depends("fsm_order_id.stage_id")
     def _compute_qty_delivered(self):
-        res = super(SaleOrderLine, self)._compute_qty_delivered()
-        lines_by_fsm = self.filtered(
-            lambda sol: sol.qty_delivered_method == "field_service"
-        )
-        complete = self.env.ref("fieldservice.fsm_stage_completed")
-        for line in lines_by_fsm:
-            qty = 0
-            if line.fsm_order_id.stage_id == complete:
-                qty = line.product_uom_qty
-                line.qty_delivered = qty
+        res = super()._compute_qty_delivered()
+        stage_complete = self.env.ref("fieldservice.fsm_stage_completed")
+        fsm_lines = self.filtered(lambda l: l.qty_delivered_method == "field_service")
+        for line in fsm_lines:
+            if line.fsm_order_id.stage_id == stage_complete:
+                line.qty_delivered = line.product_uom_qty
         return res
 
     @api.model_create_multi
@@ -60,9 +56,5 @@ def create(self, vals_list):
     def _prepare_invoice_line(self, **optional_values):
         res = super()._prepare_invoice_line(**optional_values)
         if self.fsm_order_id:
-            res.update(
-                {
-                    "fsm_order_ids": [(4, self.fsm_order_id.id)],
-                }
-            )
+            res.update({"fsm_order_ids": [(4, self.fsm_order_id.id)]})
         return res
diff --git a/fieldservice_sale/readme/CONTRIBUTORS.rst b/fieldservice_sale/readme/CONTRIBUTORS.rst
index 674036d84b..61993c265b 100644
--- a/fieldservice_sale/readme/CONTRIBUTORS.rst
+++ b/fieldservice_sale/readme/CONTRIBUTORS.rst
@@ -9,3 +9,7 @@
 * Brian McMaster <brian@mcmpest.com>
 * Rapha??l Reverdy <raphael.reverdy@akretion.com>
 * Cl??ment Mombereau <clement.mombereau@akretion.com>
+
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+  * Stefan Ungureanu
diff --git a/fieldservice_sale/data/fsm_template_group.xml b/fieldservice_sale/security/res_groups.xml
similarity index 59%
rename from fieldservice_sale/data/fsm_template_group.xml
rename to fieldservice_sale/security/res_groups.xml
index 87d01bb698..72d701425e 100644
--- a/fieldservice_sale/data/fsm_template_group.xml
+++ b/fieldservice_sale/security/res_groups.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <!-- Activate the FSM Template Group by default -->
-        <record id="base.group_user" model="res.groups">
-            <field
+    <record id="base.group_user" model="res.groups">
+        <field
             name="implied_ids"
             eval="[(4, ref('fieldservice.group_fsm_template'))]"
         />
-        </record>
+    </record>
 
 </odoo>
diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index 220c7b8f94..2ad8aa966e 100644
--- a/fieldservice_sale/static/description/index.html
+++ b/fieldservice_sale/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Field Service - Sales</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Sales</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/15.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" href="https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-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" href="https://runbot.odoo-community.org/runbot/264/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/field-service/tree/16.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" href="https://translation.odoo-community.org/projects/field-service-16-0/field-service-16-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" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/field-service&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>The module integrates the Field Service application with the Sales one and
 allows you to sell products that generate field service orders.</p>
 <p><strong>Table of contents</strong></p>
@@ -452,7 +452,7 @@ <h1><a class="toc-backref" href="#id5">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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_sale%0Aversion:%2015.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_sale%0Aversion:%2016.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">
@@ -477,6 +477,10 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
 <li>Rapha??l Reverdy &lt;<a class="reference external" href="mailto:raphael.reverdy&#64;akretion.com">raphael.reverdy&#64;akretion.com</a>&gt;</li>
 <li>Cl??ment Mombereau &lt;<a class="reference external" href="mailto:clement.mombereau&#64;akretion.com">clement.mombereau&#64;akretion.com</a>&gt;</li>
+<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
+<li>Stefan Ungureanu</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -488,7 +492,7 @@ <h2><a class="toc-backref" href="#id9">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
 <p><a class="reference external" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/15.0/fieldservice_sale">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/16.0/fieldservice_sale">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>
diff --git a/fieldservice_sale/tests/__init__.py b/fieldservice_sale/tests/__init__.py
index e004260bd5..adc9a716b7 100644
--- a/fieldservice_sale/tests/__init__.py
+++ b/fieldservice_sale/tests/__init__.py
@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 
 from . import (
-    test_fsm_sale_onchange_partner,
+    test_fsm_sale_autofill_location,
     test_fsm_sale_common,
     test_fsm_sale_order,
 )
diff --git a/fieldservice_sale/tests/test_fsm_sale_autofill_location.py b/fieldservice_sale/tests/test_fsm_sale_autofill_location.py
new file mode 100644
index 0000000000..065ab63a82
--- /dev/null
+++ b/fieldservice_sale/tests/test_fsm_sale_autofill_location.py
@@ -0,0 +1,98 @@
+# Copyright (C) 2019 Clément Mombereau (Akretion)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+from odoo.tests.common import Form, TransactionCase
+
+
+class FSMSale(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        """Create 3 related partners : a parent company, a child partner and
+        a child shipping partner.
+
+        For each test, a different partner is a fsm_location.
+        A SO is created with the child partner as customer. The test run
+        the SO's location autofill and check if the fsm_location_id
+        is the expected one.
+        """
+        super().setUpClass()
+        # create a parent company
+        cls.commercial_partner = cls.env["res.partner"].create(
+            {"name": "Company Commercial Partner", "is_company": True}
+        )
+        # create a child partner
+        cls.partner = cls.env["res.partner"].create(
+            {"name": "Child Partner 1", "parent_id": cls.commercial_partner.id}
+        )
+        # create a child partner shipping address
+        cls.shipping_partner = cls.env["res.partner"].create(
+            {
+                "name": "Shipping Partner",
+                "parent_id": cls.commercial_partner.id,
+                "type": "delivery",
+            }
+        )
+        # Demo FS location
+        cls.location1 = cls.env.ref("fieldservice.location_1")
+        cls.location2 = cls.env.ref("fieldservice.location_2")
+        cls.location3 = cls.env.ref("fieldservice.location_3")
+
+    def test_00_autofill_so_fsm_location(self):
+        """Check location autofill from SO partner
+
+        SO partner is an FSM location linked to location 2 => expect location2
+        (location 1 and 3 are ignored because we want only location explicitly
+        linked to the partner)
+        """
+        self.partner.fsm_location = True
+        self.location1.partner_id = self.commercial_partner
+        self.location2.partner_id = self.partner
+        self.location3.partner_id = self.shipping_partner
+        with Form(self.env["sale.order"]) as so_form:
+            so_form.partner_id = self.partner
+        so = so_form.save()
+        self.assertEqual(so.fsm_location_id, self.location2)
+
+    def test_01_autofill_so_fsm_location(self):
+        """Check location autofill from SO partner
+
+        SO partner is not an FSM location defined, but location1 is linked to
+        its commercial partner => expect location 1 (because of ordering)
+        """
+        self.partner.fsm_location = False
+        self.location1.partner_id = self.commercial_partner
+        self.location2.partner_id = self.partner
+        self.location3.partner_id = self.shipping_partner
+        with Form(self.env["sale.order"]) as so_form:
+            so_form.partner_id = self.partner
+        so = so_form.save()
+        self.assertEqual(so.fsm_location_id, self.location1)
+
+    def test_02_autofill_so_fsm_location(self):
+        """Check location autofill from SO partner
+
+        SO partner is not an FSM location defined, but location1 is linked to
+        the partner itself => expect location 1 (because of ordering)
+        """
+        self.partner.fsm_location = False
+        self.location1.partner_id = self.partner
+        self.location2.partner_id = self.shipping_partner
+        self.location3.partner_id = self.commercial_partner
+        with Form(self.env["sale.order"]) as so_form:
+            so_form.partner_id = self.partner
+        so = so_form.save()
+        self.assertEqual(so.fsm_location_id, self.location1)
+
+    def test_03_autofill_so_fsm_location(self):
+        """Check location autofill from SO partner
+
+        SO partner is not an FSM location defined, but location1 is linked to
+        its shipping partner => expect location 1 (because of ordering)
+        """
+        self.partner.fsm_location = False
+        self.location1.partner_id = self.shipping_partner
+        self.location2.partner_id = self.commercial_partner
+        self.location3.partner_id = self.partner
+        with Form(self.env["sale.order"]) as so_form:
+            so_form.partner_id = self.partner
+        so = so_form.save()
+        self.assertEqual(so.fsm_location_id, self.location1)
diff --git a/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py b/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
deleted file mode 100644
index 5fc713c98c..0000000000
--- a/fieldservice_sale/tests/test_fsm_sale_onchange_partner.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (C) 2019 Clément Mombereau (Akretion)
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
-from odoo.tests.common import TransactionCase
-
-
-class FSMSale(TransactionCase):
-    def setUp(self):
-        """Create 3 related partners : a parent company, a child partner and
-        a child shipping partner.
-
-        For each test, a different partner is a fsm_location.
-        A SO is created with the child partner as customer. The test run
-        the SO's onchange_partner_id and check if the fsm_location_id
-        is the expected one.
-        """
-        super(FSMSale, self).setUp()
-        # create a parent company
-        self.commercial_partner = self.env["res.partner"].create(
-            {
-                "name": "Company Commercial Partner",
-                "is_company": True,
-            }
-        )
-        # create a child partner
-        self.partner = self.env["res.partner"].create(
-            {
-                "name": "Child Partner",
-                "parent_id": self.commercial_partner.id,
-            }
-        )
-        self.partner2 = self.env["res.partner"].create(
-            {
-                "name": "Partner 2",
-                "parent_id": self.commercial_partner.id,
-            }
-        )
-        # create a child partner shipping address
-        self.shipping_partner = self.env["res.partner"].create(
-            {
-                "name": "Shipping Partner",
-                "parent_id": self.commercial_partner.id,
-                "type": "delivery",
-            }
-        )
-        # Demo FS location
-        self.location = self.env.ref("fieldservice.location_1")
-        self.partner2.fsm_location = self.location.id
-
-    def test_autofill_so_fsm_location(self):
-        """First case :
-        - commercial_partner IS NOT a fsm_location
-        - partner IS a fsm_location
-        - shipping_partner IS NOT a fsm_location
-        Test if the SO's fsm_location_id is autofilled with the expected
-        partner_location.
-        """
-        # Link demo FS location to self.partner
-        self.location.partner_id = self.partner.id
-        # create a Sale Order and run onchange_partner_id
-        self.so = self.env["sale.order"].create({"partner_id": self.partner2.id})
-        self.so.onchange_partner_id()
-
-    def test_1_autofill_so_fsm_location(self):
-        """First case :
-        - commercial_partner IS NOT a fsm_location
-        - partner IS a fsm_location
-        - shipping_partner IS NOT a fsm_location
-        Test if the SO's fsm_location_id is autofilled with the expected
-        partner_location.
-        """
-        # Link demo FS location to self.partner
-        self.location.partner_id = self.partner.id
-        # create a Sale Order and run onchange_partner_id
-        self.so = self.env["sale.order"].create({"partner_id": self.partner.id})
-        self.so.onchange_partner_id()
-        self.assertEqual(self.so.fsm_location_id.id, self.location.id)
-
-    def test_2_autofill_so_fsm_location(self):
-        """Second case :
-        - commercial_partner IS NOT a fsm_location
-        - partner IS NOT a fsm_location
-        - shipping_partner IS a fsm_location
-        Test if the SO's fsm_location_id is autofilled with the expected
-        shipping_partner_location.
-        """
-        # Link demo FS location to self.shipping_partner
-        self.location.partner_id = self.shipping_partner.id
-        # create a Sale Order and run onchange_partner_id
-        self.so = self.env["sale.order"].create({"partner_id": self.partner.id})
-        self.so.onchange_partner_id()
-        self.assertEqual(self.so.fsm_location_id.id, self.location.id)
-
-    def test_3_autofill_so_fsm_location(self):
-        """Third case :
-        - commercial_partner IS a fsm_location
-        - partner IS NOT a fsm_location
-        - shipping_partner IS NOT a fsm_location
-        Test if the SO's fsm_location_id is autofilled with the expected
-        commercial_partner_location.
-        """
-        # Link demo FS location to self.commercial_partner
-        self.location.partner_id = self.commercial_partner.id
-        # create a Sale Order and run onchange_partner_id
-        self.so = self.env["sale.order"].create({"partner_id": self.partner.id})
-        self.so.onchange_partner_id()
-        self.assertEqual(self.so.fsm_location_id.id, self.location.id)
diff --git a/fieldservice_sale/views/fsm_order.xml b/fieldservice_sale/views/fsm_order.xml
index 47a942350a..0663e8e9e8 100644
--- a/fieldservice_sale/views/fsm_order.xml
+++ b/fieldservice_sale/views/fsm_order.xml
@@ -3,7 +3,6 @@
     <record id="view_fsm_order_form_inherit_sale" model="ir.ui.view">
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form" />
-        <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]" />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
                 <button
@@ -12,6 +11,7 @@
                     class="oe_stat_button"
                     icon="fa-usd"
                     attrs="{'invisible': [('sale_line_id', '=', False), ('sale_id', '=', False)]}"
+                    groups="sales_team.group_sale_salesman"
                 >
                     <span class="o_stat_text">Sale Order</span>
                     <field name="sale_id" attrs="{'invisible': 1}" />
diff --git a/fieldservice_sale/views/product_template.xml b/fieldservice_sale/views/product_template.xml
index 5648206eec..9296555491 100644
--- a/fieldservice_sale/views/product_template.xml
+++ b/fieldservice_sale/views/product_template.xml
@@ -2,11 +2,10 @@
     <record id="view_product_fieldservice_form" model="ir.ui.view">
         <field name="name">product.template.fieldservice.form</field>
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy" />
-        <field name="groups_id" eval="[(4, ref('fieldservice.group_fsm_user'))]" />
+        <field name="inherit_id" ref="product.product_template_form_view" />
         <field name="arch" type="xml">
             <group name="sale" position="after">
-                <group>
+                <group groups="fieldservice.group_fsm_user">
                     <field name="field_service_tracking" widget="radio" />
                     <field
                         name="fsm_order_template_id"
diff --git a/fieldservice_sale/views/sale_order.xml b/fieldservice_sale/views/sale_order.xml
index a49b2a3dd9..11c5c60f9f 100644
--- a/fieldservice_sale/views/sale_order.xml
+++ b/fieldservice_sale/views/sale_order.xml
@@ -3,7 +3,6 @@
         <field name="name">sale.order.form.sale.fieldservice</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
-        <field name="groups_id" eval="[(4, ref('fieldservice.group_fsm_user'))]" />
         <field name="arch" type="xml">
             <xpath expr="//button[@name='action_view_invoice']" position="before">
                 <button
@@ -22,7 +21,7 @@
                 </button>
             </xpath>
             <xpath expr="//field[@name='partner_shipping_id']" position="after">
-                <field name="fsm_location_id" />
+                <field name="fsm_location_id" groups="fieldservice.group_fsm_user" />
             </xpath>
         </field>
     </record>