From e291ba4cffe2a87486507c263bc17485f7784e66 Mon Sep 17 00:00:00 2001
From: hparfr <raph@hpar.fr>
Date: Mon, 22 Feb 2021 22:53:19 +0100
Subject: [PATCH 001/631] fieldservice_calendar: add module

---
 fieldservice_calendar/README.rst              |  87 ++++
 fieldservice_calendar/__init__.py             |   1 +
 fieldservice_calendar/__manifest__.py         |  24 +
 fieldservice_calendar/models/__init__.py      |   3 +
 fieldservice_calendar/models/calendar.py      |  52 +++
 fieldservice_calendar/models/fsm_order.py     | 116 +++++
 fieldservice_calendar/models/fsm_team.py      |  14 +
 fieldservice_calendar/readme/CONFIGURE.rst    |   2 +
 fieldservice_calendar/readme/CONTRIBUTORS.rst |   1 +
 fieldservice_calendar/readme/DESCRIPTION.rst  |   1 +
 .../static/description/index.html             | 427 ++++++++++++++++++
 fieldservice_calendar/tests/__init__.py       |   1 +
 .../tests/test_fsm_calendar.py                |  93 ++++
 fieldservice_calendar/views/fsm_order.xml     |  12 +
 fieldservice_calendar/views/fsm_team.xml      |  13 +
 .../odoo/addons/fieldservice_calendar         |   1 +
 setup/fieldservice_calendar/setup.py          |   6 +
 17 files changed, 854 insertions(+)
 create mode 100644 fieldservice_calendar/README.rst
 create mode 100644 fieldservice_calendar/__init__.py
 create mode 100644 fieldservice_calendar/__manifest__.py
 create mode 100644 fieldservice_calendar/models/__init__.py
 create mode 100644 fieldservice_calendar/models/calendar.py
 create mode 100644 fieldservice_calendar/models/fsm_order.py
 create mode 100644 fieldservice_calendar/models/fsm_team.py
 create mode 100644 fieldservice_calendar/readme/CONFIGURE.rst
 create mode 100644 fieldservice_calendar/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_calendar/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_calendar/static/description/index.html
 create mode 100644 fieldservice_calendar/tests/__init__.py
 create mode 100644 fieldservice_calendar/tests/test_fsm_calendar.py
 create mode 100644 fieldservice_calendar/views/fsm_order.xml
 create mode 100644 fieldservice_calendar/views/fsm_team.xml
 create mode 120000 setup/fieldservice_calendar/odoo/addons/fieldservice_calendar
 create mode 100644 setup/fieldservice_calendar/setup.py

diff --git a/fieldservice_calendar/README.rst b/fieldservice_calendar/README.rst
new file mode 100644
index 0000000000..3c27e3c8d2
--- /dev/null
+++ b/fieldservice_calendar/README.rst
@@ -0,0 +1,87 @@
+========================
+Field Service - Calendar
+========================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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/14.0/fieldservice_calendar
+    :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_calendar
+    :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
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This modules creates calendar event from FSM Orders.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+A "calendar" user should be set on FSM Team. Events will be added to his calendar.
+Then the FSM Order' person_id (worker) will be an attendee of the calendar's event (Meeting).
+
+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_calendar%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Akretion
+
+Contributors
+~~~~~~~~~~~~
+
+* Raphaël Reverdy <raphael.reverdy@akretion.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-hparfr| image:: https://github.com/hparfr.png?size=40px
+    :target: https://github.com/hparfr
+    :alt: hparfr
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-hparfr| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_calendar>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_calendar/__init__.py b/fieldservice_calendar/__init__.py
new file mode 100644
index 0000000000..0650744f6b
--- /dev/null
+++ b/fieldservice_calendar/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/fieldservice_calendar/__manifest__.py b/fieldservice_calendar/__manifest__.py
new file mode 100644
index 0000000000..f8f40033a4
--- /dev/null
+++ b/fieldservice_calendar/__manifest__.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2021 Raphaël Reverdy <raphael.reverdy@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    "name": "Field Service - Calendar",
+    "summary": "Add calendar to FSM Orders",
+    "author": "Akretion, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "category": "Field Service",
+    "license": "AGPL-3",
+    "version": "14.0.1.0.0",
+    "depends": [
+        "calendar",
+        "fieldservice",
+    ],
+    "data": [
+        "views/fsm_order.xml",
+        "views/fsm_team.xml",
+    ],
+    "installable": True,
+    "development_status": "Beta",
+    "maintainers": [
+        "hparfr",
+    ],
+}
diff --git a/fieldservice_calendar/models/__init__.py b/fieldservice_calendar/models/__init__.py
new file mode 100644
index 0000000000..8ba83cde4d
--- /dev/null
+++ b/fieldservice_calendar/models/__init__.py
@@ -0,0 +1,3 @@
+from . import calendar
+from . import fsm_order
+from . import fsm_team
diff --git a/fieldservice_calendar/models/calendar.py b/fieldservice_calendar/models/calendar.py
new file mode 100644
index 0000000000..ec7d2866d9
--- /dev/null
+++ b/fieldservice_calendar/models/calendar.py
@@ -0,0 +1,52 @@
+# Copyright (C) 2021 Raphaël Reverdy <raphael.reverdy@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class Meeting(models.Model):
+    _inherit = "calendar.event"
+
+    fsm_order_id = fields.One2many(
+        string="Order id",
+        comodel_name="fsm.order",
+        inverse_name="calendar_event_id",
+    )
+
+    def _update_fsm_order_date(self):
+        self.ensure_one()
+        if self._context.get("recurse_order_calendar"):
+            # avoid recursion
+            return
+        to_apply = {}
+        to_apply["scheduled_date_start"] = self.start
+        to_apply["scheduled_duration"] = self.duration
+        self.fsm_order_id.with_context(recurse_order_calendar=True).write(to_apply)
+
+    def _update_fsm_assigned(self):
+        # update back fsm_order when an attenndee is member of a team
+        self.ensure_one()
+        if self._context.get("recurse_order_calendar"):
+            # avoid recursion
+            return
+        person_id = None
+        for partner in self.partner_ids:
+            if partner.fsm_person:
+                person_id = (
+                    self.env["fsm.person"]
+                    .search([["partner_id", "=", partner.id]], limit=1)
+                    .id
+                )
+                break
+        self.fsm_order_id.with_context(recurse_order_calendar=True).write(
+            {"person_id": person_id}
+        )
+
+    def write(self, values):
+        res = super().write(values)
+        if self.fsm_order_id:
+            if "start" in values or "duration" in values:
+                self._update_fsm_order_date()
+            if "partner_ids" in values:
+                self._update_fsm_assigned()
+        return res
diff --git a/fieldservice_calendar/models/fsm_order.py b/fieldservice_calendar/models/fsm_order.py
new file mode 100644
index 0000000000..6ec6c9f74c
--- /dev/null
+++ b/fieldservice_calendar/models/fsm_order.py
@@ -0,0 +1,116 @@
+# Copyright (C) 2021 Raphaël Reverdy <raphael.reverdy@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMOrder(models.Model):
+    _inherit = "fsm.order"
+
+    calendar_event_id = fields.Many2one(
+        "calendar.event",
+        string="Meeting",
+        readonly=True,
+    )
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        res = super().create(vals_list)
+        res._create_calendar_event()
+        return res
+
+    def _create_calendar_event(self):
+        """ Create entry in calendar of the team"""
+        for order in self._should_have_calendar_event():
+            order.calendar_event_id = (
+                self.env["calendar.event"]
+                .with_context(no_mail_to_attendees=True)
+                .create(order._prepare_calendar_event())
+            )
+
+    def _should_have_calendar_event(self):
+        return self.filtered("team_id.calendar_user_id").filtered(
+            "scheduled_date_start"
+        )
+
+    def _prepare_calendar_event(self):
+        model_id = self.env.ref("fieldservice.model_fsm_order").id
+        vals = {
+            "name": self.name,
+            "description": self.description,
+            "start": self.scheduled_date_start,
+            "stop": self.scheduled_date_end,
+            "allday": False,
+            "res_model_id": model_id,  # link back with "Document" button
+            "res_id": self.id,  # link back with "Document" button
+            "location": self._serialize_location(),
+            "user_id": self.team_id.calendar_user_id.id,
+        }
+        vals["partner_ids"] = [(4, self.team_id.calendar_user_id.partner_id.id, False)]
+        # we let calendar_user has a partner_ids in order
+        # to have the meeting in the team's calendar
+        return vals
+
+    def write(self, vals):
+        old_persons = {}
+        for rec in self:
+            old_persons[rec.id] = rec.person_id
+        res = super().write(vals)
+        to_update = self.create_or_delete_calendar()
+        with_calendar = to_update.filtered("calendar_event_id")
+        if "scheduled_date_start" in vals or "scheduled_date_end" in vals:
+            with_calendar.update_calendar_date(vals)
+        if "location_id" in vals:
+            with_calendar.update_calendar_location()
+        if "person_id" in vals:
+            with_calendar.update_calendar_person(old_persons)
+        return res
+
+    def unlink(self):
+        self._rm_calendar_event()
+        return super().unlink()
+
+    def create_or_delete_calendar(self):
+        to_update = self._should_have_calendar_event()
+        to_rm = self - to_update
+        to_create = to_update.filtered(lambda x: x.calendar_event_id.id is False)
+        to_create._create_calendar_event()
+        to_rm._rm_calendar_event()
+        return to_update
+
+    def _rm_calendar_event(self):
+        # it can be archived instead if desired
+        self.calendar_event_id.unlink()
+
+    def update_calendar_date(self, vals):
+        if self._context.get("recurse_order_calendar"):
+            # avoid recursion
+            return
+        to_apply = {}
+        to_apply["start"] = self.scheduled_date_start
+        to_apply["stop"] = self.scheduled_date_end
+        # always write start and stop in order to calc duration
+        self.mapped("calendar_event_id").with_context(
+            recurse_order_calendar=True
+        ).write(to_apply)
+
+    def update_calendar_location(self):
+        for rec in self:
+            rec.calendar_event_id.location = rec._serialize_location()
+
+    def _serialize_location(self):
+        partner_id = self.location_id.partner_id
+        return f"{partner_id.name} {partner_id._display_address()}"
+
+    def update_calendar_person(self, old_persons):
+        if self._context.get("recurse_order_calendar"):
+            # avoid recursion
+            return
+        for rec in self:
+            with_ctx = rec.calendar_event_id.with_context(recurse_order_calendar=True)
+            if old_persons.get(rec.id):
+                # remove buddy
+                with_ctx.partner_ids = [(3, old_persons[rec.id].partner_id.id, False)]
+            if rec.person_id:
+                # add the new one
+                with_ctx.partner_ids = [(4, rec.person_id.partner_id.id, False)]
diff --git a/fieldservice_calendar/models/fsm_team.py b/fieldservice_calendar/models/fsm_team.py
new file mode 100644
index 0000000000..7099726a29
--- /dev/null
+++ b/fieldservice_calendar/models/fsm_team.py
@@ -0,0 +1,14 @@
+# Copyright (C) 2021 Raphaël Reverdy <raphael.reverdy@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class FSMTeam(models.Model):
+    _inherit = "fsm.team"
+
+    calendar_user_id = fields.Many2one(
+        "res.users",
+        string="Team's calendar",
+        help="Responsible for orders's calendar",
+    )
diff --git a/fieldservice_calendar/readme/CONFIGURE.rst b/fieldservice_calendar/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..035a718f5e
--- /dev/null
+++ b/fieldservice_calendar/readme/CONFIGURE.rst
@@ -0,0 +1,2 @@
+A "calendar" user should be set on FSM Team. Events will be added to his calendar.
+Then the FSM Order' person_id (worker) will be an attendee of the calendar's event (Meeting).
diff --git a/fieldservice_calendar/readme/CONTRIBUTORS.rst b/fieldservice_calendar/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..dc3bfce89c
--- /dev/null
+++ b/fieldservice_calendar/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Raphaël Reverdy <raphael.reverdy@akretion.com>
diff --git a/fieldservice_calendar/readme/DESCRIPTION.rst b/fieldservice_calendar/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..20114c8d1e
--- /dev/null
+++ b/fieldservice_calendar/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This modules creates calendar event from FSM Orders.
diff --git a/fieldservice_calendar/static/description/index.html b/fieldservice_calendar/static/description/index.html
new file mode 100644
index 0000000000..90a439b14c
--- /dev/null
+++ b/fieldservice_calendar/static/description/index.html
@@ -0,0 +1,427 @@
+<?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: http://docutils.sourceforge.net/" />
+<title>Field Service - Calendar</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-calendar">
+<h1 class="title">Field Service - Calendar</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_calendar"><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_calendar"><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>This modules creates calendar event from FSM 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="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<p>A “calendar” user should be set on FSM Team. Events will be added to his calendar.
+Then the FSM Order’ person_id (worker) will be an attendee of the calendar’s event (Meeting).</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id2">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_calendar%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="#id3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id4">Authors</a></h2>
+<ul class="simple">
+<li>Akretion</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
+<ul class="simple">
+<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="maintainers">
+<h2><a class="toc-backref" href="#id6">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">maintainer</a>:</p>
+<p><a class="reference external" href="https://github.com/hparfr"><img alt="hparfr" src="https://github.com/hparfr.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_calendar">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_calendar/tests/__init__.py b/fieldservice_calendar/tests/__init__.py
new file mode 100644
index 0000000000..2c306eb150
--- /dev/null
+++ b/fieldservice_calendar/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_fsm_calendar
diff --git a/fieldservice_calendar/tests/test_fsm_calendar.py b/fieldservice_calendar/tests/test_fsm_calendar.py
new file mode 100644
index 0000000000..f848c1a8cc
--- /dev/null
+++ b/fieldservice_calendar/tests/test_fsm_calendar.py
@@ -0,0 +1,93 @@
+# Copyright (C) 2021 Raphaël Reverdy <raphael.reverdy@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields
+from odoo.tests.common import TransactionCase
+
+
+class TestFSMOrder(TransactionCase):
+    def setUp(self):
+        super(TestFSMOrder, self).setUp()
+        self.Order = self.env["fsm.order"]
+        self.test_location = self.env.ref("fieldservice.test_location")
+        self.team = self.Order._default_team_id()
+        self.team.calendar_user_id = self.env.ref("base.partner_root").id
+        self.person_id = self.env.ref("fieldservice.person_2")
+        self.person_id3 = self.env.ref("fieldservice.person_3")
+
+    def test_fsm_order_no_duration(self):
+        new = self.Order.create(
+            {
+                "location_id": self.test_location.id,
+                # no duration = no calendar
+            }
+        )
+        evt = new.calendar_event_id
+        self.assertFalse(evt.exists())
+
+    def test_fsm_order_no_calendar_user(self):
+        self.team.calendar_user_id = False
+        # no calendar user_id  = no calendar event
+        new = self.Order.create(
+            {
+                "location_id": self.test_location.id,
+                "scheduled_date_start": fields.Datetime.today(),
+                "scheduled_duration": 2,
+            }
+        )
+        evt = new.calendar_event_id
+        self.assertFalse(evt.exists())
+        self.team.calendar_user_id = self.env.ref("base.partner_root").id
+
+        # update order
+        new.scheduled_duration = 3
+        evt = new.calendar_event_id
+        self.assertTrue(evt.exists())
+
+        # ensure deletion
+        new.scheduled_date_start = False
+        evt = new.calendar_event_id
+        self.assertFalse(evt.exists())
+
+    def test_fsm_order_unlink(self):
+        # Create an Orders
+        new = self.Order.create(
+            {
+                "location_id": self.test_location.id,
+                "scheduled_date_start": fields.Datetime.today(),
+                "scheduled_duration": 2,
+            }
+        )
+        evt = new.calendar_event_id
+        self.assertTrue(evt.exists())
+
+        # delete the order
+        new.unlink()
+        # ensure the evt is deleted
+        # this test may fail if another module
+        # archive instead of unlink (like gcalendar)
+        self.assertFalse(evt.exists())
+
+    def test_fsm_order_ensure_attendee(self):
+        # Create an Orders
+        new = self.Order.create(
+            {
+                "location_id": self.test_location.id,
+                "scheduled_date_start": fields.Datetime.today(),
+                "scheduled_duration": 2,
+            }
+        )
+        evt = new.calendar_event_id
+
+        self.assertTrue(
+            len(evt.partner_ids) == 1,
+            "There should be no other attendees" " because there is no one assigned",
+        )
+        # organiser is attendee
+        new.person_id = self.person_id
+        self.assertTrue(self.person_id.partner_id in evt.partner_ids)
+        new.person_id = self.person_id3
+        self.assertTrue(self.person_id3.partner_id in evt.partner_ids)
+        self.assertTrue(
+            len(evt.partner_ids) == 2, "Not workers should be removed from attendees"
+        )
diff --git a/fieldservice_calendar/views/fsm_order.xml b/fieldservice_calendar/views/fsm_order.xml
new file mode 100644
index 0000000000..4246e7cb71
--- /dev/null
+++ b/fieldservice_calendar/views/fsm_order.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_fsm_order_form_inherit_calendar" model="ir.ui.view">
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form" />
+        <field name="arch" type="xml">
+            <field name="location_id" position="before">
+                <field name="calendar_event_id" />
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_calendar/views/fsm_team.xml b/fieldservice_calendar/views/fsm_team.xml
new file mode 100644
index 0000000000..30a14d6bfe
--- /dev/null
+++ b/fieldservice_calendar/views/fsm_team.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_team_form" model="ir.ui.view">
+        <field name="name">fsm.team.form</field>
+        <field name="model">fsm.team</field>
+        <field name="inherit_id" ref="fieldservice.view_team_form" />
+        <field name="arch" type="xml">
+            <field name="company_id" position="after">
+                <field name="calendar_user_id" />
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/setup/fieldservice_calendar/odoo/addons/fieldservice_calendar b/setup/fieldservice_calendar/odoo/addons/fieldservice_calendar
new file mode 120000
index 0000000000..62fb20b43a
--- /dev/null
+++ b/setup/fieldservice_calendar/odoo/addons/fieldservice_calendar
@@ -0,0 +1 @@
+../../../../fieldservice_calendar
\ No newline at end of file
diff --git a/setup/fieldservice_calendar/setup.py b/setup/fieldservice_calendar/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_calendar/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 381e46e742e93791a44476f6cd3bd82d4c7297b1 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 24 May 2019 07:38:29 -0700
Subject: [PATCH 002/631] [WIP][ADD] fsm_server_action

[ADD] Templates

[WIP] Testing

[IMP] FSM Emails

[ADD] FSM Stage Server Action

[IMP] ir.server.action in pavlov_media

[IMP] Remove dependency conflict

[IMP] Cite OCA manifest

[IMP] Remove Dependency

[IMP] Auto Config for User

[IMP] Small changes

[FIX] fieldservice (PM #515 and #577) (#230)

[IMP] fieldservice: Add notes on location (PM #596) (#231)

[FIX] fieldservice_agreement (#232)

[ADD] fieldservice_stage_server_action
---
 fieldservice_stage_server_action/README.rst   | 120 +++++
 fieldservice_stage_server_action/__init__.py  |   4 +
 .../__manifest__.py                           |  29 ++
 .../data/base_automation.xml                  |  20 +
 .../data/fsm_stage.xml                        |  27 +
 .../data/ir_server_action.xml                 |  39 ++
 .../models/__init__.py                        |   6 +
 .../models/fsm_stage.py                       |  10 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 460 ++++++++++++++++++
 .../views/fsm_stage.xml                       |  14 +
 11 files changed, 729 insertions(+)
 create mode 100644 fieldservice_stage_server_action/README.rst
 create mode 100644 fieldservice_stage_server_action/__init__.py
 create mode 100644 fieldservice_stage_server_action/__manifest__.py
 create mode 100644 fieldservice_stage_server_action/data/base_automation.xml
 create mode 100644 fieldservice_stage_server_action/data/fsm_stage.xml
 create mode 100644 fieldservice_stage_server_action/data/ir_server_action.xml
 create mode 100644 fieldservice_stage_server_action/models/__init__.py
 create mode 100644 fieldservice_stage_server_action/models/fsm_stage.py
 create mode 100644 fieldservice_stage_server_action/static/description/icon.png
 create mode 100644 fieldservice_stage_server_action/static/description/index.html
 create mode 100644 fieldservice_stage_server_action/views/fsm_stage.xml

diff --git a/fieldservice_stage_server_action/README.rst b/fieldservice_stage_server_action/README.rst
new file mode 100644
index 0000000000..d309294d67
--- /dev/null
+++ b/fieldservice_stage_server_action/README.rst
@@ -0,0 +1,120 @@
+===================================
+Field Service - Stage Server Action
+===================================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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/12.0/fieldservice_skill
+    :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_skill
+    :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
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+
+
+**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/12.0/base_geoengine
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+
+
+Usage
+=====
+
+To use this module, you need to:
+
+
+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_skill%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+
+Contributors
+~~~~~~~~~~~~
+
+* Wolfgang Hall <whall@opensourceintegrators.com>
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Steve Campbell <scampbell@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-osi-scampbell| image:: https://github.com/osi-scampbell.png?size=40px
+    :target: https://github.com/osi-scampbell
+    :alt: osi-scampbell
+.. |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-osi-scampbell| |maintainer-max3903| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_skill>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_stage_server_action/__init__.py b/fieldservice_stage_server_action/__init__.py
new file mode 100644
index 0000000000..b634044c7c
--- /dev/null
+++ b/fieldservice_stage_server_action/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_stage_server_action/__manifest__.py b/fieldservice_stage_server_action/__manifest__.py
new file mode 100644
index 0000000000..929c710007
--- /dev/null
+++ b/fieldservice_stage_server_action/__manifest__.py
@@ -0,0 +1,29 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+{
+    'name': 'FSM Stage Server Action',
+    'summary': 'Add Server Actions based on FSM Stage',
+    'version': '12.0.1.0.0',
+    'category': 'Field Service',
+    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
+    'website': 'https://github.com/ursais/osi-addons',
+    'depends': [
+        'fieldservice',
+        'fieldservice_substatus',
+        'base_automation'
+    ],
+    'data': [
+        'data/ir_server_action.xml',
+        'data/fsm_stage.xml',
+        'data/base_automation.xml',
+        'views/fsm_stage.xml'
+    ],
+    'installable': True,
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'wolfhall',
+        'max3903',
+        'osi-scampbell'
+    ]
+}
diff --git a/fieldservice_stage_server_action/data/base_automation.xml b/fieldservice_stage_server_action/data/base_automation.xml
new file mode 100644
index 0000000000..58998f02ae
--- /dev/null
+++ b/fieldservice_stage_server_action/data/base_automation.xml
@@ -0,0 +1,20 @@
+<odoo>
+    <data noupdate="1">
+        <record id="fsm_order_email_sender" model="base.automation">
+            <field name="name">FSM Order Email Sender</field>
+            <field name="model_id" ref="fieldservice.model_fsm_order"/>
+            <field name="trigger">on_create_or_write</field>
+            <field name="active" eval="True"/>
+            <field name="state">multi</field>
+            <field name="child_ids" eval=
+                "[(6, 0, [
+                    ref('fsm_order_parent_confirmed'), 
+                    ref('fsm_order_parent_requested'),
+                    ref('fsm_order_parent_assigned'),
+                    ref('fsm_order_parent_scheduled'),
+                    ref('fsm_order_parent_completed'),
+                    ref('fsm_order_parent_canceled')])
+                ]"/>
+        </record>
+    </data>
+</odoo>
diff --git a/fieldservice_stage_server_action/data/fsm_stage.xml b/fieldservice_stage_server_action/data/fsm_stage.xml
new file mode 100644
index 0000000000..6c745412f5
--- /dev/null
+++ b/fieldservice_stage_server_action/data/fsm_stage.xml
@@ -0,0 +1,27 @@
+<odoo>
+    <data noupdate="1">
+        <record id="fieldservice.fsm_stage_confirmed" model="fsm.stage">
+            <field name="action_id" ref="fsm_order_parent_confirmed"/>
+        </record>
+
+        <record id="fieldservice.fsm_stage_requested" model="fsm.stage">
+            <field name="action_id" ref="fsm_order_parent_requested"/>
+        </record>
+
+        <record id="fieldservice.fsm_stage_assigned" model="fsm.stage">
+            <field name="action_id" ref="fsm_order_parent_assigned"/>
+        </record>
+
+        <record id="fieldservice.fsm_stage_scheduled" model="fsm.stage">
+            <field name="action_id" ref="fsm_order_parent_scheduled"/>
+        </record>
+
+        <record id="fieldservice.fsm_stage_completed" model="fsm.stage">
+            <field name="action_id" ref="fsm_order_parent_completed"/>
+        </record>
+
+        <record id="fieldservice.fsm_stage_cancelled" model="fsm.stage">
+            <field name="action_id" ref="fsm_order_parent_canceled"/>
+        </record>
+    </data>
+</odoo>
diff --git a/fieldservice_stage_server_action/data/ir_server_action.xml b/fieldservice_stage_server_action/data/ir_server_action.xml
new file mode 100644
index 0000000000..4f7383509d
--- /dev/null
+++ b/fieldservice_stage_server_action/data/ir_server_action.xml
@@ -0,0 +1,39 @@
+<odoo>
+    <data noupdate="1">
+        <record id="fsm_order_parent_confirmed" model="ir.actions.server">
+            <field name="name">FSM Order Confirmed Parent</field>
+            <field name="model_id" ref="fieldservice.model_fsm_order"/>
+            <field name="state">multi</field>
+        </record>
+
+        <record id="fsm_order_parent_requested" model="ir.actions.server">
+            <field name="name">FSM Order Requested Parent</field>
+            <field name="model_id" ref="fieldservice.model_fsm_order"/>
+            <field name="state">multi</field>
+        </record>
+
+        <record id="fsm_order_parent_assigned" model="ir.actions.server">
+            <field name="name">FSM Order Assigned Parent</field>
+            <field name="model_id" ref="fieldservice.model_fsm_order"/>
+            <field name="state">multi</field>
+        </record>
+
+        <record id="fsm_order_parent_scheduled" model="ir.actions.server">
+            <field name="name">FSM Order Scheduled Parent</field>
+            <field name="model_id" ref="fieldservice.model_fsm_order"/>
+            <field name="state">multi</field>
+        </record>
+
+        <record id="fsm_order_parent_completed" model="ir.actions.server">
+            <field name="name">FSM Order Completed Parent</field>
+            <field name="model_id" ref="fieldservice.model_fsm_order"/>
+            <field name="state">multi</field>
+        </record>
+
+        <record id="fsm_order_parent_canceled" model="ir.actions.server">
+            <field name="name">FSM Order Canceled Parent</field>
+            <field name="model_id" ref="fieldservice.model_fsm_order"/>
+            <field name="state">multi</field>
+        </record>
+    </data>
+</odoo>
diff --git a/fieldservice_stage_server_action/models/__init__.py b/fieldservice_stage_server_action/models/__init__.py
new file mode 100644
index 0000000000..8d9c373b90
--- /dev/null
+++ b/fieldservice_stage_server_action/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import (
+    fsm_stage,
+)
diff --git a/fieldservice_stage_server_action/models/fsm_stage.py b/fieldservice_stage_server_action/models/fsm_stage.py
new file mode 100644
index 0000000000..8a8ba601ba
--- /dev/null
+++ b/fieldservice_stage_server_action/models/fsm_stage.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class FSMStage(models.Model):
+    _inherit = 'fsm.stage'
+
+    action_id = fields.Many2one('ir.actions.server', string="Server Action")
diff --git a/fieldservice_stage_server_action/static/description/icon.png b/fieldservice_stage_server_action/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_stage_server_action/static/description/index.html b/fieldservice_stage_server_action/static/description/index.html
new file mode 100644
index 0000000000..23490becee
--- /dev/null
+++ b/fieldservice_stage_server_action/static/description/index.html
@@ -0,0 +1,460 @@
+<?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/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">
+<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/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>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:%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>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">
+<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/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_stage_server_action/views/fsm_stage.xml b/fieldservice_stage_server_action/views/fsm_stage.xml
new file mode 100644
index 0000000000..86a1832cee
--- /dev/null
+++ b/fieldservice_stage_server_action/views/fsm_stage.xml
@@ -0,0 +1,14 @@
+<odoo>
+
+    <!-- Fieldservice Stage Form View-->
+    <record id="fsm_server_action_stage_form_view" model="ir.ui.view">
+        <field name="name">fsm.server.action.stage.form</field>
+        <field name="model">fsm.stage</field>
+        <field name="inherit_id" ref="fieldservice.fsm_stage_form_view"/>
+        <field name="arch" type="xml">
+            <field name="sub_stage_id" position="after">
+                <field name="action_id"/>
+            </field>
+        </field>
+    </record>
+</odoo>

From 869144fd1e9642de8a9d030b9e829bdcf32b3993 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 21 Jun 2019 14:48:27 -0700
Subject: [PATCH 003/631] [IMP] Remove data tags

---
 fieldservice_stage_server_action/data/base_automation.xml  | 2 --
 fieldservice_stage_server_action/data/fsm_stage.xml        | 2 --
 fieldservice_stage_server_action/data/ir_server_action.xml | 2 --
 3 files changed, 6 deletions(-)

diff --git a/fieldservice_stage_server_action/data/base_automation.xml b/fieldservice_stage_server_action/data/base_automation.xml
index 58998f02ae..2960e73b52 100644
--- a/fieldservice_stage_server_action/data/base_automation.xml
+++ b/fieldservice_stage_server_action/data/base_automation.xml
@@ -1,5 +1,4 @@
 <odoo>
-    <data noupdate="1">
         <record id="fsm_order_email_sender" model="base.automation">
             <field name="name">FSM Order Email Sender</field>
             <field name="model_id" ref="fieldservice.model_fsm_order"/>
@@ -16,5 +15,4 @@
                     ref('fsm_order_parent_canceled')])
                 ]"/>
         </record>
-    </data>
 </odoo>
diff --git a/fieldservice_stage_server_action/data/fsm_stage.xml b/fieldservice_stage_server_action/data/fsm_stage.xml
index 6c745412f5..e83abca6e1 100644
--- a/fieldservice_stage_server_action/data/fsm_stage.xml
+++ b/fieldservice_stage_server_action/data/fsm_stage.xml
@@ -1,5 +1,4 @@
 <odoo>
-    <data noupdate="1">
         <record id="fieldservice.fsm_stage_confirmed" model="fsm.stage">
             <field name="action_id" ref="fsm_order_parent_confirmed"/>
         </record>
@@ -23,5 +22,4 @@
         <record id="fieldservice.fsm_stage_cancelled" model="fsm.stage">
             <field name="action_id" ref="fsm_order_parent_canceled"/>
         </record>
-    </data>
 </odoo>
diff --git a/fieldservice_stage_server_action/data/ir_server_action.xml b/fieldservice_stage_server_action/data/ir_server_action.xml
index 4f7383509d..6e42e26d90 100644
--- a/fieldservice_stage_server_action/data/ir_server_action.xml
+++ b/fieldservice_stage_server_action/data/ir_server_action.xml
@@ -1,5 +1,4 @@
 <odoo>
-    <data noupdate="1">
         <record id="fsm_order_parent_confirmed" model="ir.actions.server">
             <field name="name">FSM Order Confirmed Parent</field>
             <field name="model_id" ref="fieldservice.model_fsm_order"/>
@@ -35,5 +34,4 @@
             <field name="model_id" ref="fieldservice.model_fsm_order"/>
             <field name="state">multi</field>
         </record>
-    </data>
 </odoo>

From 652849acf20762932843cdb8de5c910b0e830abc Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 10 Oct 2019 14:00:21 -0500
Subject: [PATCH 004/631] [FIX] fieldservice_stage_server_action

---
 fieldservice_stage_server_action/README.rst   | 67 ++++++--------
 .../__manifest__.py                           |  2 +-
 .../data/base_automation.xml                  |  4 -
 .../data/fsm_stage.xml                        | 16 ----
 .../data/ir_server_action.xml                 | 24 -----
 .../readme/CONFIGURE.rst                      |  3 +
 .../readme/CONTRIBUTORS.rst                   |  5 ++
 .../readme/DESCRIPTION.rst                    |  2 +
 .../readme/USAGE.rst                          |  4 +
 .../static/description/index.html             | 88 ++++++++-----------
 10 files changed, 79 insertions(+), 136 deletions(-)
 create mode 100644 fieldservice_stage_server_action/readme/CONFIGURE.rst
 create mode 100644 fieldservice_stage_server_action/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_stage_server_action/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_stage_server_action/readme/USAGE.rst

diff --git a/fieldservice_stage_server_action/README.rst b/fieldservice_stage_server_action/README.rst
index d309294d67..7a66a7a54f 100644
--- a/fieldservice_stage_server_action/README.rst
+++ b/fieldservice_stage_server_action/README.rst
@@ -1,6 +1,6 @@
-===================================
-Field Service - Stage Server Action
-===================================
+=======================
+FSM Stage Server Action
+=======================
 
 .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
@@ -14,10 +14,10 @@ Field Service - Stage Server Action
     :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_skill
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_stage_server_action
     :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_skill
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stage_server_action
     :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
@@ -25,39 +25,28 @@ Field Service - Stage Server Action
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
-
+This module allows you to execute server actions when a FSM orders enters a
+specific stage.
 
 **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/12.0/base_geoengine
-
 Configuration
 =============
 
-To configure this module, you need to:
-
-
+* Go to Field Service > Configuration > Stages
+* Create or select a stage
+* Select or create a server action
 
 Usage
 =====
 
-To use this module, you need to:
-
-
-Known issues / Roadmap
-======================
-
-The roadmap of the Field Service application is documented on
-`Github <https://github.com/OCA/field-service/issues/1>`_.
+* Go to Field Service
+* Select or create a FSM orders
+* Move it to the stage configured before to trigger the execution of the
+  server action
 
 Bug Tracker
 ===========
@@ -65,7 +54,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_skill%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_stage_server_action%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.
 
@@ -80,16 +69,11 @@ Authors
 Contributors
 ~~~~~~~~~~~~
 
-* Wolfgang Hall <whall@opensourceintegrators.com>
-* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
-* Steve Campbell <scampbell@opensourceintegrators.com>
+* Open Source Integrators <https://www.opensourceintegrators.com>
 
-Other credits
-~~~~~~~~~~~~~
-
-The development of this module has been financially supported by:
-
-* Open Source Integrators <https://opensourceintegrators.com>
+  * Wolfgang Hall <whall@opensourceintegrators.com>
+  * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+  * Steve Campbell <scampbell@opensourceintegrators.com>
 
 Maintainers
 ~~~~~~~~~~~
@@ -104,17 +88,20 @@ 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-osi-scampbell| image:: https://github.com/osi-scampbell.png?size=40px
-    :target: https://github.com/osi-scampbell
-    :alt: osi-scampbell
+.. |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
+.. |maintainer-osi-scampbell| image:: https://github.com/osi-scampbell.png?size=40px
+    :target: https://github.com/osi-scampbell
+    :alt: osi-scampbell
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-osi-scampbell| |maintainer-max3903| 
+|maintainer-wolfhall| |maintainer-max3903| |maintainer-osi-scampbell| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_skill>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_stage_server_action>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_stage_server_action/__manifest__.py b/fieldservice_stage_server_action/__manifest__.py
index 929c710007..5d24ee0128 100644
--- a/fieldservice_stage_server_action/__manifest__.py
+++ b/fieldservice_stage_server_action/__manifest__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators
+# Copyright (C) 2019 Open Source Integrators
 # # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 {
     'name': 'FSM Stage Server Action',
diff --git a/fieldservice_stage_server_action/data/base_automation.xml b/fieldservice_stage_server_action/data/base_automation.xml
index 2960e73b52..29fcac1eb4 100644
--- a/fieldservice_stage_server_action/data/base_automation.xml
+++ b/fieldservice_stage_server_action/data/base_automation.xml
@@ -7,10 +7,6 @@
             <field name="state">multi</field>
             <field name="child_ids" eval=
                 "[(6, 0, [
-                    ref('fsm_order_parent_confirmed'), 
-                    ref('fsm_order_parent_requested'),
-                    ref('fsm_order_parent_assigned'),
-                    ref('fsm_order_parent_scheduled'),
                     ref('fsm_order_parent_completed'),
                     ref('fsm_order_parent_canceled')])
                 ]"/>
diff --git a/fieldservice_stage_server_action/data/fsm_stage.xml b/fieldservice_stage_server_action/data/fsm_stage.xml
index e83abca6e1..a666ef79f5 100644
--- a/fieldservice_stage_server_action/data/fsm_stage.xml
+++ b/fieldservice_stage_server_action/data/fsm_stage.xml
@@ -1,20 +1,4 @@
 <odoo>
-        <record id="fieldservice.fsm_stage_confirmed" model="fsm.stage">
-            <field name="action_id" ref="fsm_order_parent_confirmed"/>
-        </record>
-
-        <record id="fieldservice.fsm_stage_requested" model="fsm.stage">
-            <field name="action_id" ref="fsm_order_parent_requested"/>
-        </record>
-
-        <record id="fieldservice.fsm_stage_assigned" model="fsm.stage">
-            <field name="action_id" ref="fsm_order_parent_assigned"/>
-        </record>
-
-        <record id="fieldservice.fsm_stage_scheduled" model="fsm.stage">
-            <field name="action_id" ref="fsm_order_parent_scheduled"/>
-        </record>
-
         <record id="fieldservice.fsm_stage_completed" model="fsm.stage">
             <field name="action_id" ref="fsm_order_parent_completed"/>
         </record>
diff --git a/fieldservice_stage_server_action/data/ir_server_action.xml b/fieldservice_stage_server_action/data/ir_server_action.xml
index 6e42e26d90..42a9d299eb 100644
--- a/fieldservice_stage_server_action/data/ir_server_action.xml
+++ b/fieldservice_stage_server_action/data/ir_server_action.xml
@@ -1,28 +1,4 @@
 <odoo>
-        <record id="fsm_order_parent_confirmed" model="ir.actions.server">
-            <field name="name">FSM Order Confirmed Parent</field>
-            <field name="model_id" ref="fieldservice.model_fsm_order"/>
-            <field name="state">multi</field>
-        </record>
-
-        <record id="fsm_order_parent_requested" model="ir.actions.server">
-            <field name="name">FSM Order Requested Parent</field>
-            <field name="model_id" ref="fieldservice.model_fsm_order"/>
-            <field name="state">multi</field>
-        </record>
-
-        <record id="fsm_order_parent_assigned" model="ir.actions.server">
-            <field name="name">FSM Order Assigned Parent</field>
-            <field name="model_id" ref="fieldservice.model_fsm_order"/>
-            <field name="state">multi</field>
-        </record>
-
-        <record id="fsm_order_parent_scheduled" model="ir.actions.server">
-            <field name="name">FSM Order Scheduled Parent</field>
-            <field name="model_id" ref="fieldservice.model_fsm_order"/>
-            <field name="state">multi</field>
-        </record>
-
         <record id="fsm_order_parent_completed" model="ir.actions.server">
             <field name="name">FSM Order Completed Parent</field>
             <field name="model_id" ref="fieldservice.model_fsm_order"/>
diff --git a/fieldservice_stage_server_action/readme/CONFIGURE.rst b/fieldservice_stage_server_action/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..c851f5f506
--- /dev/null
+++ b/fieldservice_stage_server_action/readme/CONFIGURE.rst
@@ -0,0 +1,3 @@
+* Go to Field Service > Configuration > Stages
+* Create or select a stage
+* Select or create a server action
diff --git a/fieldservice_stage_server_action/readme/CONTRIBUTORS.rst b/fieldservice_stage_server_action/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..f9cb0d612f
--- /dev/null
+++ b/fieldservice_stage_server_action/readme/CONTRIBUTORS.rst
@@ -0,0 +1,5 @@
+* Open Source Integrators <https://www.opensourceintegrators.com>
+
+  * Wolfgang Hall <whall@opensourceintegrators.com>
+  * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+  * Steve Campbell <scampbell@opensourceintegrators.com>
diff --git a/fieldservice_stage_server_action/readme/DESCRIPTION.rst b/fieldservice_stage_server_action/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..15318d3572
--- /dev/null
+++ b/fieldservice_stage_server_action/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module allows you to execute server actions when a FSM orders enters a
+specific stage.
\ No newline at end of file
diff --git a/fieldservice_stage_server_action/readme/USAGE.rst b/fieldservice_stage_server_action/readme/USAGE.rst
new file mode 100644
index 0000000000..fac3244b28
--- /dev/null
+++ b/fieldservice_stage_server_action/readme/USAGE.rst
@@ -0,0 +1,4 @@
+* Go to Field Service
+* Select or create a FSM orders
+* Move it to the stage configured before to trigger the execution of the
+  server action
diff --git a/fieldservice_stage_server_action/static/description/index.html b/fieldservice_stage_server_action/static/description/index.html
index 23490becee..54b44e4343 100644
--- a/fieldservice_stage_server_action/static/description/index.html
+++ b/fieldservice_stage_server_action/static/description/index.html
@@ -3,8 +3,8 @@
 <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>
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<title>FSM Stage Server Action</title>
 <style type="text/css">
 
 /*
@@ -360,98 +360,84 @@
 </style>
 </head>
 <body>
-<div class="document" id="field-service-sales">
-<h1 class="title">Field Service - Sales</h1>
+<div class="document" id="fsm-stage-server-action">
+<h1 class="title">FSM Stage Server Action</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 integrate the field service application with the sales one.</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_stage_server_action"><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_stage_server_action"><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>This module allows you to execute server actions when a FSM orders enters a
+specific stage.</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>
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">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>To use this module, you need to:</p>
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
 <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>
+<li>Go to Field Service &gt; Configuration &gt; Stages</li>
+<li>Create or select a stage</li>
+<li>Select or create a server action</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>
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<ul class="simple">
+<li>Go to Field Service</li>
+<li>Select or create a FSM orders</li>
+<li>Move it to the stage configured before to trigger the execution of the
+server action</li>
+</ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id5">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id3">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>
+<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_stage_server_action%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>
+<h1><a class="toc-backref" href="#id4">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id7">Authors</a></h2>
+<h2><a class="toc-backref" href="#id5">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>
+<h2><a class="toc-backref" href="#id6">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>Open Source Integrators &lt;<a class="reference external" href="https://www.opensourceintegrators.com">https://www.opensourceintegrators.com</a>&gt;<ul>
 <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>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>
 </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>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id10">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id7">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/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/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.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_stage_server_action">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 91f71bf2b6812d0f8c1b04cef964313c540eaa94 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 11 Oct 2019 12:33:21 -0500
Subject: [PATCH 005/631] [IMP] fieldservice_stage_server_action

---
 .../__manifest__.py                           |  2 +-
 .../i18n/fieldservice_stage_server_action.pot | 41 +++++++++++++++++++
 .../readme/DESCRIPTION.rst                    |  2 +-
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot

diff --git a/fieldservice_stage_server_action/__manifest__.py b/fieldservice_stage_server_action/__manifest__.py
index 5d24ee0128..08ac286481 100644
--- a/fieldservice_stage_server_action/__manifest__.py
+++ b/fieldservice_stage_server_action/__manifest__.py
@@ -2,7 +2,7 @@
 # # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 {
     'name': 'FSM Stage Server Action',
-    'summary': 'Add Server Actions based on FSM Stage',
+    'summary': 'Execute server actions when reaching a Field Service stage',
     'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot b/fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot
new file mode 100644
index 0000000000..dd6a6f4a59
--- /dev/null
+++ b/fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot
@@ -0,0 +1,41 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_stage_server_action
+#
+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_stage_server_action
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_canceled
+msgid "FSM Order Canceled Parent"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_completed
+msgid "FSM Order Completed Parent"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:base.automation,name:fieldservice_stage_server_action.fsm_order_email_sender
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_email_sender_ir_actions_server
+msgid "FSM Order Email Sender"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.model,name:fieldservice_stage_server_action.model_fsm_stage
+msgid "Field Service Stage"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__action_id
+msgid "Server Action"
+msgstr ""
+
diff --git a/fieldservice_stage_server_action/readme/DESCRIPTION.rst b/fieldservice_stage_server_action/readme/DESCRIPTION.rst
index 15318d3572..d790577097 100644
--- a/fieldservice_stage_server_action/readme/DESCRIPTION.rst
+++ b/fieldservice_stage_server_action/readme/DESCRIPTION.rst
@@ -1,2 +1,2 @@
 This module allows you to execute server actions when a FSM orders enters a
-specific stage.
\ No newline at end of file
+specific stage.

From 46fe5c773252d391608c03c4c31b87f16adb7d98 Mon Sep 17 00:00:00 2001
From: Maria Sparenberg <maria.sparenberg@gmx.net>
Date: Fri, 22 Nov 2019 13:20:39 +0000
Subject: [PATCH 006/631] Added translation using Weblate (German)

---
 fieldservice_stage_server_action/i18n/de.po | 41 +++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 fieldservice_stage_server_action/i18n/de.po

diff --git a/fieldservice_stage_server_action/i18n/de.po b/fieldservice_stage_server_action/i18n/de.po
new file mode 100644
index 0000000000..db36bf626d
--- /dev/null
+++ b/fieldservice_stage_server_action/i18n/de.po
@@ -0,0 +1,41 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_stage_server_action
+#
+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_stage_server_action
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_canceled
+msgid "FSM Order Canceled Parent"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_completed
+msgid "FSM Order Completed Parent"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:base.automation,name:fieldservice_stage_server_action.fsm_order_email_sender
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_email_sender_ir_actions_server
+msgid "FSM Order Email Sender"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.model,name:fieldservice_stage_server_action.model_fsm_stage
+msgid "Field Service Stage"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__action_id
+msgid "Server Action"
+msgstr ""

From 00983aec0737d64c1772473c2b6b225dfaa8bd4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nelson=20Ram=C3=ADrez=20S=C3=A1nchez?= <info@konos.cl>
Date: Tue, 10 Dec 2019 18:57:05 +0000
Subject: [PATCH 007/631] Added translation using Weblate (Spanish (Chile))

---
 .../i18n/es_CL.po                             | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 fieldservice_stage_server_action/i18n/es_CL.po

diff --git a/fieldservice_stage_server_action/i18n/es_CL.po b/fieldservice_stage_server_action/i18n/es_CL.po
new file mode 100644
index 0000000000..dae4e38cb0
--- /dev/null
+++ b/fieldservice_stage_server_action/i18n/es_CL.po
@@ -0,0 +1,41 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_stage_server_action
+#
+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: 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"
+
+#. module: fieldservice_stage_server_action
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_canceled
+msgid "FSM Order Canceled Parent"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_completed
+msgid "FSM Order Completed Parent"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:base.automation,name:fieldservice_stage_server_action.fsm_order_email_sender
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_email_sender_ir_actions_server
+msgid "FSM Order Email Sender"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.model,name:fieldservice_stage_server_action.model_fsm_stage
+msgid "Field Service Stage"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__action_id
+msgid "Server Action"
+msgstr ""

From 60ae1f2cdba5a40b0684bf18a83707c331ad2c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nelson=20Ram=C3=ADrez=20S=C3=A1nchez?= <info@konos.cl>
Date: Tue, 10 Dec 2019 18:57:22 +0000
Subject: [PATCH 008/631] Translated using Weblate (Spanish (Chile))

Currently translated at 100.0% (5 of 5 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_stage_server_action
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stage_server_action/es_CL/
---
 fieldservice_stage_server_action/i18n/es_CL.po | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/fieldservice_stage_server_action/i18n/es_CL.po b/fieldservice_stage_server_action/i18n/es_CL.po
index dae4e38cb0..e97ce3d880 100644
--- a/fieldservice_stage_server_action/i18n/es_CL.po
+++ b/fieldservice_stage_server_action/i18n/es_CL.po
@@ -6,36 +6,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\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_stage_server_action
 #: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_canceled
 msgid "FSM Order Canceled Parent"
-msgstr ""
+msgstr "Pedido FSM cancelado padre"
 
 #. module: fieldservice_stage_server_action
 #: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_completed
 msgid "FSM Order Completed Parent"
-msgstr ""
+msgstr "Pedido FSM Padre Completado"
 
 #. module: fieldservice_stage_server_action
 #: model:base.automation,name:fieldservice_stage_server_action.fsm_order_email_sender
 #: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_email_sender_ir_actions_server
 msgid "FSM Order Email Sender"
-msgstr ""
+msgstr "Remitente de Correo de Pedido FSM"
 
 #. module: fieldservice_stage_server_action
 #: model:ir.model,name:fieldservice_stage_server_action.model_fsm_stage
 msgid "Field Service Stage"
-msgstr ""
+msgstr "Etapa de Servicio de Campo"
 
 #. module: fieldservice_stage_server_action
 #: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__action_id
 msgid "Server Action"
-msgstr ""
+msgstr "Acci??n de Servidor"

From 6a50d72b93608b70d502d44c5b182c6afd113536 Mon Sep 17 00:00:00 2001
From: Marcel Savegnago <marcel.savegnago@gmail.com>
Date: Thu, 16 Jan 2020 06:22:10 +0000
Subject: [PATCH 009/631] Added translation using Weblate (Portuguese (Brazil))

---
 .../i18n/pt_BR.po                             | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 fieldservice_stage_server_action/i18n/pt_BR.po

diff --git a/fieldservice_stage_server_action/i18n/pt_BR.po b/fieldservice_stage_server_action/i18n/pt_BR.po
new file mode 100644
index 0000000000..542166afeb
--- /dev/null
+++ b/fieldservice_stage_server_action/i18n/pt_BR.po
@@ -0,0 +1,41 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_stage_server_action
+#
+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_stage_server_action
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_canceled
+msgid "FSM Order Canceled Parent"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_completed
+msgid "FSM Order Completed Parent"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:base.automation,name:fieldservice_stage_server_action.fsm_order_email_sender
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_email_sender_ir_actions_server
+msgid "FSM Order Email Sender"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.model,name:fieldservice_stage_server_action.model_fsm_stage
+msgid "Field Service Stage"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__action_id
+msgid "Server Action"
+msgstr ""

From 273d13563b0022334483ce3626f60b6fca6b2f0f Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 16 Jan 2020 11:39:15 -0600
Subject: [PATCH 010/631] [ADD] Spanish (es) translation

---
 fieldservice_stage_server_action/i18n/es.po | 43 +++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 fieldservice_stage_server_action/i18n/es.po

diff --git a/fieldservice_stage_server_action/i18n/es.po b/fieldservice_stage_server_action/i18n/es.po
new file mode 100644
index 0000000000..28371f0cf3
--- /dev/null
+++ b/fieldservice_stage_server_action/i18n/es.po
@@ -0,0 +1,43 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_stage_server_action
+#
+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_stage_server_action
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_canceled
+msgid "FSM Order Canceled Parent"
+msgstr "Pedido FSM cancelado padre"
+
+#. module: fieldservice_stage_server_action
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_completed
+msgid "FSM Order Completed Parent"
+msgstr "Pedido FSM Padre Completado"
+
+#. module: fieldservice_stage_server_action
+#: model:base.automation,name:fieldservice_stage_server_action.fsm_order_email_sender
+#: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_email_sender_ir_actions_server
+msgid "FSM Order Email Sender"
+msgstr "Remitente de Correo de Pedido FSM"
+
+#. module: fieldservice_stage_server_action
+#: model:ir.model,name:fieldservice_stage_server_action.model_fsm_stage
+msgid "Field Service Stage"
+msgstr "Etapa de Servicio de Campo"
+
+#. module: fieldservice_stage_server_action
+#: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__action_id
+msgid "Server Action"
+msgstr "Acci??n de Servidor"

From a3f186bc3ba64f31477910576bb4b854133f7708 Mon Sep 17 00:00:00 2001
From: Marcel Savegnago <marcel.savegnago@gmail.com>
Date: Wed, 5 Feb 2020 08:25:27 +0000
Subject: [PATCH 011/631] Translated using Weblate (Portuguese (Brazil))

Currently translated at 20.0% (1 of 5 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_stage_server_action
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stage_server_action/pt_BR/
---
 fieldservice_stage_server_action/i18n/pt_BR.po | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fieldservice_stage_server_action/i18n/pt_BR.po b/fieldservice_stage_server_action/i18n/pt_BR.po
index 542166afeb..84528bd892 100644
--- a/fieldservice_stage_server_action/i18n/pt_BR.po
+++ b/fieldservice_stage_server_action/i18n/pt_BR.po
@@ -6,13 +6,15 @@ 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 11: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_stage_server_action
 #: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_canceled
@@ -33,7 +35,7 @@ msgstr ""
 #. module: fieldservice_stage_server_action
 #: model:ir.model,name:fieldservice_stage_server_action.model_fsm_stage
 msgid "Field Service Stage"
-msgstr ""
+msgstr "Est??gio de Servi??o de Campo"
 
 #. module: fieldservice_stage_server_action
 #: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__action_id

From 716049a328988464b9db7f2ccf1fc8e30c5c6145 Mon Sep 17 00:00:00 2001
From: Fernando Colus <fcolus1@gmail.com>
Date: Wed, 17 Jun 2020 13:57:07 +0000
Subject: [PATCH 012/631] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (5 of 5 strings)

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

diff --git a/fieldservice_stage_server_action/i18n/pt_BR.po b/fieldservice_stage_server_action/i18n/pt_BR.po
index 84528bd892..29876a7551 100644
--- a/fieldservice_stage_server_action/i18n/pt_BR.po
+++ b/fieldservice_stage_server_action/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-05 11:13+0000\n"
-"Last-Translator: Marcel Savegnago <marcel.savegnago@gmail.com>\n"
+"PO-Revision-Date: 2020-06-17 16:19+0000\n"
+"Last-Translator: Fernando Colus <fcolus1@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -19,18 +19,18 @@ msgstr ""
 #. module: fieldservice_stage_server_action
 #: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_canceled
 msgid "FSM Order Canceled Parent"
-msgstr ""
+msgstr "Pai do pedido cancelado"
 
 #. module: fieldservice_stage_server_action
 #: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_completed
 msgid "FSM Order Completed Parent"
-msgstr ""
+msgstr "Pai do pedido completado"
 
 #. module: fieldservice_stage_server_action
 #: model:base.automation,name:fieldservice_stage_server_action.fsm_order_email_sender
 #: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_email_sender_ir_actions_server
 msgid "FSM Order Email Sender"
-msgstr ""
+msgstr "Remetente do email do pedido"
 
 #. module: fieldservice_stage_server_action
 #: model:ir.model,name:fieldservice_stage_server_action.model_fsm_stage
@@ -40,4 +40,4 @@ msgstr "Est??gio de Servi??o de Campo"
 #. module: fieldservice_stage_server_action
 #: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__action_id
 msgid "Server Action"
-msgstr ""
+msgstr "A????o do Servidor"

From 7542da4242368eec77ed683e5275d16333ba43f0 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 21 Jul 2020 00:44:52 -0400
Subject: [PATCH 013/631] [IMP] fieldservice_stage_migration: black, isort,
 prettier

---
 .../__manifest__.py                           |   40 +-
 .../data/base_automation.xml                  |   22 +-
 .../data/fsm_stage.xml                        |   13 +-
 .../data/ir_server_action.xml                 |   21 +-
 .../models/__init__.py                        |    4 +-
 .../models/fsm_stage.py                       |    4 +-
 .../static/description/index.html             | 1105 ++++++++++-------
 .../views/fsm_stage.xml                       |    5 +-
 8 files changed, 739 insertions(+), 475 deletions(-)

diff --git a/fieldservice_stage_server_action/__manifest__.py b/fieldservice_stage_server_action/__manifest__.py
index 08ac286481..6a66f14613 100644
--- a/fieldservice_stage_server_action/__manifest__.py
+++ b/fieldservice_stage_server_action/__manifest__.py
@@ -1,29 +1,21 @@
 # Copyright (C) 2019 Open Source Integrators
 # # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 {
-    'name': 'FSM Stage Server Action',
-    'summary': 'Execute server actions when reaching a Field Service stage',
-    'version': '12.0.1.0.0',
-    'category': 'Field Service',
-    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
-    'website': 'https://github.com/ursais/osi-addons',
-    'depends': [
-        'fieldservice',
-        'fieldservice_substatus',
-        'base_automation'
+    "name": "FSM Stage Server Action",
+    "summary": "Execute server actions when reaching a Field Service stage",
+    "version": "12.0.1.0.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/ursais/osi-addons",
+    "depends": ["fieldservice", "fieldservice_substatus", "base_automation"],
+    "data": [
+        "data/ir_server_action.xml",
+        "data/fsm_stage.xml",
+        "data/base_automation.xml",
+        "views/fsm_stage.xml",
     ],
-    'data': [
-        'data/ir_server_action.xml',
-        'data/fsm_stage.xml',
-        'data/base_automation.xml',
-        'views/fsm_stage.xml'
-    ],
-    'installable': True,
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'wolfhall',
-        'max3903',
-        'osi-scampbell'
-    ]
+    "installable": True,
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": ["wolfhall", "max3903", "osi-scampbell"],
 }
diff --git a/fieldservice_stage_server_action/data/base_automation.xml b/fieldservice_stage_server_action/data/base_automation.xml
index 29fcac1eb4..6333aa630a 100644
--- a/fieldservice_stage_server_action/data/base_automation.xml
+++ b/fieldservice_stage_server_action/data/base_automation.xml
@@ -1,14 +1,16 @@
 <odoo>
-        <record id="fsm_order_email_sender" model="base.automation">
-            <field name="name">FSM Order Email Sender</field>
-            <field name="model_id" ref="fieldservice.model_fsm_order"/>
-            <field name="trigger">on_create_or_write</field>
-            <field name="active" eval="True"/>
-            <field name="state">multi</field>
-            <field name="child_ids" eval=
-                "[(6, 0, [
+    <record id="fsm_order_email_sender" model="base.automation">
+        <field name="name">FSM Order Email Sender</field>
+        <field name="model_id" ref="fieldservice.model_fsm_order" />
+        <field name="trigger">on_create_or_write</field>
+        <field name="active" eval="True" />
+        <field name="state">multi</field>
+        <field
+            name="child_ids"
+            eval="[(6, 0, [
                     ref('fsm_order_parent_completed'),
                     ref('fsm_order_parent_canceled')])
-                ]"/>
-        </record>
+                ]"
+        />
+    </record>
 </odoo>
diff --git a/fieldservice_stage_server_action/data/fsm_stage.xml b/fieldservice_stage_server_action/data/fsm_stage.xml
index a666ef79f5..8805f3519b 100644
--- a/fieldservice_stage_server_action/data/fsm_stage.xml
+++ b/fieldservice_stage_server_action/data/fsm_stage.xml
@@ -1,9 +1,8 @@
 <odoo>
-        <record id="fieldservice.fsm_stage_completed" model="fsm.stage">
-            <field name="action_id" ref="fsm_order_parent_completed"/>
-        </record>
-
-        <record id="fieldservice.fsm_stage_cancelled" model="fsm.stage">
-            <field name="action_id" ref="fsm_order_parent_canceled"/>
-        </record>
+    <record id="fieldservice.fsm_stage_completed" model="fsm.stage">
+        <field name="action_id" ref="fsm_order_parent_completed" />
+    </record>
+    <record id="fieldservice.fsm_stage_cancelled" model="fsm.stage">
+        <field name="action_id" ref="fsm_order_parent_canceled" />
+    </record>
 </odoo>
diff --git a/fieldservice_stage_server_action/data/ir_server_action.xml b/fieldservice_stage_server_action/data/ir_server_action.xml
index 42a9d299eb..5deff9eedb 100644
--- a/fieldservice_stage_server_action/data/ir_server_action.xml
+++ b/fieldservice_stage_server_action/data/ir_server_action.xml
@@ -1,13 +1,12 @@
 <odoo>
-        <record id="fsm_order_parent_completed" model="ir.actions.server">
-            <field name="name">FSM Order Completed Parent</field>
-            <field name="model_id" ref="fieldservice.model_fsm_order"/>
-            <field name="state">multi</field>
-        </record>
-
-        <record id="fsm_order_parent_canceled" model="ir.actions.server">
-            <field name="name">FSM Order Canceled Parent</field>
-            <field name="model_id" ref="fieldservice.model_fsm_order"/>
-            <field name="state">multi</field>
-        </record>
+    <record id="fsm_order_parent_completed" model="ir.actions.server">
+        <field name="name">FSM Order Completed Parent</field>
+        <field name="model_id" ref="fieldservice.model_fsm_order" />
+        <field name="state">multi</field>
+    </record>
+    <record id="fsm_order_parent_canceled" model="ir.actions.server">
+        <field name="name">FSM Order Canceled Parent</field>
+        <field name="model_id" ref="fieldservice.model_fsm_order" />
+        <field name="state">multi</field>
+    </record>
 </odoo>
diff --git a/fieldservice_stage_server_action/models/__init__.py b/fieldservice_stage_server_action/models/__init__.py
index 8d9c373b90..2f4caa0741 100644
--- a/fieldservice_stage_server_action/models/__init__.py
+++ b/fieldservice_stage_server_action/models/__init__.py
@@ -1,6 +1,4 @@
 # Copyright (C) 2019 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import (
-    fsm_stage,
-)
+from . import fsm_stage
diff --git a/fieldservice_stage_server_action/models/fsm_stage.py b/fieldservice_stage_server_action/models/fsm_stage.py
index 8a8ba601ba..2b309dad07 100644
--- a/fieldservice_stage_server_action/models/fsm_stage.py
+++ b/fieldservice_stage_server_action/models/fsm_stage.py
@@ -5,6 +5,6 @@
 
 
 class FSMStage(models.Model):
-    _inherit = 'fsm.stage'
+    _inherit = "fsm.stage"
 
-    action_id = fields.Many2one('ir.actions.server', string="Server Action")
+    action_id = fields.Many2one("ir.actions.server", string="Server Action")
diff --git a/fieldservice_stage_server_action/static/description/index.html b/fieldservice_stage_server_action/static/description/index.html
index 54b44e4343..144349b9f6 100644
--- a/fieldservice_stage_server_action/static/description/index.html
+++ b/fieldservice_stage_server_action/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>FSM Stage Server Action</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>FSM Stage Server Action</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,348 +134,588 @@
   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="fsm-stage-server-action">
-<h1 class="title">FSM Stage Server Action</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="fsm-stage-server-action">
+      <h1 class="title">FSM Stage Server Action</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_stage_server_action"><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_stage_server_action"><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>This module allows you to execute server actions when a FSM orders enters a
-specific stage.</p>
-<p><strong>Table of contents</strong></p>
-<div class="contents local topic" id="contents">
-<ul class="simple">
-<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
-<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="configuration">
-<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
-<ul class="simple">
-<li>Go to Field Service &gt; Configuration &gt; Stages</li>
-<li>Create or select a stage</li>
-<li>Select or create a server action</li>
-</ul>
-</div>
-<div class="section" id="usage">
-<h1><a class="toc-backref" href="#id2">Usage</a></h1>
-<ul class="simple">
-<li>Go to Field Service</li>
-<li>Select or create a FSM orders</li>
-<li>Move it to the stage configured before to trigger the execution of the
-server action</li>
-</ul>
-</div>
-<div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id3">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_stage_server_action%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="#id4">Credits</a></h1>
-<div class="section" id="authors">
-<h2><a class="toc-backref" href="#id5">Authors</a></h2>
-<ul class="simple">
-<li>Open Source Integrators</li>
-</ul>
-</div>
-<div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
-<ul class="simple">
-<li>Open Source Integrators &lt;<a class="reference external" href="https://www.opensourceintegrators.com">https://www.opensourceintegrators.com</a>&gt;<ul>
-<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>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id7">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/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.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_stage_server_action">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_stage_server_action"
+          ><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_stage_server_action"
+          ><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>
+        This module allows you to execute server actions when a FSM orders enters a
+        specific stage.
+      </p>
+      <p><strong>Table of contents</strong></p>
+      <div class="contents local topic" id="contents">
+        <ul class="simple">
+          <li>
+            <a class="reference internal" href="#configuration" id="id1"
+              >Configuration</a
+            >
+          </li>
+          <li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+          <li>
+            <a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a>
+          </li>
+          <li>
+            <a class="reference internal" href="#credits" id="id4">Credits</a>
+            <ul>
+              <li>
+                <a class="reference internal" href="#authors" id="id5">Authors</a>
+              </li>
+              <li>
+                <a class="reference internal" href="#contributors" id="id6"
+                  >Contributors</a
+                >
+              </li>
+              <li>
+                <a class="reference internal" href="#maintainers" id="id7"
+                  >Maintainers</a
+                >
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+      <div class="section" id="configuration">
+        <h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+        <ul class="simple">
+          <li>Go to Field Service &gt; Configuration &gt; Stages</li>
+          <li>Create or select a stage</li>
+          <li>Select or create a server action</li>
+        </ul>
+      </div>
+      <div class="section" id="usage">
+        <h1><a class="toc-backref" href="#id2">Usage</a></h1>
+        <ul class="simple">
+          <li>Go to Field Service</li>
+          <li>Select or create a FSM orders</li>
+          <li>
+            Move it to the stage configured before to trigger the execution of the
+            server action
+          </li>
+        </ul>
+      </div>
+      <div class="section" id="bug-tracker">
+        <h1><a class="toc-backref" href="#id3">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_stage_server_action%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="#id4">Credits</a></h1>
+        <div class="section" id="authors">
+          <h2><a class="toc-backref" href="#id5">Authors</a></h2>
+          <ul class="simple">
+            <li>Open Source Integrators</li>
+          </ul>
+        </div>
+        <div class="section" id="contributors">
+          <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+          <ul class="simple">
+            <li>
+              Open Source Integrators &lt;<a
+                class="reference external"
+                href="https://www.opensourceintegrators.com"
+                >https://www.opensourceintegrators.com</a
+              >&gt;
+              <ul>
+                <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>
+              </ul>
+            </li>
+          </ul>
+        </div>
+        <div class="section" id="maintainers">
+          <h2><a class="toc-backref" href="#id7">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/osi-scampbell"
+              ><img
+                alt="osi-scampbell"
+                src="https://github.com/osi-scampbell.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_stage_server_action"
+              >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_stage_server_action/views/fsm_stage.xml b/fieldservice_stage_server_action/views/fsm_stage.xml
index 86a1832cee..54f96100e7 100644
--- a/fieldservice_stage_server_action/views/fsm_stage.xml
+++ b/fieldservice_stage_server_action/views/fsm_stage.xml
@@ -1,13 +1,12 @@
 <odoo>
-
     <!-- Fieldservice Stage Form View-->
     <record id="fsm_server_action_stage_form_view" model="ir.ui.view">
         <field name="name">fsm.server.action.stage.form</field>
         <field name="model">fsm.stage</field>
-        <field name="inherit_id" ref="fieldservice.fsm_stage_form_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_stage_form_view" />
         <field name="arch" type="xml">
             <field name="sub_stage_id" position="after">
-                <field name="action_id"/>
+                <field name="action_id" />
             </field>
         </field>
     </record>

From bf3386b5c33c589c22e1f2690a64d28fae17cd2f Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 21 Jul 2020 00:47:15 -0400
Subject: [PATCH 014/631] [MIG] fieldservice_stage_server_action: Migration to
 13.0

---
 fieldservice_stage_server_action/__init__.py             | 2 +-
 fieldservice_stage_server_action/__manifest__.py         | 4 ++--
 fieldservice_stage_server_action/models/__init__.py      | 2 +-
 fieldservice_stage_server_action/models/fsm_stage.py     | 2 +-
 fieldservice_stage_server_action/readme/CONTRIBUTORS.rst | 2 ++
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fieldservice_stage_server_action/__init__.py b/fieldservice_stage_server_action/__init__.py
index b634044c7c..a0d2c6cd29 100644
--- a/fieldservice_stage_server_action/__init__.py
+++ b/fieldservice_stage_server_action/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators
+# Copyright (C) 2019, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
diff --git a/fieldservice_stage_server_action/__manifest__.py b/fieldservice_stage_server_action/__manifest__.py
index 6a66f14613..f36f9d946c 100644
--- a/fieldservice_stage_server_action/__manifest__.py
+++ b/fieldservice_stage_server_action/__manifest__.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019, Open Source Integrators
 # # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 {
     "name": "FSM Stage Server Action",
     "summary": "Execute server actions when reaching a Field Service stage",
-    "version": "12.0.1.0.0",
+    "version": "13.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/ursais/osi-addons",
diff --git a/fieldservice_stage_server_action/models/__init__.py b/fieldservice_stage_server_action/models/__init__.py
index 2f4caa0741..bf6468a89e 100644
--- a/fieldservice_stage_server_action/models/__init__.py
+++ b/fieldservice_stage_server_action/models/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators
+# Copyright (C) 2019, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import fsm_stage
diff --git a/fieldservice_stage_server_action/models/fsm_stage.py b/fieldservice_stage_server_action/models/fsm_stage.py
index 2b309dad07..6bc8f63fa0 100644
--- a/fieldservice_stage_server_action/models/fsm_stage.py
+++ b/fieldservice_stage_server_action/models/fsm_stage.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators
+# 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_stage_server_action/readme/CONTRIBUTORS.rst b/fieldservice_stage_server_action/readme/CONTRIBUTORS.rst
index f9cb0d612f..43c8618660 100644
--- a/fieldservice_stage_server_action/readme/CONTRIBUTORS.rst
+++ b/fieldservice_stage_server_action/readme/CONTRIBUTORS.rst
@@ -3,3 +3,5 @@
   * Wolfgang Hall <whall@opensourceintegrators.com>
   * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
   * Steve Campbell <scampbell@opensourceintegrators.com>
+
+* Brian McMaster <brian@mcmpest.com>

From 937582392e5bef84f7f27dda8804aa100bdb8cbf Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Thu, 15 Oct 2020 21:19:15 -0400
Subject: [PATCH 015/631] [IMP] fieldservice_stage_server_action: Remove
 dependency

---
 fieldservice_stage_server_action/__manifest__.py     | 2 +-
 fieldservice_stage_server_action/views/fsm_stage.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_stage_server_action/__manifest__.py b/fieldservice_stage_server_action/__manifest__.py
index f36f9d946c..3a8285af0f 100644
--- a/fieldservice_stage_server_action/__manifest__.py
+++ b/fieldservice_stage_server_action/__manifest__.py
@@ -7,7 +7,7 @@
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/ursais/osi-addons",
-    "depends": ["fieldservice", "fieldservice_substatus", "base_automation"],
+    "depends": ["fieldservice", "base_automation"],
     "data": [
         "data/ir_server_action.xml",
         "data/fsm_stage.xml",
diff --git a/fieldservice_stage_server_action/views/fsm_stage.xml b/fieldservice_stage_server_action/views/fsm_stage.xml
index 54f96100e7..4e5b1e5574 100644
--- a/fieldservice_stage_server_action/views/fsm_stage.xml
+++ b/fieldservice_stage_server_action/views/fsm_stage.xml
@@ -5,7 +5,7 @@
         <field name="model">fsm.stage</field>
         <field name="inherit_id" ref="fieldservice.fsm_stage_form_view" />
         <field name="arch" type="xml">
-            <field name="sub_stage_id" position="after">
+            <field name="sequence" position="after">
                 <field name="action_id" />
             </field>
         </field>

From 676872098fcab8c7ec5d93ce2a5b8b80ea0b39ad Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Sat, 28 Nov 2020 21:35:04 +0000
Subject: [PATCH 016/631] [UPD] Update fieldservice_stage_server_action.pot

---
 .../i18n/fieldservice_stage_server_action.pot              | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot b/fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot
index dd6a6f4a59..2cb6fdcca8 100644
--- a/fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot
+++ b/fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_stage_server_action
+# 	* fieldservice_stage_server_action
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.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"
@@ -38,4 +38,3 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__action_id
 msgid "Server Action"
 msgstr ""
-

From 0e8498f1c594c93bd147fb005ba742ebdbc34e59 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sat, 28 Nov 2020 21:41:24 +0000
Subject: [PATCH 017/631] [UPD] README.rst

---
 fieldservice_stage_server_action/README.rst   |   12 +-
 .../static/description/index.html             | 1106 +++++++----------
 2 files changed, 423 insertions(+), 695 deletions(-)

diff --git a/fieldservice_stage_server_action/README.rst b/fieldservice_stage_server_action/README.rst
index 7a66a7a54f..e54f396364 100644
--- a/fieldservice_stage_server_action/README.rst
+++ b/fieldservice_stage_server_action/README.rst
@@ -14,13 +14,13 @@ FSM Stage Server Action
     :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_stage_server_action
+    :target: https://github.com/OCA/field-service/tree/13.0/fieldservice_stage_server_action
     :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_stage_server_action
+    :target: https://translation.odoo-community.org/projects/field-service-13-0/field-service-13-0-fieldservice_stage_server_action
     :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/13.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -54,7 +54,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_stage_server_action%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_stage_server_action%0Aversion:%2013.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.
 
@@ -75,6 +75,8 @@ Contributors
   * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
   * Steve Campbell <scampbell@opensourceintegrators.com>
 
+* Brian McMaster <brian@mcmpest.com>
+
 Maintainers
 ~~~~~~~~~~~
 
@@ -102,6 +104,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-wolfhall| |maintainer-max3903| |maintainer-osi-scampbell| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_stage_server_action>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/13.0/fieldservice_stage_server_action>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_stage_server_action/static/description/index.html b/fieldservice_stage_server_action/static/description/index.html
index 144349b9f6..1088c41c2b 100644
--- a/fieldservice_stage_server_action/static/description/index.html
+++ b/fieldservice_stage_server_action/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>FSM Stage Server Action</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>FSM Stage Server Action</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,588 +99,349 @@
   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="fsm-stage-server-action">
-      <h1 class="title">FSM Stage Server Action</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="fsm-stage-server-action">
+<h1 class="title">FSM Stage Server Action</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_stage_server_action"
-          ><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_stage_server_action"
-          ><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>
-        This module allows you to execute server actions when a FSM orders enters a
-        specific stage.
-      </p>
-      <p><strong>Table of contents</strong></p>
-      <div class="contents local topic" id="contents">
-        <ul class="simple">
-          <li>
-            <a class="reference internal" href="#configuration" id="id1"
-              >Configuration</a
-            >
-          </li>
-          <li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
-          <li>
-            <a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a>
-          </li>
-          <li>
-            <a class="reference internal" href="#credits" id="id4">Credits</a>
-            <ul>
-              <li>
-                <a class="reference internal" href="#authors" id="id5">Authors</a>
-              </li>
-              <li>
-                <a class="reference internal" href="#contributors" id="id6"
-                  >Contributors</a
-                >
-              </li>
-              <li>
-                <a class="reference internal" href="#maintainers" id="id7"
-                  >Maintainers</a
-                >
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-      <div class="section" id="configuration">
-        <h1><a class="toc-backref" href="#id1">Configuration</a></h1>
-        <ul class="simple">
-          <li>Go to Field Service &gt; Configuration &gt; Stages</li>
-          <li>Create or select a stage</li>
-          <li>Select or create a server action</li>
-        </ul>
-      </div>
-      <div class="section" id="usage">
-        <h1><a class="toc-backref" href="#id2">Usage</a></h1>
-        <ul class="simple">
-          <li>Go to Field Service</li>
-          <li>Select or create a FSM orders</li>
-          <li>
-            Move it to the stage configured before to trigger the execution of the
-            server action
-          </li>
-        </ul>
-      </div>
-      <div class="section" id="bug-tracker">
-        <h1><a class="toc-backref" href="#id3">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_stage_server_action%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="#id4">Credits</a></h1>
-        <div class="section" id="authors">
-          <h2><a class="toc-backref" href="#id5">Authors</a></h2>
-          <ul class="simple">
-            <li>Open Source Integrators</li>
-          </ul>
-        </div>
-        <div class="section" id="contributors">
-          <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
-          <ul class="simple">
-            <li>
-              Open Source Integrators &lt;<a
-                class="reference external"
-                href="https://www.opensourceintegrators.com"
-                >https://www.opensourceintegrators.com</a
-              >&gt;
-              <ul>
-                <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>
-              </ul>
-            </li>
-          </ul>
-        </div>
-        <div class="section" id="maintainers">
-          <h2><a class="toc-backref" href="#id7">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/osi-scampbell"
-              ><img
-                alt="osi-scampbell"
-                src="https://github.com/osi-scampbell.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_stage_server_action"
-              >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/13.0/fieldservice_stage_server_action"><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-13-0/field-service-13-0-fieldservice_stage_server_action"><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/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module allows you to execute server actions when a FSM orders enters a
+specific stage.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<ul class="simple">
+<li>Go to Field Service &gt; Configuration &gt; Stages</li>
+<li>Create or select a stage</li>
+<li>Select or create a server action</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<ul class="simple">
+<li>Go to Field Service</li>
+<li>Select or create a FSM orders</li>
+<li>Move it to the stage configured before to trigger the execution of the
+server action</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id3">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_stage_server_action%0Aversion:%2013.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="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators &lt;<a class="reference external" href="https://www.opensourceintegrators.com">https://www.opensourceintegrators.com</a>&gt;<ul>
+<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>
+</ul>
+</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="maintainers">
+<h2><a class="toc-backref" href="#id7">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/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/13.0/fieldservice_stage_server_action">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 5e11a21397022fe6e81db3ef8b9ee1392480b822 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Mon, 19 Apr 2021 17:05:51 +0530
Subject: [PATCH 018/631] [14.0][MIG]fieldservice_stage_server_action

---
 fieldservice_stage_server_action/README.rst           | 11 ++++++-----
 fieldservice_stage_server_action/__manifest__.py      |  4 ++--
 .../readme/CONTRIBUTORS.rst                           |  1 +
 .../static/description/index.html                     |  9 +++++----
 .../odoo/addons/fieldservice_stage_server_action      |  1 +
 setup/fieldservice_stage_server_action/setup.py       |  6 ++++++
 6 files changed, 21 insertions(+), 11 deletions(-)
 create mode 120000 setup/fieldservice_stage_server_action/odoo/addons/fieldservice_stage_server_action
 create mode 100644 setup/fieldservice_stage_server_action/setup.py

diff --git a/fieldservice_stage_server_action/README.rst b/fieldservice_stage_server_action/README.rst
index e54f396364..9467285b0a 100644
--- a/fieldservice_stage_server_action/README.rst
+++ b/fieldservice_stage_server_action/README.rst
@@ -14,13 +14,13 @@ FSM Stage Server Action
     :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/13.0/fieldservice_stage_server_action
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_stage_server_action
     :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-13-0/field-service-13-0-fieldservice_stage_server_action
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_stage_server_action
     :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/13.0
+    :target: https://runbot.odoo-community.org/runbot/264/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -54,7 +54,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_stage_server_action%0Aversion:%2013.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_stage_server_action%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.
 
@@ -74,6 +74,7 @@ Contributors
   * Wolfgang Hall <whall@opensourceintegrators.com>
   * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
   * Steve Campbell <scampbell@opensourceintegrators.com>
+  * Mohammad Khalid <mkhalid@opensourceintegrators.com>
 
 * Brian McMaster <brian@mcmpest.com>
 
@@ -104,6 +105,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-wolfhall| |maintainer-max3903| |maintainer-osi-scampbell| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/13.0/fieldservice_stage_server_action>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_stage_server_action>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_stage_server_action/__manifest__.py b/fieldservice_stage_server_action/__manifest__.py
index 3a8285af0f..f65d8a4420 100644
--- a/fieldservice_stage_server_action/__manifest__.py
+++ b/fieldservice_stage_server_action/__manifest__.py
@@ -3,10 +3,10 @@
 {
     "name": "FSM Stage Server Action",
     "summary": "Execute server actions when reaching a Field Service stage",
-    "version": "13.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
-    "website": "https://github.com/ursais/osi-addons",
+    "website": "https://github.com/OCA/field-service",
     "depends": ["fieldservice", "base_automation"],
     "data": [
         "data/ir_server_action.xml",
diff --git a/fieldservice_stage_server_action/readme/CONTRIBUTORS.rst b/fieldservice_stage_server_action/readme/CONTRIBUTORS.rst
index 43c8618660..a60b9eba43 100644
--- a/fieldservice_stage_server_action/readme/CONTRIBUTORS.rst
+++ b/fieldservice_stage_server_action/readme/CONTRIBUTORS.rst
@@ -3,5 +3,6 @@
   * Wolfgang Hall <whall@opensourceintegrators.com>
   * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
   * Steve Campbell <scampbell@opensourceintegrators.com>
+  * Mohammad Khalid <mkhalid@opensourceintegrators.com>
 
 * Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_stage_server_action/static/description/index.html b/fieldservice_stage_server_action/static/description/index.html
index 1088c41c2b..1064aa5ebd 100644
--- a/fieldservice_stage_server_action/static/description/index.html
+++ b/fieldservice_stage_server_action/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>FSM Stage Server Action</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">FSM Stage Server Action</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/13.0/fieldservice_stage_server_action"><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-13-0/field-service-13-0-fieldservice_stage_server_action"><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/13.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/14.0/fieldservice_stage_server_action"><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_stage_server_action"><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>This module allows you to execute server actions when a FSM orders enters a
 specific stage.</p>
 <p><strong>Table of contents</strong></p>
@@ -406,7 +406,7 @@ <h1><a class="toc-backref" href="#id3">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_stage_server_action%0Aversion:%2013.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_stage_server_action%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">
@@ -424,6 +424,7 @@ <h2><a class="toc-backref" href="#id6">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>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>Mohammad Khalid &lt;<a class="reference external" href="mailto:mkhalid&#64;opensourceintegrators.com">mkhalid&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </li>
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
@@ -438,7 +439,7 @@ <h2><a class="toc-backref" href="#id7">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/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/13.0/fieldservice_stage_server_action">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/14.0/fieldservice_stage_server_action">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/setup/fieldservice_stage_server_action/odoo/addons/fieldservice_stage_server_action b/setup/fieldservice_stage_server_action/odoo/addons/fieldservice_stage_server_action
new file mode 120000
index 0000000000..ccceeaad53
--- /dev/null
+++ b/setup/fieldservice_stage_server_action/odoo/addons/fieldservice_stage_server_action
@@ -0,0 +1 @@
+../../../../fieldservice_stage_server_action
\ No newline at end of file
diff --git a/setup/fieldservice_stage_server_action/setup.py b/setup/fieldservice_stage_server_action/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_stage_server_action/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 96ec1edb5bf58032a00c823d9f74549b0cc43f34 Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@ursainfosystems.com>
Date: Tue, 11 Dec 2018 13:10:34 +0530
Subject: [PATCH 019/631] [11.0][ADD] fieldservice_agreement module

[UPD] README.rst
---
 fieldservice_agreement/README.rst             | 109 +++++
 fieldservice_agreement/__init__.py            |   4 +
 fieldservice_agreement/__manifest__.py        |  24 +
 fieldservice_agreement/models/__init__.py     |   4 +
 fieldservice_agreement/models/agreement.py    |  38 ++
 fieldservice_agreement/models/fsm_order.py    |  12 +
 fieldservice_agreement/readme/CONFIGURE.rst   |   0
 .../readme/CONTRIBUTORS.rst                   |   1 +
 fieldservice_agreement/readme/CREDITS.rst     |   3 +
 fieldservice_agreement/readme/DESCRIPTION.rst |   7 +
 fieldservice_agreement/readme/ROADMAP.rst     |   0
 fieldservice_agreement/readme/USAGE.rst       |   8 +
 .../static/description/icon.png               | Bin 0 -> 9455 bytes
 .../static/description/index.html             | 447 ++++++++++++++++++
 .../views/agreement_view.xml                  |  19 +
 .../views/fsm_order_view.xml                  |  17 +
 16 files changed, 693 insertions(+)
 create mode 100644 fieldservice_agreement/README.rst
 create mode 100644 fieldservice_agreement/__init__.py
 create mode 100644 fieldservice_agreement/__manifest__.py
 create mode 100644 fieldservice_agreement/models/__init__.py
 create mode 100644 fieldservice_agreement/models/agreement.py
 create mode 100644 fieldservice_agreement/models/fsm_order.py
 create mode 100644 fieldservice_agreement/readme/CONFIGURE.rst
 create mode 100644 fieldservice_agreement/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_agreement/readme/CREDITS.rst
 create mode 100644 fieldservice_agreement/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_agreement/readme/ROADMAP.rst
 create mode 100644 fieldservice_agreement/readme/USAGE.rst
 create mode 100644 fieldservice_agreement/static/description/icon.png
 create mode 100644 fieldservice_agreement/static/description/index.html
 create mode 100644 fieldservice_agreement/views/agreement_view.xml
 create mode 100644 fieldservice_agreement/views/fsm_order_view.xml

diff --git a/fieldservice_agreement/README.rst b/fieldservice_agreement/README.rst
new file mode 100644
index 0000000000..1c1acd5c5d
--- /dev/null
+++ b/fieldservice_agreement/README.rst
@@ -0,0 +1,109 @@
+==============
+FSM Agreements
+==============
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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_agreement
+    :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_agreement
+    :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| 
+
+Odoo Agreement App does not provide an easy way to access field service orders
+related to an agreement. Some organizations needs to have a quick access to
+field service orders to track the performance of an agreement.
+
+This module allows you to link a field service order to an agreement and adds a
+smart button on the agreement to look at the list of related field service
+orders.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+To use this module:
+
+* Go to Field Service > Operations > Orders
+* Select or create a field service order and set the agreement
+* Go to Agreement > Agreements
+* Open the previous agreement
+* Click on the smart button "Service Orders" to see the list of related field
+  service orders
+
+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_agreement%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
+~~~~~~~~~~~~
+
+* Bhavesh Odedra <bodedra@opensourceintegrators.com>
+
+Other credits
+~~~~~~~~~~~~~
+
+The development of this module has been financially supported by:
+
+* Open Source Integrators
+
+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-max3903| image:: https://github.com/max3903.png?size=40px
+    :target: https://github.com/max3903
+    :alt: max3903
+.. |maintainer-bodedra| image:: https://github.com/bodedra.png?size=40px
+    :target: https://github.com/bodedra
+    :alt: bodedra
+
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-max3903| |maintainer-bodedra| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_agreement>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_agreement/__init__.py b/fieldservice_agreement/__init__.py
new file mode 100644
index 0000000000..631bd4893a
--- /dev/null
+++ b/fieldservice_agreement/__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_agreement/__manifest__.py b/fieldservice_agreement/__manifest__.py
new file mode 100644
index 0000000000..9ff2a7c0e7
--- /dev/null
+++ b/fieldservice_agreement/__manifest__.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "FSM Agreements",
+    "summary": "Manage FSM Agreements",
+    "author": "Open Source Integrators, "
+              "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "category": "Field Service",
+    "license": "AGPL-3",
+    "version": "11.0.1.0.0",
+    "depends": [
+        "fieldservice",
+        "agreement",
+    ],
+    "data": [
+        "views/agreement_view.xml",
+        "views/fsm_order_view.xml",
+    ],
+    "application": True,
+    "development_status": "Beta",
+    "maintainers": ["max3903", "bodedra"],
+}
diff --git a/fieldservice_agreement/models/__init__.py b/fieldservice_agreement/models/__init__.py
new file mode 100644
index 0000000000..a8787cb0a8
--- /dev/null
+++ b/fieldservice_agreement/models/__init__.py
@@ -0,0 +1,4 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import fsm_order
+from . import agreement
diff --git a/fieldservice_agreement/models/agreement.py b/fieldservice_agreement/models/agreement.py
new file mode 100644
index 0000000000..2cbd621673
--- /dev/null
+++ b/fieldservice_agreement/models/agreement.py
@@ -0,0 +1,38 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models, api
+
+
+class Agreement(models.Model):
+    _inherit = 'agreement'
+
+    service_order_count = fields.Integer(
+        compute='_compute_service_order_count',
+        string='# Service Orders'
+    )
+
+    @api.multi
+    def _compute_service_order_count(self):
+        for agreement in self:
+            res = self.env['fsm.order'].search_count(
+                [('agreement_id', '=', agreement.id)])
+            agreement.service_order_count = res or 0
+
+    @api.multi
+    def action_view_service_order(self):
+        for agreement in self:
+            fsm_order_ids = self.env['fsm.order'].search(
+                [('agreement_id', '=', agreement.id)])
+            action = self.env.ref(
+                'fieldservice.action_fsm_operation_order').read()[0]
+            if len(fsm_order_ids) > 1:
+                action['domain'] = [('id', 'in', fsm_order_ids.ids)]
+            elif len(fsm_order_ids) == 1:
+                action['views'] = [(
+                    self.env.ref('fieldservice.fsm_order_form').id,
+                    'form')]
+                action['res_id'] = fsm_order_ids.ids[0]
+            else:
+                action = {'type': 'ir.actions.act_window_close'}
+            return action
diff --git a/fieldservice_agreement/models/fsm_order.py b/fieldservice_agreement/models/fsm_order.py
new file mode 100644
index 0000000000..88c923cd1b
--- /dev/null
+++ b/fieldservice_agreement/models/fsm_order.py
@@ -0,0 +1,12 @@
+# 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 FSMOrder(geo_model.GeoModel):
+    _inherit = 'fsm.order'
+
+    agreement_id = fields.Many2one('agreement', string='Agreement')
diff --git a/fieldservice_agreement/readme/CONFIGURE.rst b/fieldservice_agreement/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/fieldservice_agreement/readme/CONTRIBUTORS.rst b/fieldservice_agreement/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..567f85bd69
--- /dev/null
+++ b/fieldservice_agreement/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Bhavesh Odedra <bodedra@opensourceintegrators.com>
diff --git a/fieldservice_agreement/readme/CREDITS.rst b/fieldservice_agreement/readme/CREDITS.rst
new file mode 100644
index 0000000000..8209266d99
--- /dev/null
+++ b/fieldservice_agreement/readme/CREDITS.rst
@@ -0,0 +1,3 @@
+The development of this module has been financially supported by:
+
+* Open Source Integrators
diff --git a/fieldservice_agreement/readme/DESCRIPTION.rst b/fieldservice_agreement/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..715fea45c6
--- /dev/null
+++ b/fieldservice_agreement/readme/DESCRIPTION.rst
@@ -0,0 +1,7 @@
+Odoo Agreement App does not provide an easy way to access field service orders
+related to an agreement. Some organizations needs to have a quick access to
+field service orders to track the performance of an agreement.
+
+This module allows you to link a field service order to an agreement and adds a
+smart button on the agreement to look at the list of related field service
+orders.
diff --git a/fieldservice_agreement/readme/ROADMAP.rst b/fieldservice_agreement/readme/ROADMAP.rst
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/fieldservice_agreement/readme/USAGE.rst b/fieldservice_agreement/readme/USAGE.rst
new file mode 100644
index 0000000000..66cebd33d1
--- /dev/null
+++ b/fieldservice_agreement/readme/USAGE.rst
@@ -0,0 +1,8 @@
+To use this module:
+
+* Go to Field Service > Operations > Orders
+* Select or create a field service order and set the agreement
+* Go to Agreement > Agreements
+* Open the previous agreement
+* Click on the smart button "Service Orders" to see the list of related field
+  service orders
diff --git a/fieldservice_agreement/static/description/icon.png b/fieldservice_agreement/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
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
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001

diff --git a/fieldservice_agreement/static/description/index.html b/fieldservice_agreement/static/description/index.html
new file mode 100644
index 0000000000..5da62f8b38
--- /dev/null
+++ b/fieldservice_agreement/static/description/index.html
@@ -0,0 +1,447 @@
+<?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>FSM Agreements</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="fsm-agreements">
+<h1 class="title">FSM Agreements</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_agreement"><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_agreement"><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>Odoo Agreement App does not provide an easy way to access field service orders
+related to an agreement. Some organizations needs to have a quick access to
+field service orders to track the performance of an agreement.</p>
+<p>This module allows you to link a field service order to an agreement and adds a
+smart button on the agreement to look at the list of related 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="#usage" id="id1">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id6">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id1">Usage</a></h1>
+<p>To use this module:</p>
+<ul class="simple">
+<li>Go to Field Service &gt; Operations &gt; Orders</li>
+<li>Select or create a field service order and set the agreement</li>
+<li>Go to Agreement &gt; Agreements</li>
+<li>Open the previous agreement</li>
+<li>Click on the smart button “Service Orders” to see the list of related field
+service orders</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id2">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_agreement%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="#id3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id4">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
+<ul class="simple">
+<li>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id6">Other credits</a></h2>
+<p>The development of this module has been financially supported by:</p>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id7">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/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/bodedra"><img alt="bodedra" src="https://github.com/bodedra.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_agreement">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_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
new file mode 100644
index 0000000000..5ae94d69f0
--- /dev/null
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<odoo>
+    <!-- Copyright 2018 Open Source Integrators
+         License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+
+    <!-- Agreement Form View -->
+	<record id="agreement_fsm_order_form_view" model="ir.ui.view">
+        <field name="name">agreement.form.fsm.order.view</field>
+        <field name="model">agreement</field>
+        <field name="inherit_id" ref="agreement.partner_agreement_form_view"/>
+        <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <button name="action_view_service_order" type="object" class="oe_stat_button" icon="fa-pencil-square-o" attrs="{'invisible': [('service_order_count', '=', 0)]}">
+                    <field name="service_order_count" widget="statinfo" string="Service Orders"/>
+                </button>
+            </div>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
new file mode 100644
index 0000000000..b6fe7d95a2
--- /dev/null
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<odoo>
+    <!-- Copyright 2018 Open Source Integrators
+         License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+
+    <!-- Fields Service Orders Form View -->
+	<record id="fsm_order_agreement_form" model="ir.ui.view">
+        <field name="name">fsm.order.agreement.form</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
+        <field name="arch" type="xml">
+            <field name="fsm_location_id" position="after">
+                <field name="agreement_id"/>
+            </field>
+        </field>
+    </record>
+</odoo>

From 70c975bb96ded53d4001816ae907422454dee5e1 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 13 Dec 2018 12:37:10 -0600
Subject: [PATCH 020/631] [IMP] Various improvements

---
 fieldservice_agreement/__manifest__.py        |   8 +++++---
 .../static/description/icon.png               | Bin 9455 -> 17808 bytes
 .../views/fsm_order_view.xml                  |   2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fieldservice_agreement/__manifest__.py b/fieldservice_agreement/__manifest__.py
index 9ff2a7c0e7..31c919f483 100644
--- a/fieldservice_agreement/__manifest__.py
+++ b/fieldservice_agreement/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    "name": "FSM Agreements",
+    "name": "Field Service - Agreements",
     "summary": "Manage FSM Agreements",
     "author": "Open Source Integrators, "
               "Odoo Community Association (OCA)",
@@ -18,7 +18,9 @@
         "views/agreement_view.xml",
         "views/fsm_order_view.xml",
     ],
-    "application": True,
     "development_status": "Beta",
-    "maintainers": ["max3903", "bodedra"],
+    "maintainers": [
+        "max3903",
+        "bodedra",
+    ],
 }
diff --git a/fieldservice_agreement/static/description/icon.png b/fieldservice_agreement/static/description/icon.png
index 3a0328b516c4980e8e44cdb63fd945757ddd132d..955674d8f0b8c47de3ffa9db25cb109fbe4a1091 100644
GIT binary patch
literal 17808
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

literal 9455
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
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index b6fe7d95a2..15ec36a8de 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -9,7 +9,7 @@
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
-            <field name="fsm_location_id" position="after">
+            <field name="location_id" position="after">
                 <field name="agreement_id"/>
             </field>
         </field>

From 023c1be6b0f8d31a4cda973052924a2072118ed1 Mon Sep 17 00:00:00 2001
From: osi-scampbell <scampbell@ursainfosystem.com>
Date: Tue, 4 Dec 2018 14:51:49 -0700
Subject: [PATCH 021/631] [ADD] fieldservice_skill

[UPD] README.rst
---
 fieldservice_agreement/README.rst                    | 6 +++---
 fieldservice_agreement/static/description/index.html | 6 +++---
 fieldservice_agreement/views/agreement_view.xml      | 3 ++-
 fieldservice_agreement/views/fsm_order_view.xml      | 3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/fieldservice_agreement/README.rst b/fieldservice_agreement/README.rst
index 1c1acd5c5d..e11cd580b9 100644
--- a/fieldservice_agreement/README.rst
+++ b/fieldservice_agreement/README.rst
@@ -1,6 +1,6 @@
-==============
-FSM Agreements
-==============
+==========================
+Field Service - Agreements
+==========================
 
 .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
diff --git a/fieldservice_agreement/static/description/index.html b/fieldservice_agreement/static/description/index.html
index 5da62f8b38..43f04c8751 100644
--- a/fieldservice_agreement/static/description/index.html
+++ b/fieldservice_agreement/static/description/index.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
-<title>FSM Agreements</title>
+<title>Field Service - Agreements</title>
 <style type="text/css">
 
 /*
@@ -360,8 +360,8 @@
 </style>
 </head>
 <body>
-<div class="document" id="fsm-agreements">
-<h1 class="title">FSM Agreements</h1>
+<div class="document" id="field-service-agreements">
+<h1 class="title">Field Service - Agreements</h1>
 
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
diff --git a/fieldservice_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index 5ae94d69f0..eaa5b7c3c4 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -4,7 +4,7 @@
          License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 
     <!-- Agreement Form View -->
-	<record id="agreement_fsm_order_form_view" model="ir.ui.view">
+    <record id="agreement_fsm_order_form_view" model="ir.ui.view">
         <field name="name">agreement.form.fsm.order.view</field>
         <field name="model">agreement</field>
         <field name="inherit_id" ref="agreement.partner_agreement_form_view"/>
@@ -16,4 +16,5 @@
             </div>
         </field>
     </record>
+
 </odoo>
diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index 15ec36a8de..566474759d 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -4,7 +4,7 @@
          License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 
     <!-- Fields Service Orders Form View -->
-	<record id="fsm_order_agreement_form" model="ir.ui.view">
+    <record id="fsm_order_agreement_form" model="ir.ui.view">
         <field name="name">fsm.order.agreement.form</field>
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
@@ -14,4 +14,5 @@
             </field>
         </field>
     </record>
+
 </odoo>

From 50b40a33de5e27c34dda2038c463e56a5736b9c1 Mon Sep 17 00:00:00 2001
From: Sandip Mangukiya <smangukiya@ursainfosystems.com>
Date: Thu, 27 Dec 2018 20:22:51 +0530
Subject: [PATCH 022/631] 11.0 imp fieldservice_agreement (#76)

* [IMP] fieldservice_agreement

[UPD] README.rst
---
 fieldservice_agreement/README.rst                 |  9 ++++++---
 fieldservice_agreement/__manifest__.py            |  1 +
 fieldservice_agreement/models/fsm_order.py        |  2 ++
 fieldservice_agreement/readme/CONTRIBUTORS.rst    |  1 +
 fieldservice_agreement/readme/USAGE.rst           |  3 +--
 .../static/description/index.html                 |  6 +++---
 fieldservice_agreement/views/agreement_view.xml   |  7 +++++--
 fieldservice_agreement/views/fsm_order_view.xml   | 15 +++++++++++++++
 8 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/fieldservice_agreement/README.rst b/fieldservice_agreement/README.rst
index e11cd580b9..07e81e061c 100644
--- a/fieldservice_agreement/README.rst
+++ b/fieldservice_agreement/README.rst
@@ -47,8 +47,7 @@ To use this module:
 * Select or create a field service order and set the agreement
 * Go to Agreement > Agreements
 * Open the previous agreement
-* Click on the smart button "Service Orders" to see the list of related field
-  service orders
+* Click on the smart button "Service Orders" to see the list of related field service orders
 
 Bug Tracker
 ===========
@@ -72,6 +71,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
+* Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -99,10 +99,13 @@ promote its widespread use.
 .. |maintainer-bodedra| image:: https://github.com/bodedra.png?size=40px
     :target: https://github.com/bodedra
     :alt: bodedra
+.. |maintainer-smangukiya| image:: https://github.com/smangukiya.png?size=40px
+    :target: https://github.com/smangukiya
+    :alt: smangukiya
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-max3903| |maintainer-bodedra| 
+|maintainer-max3903| |maintainer-bodedra| |maintainer-smangukiya| 
 
 This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_agreement>`_ project on GitHub.
 
diff --git a/fieldservice_agreement/__manifest__.py b/fieldservice_agreement/__manifest__.py
index 31c919f483..7ec7aa3d22 100644
--- a/fieldservice_agreement/__manifest__.py
+++ b/fieldservice_agreement/__manifest__.py
@@ -22,5 +22,6 @@
     "maintainers": [
         "max3903",
         "bodedra",
+        "smangukiya",
     ],
 }
diff --git a/fieldservice_agreement/models/fsm_order.py b/fieldservice_agreement/models/fsm_order.py
index 88c923cd1b..a0013547fb 100644
--- a/fieldservice_agreement/models/fsm_order.py
+++ b/fieldservice_agreement/models/fsm_order.py
@@ -10,3 +10,5 @@ class FSMOrder(geo_model.GeoModel):
     _inherit = 'fsm.order'
 
     agreement_id = fields.Many2one('agreement', string='Agreement')
+    serviceprofile_id = fields.Many2one('agreement.serviceprofile',
+                                        'Service Profile')
diff --git a/fieldservice_agreement/readme/CONTRIBUTORS.rst b/fieldservice_agreement/readme/CONTRIBUTORS.rst
index 567f85bd69..c59d5bd42c 100644
--- a/fieldservice_agreement/readme/CONTRIBUTORS.rst
+++ b/fieldservice_agreement/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
+* Sandip Mangukiya <smangukiya@opensourceintegrators.com>
diff --git a/fieldservice_agreement/readme/USAGE.rst b/fieldservice_agreement/readme/USAGE.rst
index 66cebd33d1..13f061ff60 100644
--- a/fieldservice_agreement/readme/USAGE.rst
+++ b/fieldservice_agreement/readme/USAGE.rst
@@ -4,5 +4,4 @@ To use this module:
 * Select or create a field service order and set the agreement
 * Go to Agreement > Agreements
 * Open the previous agreement
-* Click on the smart button "Service Orders" to see the list of related field
-  service orders
+* Click on the smart button "Service Orders" to see the list of related field service orders
diff --git a/fieldservice_agreement/static/description/index.html b/fieldservice_agreement/static/description/index.html
index 43f04c8751..d867d6160d 100644
--- a/fieldservice_agreement/static/description/index.html
+++ b/fieldservice_agreement/static/description/index.html
@@ -396,8 +396,7 @@ <h1><a class="toc-backref" href="#id1">Usage</a></h1>
 <li>Select or create a field service order and set the agreement</li>
 <li>Go to Agreement &gt; Agreements</li>
 <li>Open the previous agreement</li>
-<li>Click on the smart button “Service Orders” to see the list of related field
-service orders</li>
+<li>Click on the smart button “Service Orders” to see the list of related field service orders</li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
@@ -420,6 +419,7 @@ <h2><a class="toc-backref" href="#id4">Authors</a></h2>
 <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 <ul class="simple">
 <li>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -437,7 +437,7 @@ <h2><a class="toc-backref" href="#id7">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>
-<p><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/bodedra"><img alt="bodedra" src="https://github.com/bodedra.png?size=40px" /></a></p>
+<p><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/bodedra"><img alt="bodedra" src="https://github.com/bodedra.png?size=40px" /></a> <a class="reference external" href="https://github.com/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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_agreement">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>
diff --git a/fieldservice_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index eaa5b7c3c4..c8842d4368 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -10,8 +10,11 @@
         <field name="inherit_id" ref="agreement.partner_agreement_form_view"/>
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
-                <button name="action_view_service_order" type="object" class="oe_stat_button" icon="fa-pencil-square-o" attrs="{'invisible': [('service_order_count', '=', 0)]}">
-                    <field name="service_order_count" widget="statinfo" string="Service Orders"/>
+                <button name="action_view_service_order" type="object"
+                        class="oe_stat_button" icon="fa-pencil-square-o"
+                        attrs="{'invisible': [('service_order_count', '=', 0)]}">
+                    <field name="service_order_count" widget="statinfo"
+                           string="Service Orders"/>
                 </button>
             </div>
         </field>
diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index 566474759d..c103b5ab16 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -11,8 +11,23 @@
         <field name="arch" type="xml">
             <field name="location_id" position="after">
                 <field name="agreement_id"/>
+                <field name="serviceprofile_id"
+                       domain="[('agreement_id', '=', agreement_id)]"/>
             </field>
         </field>
     </record>
 
+    <!-- Inherit fsm.order search view-->
+    <record id="search_fsm_order_filter_agreement" model="ir.ui.view">
+        <field name="name">fsm.order.select.agreement</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_search_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group" position="inside">
+                <filter string="Service Profile" domain="[]"
+                        context="{'group_by':'serviceprofile_id'}"/>
+            </xpath>
+        </field>
+    </record>
+
 </odoo>

From 1e2e51e817b1c33326f564ff751c9bdbeb0cc276 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 27 Dec 2018 17:12:29 -0600
Subject: [PATCH 023/631] [IMP] Icon

---
 fieldservice_agreement/views/agreement_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fieldservice_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index c8842d4368..973956b574 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 <odoo>
-    <!-- Copyright 2018 Open Source Integrators
-         License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 
     <!-- Agreement Form View -->
     <record id="agreement_fsm_order_form_view" model="ir.ui.view">
@@ -11,7 +9,7 @@
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
                 <button name="action_view_service_order" type="object"
-                        class="oe_stat_button" icon="fa-pencil-square-o"
+                        class="oe_stat_button" icon="fa-map"
                         attrs="{'invisible': [('service_order_count', '=', 0)]}">
                     <field name="service_order_count" widget="statinfo"
                            string="Service Orders"/>

From e8354cfd46028bfab9b19b9fbffa34393657d5cc Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 3 Jan 2019 14:36:50 -0600
Subject: [PATCH 024/631] [IMP] Show stat and improve filter

---
 fieldservice_agreement/views/agreement_view.xml | 3 +--
 fieldservice_agreement/views/fsm_order_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/fieldservice_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index 973956b574..01b8210b3e 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -9,8 +9,7 @@
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
                 <button name="action_view_service_order" type="object"
-                        class="oe_stat_button" icon="fa-map"
-                        attrs="{'invisible': [('service_order_count', '=', 0)]}">
+                        class="oe_stat_button" icon="fa-map">
                     <field name="service_order_count" widget="statinfo"
                            string="Service Orders"/>
                 </button>
diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index c103b5ab16..e948512ac6 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -9,11 +9,11 @@
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
-            <field name="location_id" position="after">
+            <xpath expr="//group[@id='others-left']" position="inside">
                 <field name="agreement_id"/>
                 <field name="serviceprofile_id"
                        domain="[('agreement_id', '=', agreement_id)]"/>
-            </field>
+            </xpath>
         </field>
     </record>
 

From cde2edbf60db647bfd3c3fce690750cc39d1e128 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 3 Jan 2019 17:37:46 -0600
Subject: [PATCH 025/631] [IMP] Filtering

---
 fieldservice_agreement/views/fsm_order_view.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index e948512ac6..f6cd16558c 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 <odoo>
-    <!-- Copyright 2018 Open Source Integrators
-         License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 
     <!-- Fields Service Orders Form View -->
     <record id="fsm_order_agreement_form" model="ir.ui.view">
@@ -10,7 +8,8 @@
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
             <xpath expr="//group[@id='others-left']" position="inside">
-                <field name="agreement_id"/>
+                <field name="agreement_id"
+                       domain="[('partner_id', '=', customer_id)]"/>
                 <field name="serviceprofile_id"
                        domain="[('agreement_id', '=', agreement_id)]"/>
             </xpath>
@@ -25,7 +24,7 @@
         <field name="arch" type="xml">
             <xpath expr="//group" position="inside">
                 <filter string="Service Profile" domain="[]"
-                        context="{'group_by':'serviceprofile_id'}"/>
+                        context="{'group_by': 'serviceprofile_id'}"/>
             </xpath>
         </field>
     </record>

From bf42e5bebd93b8dc56ee267ea64a7ea2cfd8fc7b Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 31 Jan 2019 17:17:54 -0600
Subject: [PATCH 026/631] [IMP] fieldservice_agreement

---
 fieldservice_agreement/views/fsm_order_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index f6cd16558c..60f94a8314 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -7,12 +7,12 @@
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@id='others-left']" position="inside">
+            <field name="location_id" position="after">
                 <field name="agreement_id"
                        domain="[('partner_id', '=', customer_id)]"/>
                 <field name="serviceprofile_id"
                        domain="[('agreement_id', '=', agreement_id)]"/>
-            </xpath>
+            </field>
         </field>
     </record>
 

From 6fe98033be1230830836585b71796a6809e77e31 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 8 Feb 2019 00:10:04 -0600
Subject: [PATCH 027/631] [ADD] Merge fieldservice_equipment_agreement

---
 fieldservice_agreement/__manifest__.py        | 39 ++++++++--------
 fieldservice_agreement/models/__init__.py     |  7 ++-
 fieldservice_agreement/models/agreement.py    | 33 +++++++++++++-
 .../models/fsm_equipment.py                   | 12 +++++
 .../views/agreement_view.xml                  | 34 ++++++++++++--
 .../views/fsm_equipment_view.xml              | 45 +++++++++++++++++++
 6 files changed, 145 insertions(+), 25 deletions(-)
 create mode 100644 fieldservice_agreement/models/fsm_equipment.py
 create mode 100644 fieldservice_agreement/views/fsm_equipment_view.xml

diff --git a/fieldservice_agreement/__manifest__.py b/fieldservice_agreement/__manifest__.py
index 7ec7aa3d22..538e914a0b 100644
--- a/fieldservice_agreement/__manifest__.py
+++ b/fieldservice_agreement/__manifest__.py
@@ -2,26 +2,27 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    "name": "Field Service - Agreements",
-    "summary": "Manage FSM Agreements",
-    "author": "Open Source Integrators, "
-              "Odoo Community Association (OCA)",
-    "website": "https://github.com/OCA/field-service",
-    "category": "Field Service",
-    "license": "AGPL-3",
-    "version": "11.0.1.0.0",
-    "depends": [
-        "fieldservice",
-        "agreement",
+    'name': 'Field Service - Agreements',
+    'summary': 'Manage FSM Agreements',
+    'author': 'Open Source Integrators, '
+              'Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'category': 'Field Service',
+    'license': 'AGPL-3',
+    'version': '11.0.1.0.0',
+    'depends': [
+        'fieldservice',
+        'agreement',
     ],
-    "data": [
-        "views/agreement_view.xml",
-        "views/fsm_order_view.xml",
+    'data': [
+        'views/fsm_order_view.xml',
+        'views/fsm_equipment_view.xml',
+        'views/agreement_view.xml',
     ],
-    "development_status": "Beta",
-    "maintainers": [
-        "max3903",
-        "bodedra",
-        "smangukiya",
+    'development_status': 'Beta',
+    'maintainers': [
+        'max3903',
+        'bodedra',
+        'smangukiya',
     ],
 }
diff --git a/fieldservice_agreement/models/__init__.py b/fieldservice_agreement/models/__init__.py
index a8787cb0a8..07d228d784 100644
--- a/fieldservice_agreement/models/__init__.py
+++ b/fieldservice_agreement/models/__init__.py
@@ -1,4 +1,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import fsm_order
-from . import agreement
+from . import (
+    agreement,
+    fsm_equipment,
+    fsm_order,
+)
diff --git a/fieldservice_agreement/models/agreement.py b/fieldservice_agreement/models/agreement.py
index 2cbd621673..308edb96d2 100644
--- a/fieldservice_agreement/models/agreement.py
+++ b/fieldservice_agreement/models/agreement.py
@@ -11,6 +11,9 @@ class Agreement(models.Model):
         compute='_compute_service_order_count',
         string='# Service Orders'
     )
+    equipment_count = fields.Integer('# Equipments',
+                                     compute='_compute_equipment_count')
+    fsm_location_id = fields.Many2one('fsm.location', string="FSM Location")
 
     @api.multi
     def _compute_service_order_count(self):
@@ -26,7 +29,7 @@ def action_view_service_order(self):
                 [('agreement_id', '=', agreement.id)])
             action = self.env.ref(
                 'fieldservice.action_fsm_operation_order').read()[0]
-            if len(fsm_order_ids) > 1:
+            if len(fsm_order_ids) == 0 or len(fsm_order_ids) > 1:
                 action['domain'] = [('id', 'in', fsm_order_ids.ids)]
             elif len(fsm_order_ids) == 1:
                 action['views'] = [(
@@ -36,3 +39,31 @@ def action_view_service_order(self):
             else:
                 action = {'type': 'ir.actions.act_window_close'}
             return action
+
+    @api.multi
+    def _compute_equipment_count(self):
+        data = self.env['fsm.equipment'].read_group(
+            [('agreement_id', 'in', self.ids)],
+            ['agreement_id'], ['agreement_id'])
+        count_data = dict((item['agreement_id'][0],
+                           item['agreement_id_count']) for item in data)
+        for agreement in self:
+            agreement.equipment_count = count_data.get(agreement.id, 0)
+
+    @api.multi
+    def action_view_fsm_equipment(self):
+        for agreement in self:
+            equipment_ids = self.env['fsm.equipment'].search(
+                [('agreement_id', '=', agreement.id)])
+            action = self.env.ref(
+                'fieldservice.action_fsm_equipment').read()[0]
+            if len(equipment_ids) == 0 or len(equipment_ids) > 1:
+                action['domain'] = [('id', 'in', equipment_ids.ids)]
+            elif len(equipment_ids) == 1:
+                action['views'] = [(
+                    self.env.ref('fieldservice.fsm_equipment_form').id,
+                    'form')]
+                action['res_id'] = equipment_ids.ids[0]
+            else:
+                action = {'type': 'ir.actions.act_window_close'}
+            return action
diff --git a/fieldservice_agreement/models/fsm_equipment.py b/fieldservice_agreement/models/fsm_equipment.py
new file mode 100644
index 0000000000..235b538ab1
--- /dev/null
+++ b/fieldservice_agreement/models/fsm_equipment.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class FSMEquipment(models.Model):
+    _inherit = 'fsm.equipment'
+
+    agreement_id = fields.Many2one('agreement', string='Agreement')
+    serviceprofile_id = fields.Many2one('agreement.serviceprofile',
+                                        'Service Profile')
diff --git a/fieldservice_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index 01b8210b3e..b997790a76 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -8,12 +8,40 @@
         <field name="inherit_id" ref="agreement.partner_agreement_form_view"/>
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
-                <button name="action_view_service_order" type="object"
-                        class="oe_stat_button" icon="fa-map">
-                    <field name="service_order_count" widget="statinfo"
+                <button name="action_view_service_order"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-map">
+                    <field name="service_order_count"
+                           widget="statinfo"
                            string="Service Orders"/>
                 </button>
+                <button name="action_view_fsm_equipment"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-laptop"
+                        context="{'agreement_id': active_id}"
+                        groups="fieldservice.group_fsm_equipment">
+                    <div class="o_field_widget o_stat_info">
+                        <span class="o_stat_value">
+                            <field name="equipment_count"
+                                   widget="statinfo"
+                                   nolabel="1"/>
+                        </span>
+                        <span class="o_stat_text">Equipments</span>
+                    </div>
+                </button>
             </div>
+            <notebook position="inside">
+                <page string="Field Service">
+                    <group id="fsm">
+                        <group id="fsm-left">
+                            <field name="fsm_location_id"/>
+                        </group>
+                        <group id="fsm-right"/>
+                    </group>
+                </page>
+            </notebook>
         </field>
     </record>
 
diff --git a/fieldservice_agreement/views/fsm_equipment_view.xml b/fieldservice_agreement/views/fsm_equipment_view.xml
new file mode 100644
index 0000000000..f52daa0171
--- /dev/null
+++ b/fieldservice_agreement/views/fsm_equipment_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <!-- Fields Service equipment Form View -->
+    <record id="fsm_equipment_form_view_agreement" model="ir.ui.view">
+        <field name="name">fsm.equipment.agreement.form</field>
+        <field name="model">fsm.equipment</field>
+        <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view"/>
+        <field name="arch" type="xml">
+            <notebook position="inside">
+                <page string="Agreement">
+                    <group>
+                        <group id="agreement-left">
+                            <field name="agreement_id"
+                                   domain="[('fsm_location_id', '=', location_id)]"/>
+                            <field name="serviceprofile_id"
+                                   domain="[('agreement_id', '=', agreement_id)]"/>
+                        </group>
+                        <group id="agreement-right"/>
+                    </group>
+                </page>
+            </notebook>
+        </field>
+    </record>
+
+    <!-- Inherit fsm.equipment search view-->
+    <record id="fsm_equipment_search_view_agreement" model="ir.ui.view">
+        <field name="name">fsm.equipment.select.agreement</field>
+        <field name="model">fsm.equipment</field>
+        <field name="inherit_id" ref="fieldservice.fsm_equipment_search_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group" position="inside">
+                <filter string="Service Profile" domain="[]"
+                        context="{'group_by':'serviceprofile_id'}"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window"
+            id="fieldservice.action_fsm_equipment">
+        <field name="context">{'default_location_id': context.get('location_id', False),
+                               'default_agreement_id': context.get('agreement_id', False)}</field>
+    </record>
+
+</odoo>

From 2fa8a4261915d422aefee19bcb5999ff915a5cef Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@ursainfosystems.com>
Date: Fri, 22 Feb 2019 09:37:03 -0800
Subject: [PATCH 028/631] [IMP] Change Kanban Date

---
 .../views/agreement_view.xml                  | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/fieldservice_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index b997790a76..de799b206e 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <odoo>
-
     <!-- Agreement Form View -->
     <record id="agreement_fsm_order_form_view" model="ir.ui.view">
         <field name="name">agreement.form.fsm.order.view</field>
@@ -45,4 +44,34 @@
         </field>
     </record>
 
+    <record id="agreement_search_fields" model="ir.ui.view">
+        <field name="name">agreement.search.fields</field>
+        <field name="model">agreement</field>
+        <field name="type">search</field>
+        <field name="inherit_id" ref="agreement.partner_agreement_search_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="/search/filter[1]" position="before">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="agreement_type_id"/>
+                <field name="agreement_subtype_id"/>
+                <field name="fsm_location_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="agreement_end_date_kanban" model="ir.ui.view">
+        <field name="name">agreement.end.date.kanban</field>
+        <field name="model">agreement</field>
+        <field name="inherit_id" ref="agreement.view_project_agreement_kanban"/>
+        <field name="arch" type="xml">
+            <field name="start_date" position="replace">
+                <field name="end_date"/>
+            </field>
+            <xpath expr="//div[@class='o_kanban_record_subtitle text-muted']/t" position="replace">
+                <t t-if="record.end_date.raw_value and record.end_date.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+            </xpath>
+        </field>
+    </record>
+
 </odoo>

From d52034d0a6aa5587e2f1542262903aeb60d036c2 Mon Sep 17 00:00:00 2001
From: Sandip Mangukiya <smangukiya@ursainfosystems.com>
Date: Mon, 25 Feb 2019 01:18:03 -0800
Subject: [PATCH 029/631] [FIX]1. message_follower_ids needs to be inherited in
 object first 2. move views to agreement module 3. improve location heirarchy
 name construction

---
 .../views/agreement_view.xml                   | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/fieldservice_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index de799b206e..8401be21ab 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -51,27 +51,9 @@
         <field name="inherit_id" ref="agreement.partner_agreement_search_view"/>
         <field name="arch" type="xml">
             <xpath expr="/search/filter[1]" position="before">
-                <field name="name"/>
-                <field name="partner_id"/>
-                <field name="agreement_type_id"/>
-                <field name="agreement_subtype_id"/>
                 <field name="fsm_location_id"/>
             </xpath>
         </field>
     </record>
 
-    <record id="agreement_end_date_kanban" model="ir.ui.view">
-        <field name="name">agreement.end.date.kanban</field>
-        <field name="model">agreement</field>
-        <field name="inherit_id" ref="agreement.view_project_agreement_kanban"/>
-        <field name="arch" type="xml">
-            <field name="start_date" position="replace">
-                <field name="end_date"/>
-            </field>
-            <xpath expr="//div[@class='o_kanban_record_subtitle text-muted']/t" position="replace">
-                <t t-if="record.end_date.raw_value and record.end_date.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
-            </xpath>
-        </field>
-    </record>
-
 </odoo>

From bb26237b39a0923de9e1e6e690367422bf4782c4 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@ursainfosystems.com>
Date: Fri, 8 Mar 2019 13:18:05 -0800
Subject: [PATCH 030/631] [IMP] Fieldservice Account Bug Fix

---
 .../views/agreement_view.xml                  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/fieldservice_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index 8401be21ab..634223b00f 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -56,4 +56,24 @@
         </field>
     </record>
 
+    <record id="agreement_form_context_fix" model="ir.ui.view">
+        <field name="name">agreement.form.context.fix</field>
+        <field name="model">agreement</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="agreement.partner_agreement_form_view"/>
+        <field name="arch" type="xml">
+            <field name="recital_ids" position="replace">
+                <field name="recital_ids" default_order="sequence" nolabel="1" context="{'default_agreement_id': active_id}"/>
+            </field>
+            <field name="clauses_ids" position="replace">
+                <field name="clauses_ids" default_order="sequence" nolabel="1" context="{'default_agreement_id': active_id}"/>
+            </field>
+            <field name="sections_ids" position="replace">
+                <field name="sections_ids" default_order="sequence" nolabel="1" context="{'default_agreement_id': active_id}"/>
+            </field>
+            <field name="appendix_ids" position="replace">
+                <field name="appendix_ids" default_order="sequence" nolabel="1" context="{'default_agreement_id': active_id}"/>
+            </field>
+        </field>
+    </record>
 </odoo>

From 99cc9065a7e2bd80466becd7614af4a46b4dbed8 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Thu, 4 Apr 2019 16:26:14 +0530
Subject: [PATCH 031/631] [MIG][WIP][12.0] fieldservice_agreement

[UPD] README.rst
---
 fieldservice_agreement/README.rst             | 11 ++++----
 fieldservice_agreement/__manifest__.py        |  5 ++--
 fieldservice_agreement/models/agreement.py    | 27 +++++++------------
 fieldservice_agreement/models/fsm_order.py    |  6 ++---
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../static/description/index.html             |  7 ++---
 .../views/agreement_view.xml                  |  8 +++---
 .../views/fsm_equipment_view.xml              |  4 +--
 .../views/fsm_order_view.xml                  |  6 ++---
 9 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/fieldservice_agreement/README.rst b/fieldservice_agreement/README.rst
index 07e81e061c..792764660e 100644
--- a/fieldservice_agreement/README.rst
+++ b/fieldservice_agreement/README.rst
@@ -14,13 +14,13 @@ Field Service - Agreements
     :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_agreement
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_agreement
     :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_agreement
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_agreement
     :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| 
@@ -55,7 +55,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_agreement%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_agreement%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.
 
@@ -72,6 +72,7 @@ Contributors
 
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -107,6 +108,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| |maintainer-bodedra| |maintainer-smangukiya| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_agreement>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_agreement>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_agreement/__manifest__.py b/fieldservice_agreement/__manifest__.py
index 538e914a0b..ab8687d569 100644
--- a/fieldservice_agreement/__manifest__.py
+++ b/fieldservice_agreement/__manifest__.py
@@ -9,16 +9,17 @@
     'website': 'https://github.com/OCA/field-service',
     'category': 'Field Service',
     'license': 'AGPL-3',
-    'version': '11.0.1.0.0',
+    'version': '12.0.1.0.0',
     'depends': [
         'fieldservice',
-        'agreement',
+        'agreement_serviceprofile',
     ],
     'data': [
         'views/fsm_order_view.xml',
         'views/fsm_equipment_view.xml',
         'views/agreement_view.xml',
     ],
+    'installable': True,
     'development_status': 'Beta',
     'maintainers': [
         'max3903',
diff --git a/fieldservice_agreement/models/agreement.py b/fieldservice_agreement/models/agreement.py
index 308edb96d2..7aef78f9d6 100644
--- a/fieldservice_agreement/models/agreement.py
+++ b/fieldservice_agreement/models/agreement.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models, api
+from odoo import api, fields, models
 
 
 class Agreement(models.Model):
@@ -18,9 +18,8 @@ class Agreement(models.Model):
     @api.multi
     def _compute_service_order_count(self):
         for agreement in self:
-            res = self.env['fsm.order'].search_count(
+            agreement.service_order_count = self.env['fsm.order'].search_count(
                 [('agreement_id', '=', agreement.id)])
-            agreement.service_order_count = res or 0
 
     @api.multi
     def action_view_service_order(self):
@@ -29,26 +28,20 @@ def action_view_service_order(self):
                 [('agreement_id', '=', agreement.id)])
             action = self.env.ref(
                 'fieldservice.action_fsm_operation_order').read()[0]
-            if len(fsm_order_ids) == 0 or len(fsm_order_ids) > 1:
-                action['domain'] = [('id', 'in', fsm_order_ids.ids)]
-            elif len(fsm_order_ids) == 1:
+            if len(fsm_order_ids) == 1:
                 action['views'] = [(
                     self.env.ref('fieldservice.fsm_order_form').id,
                     'form')]
                 action['res_id'] = fsm_order_ids.ids[0]
             else:
-                action = {'type': 'ir.actions.act_window_close'}
+                action['domain'] = [('id', 'in', fsm_order_ids.ids)]
             return action
 
     @api.multi
     def _compute_equipment_count(self):
-        data = self.env['fsm.equipment'].read_group(
-            [('agreement_id', 'in', self.ids)],
-            ['agreement_id'], ['agreement_id'])
-        count_data = dict((item['agreement_id'][0],
-                           item['agreement_id_count']) for item in data)
         for agreement in self:
-            agreement.equipment_count = count_data.get(agreement.id, 0)
+            agreement.equipment_count = self.env['fsm.equipment'].search_count(
+                [('agreement_id', 'in', agreement.ids)])
 
     @api.multi
     def action_view_fsm_equipment(self):
@@ -57,13 +50,11 @@ def action_view_fsm_equipment(self):
                 [('agreement_id', '=', agreement.id)])
             action = self.env.ref(
                 'fieldservice.action_fsm_equipment').read()[0]
-            if len(equipment_ids) == 0 or len(equipment_ids) > 1:
-                action['domain'] = [('id', 'in', equipment_ids.ids)]
-            elif len(equipment_ids) == 1:
+            if len(equipment_ids) == 1:
                 action['views'] = [(
-                    self.env.ref('fieldservice.fsm_equipment_form').id,
+                    self.env.ref('fieldservice.fsm_equipment_form_view').id,
                     'form')]
                 action['res_id'] = equipment_ids.ids[0]
             else:
-                action = {'type': 'ir.actions.act_window_close'}
+                action['domain'] = [('id', 'in', equipment_ids.ids)]
             return action
diff --git a/fieldservice_agreement/models/fsm_order.py b/fieldservice_agreement/models/fsm_order.py
index a0013547fb..20d5f22470 100644
--- a/fieldservice_agreement/models/fsm_order.py
+++ b/fieldservice_agreement/models/fsm_order.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 FSMOrder(geo_model.GeoModel):
+class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
     agreement_id = fields.Many2one('agreement', string='Agreement')
diff --git a/fieldservice_agreement/readme/CONTRIBUTORS.rst b/fieldservice_agreement/readme/CONTRIBUTORS.rst
index c59d5bd42c..ffd570ce46 100644
--- a/fieldservice_agreement/readme/CONTRIBUTORS.rst
+++ b/fieldservice_agreement/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_agreement/static/description/index.html b/fieldservice_agreement/static/description/index.html
index d867d6160d..a4a15bde43 100644
--- a/fieldservice_agreement/static/description/index.html
+++ b/fieldservice_agreement/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Agreements</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_agreement"><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_agreement"><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_agreement"><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_agreement"><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>Odoo Agreement App does not provide an easy way to access field service orders
 related to an agreement. Some organizations needs to have a quick access to
 field service orders to track the performance of an agreement.</p>
@@ -404,7 +404,7 @@ <h1><a class="toc-backref" href="#id2">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_agreement%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_agreement%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">
@@ -420,6 +420,7 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 <ul class="simple">
 <li>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#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">
@@ -438,7 +439,7 @@ <h2><a class="toc-backref" href="#id7">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/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/bodedra"><img alt="bodedra" src="https://github.com/bodedra.png?size=40px" /></a> <a class="reference external" href="https://github.com/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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_agreement">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_agreement">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_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index 634223b00f..8c878bbafe 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <!-- Agreement Form View -->
     <record id="agreement_fsm_order_form_view" model="ir.ui.view">
         <field name="name">agreement.form.fsm.order.view</field>
         <field name="model">agreement</field>
-        <field name="inherit_id" ref="agreement.partner_agreement_form_view"/>
+        <field name="inherit_id" ref="agreement_legal.partner_agreement_form_view"/>
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
                 <button name="action_view_service_order"
@@ -48,7 +48,7 @@
         <field name="name">agreement.search.fields</field>
         <field name="model">agreement</field>
         <field name="type">search</field>
-        <field name="inherit_id" ref="agreement.partner_agreement_search_view"/>
+        <field name="inherit_id" ref="agreement_legal.partner_agreement_search_view"/>
         <field name="arch" type="xml">
             <xpath expr="/search/filter[1]" position="before">
                 <field name="fsm_location_id"/>
@@ -60,7 +60,7 @@
         <field name="name">agreement.form.context.fix</field>
         <field name="model">agreement</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="agreement.partner_agreement_form_view"/>
+        <field name="inherit_id" ref="agreement_legal.partner_agreement_form_view"/>
         <field name="arch" type="xml">
             <field name="recital_ids" position="replace">
                 <field name="recital_ids" default_order="sequence" nolabel="1" context="{'default_agreement_id': active_id}"/>
diff --git a/fieldservice_agreement/views/fsm_equipment_view.xml b/fieldservice_agreement/views/fsm_equipment_view.xml
index f52daa0171..b26169246e 100644
--- a/fieldservice_agreement/views/fsm_equipment_view.xml
+++ b/fieldservice_agreement/views/fsm_equipment_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <!-- Fields Service equipment Form View -->
@@ -30,7 +30,7 @@
         <field name="inherit_id" ref="fieldservice.fsm_equipment_search_view"/>
         <field name="arch" type="xml">
             <xpath expr="//group" position="inside">
-                <filter string="Service Profile" domain="[]"
+                <filter name="serviceprofile_id" string="Service Profile" domain="[]"
                         context="{'group_by':'serviceprofile_id'}"/>
             </xpath>
         </field>
diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index 60f94a8314..03beccb0b3 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <!-- Fields Service Orders Form View -->
@@ -7,7 +7,7 @@
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
-            <field name="location_id" position="after">
+            <field name="customer_id" position="after">
                 <field name="agreement_id"
                        domain="[('partner_id', '=', customer_id)]"/>
                 <field name="serviceprofile_id"
@@ -23,7 +23,7 @@
         <field name="inherit_id" ref="fieldservice.fsm_order_search_view"/>
         <field name="arch" type="xml">
             <xpath expr="//group" position="inside">
-                <filter string="Service Profile" domain="[]"
+                <filter name="serviceprofile_id" string="Service Profile" domain="[]"
                         context="{'group_by': 'serviceprofile_id'}"/>
             </xpath>
         </field>

From 76cab6f5f732091c2535c3c18dc251d956aac462 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 2 May 2019 10:43:38 -0700
Subject: [PATCH 032/631] [IMP] #118 Agreement Filter Location

---
 fieldservice_agreement/views/fsm_order_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index 03beccb0b3..5d3b9e0219 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -9,7 +9,7 @@
         <field name="arch" type="xml">
             <field name="customer_id" position="after">
                 <field name="agreement_id"
-                       domain="[('partner_id', '=', customer_id)]"/>
+                       domain="['|', ('partner_id', '=', customer_id), ('fsm_location_id', '=', location_id)]"/>
                 <field name="serviceprofile_id"
                        domain="[('agreement_id', '=', agreement_id)]"/>
             </field>

From 73e8419fd6767fff5ec01f3cfa00c7795137a9b2 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 2 May 2019 11:37:18 -0700
Subject: [PATCH 033/631] [IMP] #115 Worker Agreement Smart Button

[UPD] README.rst
---
 fieldservice_agreement/README.rst             |  5 ++-
 fieldservice_agreement/__manifest__.py        |  2 ++
 fieldservice_agreement/models/__init__.py     |  1 +
 fieldservice_agreement/models/fsm_person.py   | 31 +++++++++++++++++++
 .../static/description/index.html             |  2 +-
 fieldservice_agreement/views/fsm_person.xml   | 22 +++++++++++++
 6 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 fieldservice_agreement/models/fsm_person.py
 create mode 100644 fieldservice_agreement/views/fsm_person.xml

diff --git a/fieldservice_agreement/README.rst b/fieldservice_agreement/README.rst
index 792764660e..e1658d88b9 100644
--- a/fieldservice_agreement/README.rst
+++ b/fieldservice_agreement/README.rst
@@ -103,10 +103,13 @@ promote its widespread use.
 .. |maintainer-smangukiya| image:: https://github.com/smangukiya.png?size=40px
     :target: https://github.com/smangukiya
     :alt: smangukiya
+.. |maintainer-osi-scampbell| image:: https://github.com/osi-scampbell.png?size=40px
+    :target: https://github.com/osi-scampbell
+    :alt: osi-scampbell
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-max3903| |maintainer-bodedra| |maintainer-smangukiya| 
+|maintainer-max3903| |maintainer-bodedra| |maintainer-smangukiya| |maintainer-osi-scampbell| 
 
 This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_agreement>`_ project on GitHub.
 
diff --git a/fieldservice_agreement/__manifest__.py b/fieldservice_agreement/__manifest__.py
index ab8687d569..71ec3aa804 100644
--- a/fieldservice_agreement/__manifest__.py
+++ b/fieldservice_agreement/__manifest__.py
@@ -18,6 +18,7 @@
         'views/fsm_order_view.xml',
         'views/fsm_equipment_view.xml',
         'views/agreement_view.xml',
+        'views/fsm_person.xml'
     ],
     'installable': True,
     'development_status': 'Beta',
@@ -25,5 +26,6 @@
         'max3903',
         'bodedra',
         'smangukiya',
+        'osi-scampbell'
     ],
 }
diff --git a/fieldservice_agreement/models/__init__.py b/fieldservice_agreement/models/__init__.py
index 07d228d784..fe35aa88a5 100644
--- a/fieldservice_agreement/models/__init__.py
+++ b/fieldservice_agreement/models/__init__.py
@@ -4,4 +4,5 @@
     agreement,
     fsm_equipment,
     fsm_order,
+    fsm_person
 )
diff --git a/fieldservice_agreement/models/fsm_person.py b/fieldservice_agreement/models/fsm_person.py
new file mode 100644
index 0000000000..c0687587d1
--- /dev/null
+++ b/fieldservice_agreement/models/fsm_person.py
@@ -0,0 +1,31 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMPerson(models.Model):
+    _inherit = 'fsm.person'
+
+    agreement_count = fields.Integer(string='Agreements',
+                                     compute='_compute_agreements')
+
+    def _compute_agreements(self):
+        self.agreement_count = self.env['agreement'].search_count([
+            ('partner_id', '=', self.name)])
+
+    @api.multi
+    def action_view_agreements(self):
+        for person in self:
+            action = self.env.ref('agreement_legal.\
+                agreement_operations_agreement').read()[0]
+            agreements = self.env['agreement'].search(
+                [('partner_id', '=', person.partner_id.id)])
+            if len(agreements) == 1:
+                action['views'] = [
+                    (self.env.ref('agreement_legal.\
+                        partner_agreement_form_view').id, 'form')]
+                action['res_id'] = agreements.id
+            else:
+                action['domain'] = [('id', 'in', agreements.ids)]
+            return action
diff --git a/fieldservice_agreement/static/description/index.html b/fieldservice_agreement/static/description/index.html
index a4a15bde43..5ee30cb9cc 100644
--- a/fieldservice_agreement/static/description/index.html
+++ b/fieldservice_agreement/static/description/index.html
@@ -438,7 +438,7 @@ <h2><a class="toc-backref" href="#id7">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>
-<p><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/bodedra"><img alt="bodedra" src="https://github.com/bodedra.png?size=40px" /></a> <a class="reference external" href="https://github.com/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.png?size=40px" /></a></p>
+<p><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/bodedra"><img alt="bodedra" src="https://github.com/bodedra.png?size=40px" /></a> <a class="reference external" href="https://github.com/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.png?size=40px" /></a> <a class="reference external" href="https://github.com/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.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_agreement">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>
diff --git a/fieldservice_agreement/views/fsm_person.xml b/fieldservice_agreement/views/fsm_person.xml
new file mode 100644
index 0000000000..8e44da2a6b
--- /dev/null
+++ b/fieldservice_agreement/views/fsm_person.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="fsm_person_form" model="ir.ui.view">
+        <field name="name">fsm.person.form</field>
+        <field name="model">fsm.person</field>
+        <field name="inherit_id" ref="fieldservice.fsm_person_form"/>
+        <field name="arch" type="xml">
+            <div name="button_box" position="inside">
+                <button type="object"
+                        name="action_view_agreements"
+                        class="oe_stat_button"
+                        icon="fa-folder"
+                        groups="base.group_user">
+                    <field name="agreement_count" widget="statinfo"
+                           string="Agreements"/>
+                </button>
+            </div>
+        </field>
+    </record>
+
+</odoo>

From 1efb944ed27ac1e1dac8da953916a435a88cec79 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 24 May 2019 18:42:50 -0500
Subject: [PATCH 034/631] [IMP] fieldservice_agreement

---
 fieldservice_agreement/views/agreement_view.xml     | 2 +-
 fieldservice_agreement/views/fsm_equipment_view.xml | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/fieldservice_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index 8c878bbafe..09f7ff1813 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -19,7 +19,7 @@
                         type="object"
                         class="oe_stat_button"
                         icon="fa-laptop"
-                        context="{'agreement_id': active_id}"
+                        context="{'default_agreement_id': active_id}"
                         groups="fieldservice.group_fsm_equipment">
                     <div class="o_field_widget o_stat_info">
                         <span class="o_stat_value">
diff --git a/fieldservice_agreement/views/fsm_equipment_view.xml b/fieldservice_agreement/views/fsm_equipment_view.xml
index b26169246e..ac3f1ecf09 100644
--- a/fieldservice_agreement/views/fsm_equipment_view.xml
+++ b/fieldservice_agreement/views/fsm_equipment_view.xml
@@ -31,15 +31,9 @@
         <field name="arch" type="xml">
             <xpath expr="//group" position="inside">
                 <filter name="serviceprofile_id" string="Service Profile" domain="[]"
-                        context="{'group_by':'serviceprofile_id'}"/>
+                        context="{'group_by': 'serviceprofile_id'}"/>
             </xpath>
         </field>
     </record>
 
-    <record model="ir.actions.act_window"
-            id="fieldservice.action_fsm_equipment">
-        <field name="context">{'default_location_id': context.get('location_id', False),
-                               'default_agreement_id': context.get('agreement_id', False)}</field>
-    </record>
-
 </odoo>

From dc335303d8ca873288fa873d5f2ea439abcabd4f Mon Sep 17 00:00:00 2001
From: Steve Campbell <scampbell@ursainfosystems.com>
Date: Tue, 11 Jun 2019 06:01:56 -0700
Subject: [PATCH 035/631] [FIX] fieldservice_agreement (#232)

---
 fieldservice_agreement/__manifest__.py        |  3 ++-
 fieldservice_agreement/models/__init__.py     |  3 ++-
 fieldservice_agreement/models/fsm_location.py | 26 +++++++++++++++++++
 fieldservice_agreement/views/fsm_location.xml | 24 +++++++++++++++++
 4 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 fieldservice_agreement/models/fsm_location.py
 create mode 100644 fieldservice_agreement/views/fsm_location.xml

diff --git a/fieldservice_agreement/__manifest__.py b/fieldservice_agreement/__manifest__.py
index 71ec3aa804..9fa96e4f9d 100644
--- a/fieldservice_agreement/__manifest__.py
+++ b/fieldservice_agreement/__manifest__.py
@@ -18,7 +18,8 @@
         'views/fsm_order_view.xml',
         'views/fsm_equipment_view.xml',
         'views/agreement_view.xml',
-        'views/fsm_person.xml'
+        'views/fsm_person.xml',
+        'views/fsm_location.xml'
     ],
     'installable': True,
     'development_status': 'Beta',
diff --git a/fieldservice_agreement/models/__init__.py b/fieldservice_agreement/models/__init__.py
index fe35aa88a5..98a54f21cc 100644
--- a/fieldservice_agreement/models/__init__.py
+++ b/fieldservice_agreement/models/__init__.py
@@ -3,6 +3,7 @@
 from . import (
     agreement,
     fsm_equipment,
+    fsm_location,
     fsm_order,
-    fsm_person
+    fsm_person,
 )
diff --git a/fieldservice_agreement/models/fsm_location.py b/fieldservice_agreement/models/fsm_location.py
new file mode 100644
index 0000000000..d8127c93f4
--- /dev/null
+++ b/fieldservice_agreement/models/fsm_location.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMLocation(models.Model):
+    _inherit = 'fsm.location'
+
+    serviceprofile_ids = fields.Many2many('agreement.serviceprofile',
+                                          string="Service Profiles",
+                                          compute='_compute_service_ids')
+
+    @api.multi
+    def _compute_service_ids(self):
+        for loc in self:
+            agreements = self.env['agreement'].\
+                search([('fsm_location_id', '=', self.name)])
+            ids = []
+            for agree in agreements:
+                servpros = self.env['agreement.serviceprofile'].\
+                    search([('agreement_id', '=', agree.id)])
+                for ser in servpros:
+                    if ser.id not in ids:
+                        ids.append(ser.id)
+            self.serviceprofile_ids = ids
diff --git a/fieldservice_agreement/views/fsm_location.xml b/fieldservice_agreement/views/fsm_location.xml
new file mode 100644
index 0000000000..e657aa1033
--- /dev/null
+++ b/fieldservice_agreement/views/fsm_location.xml
@@ -0,0 +1,24 @@
+<!-- Copyright 2019 Open Source Integrators
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) -->
+<odoo>
+
+    <record id="fsm_location_agreement_serviceprofile" model="ir.ui.view">
+        <field name="name">fsm.location.agreement.serviceprofile</field>
+        <field name="model">fsm.location</field>
+        <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
+        <field name="arch" type="xml">
+            <notebook position="inside">
+                <page string="Service Profiles">
+                    <field name="serviceprofile_ids">
+                        <tree>
+                            <field name="name"/>
+                            <field name="agreement_id"/>
+                            <field name="notes"/>
+                        </tree>
+                    </field>
+                </page>
+            </notebook>
+        </field>
+    </record>
+
+</odoo>

From 266f1ec326de64e8627c5c2ee85e1e11bb782e26 Mon Sep 17 00:00:00 2001
From: Steve Campbell <scampbell@opensourceintegrators.com>
Date: Tue, 18 Jun 2019 06:18:51 -0700
Subject: [PATCH 036/631] [FIX] fieldservice_agreement: FSM Location Agreement
 Bug (#237)

[UPD] README.rst
---
 fieldservice_agreement/models/fsm_location.py        | 4 ++--
 fieldservice_agreement/static/description/index.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fieldservice_agreement/models/fsm_location.py b/fieldservice_agreement/models/fsm_location.py
index d8127c93f4..7e7c258fe5 100644
--- a/fieldservice_agreement/models/fsm_location.py
+++ b/fieldservice_agreement/models/fsm_location.py
@@ -15,7 +15,7 @@ class FSMLocation(models.Model):
     def _compute_service_ids(self):
         for loc in self:
             agreements = self.env['agreement'].\
-                search([('fsm_location_id', '=', self.name)])
+                search([('fsm_location_id', '=', loc.id)])
             ids = []
             for agree in agreements:
                 servpros = self.env['agreement.serviceprofile'].\
@@ -23,4 +23,4 @@ def _compute_service_ids(self):
                 for ser in servpros:
                     if ser.id not in ids:
                         ids.append(ser.id)
-            self.serviceprofile_ids = ids
+            loc.serviceprofile_ids = ids
diff --git a/fieldservice_agreement/static/description/index.html b/fieldservice_agreement/static/description/index.html
index 5ee30cb9cc..0debdbe71e 100644
--- a/fieldservice_agreement/static/description/index.html
+++ b/fieldservice_agreement/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 - Agreements</title>
 <style type="text/css">
 

From 23ac0dba905d44d497b1a27a053f65410246ee9c Mon Sep 17 00:00:00 2001
From: Kitti U <kittiu@gmail.com>
Date: Thu, 1 Aug 2019 10:37:12 +0700
Subject: [PATCH 037/631] [12.0][IMP] fieldservice_agreement, add unit test

---
 fieldservice_agreement/tests/__init__.py      |  4 ++
 .../tests/test_fsm_agreement.py               | 67 +++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 fieldservice_agreement/tests/__init__.py
 create mode 100644 fieldservice_agreement/tests/test_fsm_agreement.py

diff --git a/fieldservice_agreement/tests/__init__.py b/fieldservice_agreement/tests/__init__.py
new file mode 100644
index 0000000000..d7abc9fc1f
--- /dev/null
+++ b/fieldservice_agreement/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_fsm_agreement
diff --git a/fieldservice_agreement/tests/test_fsm_agreement.py b/fieldservice_agreement/tests/test_fsm_agreement.py
new file mode 100644
index 0000000000..292b6f9e2d
--- /dev/null
+++ b/fieldservice_agreement/tests/test_fsm_agreement.py
@@ -0,0 +1,67 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields
+from odoo.tests.common import TransactionCase, Form
+
+
+class FSMOrder(TransactionCase):
+
+    def setUp(self):
+        super(FSMOrder, self).setUp()
+        self.Order = self.env['fsm.order']
+        self.Agreement = self.env['agreement']
+        self.Serviceprofile = self.env['agreement.serviceprofile']
+        self.Equipment = self.env['fsm.equipment']
+        self.test_location = self.env.ref('fieldservice.test_location')
+        self.agreement_type = self.env.ref('agreement_legal.'
+                                           'agreement_type_agreement')
+        self.test_person = self.env.ref('fieldservice.test_person')
+
+    def test_fsm_agreement(self):
+        """
+        By create new order and equipment and link to an agreement, I expect,
+        - Agreement count and link to the order/equipment is corrrect
+        - Location's service profile display correctly
+        - Person (partner) can relate back to agreement correctly
+        """
+        # Create agreement and assign to test location
+        view_id = ('agreement_legal.partner_agreement_form_view')
+        with Form(self.Agreement, view=view_id) as f:
+            f.name = 'Test Agreement'
+            f.agreement_type_id = self.agreement_type
+            f.description = 'Test Agreement'
+            f.start_date = f.end_date = fields.Date.today()
+            f.fsm_location_id = self.test_location
+            f.partner_id = self.test_person.partner_id
+        agreement = f.save()
+        profile = self.Serviceprofile.create({'name': 'Test Profile',
+                                              'agreement_id': agreement.id})
+        # Create 2 Orders, that link to this agreement
+        view_id = ('fieldservice.fsm_order_form')
+        with Form(self.Order, view=view_id) as f:
+            f.location_id = self.test_location
+            f.agreement_id = agreement
+        order1 = f.save()
+        order2 = order1.copy()
+        self.assertEqual(agreement.service_order_count, 2)
+        self.assertEqual([order1.id, order2.id],
+                         agreement.action_view_service_order()['domain'][0][2])
+        # Create 3 equipment, that link to this agreement
+        view_id = ('fieldservice.fsm_equipment_form_view')
+        with Form(self.Equipment, view=view_id) as f:
+            f.name = 'EQ1'
+            f.current_location_id = self.test_location
+            f.agreement_id = agreement
+        equipment1 = f.save()
+        equipment2 = equipment1.copy({'name': 'EQ2'})
+        equipment3 = equipment1.copy({'name': 'EQ3'})
+        self.assertEqual(agreement.equipment_count, 3)
+        self.assertEqual([equipment1.id, equipment2.id, equipment3.id],
+                         agreement.action_view_fsm_equipment()['domain'][0][2])
+        # Location's service profile display correctly
+        self.assertEqual(self.test_location.serviceprofile_ids, profile)
+        # Person (partner) can relate back to agreement correctly
+        self.assertEqual(self.test_person.agreement_count, 1)
+        self.assertEqual(self.test_person.action_view_agreements()['res_id'],
+                         agreement.id)

From 2c34dece4fc5d4f5e934cc5e234eed2c00d53311 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 21 Aug 2019 10:27:13 -0700
Subject: [PATCH 038/631] [IMP] Filter Out Templates

---
 fieldservice_agreement/views/fsm_order_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index 5d3b9e0219..a65726d26e 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -9,7 +9,7 @@
         <field name="arch" type="xml">
             <field name="customer_id" position="after">
                 <field name="agreement_id"
-                       domain="['|', ('partner_id', '=', customer_id), ('fsm_location_id', '=', location_id)]"/>
+                       domain="['|', ('partner_id', '=', customer_id), ('fsm_location_id', '=', location_id), ('is_template', '=', False)]"/>
                 <field name="serviceprofile_id"
                        domain="[('agreement_id', '=', agreement_id)]"/>
             </field>

From 51be5c612d79d55017836cf5f5a4c5441493892d Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 9 Oct 2019 23:09:01 -0500
Subject: [PATCH 039/631] [FIX] fieldservice_agreement

---
 fieldservice_agreement/views/fsm_order_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index a65726d26e..c2da61068a 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -7,7 +7,7 @@
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
-            <field name="customer_id" position="after">
+            <field name="location_id" position="after">
                 <field name="agreement_id"
                        domain="['|', ('partner_id', '=', customer_id), ('fsm_location_id', '=', location_id), ('is_template', '=', False)]"/>
                 <field name="serviceprofile_id"

From e2fe8f036fcd9a2294566fe15c3228031bee0f39 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 10 Oct 2019 08:34:32 -0500
Subject: [PATCH 040/631] [FIX] fieldservice_agreement

---
 fieldservice_agreement/views/agreement_view.xml | 1 -
 fieldservice_agreement/views/fsm_order_view.xml | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/fieldservice_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index 09f7ff1813..051957d5e7 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <!-- Agreement Form View -->
     <record id="agreement_fsm_order_form_view" model="ir.ui.view">
diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index c2da61068a..03b0dbd2af 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <!-- Fields Service Orders Form View -->
@@ -9,7 +8,7 @@
         <field name="arch" type="xml">
             <field name="location_id" position="after">
                 <field name="agreement_id"
-                       domain="['|', ('partner_id', '=', customer_id), ('fsm_location_id', '=', location_id), ('is_template', '=', False)]"/>
+                       domain="[('fsm_location_id', '=', location_id), ('is_template', '=', False)]"/>
                 <field name="serviceprofile_id"
                        domain="[('agreement_id', '=', agreement_id)]"/>
             </field>

From 3c04d1953e14101c54c1d4973c0d0528a4401838 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 11 Oct 2019 12:05:19 -0500
Subject: [PATCH 041/631] [FIX] fieldservice_agreement

[IMP] fieldservice_vehicle_stock
---
 fieldservice_agreement/__manifest__.py        |  2 +-
 fieldservice_agreement/models/agreement.py    |  2 +-
 fieldservice_agreement/models/fsm_person.py   | 12 +++---
 .../tests/test_fsm_agreement.py               | 41 ++++++++++++-------
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/fieldservice_agreement/__manifest__.py b/fieldservice_agreement/__manifest__.py
index 9fa96e4f9d..4e819bef80 100644
--- a/fieldservice_agreement/__manifest__.py
+++ b/fieldservice_agreement/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Agreements',
-    'summary': 'Manage FSM Agreements',
+    'summary': 'Manage Field Service agreements and contracts',
     'author': 'Open Source Integrators, '
               'Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_agreement/models/agreement.py b/fieldservice_agreement/models/agreement.py
index 7aef78f9d6..5154c7960f 100644
--- a/fieldservice_agreement/models/agreement.py
+++ b/fieldservice_agreement/models/agreement.py
@@ -41,7 +41,7 @@ def action_view_service_order(self):
     def _compute_equipment_count(self):
         for agreement in self:
             agreement.equipment_count = self.env['fsm.equipment'].search_count(
-                [('agreement_id', 'in', agreement.ids)])
+                [('agreement_id', '=', agreement.id)])
 
     @api.multi
     def action_view_fsm_equipment(self):
diff --git a/fieldservice_agreement/models/fsm_person.py b/fieldservice_agreement/models/fsm_person.py
index c0687587d1..b2fd6e2b46 100644
--- a/fieldservice_agreement/models/fsm_person.py
+++ b/fieldservice_agreement/models/fsm_person.py
@@ -7,7 +7,7 @@
 class FSMPerson(models.Model):
     _inherit = 'fsm.person'
 
-    agreement_count = fields.Integer(string='Agreements',
+    agreement_count = fields.Integer(string='# of Agreements',
                                      compute='_compute_agreements')
 
     def _compute_agreements(self):
@@ -17,14 +17,16 @@ def _compute_agreements(self):
     @api.multi
     def action_view_agreements(self):
         for person in self:
-            action = self.env.ref('agreement_legal.\
-                agreement_operations_agreement').read()[0]
+            action = self.env.\
+                ref('agreement_legal.agreement_operations_agreement').\
+                read()[0]
             agreements = self.env['agreement'].search(
                 [('partner_id', '=', person.partner_id.id)])
             if len(agreements) == 1:
                 action['views'] = [
-                    (self.env.ref('agreement_legal.\
-                        partner_agreement_form_view').id, 'form')]
+                    (self.env.
+                     ref('agreement_legal.partner_agreement_form_view').
+                     id, 'form')]
                 action['res_id'] = agreements.id
             else:
                 action['domain'] = [('id', 'in', agreements.ids)]
diff --git a/fieldservice_agreement/tests/test_fsm_agreement.py b/fieldservice_agreement/tests/test_fsm_agreement.py
index 292b6f9e2d..4dd9dbe19f 100644
--- a/fieldservice_agreement/tests/test_fsm_agreement.py
+++ b/fieldservice_agreement/tests/test_fsm_agreement.py
@@ -14,9 +14,11 @@ def setUp(self):
         self.Serviceprofile = self.env['agreement.serviceprofile']
         self.Equipment = self.env['fsm.equipment']
         self.test_location = self.env.ref('fieldservice.test_location')
-        self.agreement_type = self.env.ref('agreement_legal.'
-                                           'agreement_type_agreement')
+        self.agreement_type = self.env.\
+            ref('agreement_legal.agreement_type_agreement')
         self.test_person = self.env.ref('fieldservice.test_person')
+        self.service = self.env.ref(
+            'product.product_product_1_product_template')
 
     def test_fsm_agreement(self):
         """
@@ -36,26 +38,35 @@ def test_fsm_agreement(self):
             f.partner_id = self.test_person.partner_id
         agreement = f.save()
         profile = self.Serviceprofile.create({'name': 'Test Profile',
-                                              'agreement_id': agreement.id})
+                                              'agreement_id': agreement.id,
+                                              'product_id': self.service.id})
         # Create 2 Orders, that link to this agreement
-        view_id = ('fieldservice.fsm_order_form')
-        with Form(self.Order, view=view_id) as f:
-            f.location_id = self.test_location
-            f.agreement_id = agreement
-        order1 = f.save()
-        order2 = order1.copy()
+        vals = {
+            'name': 'Order1',
+            'location_id': self.test_location.id,
+            'agreement_id': agreement.id
+        }
+        order1 = self.Order.create(vals)
+        vals = {
+            'name': 'Order2',
+            'location_id': self.test_location.id,
+            'agreement_id': agreement.id
+        }
+        order2 = self.Order.create(vals)
+        agreement._compute_service_order_count()
         self.assertEqual(agreement.service_order_count, 2)
         self.assertEqual([order1.id, order2.id],
                          agreement.action_view_service_order()['domain'][0][2])
         # Create 3 equipment, that link to this agreement
-        view_id = ('fieldservice.fsm_equipment_form_view')
-        with Form(self.Equipment, view=view_id) as f:
-            f.name = 'EQ1'
-            f.current_location_id = self.test_location
-            f.agreement_id = agreement
-        equipment1 = f.save()
+        vals = {
+            'name': 'EQ1',
+            'current_location_id': self.test_location.id,
+            'agreement_id': agreement.id
+        }
+        equipment1 = self.Equipment.create(vals)
         equipment2 = equipment1.copy({'name': 'EQ2'})
         equipment3 = equipment1.copy({'name': 'EQ3'})
+        agreement._compute_equipment_count()
         self.assertEqual(agreement.equipment_count, 3)
         self.assertEqual([equipment1.id, equipment2.id, equipment3.id],
                          agreement.action_view_fsm_equipment()['domain'][0][2])

From 486085355a62c27614364323f5351ffa26e0dee4 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Mon, 21 Oct 2019 11:25:40 -0700
Subject: [PATCH 042/631] [IMP] Improved Test Cases

[UPD] Update fieldservice_agreement.pot

Added translation using Weblate (Portuguese (Brazil))

Added translation using Weblate (Spanish (Chile))

Translated using Weblate (Spanish (Chile))

Currently translated at 100.0% (15 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_agreement
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_agreement/es_CL/

Added translation using Weblate (German)

Translated using Weblate (German)

Currently translated at 6.7% (1 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_agreement
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_agreement/de/

Translated using Weblate (German)

Currently translated at 26.7% (4 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_agreement
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_agreement/de/

Translated using Weblate (German)

Currently translated at 100.0% (15 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_agreement
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_agreement/de/

[ADD] Spanish (es) translation

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (15 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_agreement
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_agreement/pt_BR/

Translated using Weblate (Spanish)

Currently translated at 100.0% (15 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_agreement
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_agreement/es/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (15 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_agreement
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_agreement/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (15 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_agreement
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_agreement/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (15 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_agreement
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_agreement/pt_BR/

Added translation using Weblate (Spanish (Argentina))

Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (15 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_agreement
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_agreement/es_AR/
---
 fieldservice_agreement/i18n/de.po             | 99 +++++++++++++++++++
 fieldservice_agreement/i18n/es.po             | 99 +++++++++++++++++++
 fieldservice_agreement/i18n/es_AR.po          | 99 +++++++++++++++++++
 fieldservice_agreement/i18n/es_CL.po          | 99 +++++++++++++++++++
 .../i18n/fieldservice_agreement.pot           | 97 ++++++++++++++++++
 fieldservice_agreement/i18n/pt_BR.po          | 99 +++++++++++++++++++
 fieldservice_agreement/models/fsm_person.py   |  6 +-
 7 files changed, 594 insertions(+), 4 deletions(-)
 create mode 100644 fieldservice_agreement/i18n/de.po
 create mode 100644 fieldservice_agreement/i18n/es.po
 create mode 100644 fieldservice_agreement/i18n/es_AR.po
 create mode 100644 fieldservice_agreement/i18n/es_CL.po
 create mode 100644 fieldservice_agreement/i18n/fieldservice_agreement.pot
 create mode 100644 fieldservice_agreement/i18n/pt_BR.po

diff --git a/fieldservice_agreement/i18n/de.po b/fieldservice_agreement/i18n/de.po
new file mode 100644
index 0000000000..54153a4009
--- /dev/null
+++ b/fieldservice_agreement/i18n/de.po
@@ -0,0 +1,99 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_agreement
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-26 17:58+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_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__equipment_count
+msgid "# Equipments"
+msgstr "# Equipment"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__service_order_count
+msgid "# Service Orders"
+msgstr "# Service-Aufträge"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_person__agreement_count
+msgid "# of Agreements"
+msgstr "# Vereinbarungen"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "<span class=\"o_stat_text\">Equipments</span>"
+msgstr "<span class=\"o_stat_text\">Equipment</span>"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__agreement_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__agreement_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_form_view_agreement
+msgid "Agreement"
+msgstr "Vereinbarung"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_person_form
+msgid "Agreements"
+msgstr "Vereinbarungen"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__fsm_location_id
+msgid "FSM Location"
+msgstr "Field-Service-Ort"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Field Service"
+msgstr "Field-Service"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Service-Equipment"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_location
+msgid "Field Service Location"
+msgstr "Field-Service-Ort"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_order
+msgid "Field Service Order"
+msgstr "Field-Service-Auftrag"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Service-Mitarbeiter"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Service Orders"
+msgstr "Service-Aufträge"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__serviceprofile_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__serviceprofile_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_search_view_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.search_fsm_order_filter_agreement
+msgid "Service Profile"
+msgstr "Service-Profil"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_location__serviceprofile_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_location_agreement_serviceprofile
+msgid "Service Profiles"
+msgstr "Service-Profile"
diff --git a/fieldservice_agreement/i18n/es.po b/fieldservice_agreement/i18n/es.po
new file mode 100644
index 0000000000..e38ede329b
--- /dev/null
+++ b/fieldservice_agreement/i18n/es.po
@@ -0,0 +1,99 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_agreement
+#
+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"
+"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.10\n"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__equipment_count
+msgid "# Equipments"
+msgstr "# de Equipos"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__service_order_count
+msgid "# Service Orders"
+msgstr "# Ordenes de Servicio"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_person__agreement_count
+msgid "# of Agreements"
+msgstr "# de Acuerdos"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "<span class=\"o_stat_text\">Equipments</span>"
+msgstr "<span class=\"o_stat_text\">Equipos</span>"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__agreement_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__agreement_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_form_view_agreement
+msgid "Agreement"
+msgstr "Acuerdo"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_person_form
+msgid "Agreements"
+msgstr "Acuerdos"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__fsm_location_id
+msgid "FSM Location"
+msgstr "Ubicación SC"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Field Service"
+msgstr "Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Equipo de Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación de Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_order
+msgid "Field Service Order"
+msgstr "Pedido de Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabajador de Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Service Orders"
+msgstr "Ordenes de Servicio"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__serviceprofile_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__serviceprofile_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_search_view_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.search_fsm_order_filter_agreement
+msgid "Service Profile"
+msgstr "Perfil de Servicio"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_location__serviceprofile_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_location_agreement_serviceprofile
+msgid "Service Profiles"
+msgstr "Perfiles de Servicio"
diff --git a/fieldservice_agreement/i18n/es_AR.po b/fieldservice_agreement/i18n/es_AR.po
new file mode 100644
index 0000000000..561559bf38
--- /dev/null
+++ b/fieldservice_agreement/i18n/es_AR.po
@@ -0,0 +1,99 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_agreement
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-07-21 05:19+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 3.10\n"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__equipment_count
+msgid "# Equipments"
+msgstr "# Equipos"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__service_order_count
+msgid "# Service Orders"
+msgstr "# Pedidos de Servicio"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_person__agreement_count
+msgid "# of Agreements"
+msgstr "# de Acuerdos"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "<span class=\"o_stat_text\">Equipments</span>"
+msgstr "<span class=\"o_stat_text\">Equipos</span>"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__agreement_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__agreement_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_form_view_agreement
+msgid "Agreement"
+msgstr "Acuerdo"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_person_form
+msgid "Agreements"
+msgstr "Acuerdos"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__fsm_location_id
+msgid "FSM Location"
+msgstr "Ubicación del FSM"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Field Service"
+msgstr "Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Equipo del Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación del Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_order
+msgid "Field Service Order"
+msgstr "Pedido de Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabajador de Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Service Orders"
+msgstr "Pedidos de Servicio"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__serviceprofile_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__serviceprofile_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_search_view_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.search_fsm_order_filter_agreement
+msgid "Service Profile"
+msgstr "Perfil del Servicio"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_location__serviceprofile_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_location_agreement_serviceprofile
+msgid "Service Profiles"
+msgstr "Perfiles de Servicio"
diff --git a/fieldservice_agreement/i18n/es_CL.po b/fieldservice_agreement/i18n/es_CL.po
new file mode 100644
index 0000000000..c523b322de
--- /dev/null
+++ b/fieldservice_agreement/i18n/es_CL.po
@@ -0,0 +1,99 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_agreement
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-21 20:35+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.8\n"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__equipment_count
+msgid "# Equipments"
+msgstr "# de Equipos"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__service_order_count
+msgid "# Service Orders"
+msgstr "# Ordenes de Servicio"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_person__agreement_count
+msgid "# of Agreements"
+msgstr "# de Acuerdos"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "<span class=\"o_stat_text\">Equipments</span>"
+msgstr "<span class=\"o_stat_text\">Equipos</span>"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__agreement_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__agreement_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_form_view_agreement
+msgid "Agreement"
+msgstr "Acuerdo"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_person_form
+msgid "Agreements"
+msgstr "Acuerdos"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__fsm_location_id
+msgid "FSM Location"
+msgstr "Ubicación FSM"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Field Service"
+msgstr "Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Equipo de Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación de Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_order
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabajador de Servicio de Campo"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Service Orders"
+msgstr "Ordenes de Servicio"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__serviceprofile_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__serviceprofile_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_search_view_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.search_fsm_order_filter_agreement
+msgid "Service Profile"
+msgstr "Perfil de Servicio"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_location__serviceprofile_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_location_agreement_serviceprofile
+msgid "Service Profiles"
+msgstr "Perfiles de Servicio"
diff --git a/fieldservice_agreement/i18n/fieldservice_agreement.pot b/fieldservice_agreement/i18n/fieldservice_agreement.pot
new file mode 100644
index 0000000000..dad94cfd58
--- /dev/null
+++ b/fieldservice_agreement/i18n/fieldservice_agreement.pot
@@ -0,0 +1,97 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_agreement
+#
+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_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__equipment_count
+msgid "# Equipments"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__service_order_count
+msgid "# Service Orders"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_person__agreement_count
+msgid "# of Agreements"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "<span class=\"o_stat_text\">Equipments</span>"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__agreement_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__agreement_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_form_view_agreement
+msgid "Agreement"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_person_form
+msgid "Agreements"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__fsm_location_id
+msgid "FSM Location"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Field Service"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_person
+msgid "Field Service Worker"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Service Orders"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__serviceprofile_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__serviceprofile_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_search_view_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.search_fsm_order_filter_agreement
+msgid "Service Profile"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_location__serviceprofile_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_location_agreement_serviceprofile
+msgid "Service Profiles"
+msgstr ""
+
diff --git a/fieldservice_agreement/i18n/pt_BR.po b/fieldservice_agreement/i18n/pt_BR.po
new file mode 100644
index 0000000000..dd40cb2814
--- /dev/null
+++ b/fieldservice_agreement/i18n/pt_BR.po
@@ -0,0 +1,99 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_agreement
+#
+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"
+"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_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__equipment_count
+msgid "# Equipments"
+msgstr "# Equipamentos"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__service_order_count
+msgid "# Service Orders"
+msgstr "# Ordens de Serviço"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_person__agreement_count
+msgid "# of Agreements"
+msgstr "# de Contratos"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "<span class=\"o_stat_text\">Equipments</span>"
+msgstr "<span class=\"o_stat_text\">Equipamentos</span>"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__agreement_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__agreement_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_form_view_agreement
+msgid "Agreement"
+msgstr "Acordo"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_person_form
+msgid "Agreements"
+msgstr "Acordos"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__fsm_location_id
+msgid "FSM Location"
+msgstr "Localização do FSM"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Field Service"
+msgstr "Serviço de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Equipamento Usados em Serviços de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_location
+msgid "Field Service Location"
+msgstr "Localização do Serviço de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_order
+msgid "Field Service Order"
+msgstr "Pedido de Serviço de Campo"
+
+#. module: fieldservice_agreement
+#: model:ir.model,name:fieldservice_agreement.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabalhador de Serviço de Campo"
+
+#. module: fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
+msgid "Service Orders"
+msgstr "Ordens de Serviço"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__serviceprofile_id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__serviceprofile_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_equipment_search_view_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.search_fsm_order_filter_agreement
+msgid "Service Profile"
+msgstr "Perfil de Serviço"
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_location__serviceprofile_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_location_agreement_serviceprofile
+msgid "Service Profiles"
+msgstr "Perfis de Serviço"
diff --git a/fieldservice_agreement/models/fsm_person.py b/fieldservice_agreement/models/fsm_person.py
index b2fd6e2b46..3dcebee5f6 100644
--- a/fieldservice_agreement/models/fsm_person.py
+++ b/fieldservice_agreement/models/fsm_person.py
@@ -23,10 +23,8 @@ def action_view_agreements(self):
             agreements = self.env['agreement'].search(
                 [('partner_id', '=', person.partner_id.id)])
             if len(agreements) == 1:
-                action['views'] = [
-                    (self.env.
-                     ref('agreement_legal.partner_agreement_form_view').
-                     id, 'form')]
+                action['views'] = [(self.env.ref(
+                    'agreement_legal.partner_agreement_form_view').id, 'form')]
                 action['res_id'] = agreements.id
             else:
                 action['domain'] = [('id', 'in', agreements.ids)]

From 13218f7d5c38eb9219f8273c02d94e5eddf5c0c6 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Wed, 19 May 2021 20:51:35 +0530
Subject: [PATCH 043/631] [14.0][FIX]fieldservice_timeline

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

diff --git a/fieldservice_timeline/models/fsm_person.py b/fieldservice_timeline/models/fsm_person.py
index 845e3d3b5b..e206ec5291 100644
--- a/fieldservice_timeline/models/fsm_person.py
+++ b/fieldservice_timeline/models/fsm_person.py
@@ -6,4 +6,4 @@
 
 class FSMPerson(models.Model):
     _name = "fsm.person"
-    _inherit = ["fsm.person", "mail.activity.mixin"]
+    _inherit = ["fsm.person", "mail.thread.blacklist"]

From 502cb7d3cc704750febf47b58bd02e0eaa724e7b Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 20 May 2021 16:11:24 +0530
Subject: [PATCH 044/631] [IMP] Improved Code

---
 fieldservice_timeline/__init__.py          | 1 -
 fieldservice_timeline/models/__init__.py   | 1 -
 fieldservice_timeline/models/fsm_person.py | 9 ---------
 3 files changed, 11 deletions(-)
 delete mode 100644 fieldservice_timeline/models/__init__.py
 delete mode 100644 fieldservice_timeline/models/fsm_person.py

diff --git a/fieldservice_timeline/__init__.py b/fieldservice_timeline/__init__.py
index 05b8ae190e..5653e5efbb 100644
--- a/fieldservice_timeline/__init__.py
+++ b/fieldservice_timeline/__init__.py
@@ -1,5 +1,4 @@
 # Copyright (C) 2021 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import models
 from .hooks import uninstall_hook
diff --git a/fieldservice_timeline/models/__init__.py b/fieldservice_timeline/models/__init__.py
deleted file mode 100644
index 9ba36590c4..0000000000
--- a/fieldservice_timeline/models/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import fsm_person
diff --git a/fieldservice_timeline/models/fsm_person.py b/fieldservice_timeline/models/fsm_person.py
deleted file mode 100644
index e206ec5291..0000000000
--- a/fieldservice_timeline/models/fsm_person.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2021 Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import models
-
-
-class FSMPerson(models.Model):
-    _name = "fsm.person"
-    _inherit = ["fsm.person", "mail.thread.blacklist"]

From a3f8e2731ad6d00092355ec32219851efb67535b Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 20 May 2021 16:37:15 +0530
Subject: [PATCH 045/631] [14.0][FIX] fieldservice

---
 fieldservice/models/fsm_person.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fieldservice/models/fsm_person.py b/fieldservice/models/fsm_person.py
index d1ea7205aa..f87e8ee2d0 100644
--- a/fieldservice/models/fsm_person.py
+++ b/fieldservice/models/fsm_person.py
@@ -7,6 +7,7 @@
 class FSMPerson(models.Model):
     _name = "fsm.person"
     _inherits = {"res.partner": "partner_id"}
+    _inherit = ["mail.thread.blacklist"]
     _description = "Field Service Worker"
 
     partner_id = fields.Many2one(

From bba09fc76e6abd1368ac1f3caa1d74a5b84569d0 Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Wed, 9 Jun 2021 20:27:12 +0000
Subject: [PATCH 046/631] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (535 of 535 strings)

Translation: field-service-14.0/field-service-14.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice/es_AR/
---
 fieldservice/i18n/es_AR.po | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index 6421e39ec0..7d93458ca0 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-06-05 04:48+0000\n"
+"PO-Revision-Date: 2021-06-09 22:49+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_AR\n"
@@ -1419,6 +1419,8 @@ msgid ""
 "If set, this Sales Team will be used for sales and assignments related to "
 "this partner"
 msgstr ""
+"Si está configurado, este Equipo de Ventas será utilizado para ventas y "
+"asignaciones relacionadas a este contacto"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__is_blacklisted

From e1810f86d54a539df897e7ed7e73027b4ab92d27 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Sat, 26 Jun 2021 15:15:53 +0000
Subject: [PATCH 047/631] Added translation using Weblate (Turkish)

---
 fieldservice/i18n/tr.po | 3379 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 3379 insertions(+)
 create mode 100644 fieldservice/i18n/tr.po

diff --git a/fieldservice/i18n/tr.po b/fieldservice/i18n/tr.po
new file mode 100644
index 0000000000..37ce2d42a5
--- /dev/null
+++ b/fieldservice/i18n/tr.po
@@ -0,0 +1,3379 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice
+#
+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: tr\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
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__meeting_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__meeting_count
+msgid "# Meetings"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__opportunity_count
+msgid "# Opportunities"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__task_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__task_count
+msgid "# Tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__owned_location_count
+#: model:ir.model.fields,field_description:fieldservice.field_res_users__owned_location_count
+msgid "# of Owned Locations"
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "%s is a holiday (%s)."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.report,print_report_name:fieldservice.action_report_fsm_order
+msgid "'Service Order - %s' % (object.name)"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "<i class=\"fa fa-ellipsis-v\" title=\"Manager\"/>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "<span class=\"oe_inline\"> ( On  </span>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "<span> : Lat : </span>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "<span> ;  Long:  </span>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "<span>Reporting</span>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "<span>View</span>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "<strong>Assigned To:</strong>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "<strong>Date Completed:</strong>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "<strong>ETA:</strong>"
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/wizard/fsm_wizard.py:0
+#, python-format
+msgid "A Field Service Location related to that partner already exists."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/wizard/fsm_wizard.py:0
+#, python-format
+msgid "A Field Service Worker related to that partner already exists."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_payable_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_payable_id
+msgid "Account Payable"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_receivable_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_receivable_id
+msgid "Account Receivable"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_needaction
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_needaction
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_needaction
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_needaction
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__active
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__active
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__active
+msgid "Active"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__active_lang_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__active_lang_count
+msgid "Active Lang Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_exception_decoration
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_exception_decoration
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_exception_decoration
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_exception_decoration
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_state
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_state
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_state
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_state
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__date_end
+msgid "Actual End"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__date_start
+msgid "Actual Start"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__duration
+msgid "Actual duration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__duration
+msgid "Actual duration in hours"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_person
+msgid "Add Field Service Workers here."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_dash_equipment
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_equipment
+msgid "Add a Field Service Equipment here."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_category
+msgid "Add a Field Service Worker Category here."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
+msgid "Add a description..."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__additional_info
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__additional_info
+msgid "Additional info"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Address"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__type
+msgid "Address Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__state_name
+msgid ""
+"Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "All"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_operation_order
+msgid "All Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
+msgid ""
+"All the emails and documents sent to this contact will be translated in this"
+" language."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_google_map
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Allow Field Service Google Map"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_web_timeline_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Allow Field Service Web Timeline View"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__location_id
+msgid "Assigned Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__person_id
+msgid "Assigned Operator"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__person_id
+msgid "Assigned To"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_attachment_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_attachment_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_attachment_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_attachment_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Auto-fill the equipments on the order"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Auto-fill the workers on the location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__auto_populate_equipments_on_order
+msgid "Auto-populate Equipments on Order based on Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__auto_populate_persons_on_location
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__auto_populate_persons_on_location
+msgid "Auto-populate Workers on Location based on Territory"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__auto_populate_equipments_on_order
+msgid "Auto-populate equipments on Order based on the Location"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid ""
+"Auto-populate the equipments on the order based on the location content"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid ""
+"Auto-populate the preferred workers of a location based on the territory"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid ""
+"Automatically creates a day route when an order is assigned and scheduled"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
+msgid "Bank"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_ids
+msgid "Banks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__barcode
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__barcode
+msgid "Barcode"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__is_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__is_blacklisted
+msgid "Blacklist"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__mobile_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__mobile_blacklisted
+msgid "Blacklisted Phone Is Mobile"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone_blacklisted
+msgid "Blacklisted Phone is Phone"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_bounce
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_bounce
+msgid "Bounce"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__branch_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__branch_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__branch_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Branch"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__branch_manager_id
+msgid "Branch Manager"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_crm
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "CRM"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.partner_wizard_view
+msgid "Cancel"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Cancel Order"
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_stage.py:0
+#, python-format
+msgid ""
+"Cannot create FSM Stage because it has the same Type and Sequence of an "
+"existing FSM Stage."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "Cannot move to completed from Kanban"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__category_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__category_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__category_ids
+#: model:ir.ui.menu,name:fieldservice.menu_hr_skill
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_category_tree_view
+msgid "Categories"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_category_form_view
+msgid "Category"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_category_name_uniq
+msgid "Category name already exists!"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_change_management
+msgid "Change Management"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__channel_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__channel_ids
+msgid "Channels"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Check collected payments"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__is_company
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__is_company
+msgid "Check if the contact is a company, otherwise it is a person"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Check inventory"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Check the amount collected by the worker during the route"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_route_account
+msgid "Check the amount collected during the route"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_route_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Check the inventory of the vehicle at the end of the route"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__employee
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__employee
+msgid "Check this box if this contact is an Employee."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__child_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+msgid "Children"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_template__team_id
+msgid "Choose a team to be set on orders of this template"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__city
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__city
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__city
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "City"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__tag_ids
+msgid "Classify and analyze your orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__custom_color
+msgid "Color Code"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__color
+msgid "Color Index"
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_stage.py:0
+#, python-format
+msgid "Color code should be Hex Code. Ex:-#FFFFFF"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__commercial_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__commercial_partner_id
+msgid "Commercial Entity"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__ref_company_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__ref_company_ids
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__company_id
+msgid "Company"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__company_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__company_name
+msgid "Company Name"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__commercial_company_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__commercial_company_name
+msgid "Company Name Entity"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__company_type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__company_type
+msgid "Company Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_gid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_gid
+msgid "Company database ID"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_category__company_id
+msgid "Company related to this category"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__company_id
+msgid "Company related to this equipment"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__company_id
+msgid "Company related to this order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_tag__company_id
+msgid "Company related to this tag"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__company_id
+msgid "Company related to this team"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_template__company_id
+msgid "Company related to this template"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Complete"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contact_address
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__contact_address
+msgid "Complete Address"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__complete_name
+msgid "Complete Name"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.config
+msgid "Configuration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_res_partner
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__child_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__contact_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__child_ids
+msgid "Contact"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Contacts"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contact_count
+msgid "Contacts Count"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.partner_wizard_view
+msgid "Convert"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.partner_fsm_action
+msgid "Convert to FSM Record"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.partner_wizard_view
+msgid "Convert to a Field Service Worker or Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__payment_token_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__payment_token_count
+msgid "Count Payment Token"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_bounce
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_bounce
+msgid "Counter of the number of bounced emails for this contact"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__country_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__country_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__country_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Country"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Create FSM Orders from Opportunities."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_customer
+msgid "Create a Customer."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_location
+msgid "Create a Service Location"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_stage
+msgid "Create a Stage."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_team_settings
+msgid "Create a new team"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_tag
+msgid "Create a tag."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_dash_order
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_operation_order
+msgid "Create an Order."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_template
+msgid "Create an order template"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Create multiple FSM Locations at once using Location Builder Wizard"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_location_person
+msgid "Create the linked locations of a worker."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid ""
+"Create vendor bills and customer invoices when completing service orders.\n"
+"                                    Track costs and revenues."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__credit_limit
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__credit_limit
+msgid "Credit Limit"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__current_date
+msgid "Current Date"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__current_location_id
+msgid "Current Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
+msgid "Customer Payment Terms"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__customer_rank
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__customer_rank
+msgid "Customer Rank"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_customer
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_customer
+msgid "Customers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.dashboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__date
+msgid "Date"
+msgstr ""
+
+#. module: fieldservice
+#: model:fsm.team,name:fieldservice.fsm_team_default
+msgid "Default Team"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
+msgid "Default duration in hours"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__trust
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__trust
+msgid "Degree of trust you have in this debtor"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_kanban_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_kanban_view
+msgid "Delete"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__description
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__description
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__description
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "Description"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__direction
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Directions"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_dispatcher
+msgid "Dispatcher"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Display locations and orders on a map with OpenStreetMap"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__district_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__district_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__district_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "District"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__district_manager_id
+msgid "District Manager"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "Done"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_kanban_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_kanban_view
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Due Within 30 Days"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Due Within 7 Days"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__duration
+msgid "Duration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__request_early
+msgid "Earliest Request Date"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_kanban_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_kanban_view
+msgid "Edit"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__partner_share
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__partner_share
+msgid ""
+"Either customer (not a user), either shared user. Indicated the current "
+"partner is a customer without access or with a limited access created for "
+"sharing data."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__email
+msgid "Email"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__employee
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__employee
+msgid "Employee"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__equipment_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__equipment_id
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_stage__stage_type__equipment
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_tree_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Equipment"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_equipment_name_uniq
+msgid "Equipment name already exists!"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_report_equipment
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__equipment_ids
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_dash_equipment
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_equipment
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_report_equipment
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Equipments"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_report_equipment
+msgid "Equipments Report"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Execution"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__legend_priority
+msgid ""
+"Explanation text to help users using the star and priority mechanism on "
+"stages or orders that are in this stage."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "FS Order #"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order_type__internal_type__fsm
+msgid "FSM"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+msgid "FSM Equipment Name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "FSM Location Builder"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_pivot_view
+msgid "FSM Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "FSM Order Name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_calendar_view
+msgid "FSM Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_person_calendar_filter
+msgid "FSM Person Calendar Filter"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__fsm_person_id
+msgid "FSM Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.module.category,name:fieldservice.fsm
+#: model:ir.ui.menu,name:fieldservice.root
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_partner_fields
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Field Service"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_category
+msgid "Field Service Category"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_dash_equipment
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_equipment
+#: model:ir.model,name:fieldservice.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_location_person
+msgid "Field Service Location Person Info"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_template
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_order_type
+msgid "Field Service Order Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_stage
+msgid "Field Service Stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_tag
+msgid "Field Service Tag"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_team
+msgid "Field Service Team"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_person
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Field Service Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_category
+msgid "Field Service Worker Category"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_person
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__person_ids
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory__person_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_tree
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_territory_form_view_inherit
+msgid "Field Service Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_sanitized
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__phone_sanitized
+msgid ""
+"Field used to store sanitized phone number. Helps speeding up searches and "
+"comparisons."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_position_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__fold
+msgid "Folded in Kanban"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_follower_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_follower_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_follower_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_channel_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_channel_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_channel_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_partner_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_partner_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_partner_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__email_formatted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__email_formatted
+msgid "Format email address \"Name <email@domain>\""
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__email_formatted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__email_formatted
+msgid "Formatted Email"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__full_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__full_name
+msgid "Full Name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Future Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "General Notes"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_latitude
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_latitude
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Geo Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_longitude
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_longitude
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Geolocate"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Geolocation"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__date_localization
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__date_localization
+msgid "Geolocation Date"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Group By"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__has_unreconciled_entries
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__has_unreconciled_entries
+msgid "Has Unreconciled Entries"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__hide
+msgid "Hide"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__2
+msgid "High"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__im_status
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__im_status
+msgid "IM Status"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_exception_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_exception_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_exception_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_exception_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_exception_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__activity_exception_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__activity_exception_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__activity_exception_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_needaction
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_unread
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_needaction
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_unread
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_needaction
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_unread
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_needaction
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_unread
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_needaction
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_unread
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_has_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_has_sms_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_has_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_has_sms_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_has_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_has_sms_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_has_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_has_sms_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_has_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__team_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__team_id
+msgid ""
+"If set, this Sales Team will be used for sales and assignments related to "
+"this partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__is_blacklisted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__is_blacklisted
+msgid ""
+"If the email address is on the blacklist, the contact won't receive mass "
+"mailing anymore, from any list"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_sanitized_blacklisted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__phone_sanitized_blacklisted
+msgid ""
+"If the sanitized phone number is on the blacklist, the contact won't receive"
+" mass mailing sms anymore, from any list"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_1920
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_1920
+msgid "Image"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_1024
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_1024
+msgid "Image 1024"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_128
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_128
+msgid "Image 128"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_256
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_256
+msgid "Image 256"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_512
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_512
+msgid "Image 512"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__mobile_blacklisted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__mobile_blacklisted
+msgid ""
+"Indicates if a blacklisted sanitized phone number is a mobile number. Helps "
+"distinguish which number is blacklisted             when there is both a "
+"mobile and phone field in a model."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_blacklisted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__phone_blacklisted
+msgid ""
+"Indicates if a blacklisted sanitized phone number is a phone number. Helps "
+"distinguish which number is blacklisted             when there is both a "
+"mobile and phone field in a model."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__industry_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__industry_id
+msgid "Industry"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__todo
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__instructions
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_template_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "Instructions"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__internal_type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__internal_type
+msgid "Internal Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_warn
+msgid "Invoice"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__type
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__type
+msgid ""
+"Invoice & Delivery addresses are used in sales orders. Private addresses are"
+" only visible by authorized users."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_account
+msgid "Invoice your FSM orders"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Invoice your Service Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_ids
+msgid "Invoices"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__is_button
+msgid "Is Button"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_is_follower
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_is_follower
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_is_follower
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_is_follower
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__is_company
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__is_company
+msgid "Is a Company"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fsm_location
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__fsm_location
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__fsm_location
+#: model:ir.model.fields,field_description:fieldservice.field_res_users__fsm_location
+msgid "Is a FS Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fsm_person
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__fsm_person
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__fsm_person
+#: model:ir.model.fields,field_description:fieldservice.field_res_users__fsm_person
+msgid "Is a FS Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__is_closed
+msgid "Is a close stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__is_default
+msgid "Is a default stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__function
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__function
+msgid "Job Position"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__journal_item_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__journal_item_count
+msgid "Journal Items"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__lang
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__lang
+msgid "Language"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_company____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__calendar_last_notif_ack
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__calendar_last_notif_ack
+msgid "Last notification marked as read from base Calendar"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__last_time_entries_checked
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__last_time_entries_checked
+msgid ""
+"Last time the invoices & payments matching was performed for this partner. "
+"It is set either if there's not at least an unreconciled debit and an "
+"unreconciled credit or if you click the \"Done\" button."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__last_time_entries_checked
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__last_time_entries_checked
+msgid "Latest Invoices & Payments Matching Date"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__request_late
+msgid "Latest Request Date"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_repair
+msgid "Link FSM orders to MRP Repair orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_maintenance
+msgid "Link FSM orders to maintenance requests"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_fleet
+msgid "Link FSM vehicles to Fleet vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Link Field Service vehicles with Fleet vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Link to Fleet Vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Link your FSM orders to MRP repair orders"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Link your FSM orders to Projects and Project Tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Link your FSM orders to maintenance requests"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__location_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Linked Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__location_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__location_id
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_stage__stage_type__location
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_wizard__fsm_record_type__location
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
+msgid "Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__location_directions
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Location Directions"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__notes
+msgid "Location Notes"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_location_person
+msgid "Location Persons"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__phone
+msgid "Location Phone"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_report_location
+msgid "Location Reports."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_form_view
+msgid "Location Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_location_person
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_tree_view
+msgid "Location Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_report_location
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_config_location
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_fsm_location
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_report_location
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_tree_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__1
+msgid "Low"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "MRP Repair"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_main_attachment_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_main_attachment_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_main_attachment_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_main_attachment_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Maintenance"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Make sure to send the right worker with the appropriate skills"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Agreements"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__group_fsm_category
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Categories"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_distribution
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Distribution"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__group_fsm_equipment
+msgid "Manage Equipment"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Equipments"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_activity
+msgid "Manage FSM Activities"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_equipment
+msgid "Manage Field Service Equipment"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_template
+msgid "Manage Field Service Order Templates"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_tag
+msgid "Manage Field Service Tags"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_team
+msgid "Manage Field Service Teams"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_category
+msgid "Manage Field Service Worker Categories"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Order Activities"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Order Sizes"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Order Sub-Statuses"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Order Templates"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_recurring
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Recurring Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_skill
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Skills"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_substatus
+msgid "Manage Sub-Statuses"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__group_fsm_tag
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Tags"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__group_fsm_team
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Teams"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__group_fsm_template
+msgid "Manage Template"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage activities"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage agreements and contracts"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage different categories of Field Service workers"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage different teams of Field Service workers"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage equipments at the service location"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid ""
+"Manage inventory and stock operations.\n"
+"                                    Automatically activate Lots &amp; Serial Numbers."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage recurring orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_route
+msgid "Manage routes"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage routes of your workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_size
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage sizes for orders and locations"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage sub-statuses"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_purchase
+msgid "Manage subcontractors and their pricelists"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage subcontractors with pricelists"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage tags on service orders"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage templates"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage your distribution structure"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__managed_by_id
+msgid "Managed By"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_manager
+msgid "Manager"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Mapping Tools"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.data
+msgid "Master Data"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__user_id
+msgid "Me"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__meeting_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__meeting_ids
+msgid "Meetings"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_has_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_has_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_warn_msg
+msgid "Message for Invoice"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__mobile
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__mobile
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__mobile
+msgid "Mobile"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "My Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "Need Assigned"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "Need Scheduled"
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#: code:addons/fieldservice/models/fsm_order.py:0
+#: code:addons/fieldservice/models/fsm_order.py:0
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_summary
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_summary
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_summary
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_summary
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Next Stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__0
+msgid "Normal"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__email_normalized
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__email_normalized
+msgid "Normalized Email"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__notes
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__comment
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__comment
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+msgid "Notes"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_needaction_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_needaction_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_needaction_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_has_error_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_has_error_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_has_error_counter
+msgid "Number of errors"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_needaction_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_needaction_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_needaction_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_needaction_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_has_error_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_has_error_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_has_error_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_has_error_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_unread_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_unread_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_unread_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_unread_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__calendar_id
+msgid "Office Hours"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.operations
+msgid "Operations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__opportunity_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__opportunity_ids
+msgid "Opportunities"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__opportunity_count
+msgid "Opportunity"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__display_name
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_stage__stage_type__order
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_assigned
+msgid "Order Assigned"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_cancelled
+msgid "Order Cancelled"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_completed
+msgid "Order Completed"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_confirmed
+msgid "Order Confirmed"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_new
+msgid "Order Created"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_enroute
+msgid "Order En Route"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_scheduled
+msgid "Order Scheduled"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_started
+msgid "Order Started"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_form
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_tree
+msgid "Order Team"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_template
+msgid "Order Templates"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_order_type
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_order_type
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_type_tree_view
+msgid "Order Types"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_assigned
+msgid "Order assigned"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_cancelled
+msgid "Order cancelled"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_completed
+msgid "Order completed"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_confirmed
+msgid "Order confirmed"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_new
+msgid "Order created"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_enroute
+msgid "Order en route"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_scheduled
+msgid "Order scheduled"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_started
+msgid "Order started"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_dash_order
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_operation_order
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_report_order
+#: model:ir.actions.act_window,name:fieldservice.fsm_order_action_from_dashboard
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__order_ids
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_config_order
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_dash_order
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_report_order
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_tree_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__order_count
+msgid "Orders Count"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_report_order
+msgid "Orders Reports."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__order_need_assign_count
+msgid "Orders to Assign"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__order_need_schedule_count
+msgid "Orders to Schedule"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Others"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
+msgid "Owned By"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_ids
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__owned_location_ids
+#: model:ir.model.fields,field_description:fieldservice.field_res_users__owned_location_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_partner_fields
+msgid "Owned Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__owner_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
+msgid "Owner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__parent_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__parent_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fsm_parent_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__parent_id
+msgid "Parent"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__parent_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__parent_name
+msgid "Parent name"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contract_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__contract_ids
+msgid "Partner Contracts"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__same_vat_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__same_vat_partner_id
+msgid "Partner with same Tax ID"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__debit_limit
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__debit_limit
+msgid "Payable Limit"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_method_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_method_id
+msgid "Payment Method"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__payment_token_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__payment_token_ids
+msgid "Payment Tokens"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__phone
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone
+msgid "Phone"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone_sanitized_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone_sanitized_blacklisted
+msgid "Phone Blacklisted"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Planning"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Preferred Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_payment_method_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_payment_method_id
+msgid ""
+"Preferred payment method when paying this vendor. This is used to filter "
+"vendor bills by preferred payment method to register payments in mass. Use "
+"cases: create bank files for batch wires, check runs."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Previous Stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_product_pricelist
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_product_pricelist
+msgid "Pricelist"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__territory_manager_id
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory__person_id
+msgid "Primary Assignment"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contact_id
+msgid "Primary Contact"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__service_location_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__service_location_id
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__service_location_id
+#: model:ir.model.fields,field_description:fieldservice.field_res_users__service_location_id
+msgid "Primary Service Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__priority
+msgid "Priority"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__legend_priority
+msgid "Priority Management Explanation"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Project and Tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_project
+msgid "Projects and Tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
+msgid "Record Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__ref
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__ref
+msgid "Reference"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__region_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__region_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__region_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Region"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__region_manager_id
+msgid "Region Manager"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__parent_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__parent_id
+msgid "Related Company"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owner_id
+msgid "Related Owner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_id
+msgid "Related Partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Request Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Requirements"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__resolution
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Resolution"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "Resolution Notes"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_user_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_user_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_user_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_user_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Routes"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_sms_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_sms_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_has_sms_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_has_sms_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
+msgid "Sales Team"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
+msgid "Salesperson"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone_sanitized
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone_sanitized
+msgid "Sanitized Number"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Schedule Details"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__scheduled_date_end
+msgid "Scheduled End"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__scheduled_date_start
+msgid "Scheduled Start (ETA)"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__scheduled_duration
+msgid "Scheduled duration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__scheduled_duration
+msgid "Scheduled duration of the work in hours"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
+msgid "Search FSM Location"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_search_view
+msgid "Search FSM Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__search_on_complete_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__search_on_complete_name
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Search Location By Hierarchy"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_search_view
+msgid "Search Location Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Search Locations based on their full hierarchy name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Select field services on sale orders."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.partner_wizard_view
+msgid ""
+"Select whether you want to convert this record to a Field\n"
+"                    Service Worker or Location."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"Selecting \"Blocking Message\" will throw an exception with the message and "
+"block the flow. The Message has to be written in the next field."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__self
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__self
+msgid "Self"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_sale
+msgid "Sell FSM orders"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Sell Service Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__sequence
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__sequence
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__sequence
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_location
+msgid "Service Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.report,name:fieldservice.action_report_fsm_order
+msgid "Service Order"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_pivot_view
+msgid "Service Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__is_closed
+msgid "Services in this stage are considered as closed."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_config
+#: model:ir.ui.menu,name:fieldservice.settings
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "Settings"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_share
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_share
+msgid "Share Partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__signup_expiration
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__signup_expiration
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__signup_token
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__signup_token
+msgid "Signup Token"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__signup_type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__signup_type
+msgid "Signup Token Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__signup_valid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__signup_valid
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__signup_url
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__signup_url
+msgid "Signup URL"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__stage_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__stage_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__stage_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__stage_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_tree_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
+msgid "Stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__custom_color
+msgid "Stage Color"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
+msgid "Stage Description and Tooltips"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__stage_name
+msgid "Stage Name"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_stage
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__stage_ids
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_stage
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_tree_view
+msgid "Stages"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__state_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__state_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__state_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "State"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_state
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__activity_state
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__activity_state
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__activity_state
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__street
+msgid "Street"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Street 2..."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Street..."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street2
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street2
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__street2
+msgid "Street2"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sublocation_count
+msgid "Sub Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Sub-Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
+msgid "Supplier Rank"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_tag_name_uniq
+msgid "Tag name already exists!"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_tag
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__tag_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__category_id
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_tag
+msgid "Tags"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__task_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__task_ids
+msgid "Tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__vat
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__vat
+msgid "Tax ID"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__team_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__team_id
+msgid "Team"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_form
+msgid "Team Name"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_team_name_uniq
+msgid "Team name already exists!"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_team_dashboard
+#: model:ir.actions.act_window,name:fieldservice.action_team_settings
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__team_ids
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_dash_team
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_team
+msgid "Teams"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__template_id
+msgid "Template"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_template
+msgid "Templates"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__territory_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Territories"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_res_territory
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__territory_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__territory_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__territory_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Territory"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__vat
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__vat
+msgid ""
+"The Tax Identification Number. Complete it if the contact is subjected to "
+"government taxes. Used in some legal statements."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_account_position_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_account_position_id
+msgid ""
+"The fiscal position determines the taxes/accounts used for this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__country_name
+msgid "The full name of the country."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__user_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__user_id
+msgid "The internal user in charge of this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__has_unreconciled_entries
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__has_unreconciled_entries
+msgid ""
+"The partner has at least one unreconciled debit and credit since last time "
+"the invoices & payments matching was performed."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
+msgid "The worker is already linked to this location."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_account_payable_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_account_payable_id
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_account_receivable_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_account_receivable_id
+msgid ""
+"This account will be used instead of the default one as the receivable "
+"account for the current partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
+msgid ""
+"This field is used to search on email address as the primary email field can"
+" contain more than strictly an email address."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_supplier_payment_term_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_supplier_payment_term_id
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and vendor bills"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_payment_term_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_payment_term_id
+msgid ""
+"This payment term will be used instead of the default one for sales orders "
+"and customer invoices"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_product_pricelist
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_product_pricelist
+msgid ""
+"This pricelist will be used, instead of the default one, for sales to the "
+"current partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__fold
+msgid ""
+"This stage is folded in the kanban view when there are no record in that "
+"stage to display."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__tz
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__tz
+msgid "Timezone"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__tz_offset
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__tz_offset
+msgid "Timezone offset"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__title
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__title
+msgid "Title"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "To Assign"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "To Do"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "To Schedule"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Today Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__total_invoiced
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__total_invoiced
+msgid "Total Invoiced"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__debit
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__debit
+msgid "Total Payable"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__credit
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__credit
+msgid "Total Receivable"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__credit
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__credit
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__debit
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__debit
+msgid "Total amount you have to pay to this vendor."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__stage_type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__type_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_type_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_search_view
+msgid "Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_exception_decoration
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__activity_exception_decoration
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__activity_exception_decoration
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__activity_exception_decoration
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Unassigned"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_unread
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_unread
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_unread
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_unread
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_unread_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_unread_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_unread_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Unscheduled"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__3
+msgid "Urgent"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_location_builder
+msgid "Use FSM Location Builder"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_geoengine
+msgid "Use GeoEngine"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Use GeoEngine with OpenStreetMap"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__custom_color
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__custom_color
+msgid "Use Hex Code only Ex:-#FFFFFF"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_stock
+msgid "Use Odoo Logistics"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Use Odoo Purchase"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Use Odoo Stock Logistics"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__barcode
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__barcode
+msgid "Use a barcode to identify this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__is_default
+msgid "Used a default stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__sequence
+msgid "Used to order stages. Lower is better."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__sequence
+msgid "Used to sort teams. Lower is better."
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_user
+msgid "User"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_ids
+msgid "Users"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__currency_id
+msgid "Utility field to express amount currency"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id
+msgid "Vendor Payment Terms"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__website
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__website
+msgid "Website Link"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__tz
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__tz
+msgid ""
+"When printing documents and exporting/importing data, time values are computed according to this timezone.\n"
+"If the timezone is not set, UTC (Coordinated Universal Time) is used.\n"
+"Anywhere else, time values are computed according to the time offset of your web client."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__person_id
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_stage__stage_type__worker
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_wizard__fsm_record_type__person
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_search_view
+msgid "Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__person_phone
+msgid "Worker Phone"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__person_ids
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_config_person
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_person
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__calendar_id
+msgid "Working Schedule"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
+msgid ""
+"You can add a description to help your coworkers understand the meaning and "
+"purpose of the stage."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_location.py:0
+#, python-format
+msgid "You cannot create recursive location."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "You cannot delete this order."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_person_calendar_filter_user_id_fsm_person_id_unique
+msgid "You cannot have the same worker twice."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "You must create an FSM order stage first."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "You must create an FSM team first."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "ZIP"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__zip
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__zip
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__zip
+msgid "Zip"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_tag_form_view
+msgid "tag"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_tag_tree_view
+msgid "tags"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_template_form_view
+msgid "template"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_template_tree_view
+msgid "templates"
+msgstr ""

From bcefe17395e9f45f4eb31b38879ac2405295e849 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Sat, 26 Jun 2021 15:17:27 +0000
Subject: [PATCH 048/631] Added translation using Weblate (Turkish)

---
 base_territory/i18n/tr.po | 204 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 204 insertions(+)
 create mode 100644 base_territory/i18n/tr.po

diff --git a/base_territory/i18n/tr.po b/base_territory/i18n/tr.po
new file mode 100644
index 0000000000..1d7250166a
--- /dev/null
+++ b/base_territory/i18n/tr.po
@@ -0,0 +1,204 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* base_territory
+#
+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: tr\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: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__branch_id
+#: model_terms:ir.ui.view,arch_db:base_territory.res_branch_form_view
+msgid "Branch"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__partner_id
+msgid "Branch Manager"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.actions.act_window,name:base_territory.action_res_branch
+#: model:ir.ui.menu,name:base_territory.menu_res_branch
+#: model_terms:ir.ui.view,arch_db:base_territory.res_branch_tree_view
+msgid "Branches"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model,name:base_territory.model_res_country
+#: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__country
+msgid "Country"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__country_ids
+msgid "Country Names"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__create_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_district__create_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_region__create_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__create_date
+#: model:ir.model.fields,field_description:base_territory.field_res_district__create_date
+#: model:ir.model.fields,field_description:base_territory.field_res_region__create_date
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: base_territory
+#: model_terms:ir.ui.view,arch_db:base_territory.res_territory_form_view
+msgid "Definition"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__description
+#: model:ir.model.fields,field_description:base_territory.field_res_district__description
+#: model:ir.model.fields,field_description:base_territory.field_res_region__description
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__description
+msgid "Description"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__display_name
+#: model:ir.model.fields,field_description:base_territory.field_res_country__display_name
+#: model:ir.model.fields,field_description:base_territory.field_res_district__display_name
+#: model:ir.model.fields,field_description:base_territory.field_res_region__display_name
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model,name:base_territory.model_res_district
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__district_id
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__district_id
+#: model_terms:ir.ui.view,arch_db:base_territory.res_district_form_view
+msgid "District"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_district__partner_id
+msgid "District Manager"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.actions.act_window,name:base_territory.action_res_district
+#: model:ir.ui.menu,name:base_territory.menu_res_district
+#: model_terms:ir.ui.view,arch_db:base_territory.res_district_tree_view
+msgid "Districts"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__id
+#: model:ir.model.fields,field_description:base_territory.field_res_country__id
+#: model:ir.model.fields,field_description:base_territory.field_res_district__id
+#: model:ir.model.fields,field_description:base_territory.field_res_region__id
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__id
+msgid "ID"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch____last_update
+#: model:ir.model.fields,field_description:base_territory.field_res_country____last_update
+#: model:ir.model.fields,field_description:base_territory.field_res_district____last_update
+#: model:ir.model.fields,field_description:base_territory.field_res_region____last_update
+#: model:ir.model.fields,field_description:base_territory.field_res_territory____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__write_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_district__write_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_region__write_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__write_date
+#: model:ir.model.fields,field_description:base_territory.field_res_district__write_date
+#: model:ir.model.fields,field_description:base_territory.field_res_region__write_date
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__name
+#: model:ir.model.fields,field_description:base_territory.field_res_district__name
+#: model:ir.model.fields,field_description:base_territory.field_res_region__name
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__name
+msgid "Name"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model,name:base_territory.model_res_region
+#: model:ir.model.fields,field_description:base_territory.field_res_district__region_id
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__region_id
+#: model_terms:ir.ui.view,arch_db:base_territory.res_region_form_view
+msgid "Region"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_region__partner_id
+msgid "Region Manager"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.actions.act_window,name:base_territory.action_res_region
+#: model:ir.model.fields,field_description:base_territory.field_res_country__region_ids
+#: model:ir.ui.menu,name:base_territory.menu_res_region
+#: model_terms:ir.ui.view,arch_db:base_territory.res_region_tree_view
+msgid "Regions"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__state
+msgid "State"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.actions.act_window,name:base_territory.action_res_territory
+#: model:ir.ui.menu,name:base_territory.menu_res_territory
+#: model_terms:ir.ui.view,arch_db:base_territory.res_territory_tree_view
+msgid "Territories"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model,name:base_territory.model_res_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_country__territory_id
+#: model_terms:ir.ui.view,arch_db:base_territory.res_territory_form_view
+msgid "Territory"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__type
+msgid "Type"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__zip_codes
+msgid "ZIP Codes"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__zip
+msgid "Zip"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model,name:base_territory.model_res_branch
+msgid "branch"
+msgstr ""

From 4d92e8421daf77f34f74eec3d7ea9aa9f8bf8025 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Sat, 26 Jun 2021 15:27:38 +0000
Subject: [PATCH 049/631] Translated using Weblate (Turkish)

Currently translated at 2.4% (13 of 535 strings)

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

diff --git a/fieldservice/i18n/tr.po b/fieldservice/i18n/tr.po
index 37ce2d42a5..d7c6525f1f 100644
--- a/fieldservice/i18n/tr.po
+++ b/fieldservice/i18n/tr.po
@@ -6,30 +6,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2021-06-26 17:48+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\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
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__meeting_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__meeting_count
 msgid "# Meetings"
-msgstr ""
+msgstr "# Toplantılar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__opportunity_count
 msgid "# Opportunities"
-msgstr ""
+msgstr "# Fırsatalar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__task_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__task_count
 msgid "# Tasks"
-msgstr ""
+msgstr "# Görevler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
@@ -37,23 +39,23 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_res_partner__owned_location_count
 #: model:ir.model.fields,field_description:fieldservice.field_res_users__owned_location_count
 msgid "# of Owned Locations"
-msgstr ""
+msgstr "# Sahip Olunan Konumlar"
 
 #. module: fieldservice
 #: code:addons/fieldservice/models/fsm_order.py:0
 #, python-format
 msgid "%s is a holiday (%s)."
-msgstr ""
+msgstr "%s tatil mi (%s)."
 
 #. module: fieldservice
 #: model:ir.actions.report,print_report_name:fieldservice.action_report_fsm_order
 msgid "'Service Order - %s' % (object.name)"
-msgstr ""
+msgstr "'Servis Siparişi - %s' % (object.name)"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "<i class=\"fa fa-ellipsis-v\" title=\"Manager\"/>"
-msgstr ""
+msgstr "<i class=\"fa fa-ellipsis-v\" title=\"Yönetici\"/>"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
@@ -73,22 +75,22 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "<span>Reporting</span>"
-msgstr ""
+msgstr "<span>Raporlama</span>"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "<span>View</span>"
-msgstr ""
+msgstr "<span>Görünüm</span>"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
 msgid "<strong>Assigned To:</strong>"
-msgstr ""
+msgstr "<strong>Atandı:</strong>"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
 msgid "<strong>Date Completed:</strong>"
-msgstr ""
+msgstr "<strong>Tamamlanma Tarihi:</strong>"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
@@ -99,13 +101,13 @@ msgstr ""
 #: code:addons/fieldservice/wizard/fsm_wizard.py:0
 #, python-format
 msgid "A Field Service Location related to that partner already exists."
-msgstr ""
+msgstr "Bu iş ortağıyla ilgili bir Saha Servis Lokasyon zaten var."
 
 #. module: fieldservice
 #: code:addons/fieldservice/wizard/fsm_wizard.py:0
 #, python-format
 msgid "A Field Service Worker related to that partner already exists."
-msgstr ""
+msgstr "Bu iş ortağıyla ilgili bir Saha Servis Çalışanı zaten var."
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_payable_id

From 01a1fd19ff72a0aa43d167c5d0c380778c16def8 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Sat, 3 Jul 2021 16:59:54 +0000
Subject: [PATCH 050/631] [UPD] Update fieldservice.pot

---
 fieldservice/i18n/fieldservice.pot | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/fieldservice/i18n/fieldservice.pot b/fieldservice/i18n/fieldservice.pot
index 1dccbe0138..b73f52da80 100644
--- a/fieldservice/i18n/fieldservice.pot
+++ b/fieldservice/i18n/fieldservice.pot
@@ -2052,6 +2052,15 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "My Orders"

From 54971b13223943cf6f88b26db6157ac785a9917b Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Sat, 3 Jul 2021 16:59:56 +0000
Subject: [PATCH 051/631] [UPD] Update fieldservice_timeline.pot

---
 fieldservice_timeline/i18n/fieldservice_timeline.pot | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fieldservice_timeline/i18n/fieldservice_timeline.pot b/fieldservice_timeline/i18n/fieldservice_timeline.pot
index 7bd58ef5ca..b36d9b0972 100644
--- a/fieldservice_timeline/i18n/fieldservice_timeline.pot
+++ b/fieldservice_timeline/i18n/fieldservice_timeline.pot
@@ -90,6 +90,11 @@ msgstr ""
 msgid "Last Modified on"
 msgstr ""
 
+#. module: fieldservice_timeline
+#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: fieldservice_timeline
 #: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_date_deadline
 msgid "Next Activity Deadline"

From 9ad836cd43d2ed8a21bf396c099e27abf0a217cd Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sat, 3 Jul 2021 19:29:58 +0000
Subject: [PATCH 052/631] fieldservice 14.0.1.1.1

---
 fieldservice/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice/__manifest__.py b/fieldservice/__manifest__.py
index 51b2891dbd..bfae35b4cb 100644
--- a/fieldservice/__manifest__.py
+++ b/fieldservice/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Field Service",
     "summary": "Manage Field Service Locations, Workers and Orders",
-    "version": "14.0.1.1.0",
+    "version": "14.0.1.1.1",
     "license": "AGPL-3",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",

From 07224ff334bab91971a123a500243f118b327a33 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sat, 3 Jul 2021 19:30:05 +0000
Subject: [PATCH 053/631] [UPD] addons table in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f623f780a9..6efda48f46 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Available addons
 addon | version | summary
 --- | --- | ---
 [base_territory](base_territory/) | 14.0.1.0.0 | This module allows you to define territories, branches, districts and regions to be used for Field Service operations or Sales.
-[fieldservice](fieldservice/) | 14.0.1.1.0 | Manage Field Service Locations, Workers and Orders
+[fieldservice](fieldservice/) | 14.0.1.1.1 | Manage Field Service Locations, Workers and Orders
 [fieldservice_account](fieldservice_account/) | 14.0.1.0.0 | Track invoices linked to Field Service orders
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task

From 2c1c570aa007362f3654e00fcd5aa0b1645657b2 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 3 Jul 2021 19:30:09 +0000
Subject: [PATCH 054/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-14.0/field-service-14.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice/
---
 fieldservice/i18n/de.po    |  9 +++++++++
 fieldservice/i18n/es.po    |  9 +++++++++
 fieldservice/i18n/es_AR.po |  9 +++++++++
 fieldservice/i18n/es_CL.po |  9 +++++++++
 fieldservice/i18n/fr.po    |  9 +++++++++
 fieldservice/i18n/fr_FR.po |  9 +++++++++
 fieldservice/i18n/pt_BR.po |  9 +++++++++
 fieldservice/i18n/tr.po    | 40 +++++++++++++++++++++++---------------
 8 files changed, 87 insertions(+), 16 deletions(-)

diff --git a/fieldservice/i18n/de.po b/fieldservice/i18n/de.po
index b9839f6f01..5d90affae5 100644
--- a/fieldservice/i18n/de.po
+++ b/fieldservice/i18n/de.po
@@ -2065,6 +2065,15 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "My Orders"
diff --git a/fieldservice/i18n/es.po b/fieldservice/i18n/es.po
index 34cd0a7c2b..500f926099 100644
--- a/fieldservice/i18n/es.po
+++ b/fieldservice/i18n/es.po
@@ -2096,6 +2096,15 @@ msgstr "Mensajes"
 msgid "Mobile"
 msgstr "Móvil"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "My Orders"
diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index 7d93458ca0..98b0c48db1 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -2104,6 +2104,15 @@ msgstr "Mensajes"
 msgid "Mobile"
 msgstr "Celular"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "My Orders"
diff --git a/fieldservice/i18n/es_CL.po b/fieldservice/i18n/es_CL.po
index 3a054d9342..67f587c711 100644
--- a/fieldservice/i18n/es_CL.po
+++ b/fieldservice/i18n/es_CL.po
@@ -2096,6 +2096,15 @@ msgstr "Mensajes"
 msgid "Mobile"
 msgstr "Móvil"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "My Orders"
diff --git a/fieldservice/i18n/fr.po b/fieldservice/i18n/fr.po
index b0dfcfce2d..128c88eefc 100644
--- a/fieldservice/i18n/fr.po
+++ b/fieldservice/i18n/fr.po
@@ -2116,6 +2116,15 @@ msgstr "Messages"
 msgid "Mobile"
 msgstr "Téléphone portable"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "My Orders"
diff --git a/fieldservice/i18n/fr_FR.po b/fieldservice/i18n/fr_FR.po
index b325b3fc2d..7d9ed32324 100644
--- a/fieldservice/i18n/fr_FR.po
+++ b/fieldservice/i18n/fr_FR.po
@@ -2113,6 +2113,15 @@ msgstr "Messages"
 msgid "Mobile"
 msgstr "Téléphone portable"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "My Orders"
diff --git a/fieldservice/i18n/pt_BR.po b/fieldservice/i18n/pt_BR.po
index afca5cd494..cc6d7803f2 100644
--- a/fieldservice/i18n/pt_BR.po
+++ b/fieldservice/i18n/pt_BR.po
@@ -2098,6 +2098,15 @@ msgstr "Mensagens"
 msgid "Mobile"
 msgstr "Celular"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "My Orders"
diff --git a/fieldservice/i18n/tr.po b/fieldservice/i18n/tr.po
index d7c6525f1f..5bda20ce73 100644
--- a/fieldservice/i18n/tr.po
+++ b/fieldservice/i18n/tr.po
@@ -258,8 +258,8 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
 msgid ""
-"All the emails and documents sent to this contact will be translated in this"
-" language."
+"All the emails and documents sent to this contact will be translated in this "
+"language."
 msgstr ""
 
 #. module: fieldservice
@@ -326,8 +326,7 @@ msgstr ""
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
-msgid ""
-"Auto-populate the equipments on the order based on the location content"
+msgid "Auto-populate the equipments on the order based on the location content"
 msgstr ""
 
 #. module: fieldservice
@@ -1405,8 +1404,8 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_sanitized_blacklisted
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__phone_sanitized_blacklisted
 msgid ""
-"If the sanitized phone number is on the blacklist, the contact won't receive"
-" mass mailing sms anymore, from any list"
+"If the sanitized phone number is on the blacklist, the contact won't receive "
+"mass mailing sms anymore, from any list"
 msgstr ""
 
 #. module: fieldservice
@@ -1488,8 +1487,8 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__type
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__type
 msgid ""
-"Invoice & Delivery addresses are used in sales orders. Private addresses are"
-" only visible by authorized users."
+"Invoice & Delivery addresses are used in sales orders. Private addresses are "
+"only visible by authorized users."
 msgstr ""
 
 #. module: fieldservice
@@ -1934,7 +1933,8 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid ""
 "Manage inventory and stock operations.\n"
-"                                    Automatically activate Lots &amp; Serial Numbers."
+"                                    Automatically activate Lots &amp; Serial "
+"Numbers."
 msgstr ""
 
 #. module: fieldservice
@@ -2055,6 +2055,15 @@ msgstr ""
 msgid "Mobile"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "My Orders"
@@ -2086,9 +2095,6 @@ msgstr ""
 
 #. module: fieldservice
 #: code:addons/fieldservice/models/fsm_order.py:0
-#: code:addons/fieldservice/models/fsm_order.py:0
-#: code:addons/fieldservice/models/fsm_order.py:0
-#: code:addons/fieldservice/models/fsm_order.py:0
 #, python-format
 msgid "New"
 msgstr ""
@@ -3011,8 +3017,8 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
 msgid ""
-"This field is used to search on email address as the primary email field can"
-" contain more than strictly an email address."
+"This field is used to search on email address as the primary email field can "
+"contain more than strictly an email address."
 msgstr ""
 
 #. module: fieldservice
@@ -3279,9 +3285,11 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__tz
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__tz
 msgid ""
-"When printing documents and exporting/importing data, time values are computed according to this timezone.\n"
+"When printing documents and exporting/importing data, time values are "
+"computed according to this timezone.\n"
 "If the timezone is not set, UTC (Coordinated Universal Time) is used.\n"
-"Anywhere else, time values are computed according to the time offset of your web client."
+"Anywhere else, time values are computed according to the time offset of your "
+"web client."
 msgstr ""
 
 #. module: fieldservice

From 0b0343dd2d886abf1e0c3562efb60b336e651de5 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 3 Jul 2021 19:30:09 +0000
Subject: [PATCH 055/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-14.0/field-service-14.0-fieldservice_timeline
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_timeline/
---
 fieldservice_timeline/i18n/pt_BR.po | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fieldservice_timeline/i18n/pt_BR.po b/fieldservice_timeline/i18n/pt_BR.po
index cb229f5137..4ca844590c 100644
--- a/fieldservice_timeline/i18n/pt_BR.po
+++ b/fieldservice_timeline/i18n/pt_BR.po
@@ -53,7 +53,6 @@ msgstr "Aplicar"
 #. module: fieldservice_timeline
 #. openerp-web
 #: code:addons/fieldservice_timeline/static/src/xml/fsm_gantt_person_filter.xml:0
-#: code:addons/fieldservice_timeline/static/src/xml/fsm_gantt_person_filter.xml:0
 #, python-format
 msgid "Delete"
 msgstr "Excluir"
@@ -93,6 +92,11 @@ msgstr "Ícone para indicar uma atividade de exceção."
 msgid "Last Modified on"
 msgstr "Última Modificação em"
 
+#. module: fieldservice_timeline
+#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: fieldservice_timeline
 #: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_date_deadline
 msgid "Next Activity Deadline"

From adf0f1934adbe04ec5469500ccfeec1a16df4e10 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Sat, 3 Jul 2021 22:52:48 +0000
Subject: [PATCH 056/631] [UPD] Update fieldservice_timeline.pot

---
 .../i18n/fieldservice_timeline.pot            | 94 -------------------
 1 file changed, 94 deletions(-)

diff --git a/fieldservice_timeline/i18n/fieldservice_timeline.pot b/fieldservice_timeline/i18n/fieldservice_timeline.pot
index b36d9b0972..21e5b3cdaa 100644
--- a/fieldservice_timeline/i18n/fieldservice_timeline.pot
+++ b/fieldservice_timeline/i18n/fieldservice_timeline.pot
@@ -13,26 +13,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_ids
-msgid "Activities"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_exception_decoration
-msgid "Activity Exception Decoration"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_state
-msgid "Activity State"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_type_icon
-msgid "Activity Type Icon"
-msgstr ""
-
 #. module: fieldservice_timeline
 #. openerp-web
 #: code:addons/fieldservice_timeline/static/src/xml/fsm_gantt_person_filter.xml:0
@@ -55,61 +35,6 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model,name:fieldservice_timeline.model_fsm_person
-msgid "Field Service Worker"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,help:fieldservice_timeline.field_fsm_person__activity_type_icon
-msgid "Font awesome icon e.g. fa-tasks"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__id
-msgid "ID"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_exception_icon
-msgid "Icon"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,help:fieldservice_timeline.field_fsm_person__activity_exception_icon
-msgid "Icon to indicate an exception activity."
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person____last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__my_activity_date_deadline
-msgid "My Activity Deadline"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_date_deadline
-msgid "Next Activity Deadline"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_summary
-msgid "Next Activity Summary"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_type_id
-msgid "Next Activity Type"
-msgstr ""
-
 #. module: fieldservice_timeline
 #: model_terms:ir.ui.view,arch_db:fieldservice_timeline.fsm_order_timeline_view
 msgid "Orders"
@@ -122,25 +47,6 @@ msgstr ""
 msgid "Person Filter"
 msgstr ""
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_user_id
-msgid "Responsible User"
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,help:fieldservice_timeline.field_fsm_person__activity_state
-msgid ""
-"Status based on activities\n"
-"Overdue: Due date is already passed\n"
-"Today: Activity date is today\n"
-"Planned: Future activities."
-msgstr ""
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,help:fieldservice_timeline.field_fsm_person__activity_exception_decoration
-msgid "Type of the exception activity on record."
-msgstr ""
-
 #. module: fieldservice_timeline
 #. openerp-web
 #: code:addons/fieldservice_timeline/static/src/xml/fsm_gantt_person_filter.xml:0

From eb718760a2bcc2f258cdb4e8a574dc4ef57ae71b Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sun, 4 Jul 2021 00:01:56 +0000
Subject: [PATCH 057/631] fieldservice_timeline 14.0.1.1.1

---
 fieldservice_timeline/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_timeline/__manifest__.py b/fieldservice_timeline/__manifest__.py
index 01c3ea71f2..894b45ebcf 100644
--- a/fieldservice_timeline/__manifest__.py
+++ b/fieldservice_timeline/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Field Service Web Timeline",
     "summary": "This module is a display timeline view of the Field Service"
     " order in Odoo.",
-    "version": "14.0.1.1.0",
+    "version": "14.0.1.1.1",
     "category": "Field Service",
     "license": "AGPL-3",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",

From 20c460d627f5ae0e8ceb011953f393f86e949a54 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sun, 4 Jul 2021 00:02:04 +0000
Subject: [PATCH 058/631] [UPD] addons table in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6efda48f46..6051d5a65a 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ addon | version | summary
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills
-[fieldservice_timeline](fieldservice_timeline/) | 14.0.1.1.0 | This module is a display timeline view of the Field Service order in Odoo.
+[fieldservice_timeline](fieldservice_timeline/) | 14.0.1.1.1 | This module is a display timeline view of the Field Service order in Odoo.
 
 [//]: # (end addons)
 

From d6e0d70bcd44c5031cbcd1c09b41240800a0fce7 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sun, 4 Jul 2021 00:02:11 +0000
Subject: [PATCH 059/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

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

diff --git a/fieldservice_timeline/i18n/pt_BR.po b/fieldservice_timeline/i18n/pt_BR.po
index 4ca844590c..ccd7a983fb 100644
--- a/fieldservice_timeline/i18n/pt_BR.po
+++ b/fieldservice_timeline/i18n/pt_BR.po
@@ -16,26 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.3.2\n"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_ids
-msgid "Activities"
-msgstr "Atividades"
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_exception_decoration
-msgid "Activity Exception Decoration"
-msgstr "Decoração de Exceção de Atividade"
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_state
-msgid "Activity State"
-msgstr "Estado da Atividade"
-
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_type_icon
-msgid "Activity Type Icon"
-msgstr "Ícone de Tipo de Atividade"
-
 #. module: fieldservice_timeline
 #. openerp-web
 #: code:addons/fieldservice_timeline/static/src/xml/fsm_gantt_person_filter.xml:0
@@ -58,98 +38,79 @@ msgid "Delete"
 msgstr "Excluir"
 
 #. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__display_name
-msgid "Display Name"
-msgstr "Nome de Exibição"
+#: model_terms:ir.ui.view,arch_db:fieldservice_timeline.fsm_order_timeline_view
+msgid "Orders"
+msgstr "Ordens"
 
 #. module: fieldservice_timeline
-#: model:ir.model,name:fieldservice_timeline.model_fsm_person
-msgid "Field Service Worker"
-msgstr "Trabalhador de Serviço de Campo"
+#. openerp-web
+#: code:addons/fieldservice_timeline/static/src/xml/fsm_gantt_person_filter.xml:0
+#, python-format
+msgid "Person Filter"
+msgstr "Filtro de Pessoa"
 
 #. module: fieldservice_timeline
-#: model:ir.model.fields,help:fieldservice_timeline.field_fsm_person__activity_type_icon
-msgid "Font awesome icon e.g. fa-tasks"
-msgstr "Ícone Font Awesome ex: fa-tasks"
+#. openerp-web
+#: code:addons/fieldservice_timeline/static/src/xml/fsm_gantt_person_filter.xml:0
+#, python-format
+msgid "or"
+msgstr "ou"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__id
-msgid "ID"
-msgstr "ID"
+#~ msgid "Activities"
+#~ msgstr "Atividades"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_exception_icon
-msgid "Icon"
-msgstr "Ícone"
+#~ msgid "Activity Exception Decoration"
+#~ msgstr "Decoração de Exceção de Atividade"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,help:fieldservice_timeline.field_fsm_person__activity_exception_icon
-msgid "Icon to indicate an exception activity."
-msgstr "Ícone para indicar uma atividade de exceção."
+#~ msgid "Activity State"
+#~ msgstr "Estado da Atividade"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person____last_update
-msgid "Last Modified on"
-msgstr "Última Modificação em"
+#~ msgid "Activity Type Icon"
+#~ msgstr "Ícone de Tipo de Atividade"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__my_activity_date_deadline
-msgid "My Activity Deadline"
-msgstr ""
+#~ msgid "Display Name"
+#~ msgstr "Nome de Exibição"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_date_deadline
-msgid "Next Activity Deadline"
-msgstr "Prazo da Próxima Atividade"
+#~ msgid "Field Service Worker"
+#~ msgstr "Trabalhador de Serviço de Campo"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_summary
-msgid "Next Activity Summary"
-msgstr "Resumo da Próxima Atividade"
+#~ msgid "Font awesome icon e.g. fa-tasks"
+#~ msgstr "Ícone Font Awesome ex: fa-tasks"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_type_id
-msgid "Next Activity Type"
-msgstr "Tipo da Próxima Atividade"
+#~ msgid "ID"
+#~ msgstr "ID"
 
-#. module: fieldservice_timeline
-#: model_terms:ir.ui.view,arch_db:fieldservice_timeline.fsm_order_timeline_view
-msgid "Orders"
-msgstr "Ordens"
+#~ msgid "Icon"
+#~ msgstr "Ícone"
 
-#. module: fieldservice_timeline
-#. openerp-web
-#: code:addons/fieldservice_timeline/static/src/xml/fsm_gantt_person_filter.xml:0
-#, python-format
-msgid "Person Filter"
-msgstr "Filtro de Pessoa"
+#~ msgid "Icon to indicate an exception activity."
+#~ msgstr "Ícone para indicar uma atividade de exceção."
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,field_description:fieldservice_timeline.field_fsm_person__activity_user_id
-msgid "Responsible User"
-msgstr "Usuário Responsável"
+#~ msgid "Last Modified on"
+#~ msgstr "Última Modificação em"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,help:fieldservice_timeline.field_fsm_person__activity_state
-msgid ""
-"Status based on activities\n"
-"Overdue: Due date is already passed\n"
-"Today: Activity date is today\n"
-"Planned: Future activities."
-msgstr ""
-"Situação baseada em atividades\n"
-"Atrasada: A data de vencimento já passou\n"
-"Hoje: Data da atividade é hoje\n"
-"Planejada: Atividades futuras."
+#~ msgid "Next Activity Deadline"
+#~ msgstr "Prazo da Próxima Atividade"
 
-#. module: fieldservice_timeline
-#: model:ir.model.fields,help:fieldservice_timeline.field_fsm_person__activity_exception_decoration
-msgid "Type of the exception activity on record."
-msgstr "Tipo de atividade de exceção no registro."
+#~ msgid "Next Activity Summary"
+#~ msgstr "Resumo da Próxima Atividade"
 
-#. module: fieldservice_timeline
-#. openerp-web
-#: code:addons/fieldservice_timeline/static/src/xml/fsm_gantt_person_filter.xml:0
-#, python-format
-msgid "or"
-msgstr "ou"
+#~ msgid "Next Activity Type"
+#~ msgstr "Tipo da Próxima Atividade"
+
+#~ msgid "Responsible User"
+#~ msgstr "Usuário Responsável"
+
+#~ msgid ""
+#~ "Status based on activities\n"
+#~ "Overdue: Due date is already passed\n"
+#~ "Today: Activity date is today\n"
+#~ "Planned: Future activities."
+#~ msgstr ""
+#~ "Situação baseada em atividades\n"
+#~ "Atrasada: A data de vencimento já passou\n"
+#~ "Hoje: Data da atividade é hoje\n"
+#~ "Planejada: Atividades futuras."
+
+#~ msgid "Type of the exception activity on record."
+#~ msgstr "Tipo de atividade de exceção no registro."

From 4644aeedd5af1f7fd185861d99c784a47efcf195 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 24 Nov 2018 14:28:34 -0500
Subject: [PATCH 060/631] [ADD] fieldservice_stock 0.0.1

---
 fieldservice_stock/__init__.py             |   4 +
 fieldservice_stock/__manifest__.py         |  30 +++++
 fieldservice_stock/data/fsm_stock_data.xml | 144 +++++++++++++++++++++
 fieldservice_stock/models/__init__.py      |   7 +
 fieldservice_stock/models/fsm_location.py  |  11 ++
 fieldservice_stock/models/fsm_vehicle.py   |  11 ++
 fieldservice_stock/readme/CONFIGURE.rst    |   3 +
 fieldservice_stock/readme/CONTRIBUTORS.rst |   1 +
 fieldservice_stock/readme/CREDITS.rst      |   3 +
 fieldservice_stock/readme/DESCRIPTION.rst  |   2 +
 fieldservice_stock/readme/INSTALL.rst      |   6 +
 fieldservice_stock/readme/ROADMAP.rst      |   2 +
 fieldservice_stock/readme/USAGE.rst        |   3 +
 fieldservice_stock/views/fsm_location.xml  |  14 ++
 fieldservice_stock/views/fsm_vehicle.xml   |  14 ++
 15 files changed, 255 insertions(+)
 create mode 100644 fieldservice_stock/__init__.py
 create mode 100644 fieldservice_stock/__manifest__.py
 create mode 100644 fieldservice_stock/data/fsm_stock_data.xml
 create mode 100644 fieldservice_stock/models/__init__.py
 create mode 100644 fieldservice_stock/models/fsm_location.py
 create mode 100644 fieldservice_stock/models/fsm_vehicle.py
 create mode 100644 fieldservice_stock/readme/CONFIGURE.rst
 create mode 100644 fieldservice_stock/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_stock/readme/CREDITS.rst
 create mode 100644 fieldservice_stock/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_stock/readme/INSTALL.rst
 create mode 100644 fieldservice_stock/readme/ROADMAP.rst
 create mode 100644 fieldservice_stock/readme/USAGE.rst
 create mode 100644 fieldservice_stock/views/fsm_location.xml
 create mode 100644 fieldservice_stock/views/fsm_vehicle.xml

diff --git a/fieldservice_stock/__init__.py b/fieldservice_stock/__init__.py
new file mode 100644
index 0000000000..da2feecfe9
--- /dev/null
+++ b/fieldservice_stock/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
new file mode 100644
index 0000000000..5740b09ee3
--- /dev/null
+++ b/fieldservice_stock/__manifest__.py
@@ -0,0 +1,30 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service Stock add-on',
+    'summary': 'Inventory and Stock operations for Field Service',
+    'version': '11.0.0.0.1',
+    'category': 'Field Service',
+    'author': 'Open Source Integrators, Brian McMaster,  Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'base_geolocalize',
+        'mail',
+        'fieldservice',
+        'stock',
+    ],
+    'data': [
+        'data/fsm_stock_data.xml',
+        'views/fsm_location.xml',
+        'views/fsm_vehicle.xml',
+    ],
+    'installable': True,
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'brian10048',
+        'wolfhall',
+        'max3903',
+    ],
+}
diff --git a/fieldservice_stock/data/fsm_stock_data.xml b/fieldservice_stock/data/fsm_stock_data.xml
new file mode 100644
index 0000000000..4c3750e2c8
--- /dev/null
+++ b/fieldservice_stock/data/fsm_stock_data.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="stock_location_field" model="stock.location">
+            <field name="name">Field</field>
+            <field name="usage">view</field>
+            <field name="company_id"></field>
+        </record>
+
+        <record id="stock_location_vehicle" model="stock.location">
+            <field name="name">Vehicle</field>
+            <field name="usage">view</field>
+            <field name="company_id"></field>
+        </record>
+    </data>
+
+    <data noupdate="1">
+        <!-- Output to Vehicle operations -->
+        <record id="seq_picking_type_output_to_vehicle" model="ir.sequence">
+            <field name="name">Vehicle Loading</field>
+            <field name="prefix">VL</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+
+        <record id="picking_type_output_to_vehicle" model="stock.picking.type">
+            <field name="name">Vehicle Loading</field>
+            <field name="sequence_id" ref="seq_picking_type_output_to_vehicle"/>
+            <field name="code">internal</field>
+            <field name="warehouse_id" eval="False"/>
+            <field name="default_location_src_id" ref="stock.stock_location_stock"/>
+            <field name="default_location_dest_id" ref="stock_location_vehicle"/>
+        </record>
+
+        <record id="route_output_to_vehicle" model='stock.location.route'>
+            <field name="name">Output to Vehicle</field>
+            <field name="sequence">3</field>
+            <field name="company_id"></field>
+        </record>
+
+        <record id="procurement_rule_output_to_vehicle" model="procurement.rule">
+            <field name="name">Warehouse → Vehicle</field>
+            <field name="action">move</field>
+            <field name="location_id" ref="stock_location_vehicle"/>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="route_id" ref="route_output_to_vehicle"/>
+            <field name="picking_type_id" ref="picking_type_output_to_vehicle"/>
+        </record>
+
+        <!-- Vehicle to Location operations -->
+        <record id="seq_picking_type_vehicle_to_location" model="ir.sequence">
+            <field name="name">Location Delivery</field>
+            <field name="prefix">LD</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+
+        <record id="picking_type_vehicle_to_location" model="stock.picking.type">
+            <field name="name">Location Delivery</field>
+            <field name="sequence_id" ref="seq_picking_type_vehicle_to_location"/>
+            <field name="code">outgoing</field>
+            <field name="warehouse_id" eval="False"/>
+            <field name="default_location_src_id" ref="stock_location_vehicle"/>
+        </record>
+
+        <record id="route_vehicle_to_location" model='stock.location.route'>
+            <field name="name">Vehicle to Location</field>
+            <field name="sequence">3</field>
+            <field name="company_id"></field>
+        </record>
+
+        <record id="procurement_rule_vehicle_to_location" model="procurement.rule">
+            <field name="name">Vehicle → Location</field>
+            <field name="action">move</field>
+            <field name="location_id" ref="stock.stock_location_customers"/>
+            <field name="location_src_id" ref="stock_location_vehicle"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="route_id" ref="route_vehicle_to_location"/>
+            <field name="picking_type_id" ref="picking_type_vehicle_to_location"/>
+        </record>
+
+        <!-- Location Return Operations -->
+        <record id="route_location_return" model='stock.location.route'>
+            <field name="name">Location Return</field>
+            <field name="sequence">3</field>
+            <field name="company_id"></field>
+        </record>
+
+        <!-- Location Return to Vehicle operations -->
+        <record id="seq_picking_type_location_to_vehicle" model="ir.sequence">
+            <field name="name">Location Pickup</field>
+            <field name="prefix">LP</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+
+        <record id="picking_type_location_to_vehicle" model="stock.picking.type">
+            <field name="name">Location Pickup</field>
+            <field name="sequence_id" ref="seq_picking_type_location_to_vehicle"/>
+            <field name="code">internal</field>
+            <field name="warehouse_id" eval="False"/>
+            <field name="default_location_dest_id" ref="stock_location_vehicle"/>
+        </record>
+
+        <record id="procurement_rule_location_to_vehicle" model="procurement.rule">
+            <field name="name">Warehouse → Vehicle</field>
+            <field name="action">move</field>
+            <field name="location_id" ref="stock_location_vehicle"/>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="route_id" ref="route_location_return"/>
+            <field name="picking_type_id" ref="picking_type_location_to_vehicle"/>
+        </record>
+
+
+        <!-- Vehicle to Input -->
+        <record id="seq_picking_type_vehicle_to_input" model="ir.sequence">
+            <field name="name">Vehicle Returns</field>
+            <field name="prefix">VR</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+        
+        <record id="picking_type_vehicle_to_input" model="stock.picking.type">
+            <field name="name">Vehicle Returns</field>
+            <field name="sequence_id" ref="seq_picking_type_vehicle_to_input"/>
+            <field name="code">internal</field>
+            <field name="warehouse_id" eval="False"/>
+            <field name="default_location_src_id" ref="stock_location_vehicle"/>
+            <field name="default_location_dest_id" ref="stock.stock_location_stock"/>
+        </record>
+
+        <record id="stock_location_path_vehicle_to_input" model="stock.location.path">
+            <field name="name">Vehicle → Warehouse</field>
+            <field name="location_from_id" ref="stock_location_vehicle"/>
+            <field name="location_dest_id" ref="stock.stock_location_stock"/>
+            <field name="auto">manual</field>
+            <field name="picking_type_id" ref="picking_type_vehicle_to_input"/>
+            <field name="route_id" ref="route_location_return"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
new file mode 100644
index 0000000000..4f639d9629
--- /dev/null
+++ b/fieldservice_stock/models/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import (
+    fsm_location,
+    fsm_vehicle
+)
diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
new file mode 100644
index 0000000000..8890b3d983
--- /dev/null
+++ b/fieldservice_stock/models/fsm_location.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMLocation(models.Model):
+    _inherit = 'fsm.location'
+
+    inventory_location = fields.Many2one('stock.location',
+                                         'Inventory Location')
diff --git a/fieldservice_stock/models/fsm_vehicle.py b/fieldservice_stock/models/fsm_vehicle.py
new file mode 100644
index 0000000000..eb4f6a21e3
--- /dev/null
+++ b/fieldservice_stock/models/fsm_vehicle.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMVehicle(models.Model):
+    _inherit = 'fsm.vehicle'
+
+    inventory_location = fields.Many2one('stock.location',
+                                         'Inventory Location')
diff --git a/fieldservice_stock/readme/CONFIGURE.rst b/fieldservice_stock/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..eff3513290
--- /dev/null
+++ b/fieldservice_stock/readme/CONFIGURE.rst
@@ -0,0 +1,3 @@
+To configure this module, you need to:
+
+* Go to Field Service > Configuration > Settings
diff --git a/fieldservice_stock/readme/CONTRIBUTORS.rst b/fieldservice_stock/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..39ef3fa3d7
--- /dev/null
+++ b/fieldservice_stock/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_stock/readme/CREDITS.rst b/fieldservice_stock/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_stock/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_stock/readme/DESCRIPTION.rst b/fieldservice_stock/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..978a9f3b33
--- /dev/null
+++ b/fieldservice_stock/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module is an add-on for the Field Service application in Odoo.
+It provides inventory and stock operations.
diff --git a/fieldservice_stock/readme/INSTALL.rst b/fieldservice_stock/readme/INSTALL.rst
new file mode 100644
index 0000000000..a7c9f727b2
--- /dev/null
+++ b/fieldservice_stock/readme/INSTALL.rst
@@ -0,0 +1,6 @@
+You will first need to install:
+
+* fieldservice
+
+Then go to Field Service > Configuration > Settings
+Enable the 'Use Odoo Stock Logistics' option under Integrations
diff --git a/fieldservice_stock/readme/ROADMAP.rst b/fieldservice_stock/readme/ROADMAP.rst
new file mode 100644
index 0000000000..f607015959
--- /dev/null
+++ b/fieldservice_stock/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_stock/readme/USAGE.rst b/fieldservice_stock/readme/USAGE.rst
new file mode 100644
index 0000000000..fc3d1987aa
--- /dev/null
+++ b/fieldservice_stock/readme/USAGE.rst
@@ -0,0 +1,3 @@
+To use this module, you need to:
+
+* Set Inventory Locations for FSM Locations and FSM Vehicles
diff --git a/fieldservice_stock/views/fsm_location.xml b/fieldservice_stock/views/fsm_location.xml
new file mode 100644
index 0000000000..54d7738445
--- /dev/null
+++ b/fieldservice_stock/views/fsm_location.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="fsm_location_stock_form_view" model="ir.ui.view">
+        <field name="model">fsm.location</field>
+        <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form/sheet/group/group[2]" position="inside">
+                <field name="inventory_location" domain="[('usage', 'in', ['internal','supplier','customer'])]"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_stock/views/fsm_vehicle.xml b/fieldservice_stock/views/fsm_vehicle.xml
new file mode 100644
index 0000000000..b1e6aed8e8
--- /dev/null
+++ b/fieldservice_stock/views/fsm_vehicle.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="fsm_vehicle_stock_form_view" model="ir.ui.view">
+        <field name="model">fsm.vehicle</field>
+        <field name="inherit_id" ref="fieldservice.fsm_vehicle_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form/sheet/group/group[2]" position="inside">
+                <field name="inventory_location" domain="[('usage', '=', 'internal')]"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file

From 693c605a3affeabf7a4c9f30ca4aca5c1b7713c1 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 24 Nov 2018 15:13:33 -0500
Subject: [PATCH 061/631] [FIX] fieldservice_stock

Travis errors
---
 fieldservice_stock/README.rst             | 0
 fieldservice_stock/__manifest__.py        | 6 +++++-
 fieldservice_stock/models/fsm_location.py | 2 +-
 fieldservice_stock/models/fsm_vehicle.py  | 2 +-
 fieldservice_stock/views/fsm_vehicle.xml  | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 fieldservice_stock/README.rst

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 5740b09ee3..a5c61cff67 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -6,7 +6,11 @@
     'summary': 'Inventory and Stock operations for Field Service',
     'version': '11.0.0.0.1',
     'category': 'Field Service',
-    'author': 'Open Source Integrators, Brian McMaster,  Odoo Community Association (OCA)',
+    'author': [
+        'Open Source Integrators',
+        'Brian McMaster',
+        'Odoo Community Association (OCA)',
+    ],
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'base_geolocalize',
diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
index 8890b3d983..e11989ba5b 100644
--- a/fieldservice_stock/models/fsm_location.py
+++ b/fieldservice_stock/models/fsm_location.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class FSMLocation(models.Model):
diff --git a/fieldservice_stock/models/fsm_vehicle.py b/fieldservice_stock/models/fsm_vehicle.py
index eb4f6a21e3..06d78920d9 100644
--- a/fieldservice_stock/models/fsm_vehicle.py
+++ b/fieldservice_stock/models/fsm_vehicle.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class FSMVehicle(models.Model):
diff --git a/fieldservice_stock/views/fsm_vehicle.xml b/fieldservice_stock/views/fsm_vehicle.xml
index b1e6aed8e8..84b559e8f0 100644
--- a/fieldservice_stock/views/fsm_vehicle.xml
+++ b/fieldservice_stock/views/fsm_vehicle.xml
@@ -11,4 +11,4 @@
         </field>
     </record>
 
-</odoo>
\ No newline at end of file
+</odoo>

From 65782695b4036548bee20433a58ed9c8785aa771 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 24 Nov 2018 15:34:02 -0500
Subject: [PATCH 062/631] [FIX] fieldservice_stock

Travis error

[UPD] README.rst
---
 fieldservice_stock/README.rst                 | 126 +++++
 fieldservice_stock/__manifest__.py            |   8 +-
 .../static/description/index.html             | 463 ++++++++++++++++++
 3 files changed, 592 insertions(+), 5 deletions(-)
 create mode 100644 fieldservice_stock/static/description/index.html

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index e69de29bb2..17fa4c5cb7 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -0,0 +1,126 @@
+==========================
+Field Service Stock add-on
+==========================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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_stock
+    :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_stock
+    :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| 
+
+This module is an add-on for the Field Service application in Odoo.
+It provides inventory and stock operations.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Installation
+============
+
+You will first need to install:
+
+* fieldservice
+
+Then go to Field Service > Configuration > Settings
+Enable the 'Use Odoo Stock Logistics' option under Integrations
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+* Go to Field Service > Configuration > Settings
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Set Inventory Locations for FSM Locations and FSM Vehicles
+
+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_stock%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
+* Brian McMaster
+
+Contributors
+~~~~~~~~~~~~
+
+* Brian McMaster <brian@mcmpest.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-brian10048| image:: https://github.com/brian10048.png?size=40px
+    :target: https://github.com/brian10048
+    :alt: brian10048
+.. |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-brian10048| |maintainer-wolfhall| |maintainer-max3903| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_stock>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index a5c61cff67..bc6f3d9756 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -6,11 +6,9 @@
     'summary': 'Inventory and Stock operations for Field Service',
     'version': '11.0.0.0.1',
     'category': 'Field Service',
-    'author': [
-        'Open Source Integrators',
-        'Brian McMaster',
-        'Odoo Community Association (OCA)',
-    ],
+    'author': "Open Source Integrators, "
+              "Brian McMaster, "
+              "Odoo Community Association (OCA)",
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'base_geolocalize',
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
new file mode 100644
index 0000000000..39ee16f80a
--- /dev/null
+++ b/fieldservice_stock/static/description/index.html
@@ -0,0 +1,463 @@
+<?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 Stock add-on</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-stock-add-on">
+<h1 class="title">Field Service Stock add-on</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_stock"><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_stock"><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 an add-on for the Field Service application in Odoo.
+It provides inventory and stock operations.</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>You will first need to install:</p>
+<ul class="simple">
+<li>fieldservice</li>
+</ul>
+<p>Then go to Field Service &gt; Configuration &gt; Settings
+Enable the ‘Use Odoo Stock Logistics’ option under Integrations</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>Set Inventory Locations for FSM Locations and FSM Vehicles</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_stock%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>
+<li>Brian McMaster</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id8">Contributors</a></h2>
+<ul class="simple">
+<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">
+<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/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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_stock">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 1b2d4b5dd94ecf0a55ef8c0b5f16203487f8ae2b Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Wed, 12 Dec 2018 12:25:54 -0500
Subject: [PATCH 063/631] [ADD] field service stock 0.0.2 (#49)

* [ADD] field service stock 0.0.2

[UPD] README.rst
---
 fieldservice_stock/README.rst                 |   9 +-
 fieldservice_stock/__manifest__.py            |   6 +-
 fieldservice_stock/data/fsm_stock_data.xml    |  46 ++--
 fieldservice_stock/models/__init__.py         |   4 +-
 fieldservice_stock/models/fsm_order.py        | 204 ++++++++++++++++++
 fieldservice_stock/models/stock.py            |  53 +++++
 fieldservice_stock/readme/CONFIGURE.rst       |   3 +-
 fieldservice_stock/readme/USAGE.rst           |   6 +-
 .../static/description/index.html             |   9 +-
 fieldservice_stock/views/fsm_order.xml        |  42 ++++
 fieldservice_stock/views/inventory.xml        |   7 +
 11 files changed, 358 insertions(+), 31 deletions(-)
 create mode 100644 fieldservice_stock/models/fsm_order.py
 create mode 100644 fieldservice_stock/models/stock.py
 create mode 100644 fieldservice_stock/views/fsm_order.xml
 create mode 100644 fieldservice_stock/views/inventory.xml

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index 17fa4c5cb7..6e47c9a11b 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -48,14 +48,19 @@ Configuration
 
 To configure this module, you need to:
 
-* Go to Field Service > Configuration > Settings
+* Set Inventory Locations for FSM Locations and FSM Vehicles
+* Verify procurement routes
 
 Usage
 =====
 
 To use this module, you need to:
 
-* Set Inventory Locations for FSM Locations and FSM Vehicles
+* Create a new field service order
+* Under the Materials tab, add products with quantity
+* Confirm an order to create stock moves
+* Validate stock moves in the Inventory app
+* Quantities Delivered on FSM Order Line will be updated based on move
 
 Known issues / Roadmap
 ======================
diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index bc6f3d9756..09da289177 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,15 +4,13 @@
 {
     'name': 'Field Service Stock add-on',
     'summary': 'Inventory and Stock operations for Field Service',
-    'version': '11.0.0.0.1',
+    'version': '11.0.0.0.2',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
               "Odoo Community Association (OCA)",
     'website': 'https://github.com/OCA/field-service',
     'depends': [
-        'base_geolocalize',
-        'mail',
         'fieldservice',
         'stock',
     ],
@@ -20,6 +18,8 @@
         'data/fsm_stock_data.xml',
         'views/fsm_location.xml',
         'views/fsm_vehicle.xml',
+        'views/fsm_order.xml',
+        'views/inventory.xml',
     ],
     'installable': True,
     'license': 'AGPL-3',
diff --git a/fieldservice_stock/data/fsm_stock_data.xml b/fieldservice_stock/data/fsm_stock_data.xml
index 4c3750e2c8..94456fe978 100644
--- a/fieldservice_stock/data/fsm_stock_data.xml
+++ b/fieldservice_stock/data/fsm_stock_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
+
         <record id="stock_location_field" model="stock.location">
             <field name="name">Field</field>
             <field name="usage">view</field>
@@ -12,9 +13,18 @@
             <field name="usage">view</field>
             <field name="company_id"></field>
         </record>
+
+        <record id="stock_location_vehicle_storage" model="stock.location">
+            <field name="name">Storage</field>
+            <field name="usage">internal</field>
+            <field name="location_id" ref="stock_location_vehicle"/>
+            <field name="company_id"></field>
+        </record>
+
     </data>
 
     <data noupdate="1">
+    
         <!-- Output to Vehicle operations -->
         <record id="seq_picking_type_output_to_vehicle" model="ir.sequence">
             <field name="name">Vehicle Loading</field>
@@ -32,22 +42,6 @@
             <field name="default_location_dest_id" ref="stock_location_vehicle"/>
         </record>
 
-        <record id="route_output_to_vehicle" model='stock.location.route'>
-            <field name="name">Output to Vehicle</field>
-            <field name="sequence">3</field>
-            <field name="company_id"></field>
-        </record>
-
-        <record id="procurement_rule_output_to_vehicle" model="procurement.rule">
-            <field name="name">Warehouse → Vehicle</field>
-            <field name="action">move</field>
-            <field name="location_id" ref="stock_location_vehicle"/>
-            <field name="location_src_id" ref="stock.stock_location_stock"/>
-            <field name="procure_method">make_to_stock</field>
-            <field name="route_id" ref="route_output_to_vehicle"/>
-            <field name="picking_type_id" ref="picking_type_output_to_vehicle"/>
-        </record>
-
         <!-- Vehicle to Location operations -->
         <record id="seq_picking_type_vehicle_to_location" model="ir.sequence">
             <field name="name">Location Delivery</field>
@@ -64,8 +58,8 @@
             <field name="default_location_src_id" ref="stock_location_vehicle"/>
         </record>
 
-        <record id="route_vehicle_to_location" model='stock.location.route'>
-            <field name="name">Vehicle to Location</field>
+        <record id="route_stock_to_vehicle_to_location" model='stock.location.route'>
+            <field name="name">Stock to Vehicle to Location</field>
             <field name="sequence">3</field>
             <field name="company_id"></field>
         </record>
@@ -74,12 +68,22 @@
             <field name="name">Vehicle → Location</field>
             <field name="action">move</field>
             <field name="location_id" ref="stock.stock_location_customers"/>
-            <field name="location_src_id" ref="stock_location_vehicle"/>
-            <field name="procure_method">make_to_stock</field>
-            <field name="route_id" ref="route_vehicle_to_location"/>
+            <field name="location_src_id" ref="stock_location_vehicle_storage"/>
+            <field name="procure_method">make_to_order</field>
+            <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
             <field name="picking_type_id" ref="picking_type_vehicle_to_location"/>
         </record>
 
+        <record id="procurement_rule_output_to_vehicle" model="procurement.rule">
+            <field name="name">Warehouse → Vehicle</field>
+            <field name="action">move</field>
+            <field name="location_id" ref="stock_location_vehicle_storage"/>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
+            <field name="picking_type_id" ref="picking_type_output_to_vehicle"/>
+        </record>
+
         <!-- Location Return Operations -->
         <record id="route_location_return" model='stock.location.route'>
             <field name="name">Location Return</field>
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index 4f639d9629..beae0f7109 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -3,5 +3,7 @@
 
 from . import (
     fsm_location,
-    fsm_vehicle
+    fsm_vehicle,
+    fsm_order,
+    stock,
 )
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
new file mode 100644
index 0000000000..0bb0849dac
--- /dev/null
+++ b/fieldservice_stock/models/fsm_order.py
@@ -0,0 +1,204 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import datetime, timedelta
+
+from odoo import api, fields, models
+
+from odoo.tools import (DEFAULT_SERVER_DATETIME_FORMAT,
+                        float_is_zero, float_compare)
+from odoo.addons import decimal_precision as dp
+from odoo.exceptions import UserError
+
+from odoo.addons.base_geoengine import geo_model
+
+
+class FSMOrder(geo_model.GeoModel):
+    _inherit = 'fsm.order'
+
+    line_ids = fields.One2many(
+        'fsm.order.line', 'order_id', string="Order Lines",)
+    picking_ids = fields.One2many('stock.picking', 'fsm_order_id',
+                                  string='Transfers')
+    procurement_group_id = fields.Many2one(
+        'procurement.group', 'Procurement Group', copy=False)
+
+    def action_confirm(self):
+        self.line_ids._confirm_picking()
+        return super(FSMOrder, self).action_confirm()
+
+
+class FSMOrderLine(models.Model):
+    _name = 'fsm.order.line'
+    _description = "FSM Order Lines"
+    _order = 'order_id, sequence, id'
+
+    order_id = fields.Many2one(
+        'fsm.order', string="FSM Order", required=True,
+        ondelete='cascade', index=True, copy=False,
+        readonly=True, states={'draft': [('readonly', False)]})
+    name = fields.Char(string='Description', required=True,
+                       readonly=True, states={'draft': [('readonly', False)]})
+    sequence = fields.Integer(string='Sequence', default=10, readonly=True,
+                              states={'draft': [('readonly', False)]})
+    product_id = fields.Many2one(
+        'product.product', string="Product", required=True,
+        domain=[('type', '=', 'product')], ondelete='restrict',
+        readonly=True, states={'draft': [('readonly', False)]})
+    product_uom_id = fields.Many2one(
+        'product.uom', string='Unit of Measure', required=True,
+        readonly=True, states={'draft': [('readonly', False)]})
+    qty_ordered = fields.Float(
+        string='Quantity Requested', readonly=True,
+        states={'draft': [('readonly', False)]},
+        digits=dp.get_precision('Product Unit of Measure'))
+    qty_delivered = fields.Float(
+        string='Quantity Delivered', readonly=True, copy=False,
+        digits=dp.get_precision('Product Unit of Measure'))
+    state = fields.Selection([
+        ('draft', 'Draft'),
+        ('confirmed', 'Confirmed'),
+        ('partial', 'Partially Shipped'),
+        ('done', 'Done')],
+        string='State', compute='_compute_state', copy=False, index=True,
+        readonly=True, store=True)
+    move_ids = fields.One2many(
+        'stock.move', 'fsm_order_line_id', string='Stock Moves',
+        readonly=True, states={'draft': [('readonly', False)]})
+
+    @api.depends('move_ids', 'qty_ordered', 'qty_delivered')
+    def _compute_state(self):
+        precision = self.env['decimal.precision'].precision_get(
+            'Product Unit of Measure')
+        for line in self:
+            if line.move_ids and not float_is_zero(line.qty_delivered,
+                                                   precision_digits=precision):
+                if float_compare(line.qty_delivered, line.qty_ordered,
+                                 precision_digits=precision) == -1:
+                    line.state = 'partial'
+                elif float_compare(line.qty_delivered, line.qty_ordered,
+                                   precision_digits=precision) >= 0:
+                    line.state = 'done'
+            elif line.move_ids:
+                line.state = 'confirmed'
+            else:
+                line.state = 'draft'
+
+    @api.multi
+    @api.onchange('product_id')
+    def onchange_product_id(self):
+        if not self.product_id:
+            return {'domain': {'product_uom': []}}
+
+        vals = {}
+        domain = {'product_uom': [('category_id', '=',
+                                   self.product_id.uom_id.category_id.id)]}
+
+        if (not self.product_uom_id
+                or (self.product_id.uom_id.id != self.product_uom_id.id)):
+            vals['product_uom_id'] = self.product_id.uom_id
+            vals['qty_ordered'] = 1.0
+
+        product = self.product_id.with_context(
+            quantity=vals.get('qty_ordered') or self.qty_ordered,
+            uom=self.product_uom_id.id,
+        )
+
+        result = {'domain': domain}
+
+        name = product.name_get()[0][1]
+        if product.description_sale:
+            name += '\n' + product.description_sale
+        vals['name'] = name
+
+        self.update(vals)
+        return result
+
+    @api.multi
+    def _prepare_procurement_values(self, group_id=False):
+        self.ensure_one()
+        values = {}
+        date_planned = (self.order_id.scheduled_date_start
+                        or self.order_id.requested_date
+                        or (datetime.now() + timedelta(days=1)).strftime(
+                            DEFAULT_SERVER_DATETIME_FORMAT))
+        values.update({
+            'group_id': group_id,
+            'fsm_order_line_id': self.id,
+            'date_planned': date_planned,
+            'route_ids': self.env.ref(
+                'fieldservice_stock.route_stock_to_vehicle_to_location'),
+            'partner_dest_id': self.order_id.customer_id
+        })
+        return values
+
+    def _get_procurement_qty(self):
+        self.ensure_one()
+        qty = 0.0
+        for move in self.move_ids.filtered(lambda r: r.state != 'cancel'):
+            if move.picking_code == 'outgoing':
+                qty += move.product_uom._compute_quantity(
+                    move.product_uom_qty, self.product_uom_id,
+                    rounding_method='HALF-UP')
+            elif move.picking_code == 'incoming':
+                qty -= move.product_uom._compute_quantity(
+                    move.product_uom_qty, self.product_uom_id,
+                    rounding_method='HALF-UP')
+        return qty
+
+    @api.multi
+    def _confirm_picking(self):
+        precision = self.env['decimal.precision'].precision_get(
+            'Product Unit of Measure')
+        errors = []
+        for line in self:
+            qty_procured = line._get_procurement_qty()
+            if float_compare(qty_procured, line.qty_ordered,
+                             precision_digits=precision) >= 0:
+                continue
+            group_id = line.order_id.procurement_group_id
+            if not group_id:
+                group_id = self.env['procurement.group'].create({
+                    'name': line.order_id.name,
+                    'move_type': 'direct',
+                    'fsm_order_id': line.order_id.id,
+                    'partner_id': line.order_id.customer_id.id,
+                })
+                line.order_id.procurement_group_id = group_id
+            values = line._prepare_procurement_values(group_id=group_id)
+            qty_needed = line.qty_ordered - qty_procured
+            procurement_uom = line.product_uom_id
+            quant_uom = line.product_id.uom_id
+            get_param = self.env['ir.config_parameter'].sudo().get_param
+            if (procurement_uom.id != quant_uom.id
+                    and get_param('stock.propagate_uom') != '1'):
+                qty_needed = line.product_uom_id._compute_quantity(
+                    qty_needed, quant_uom, rounding_method='HALF-UP')
+                procurement_uom = quant_uom
+            try:
+                self.env['procurement.group'].run(
+                    line.product_id, qty_needed, procurement_uom,
+                    line.order_id.fsm_location_id.inventory_location,
+                    line.name, line.order_id.name, values)
+            except UserError as error:
+                errors.append(error.name)
+        if errors:
+            raise UserError('\n'.join(errors))
+        return True
+
+    @api.multi
+    def _get_delivered_qty(self):
+        self.ensure_one()
+        qty = 0.0
+        for move in self.move_ids.filtered(lambda r: r.state == 'done'
+                                           and not r.scrapped):
+            if move.location_dest_id.usage == "customer":
+                if (not move.origin_returned_move_id
+                        or (move.origin_returned_move_id and move.to_refund)):
+                    qty += move.product_uom._compute_quantity(
+                        move.product_uom_qty, self.product_uom_id)
+            elif (move.location_dest_id.usage != "customer"
+                    and move.to_refund):
+                qty -= move.product_uom._compute_quantity(
+                    move.product_uom_qty, self.product_uom_id)
+        return qty
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
new file mode 100644
index 0000000000..e2ccc4f590
--- /dev/null
+++ b/fieldservice_stock/models/stock.py
@@ -0,0 +1,53 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class StockMove(models.Model):
+    _inherit = "stock.move"
+
+    fsm_order_line_id = fields.Many2one('fsm.order.line', 'FSM Order Line')
+
+    def _action_done(self):
+        result = super(StockMove, self)._action_done()
+        for line in result.mapped('fsm_order_line_id').sudo():
+            line.qty_delivered = line._get_delivered_qty()
+        return result
+
+    @api.multi
+    def write(self, vals):
+        res = super(StockMove, self).write(vals)
+        if 'product_uom_qty' in vals:
+            for move in self:
+                if move.state == 'done':
+                    for line in res.mapped('fsm_order_line_id').sudo():
+                        line.qty_delivered = line._get_delivered_qty()
+        return res
+
+
+class ProcurementGroup(models.Model):
+    _inherit = 'procurement.group'
+
+    fsm_order_id = fields.Many2one('fsm.order', 'Field Service Order')
+
+
+class ProcurementRule(models.Model):
+    _inherit = 'procurement.rule'
+
+    def _get_stock_move_values(self, product_id, product_qty, product_uom,
+                               location_id, name, origin, values, group_id):
+        result = super(ProcurementRule, self)._get_stock_move_values(
+            product_id, product_qty, product_uom,
+            location_id, name, origin, values, group_id)
+        if values.get('fsm_order_line_id', False):
+            result['fsm_order_line_id'] = values['fsm_order_line_id']
+        return result
+
+
+class StockPicking(models.Model):
+    _inherit = 'stock.picking'
+
+    fsm_order_id = fields.Many2one(
+        related="group_id.fsm_order_id", string="Field Service Order",
+        store=True)
diff --git a/fieldservice_stock/readme/CONFIGURE.rst b/fieldservice_stock/readme/CONFIGURE.rst
index eff3513290..6b50a28919 100644
--- a/fieldservice_stock/readme/CONFIGURE.rst
+++ b/fieldservice_stock/readme/CONFIGURE.rst
@@ -1,3 +1,4 @@
 To configure this module, you need to:
 
-* Go to Field Service > Configuration > Settings
+* Set Inventory Locations for FSM Locations and FSM Vehicles
+* Verify procurement routes
diff --git a/fieldservice_stock/readme/USAGE.rst b/fieldservice_stock/readme/USAGE.rst
index fc3d1987aa..2934857b2b 100644
--- a/fieldservice_stock/readme/USAGE.rst
+++ b/fieldservice_stock/readme/USAGE.rst
@@ -1,3 +1,7 @@
 To use this module, you need to:
 
-* Set Inventory Locations for FSM Locations and FSM Vehicles
+* Create a new field service order
+* Under the Materials tab, add products with quantity
+* Confirm an order to create stock moves
+* Validate stock moves in the Inventory app
+* Quantities Delivered on FSM Order Line will be updated based on move
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index 39ee16f80a..0f2fd33746 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/static/description/index.html
@@ -400,14 +400,19 @@ <h1><a class="toc-backref" href="#id1">Installation</a></h1>
 <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>
+<li>Set Inventory Locations for FSM Locations and FSM Vehicles</li>
+<li>Verify procurement routes</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>Set Inventory Locations for FSM Locations and FSM Vehicles</li>
+<li>Create a new field service order</li>
+<li>Under the Materials tab, add products with quantity</li>
+<li>Confirm an order to create stock moves</li>
+<li>Validate stock moves in the Inventory app</li>
+<li>Quantities Delivered on FSM Order Line will be updated based on move</li>
 </ul>
 </div>
 <div class="section" id="known-issues-roadmap">
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
new file mode 100644
index 0000000000..a165b4f6e2
--- /dev/null
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_fsm_order_form_inherit_stock" model="ir.ui.view">
+        <field name="name">fsm.order.form.stock</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//notebook/page[1]" position="after">
+                <page string="Materials">
+                    <field name="line_ids" mode="tree">
+                        <tree string="Material Order Lines" editable="bottom">
+                            <field name="sequence" widget="handle"/>
+                            <field name="product_id"
+                                context="{
+                                    'quantity':qty_ordered,
+                                    'uom':product_uom_id,
+                                }"
+                            />
+                            <field name="name"/>
+                            <field name="qty_ordered"
+                                string="Ordered Qty"
+                                context="{
+                                    'quantity':qty_ordered,
+                                    'uom':product_uom_id,
+                                }"
+                            />
+                            <field name="qty_delivered"
+                                 />
+                            <field name="product_uom_id"
+                                attrs="{'readonly': [('state', 'in', ('sale','done', 'cancel'))]}"
+                                options='{"no_open": True, "no_create": True}'
+                                groups="product.group_uom"/>
+                            <field name="state" invisible="1"/>
+                        </tree>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_stock/views/inventory.xml b/fieldservice_stock/views/inventory.xml
new file mode 100644
index 0000000000..5061f5c410
--- /dev/null
+++ b/fieldservice_stock/views/inventory.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <menuitem action="stock.quantsact" id="menu_fsm_stock_inventory"
+              parent="fieldservice.reporting" sequence="30"/>
+
+</odoo>

From ba765781c8c7f6d96529e2d92f4c48979ce03361 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 13 Dec 2018 12:37:10 -0600
Subject: [PATCH 064/631] [IMP] Various improvements

[UPD] README.rst
---
 fieldservice_stock/README.rst                   |   6 +++---
 fieldservice_stock/__manifest__.py              |   6 +++---
 fieldservice_stock/static/description/icon.png  | Bin 0 -> 17808 bytes
 .../static/description/index.html               |   6 +++---
 fieldservice_stock/views/inventory.xml          |   7 -------
 fieldservice_stock/views/stock.xml              |  10 ++++++++++
 6 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 fieldservice_stock/static/description/icon.png
 delete mode 100644 fieldservice_stock/views/inventory.xml
 create mode 100644 fieldservice_stock/views/stock.xml

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index 6e47c9a11b..3510cd588b 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -1,6 +1,6 @@
-==========================
-Field Service Stock add-on
-==========================
+=====================
+Field Service - Stock
+=====================
 
 .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 09da289177..b5c819bc34 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -2,8 +2,8 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service Stock add-on',
-    'summary': 'Inventory and Stock operations for Field Service',
+    'name': 'Field Service - Stock',
+    'summary': 'Inventory and Stock Operations for Field Service',
     'version': '11.0.0.0.2',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
@@ -19,7 +19,7 @@
         'views/fsm_location.xml',
         'views/fsm_vehicle.xml',
         'views/fsm_order.xml',
-        'views/inventory.xml',
+        'views/stock.xml',
     ],
     'installable': True,
     'license': 'AGPL-3',
diff --git a/fieldservice_stock/static/description/icon.png b/fieldservice_stock/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_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index 0f2fd33746..7cf0406b5e 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/static/description/index.html
@@ -4,7 +4,7 @@
 <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 Stock add-on</title>
+<title>Field Service - Stock</title>
 <style type="text/css">
 
 /*
@@ -360,8 +360,8 @@
 </style>
 </head>
 <body>
-<div class="document" id="field-service-stock-add-on">
-<h1 class="title">Field Service Stock add-on</h1>
+<div class="document" id="field-service-stock">
+<h1 class="title">Field Service - Stock</h1>
 
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
diff --git a/fieldservice_stock/views/inventory.xml b/fieldservice_stock/views/inventory.xml
deleted file mode 100644
index 5061f5c410..0000000000
--- a/fieldservice_stock/views/inventory.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <menuitem action="stock.quantsact" id="menu_fsm_stock_inventory"
-              parent="fieldservice.reporting" sequence="30"/>
-
-</odoo>
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
new file mode 100644
index 0000000000..07dd7c5408
--- /dev/null
+++ b/fieldservice_stock/views/stock.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <menuitem id="menu_fsm_stock_inventory"
+              name="Inventory"
+              action="stock.quantsact"
+              parent="fieldservice.reporting"
+              sequence="30"/>
+
+</odoo>

From e0ea02d689e2b9674921e2ce69f753d094302173 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 13 Dec 2018 18:57:19 -0600
Subject: [PATCH 065/631] [ADD] fieldservice_vehicle_stock

---
 fieldservice_stock/__manifest__.py         |   3 +-
 fieldservice_stock/data/fsm_stock_data.xml | 148 +--------------------
 fieldservice_stock/models/__init__.py      |   1 -
 fieldservice_stock/models/fsm_location.py  |   5 +-
 fieldservice_stock/models/fsm_order.py     |  46 +++++--
 fieldservice_stock/models/fsm_vehicle.py   |  11 --
 fieldservice_stock/readme/CONFIGURE.rst    |   4 +-
 fieldservice_stock/readme/INSTALL.rst      |   8 +-
 fieldservice_stock/readme/USAGE.rst        |  10 +-
 fieldservice_stock/views/fsm_location.xml  |   3 +-
 fieldservice_stock/views/fsm_order.xml     |  45 ++++---
 fieldservice_stock/views/fsm_vehicle.xml   |  14 --
 fieldservice_stock/views/stock.xml         |   6 +
 13 files changed, 95 insertions(+), 209 deletions(-)
 delete mode 100644 fieldservice_stock/models/fsm_vehicle.py
 delete mode 100644 fieldservice_stock/views/fsm_vehicle.xml

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index b5c819bc34..266983cc0a 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Stock',
-    'summary': 'Inventory and Stock Operations for Field Service',
+    'summary': 'Inventory and Stock Operations for Field Services',
     'version': '11.0.0.0.2',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
@@ -17,7 +17,6 @@
     'data': [
         'data/fsm_stock_data.xml',
         'views/fsm_location.xml',
-        'views/fsm_vehicle.xml',
         'views/fsm_order.xml',
         'views/stock.xml',
     ],
diff --git a/fieldservice_stock/data/fsm_stock_data.xml b/fieldservice_stock/data/fsm_stock_data.xml
index 94456fe978..c74036dae3 100644
--- a/fieldservice_stock/data/fsm_stock_data.xml
+++ b/fieldservice_stock/data/fsm_stock_data.xml
@@ -1,148 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="stock_location_field" model="stock.location">
-            <field name="name">Field</field>
-            <field name="usage">view</field>
-            <field name="company_id"></field>
-        </record>
+    <record id="stock_location_field" model="stock.location">
+        <field name="name">Field</field>
+        <field name="usage">view</field>
+        <field name="company_id"></field>
+    </record>
 
-        <record id="stock_location_vehicle" model="stock.location">
-            <field name="name">Vehicle</field>
-            <field name="usage">view</field>
-            <field name="company_id"></field>
-        </record>
-
-        <record id="stock_location_vehicle_storage" model="stock.location">
-            <field name="name">Storage</field>
-            <field name="usage">internal</field>
-            <field name="location_id" ref="stock_location_vehicle"/>
-            <field name="company_id"></field>
-        </record>
-
-    </data>
-
-    <data noupdate="1">
-    
-        <!-- Output to Vehicle operations -->
-        <record id="seq_picking_type_output_to_vehicle" model="ir.sequence">
-            <field name="name">Vehicle Loading</field>
-            <field name="prefix">VL</field>
-            <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
-        </record>
-
-        <record id="picking_type_output_to_vehicle" model="stock.picking.type">
-            <field name="name">Vehicle Loading</field>
-            <field name="sequence_id" ref="seq_picking_type_output_to_vehicle"/>
-            <field name="code">internal</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id" ref="stock.stock_location_stock"/>
-            <field name="default_location_dest_id" ref="stock_location_vehicle"/>
-        </record>
-
-        <!-- Vehicle to Location operations -->
-        <record id="seq_picking_type_vehicle_to_location" model="ir.sequence">
-            <field name="name">Location Delivery</field>
-            <field name="prefix">LD</field>
-            <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
-        </record>
-
-        <record id="picking_type_vehicle_to_location" model="stock.picking.type">
-            <field name="name">Location Delivery</field>
-            <field name="sequence_id" ref="seq_picking_type_vehicle_to_location"/>
-            <field name="code">outgoing</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id" ref="stock_location_vehicle"/>
-        </record>
-
-        <record id="route_stock_to_vehicle_to_location" model='stock.location.route'>
-            <field name="name">Stock to Vehicle to Location</field>
-            <field name="sequence">3</field>
-            <field name="company_id"></field>
-        </record>
-
-        <record id="procurement_rule_vehicle_to_location" model="procurement.rule">
-            <field name="name">Vehicle → Location</field>
-            <field name="action">move</field>
-            <field name="location_id" ref="stock.stock_location_customers"/>
-            <field name="location_src_id" ref="stock_location_vehicle_storage"/>
-            <field name="procure_method">make_to_order</field>
-            <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
-            <field name="picking_type_id" ref="picking_type_vehicle_to_location"/>
-        </record>
-
-        <record id="procurement_rule_output_to_vehicle" model="procurement.rule">
-            <field name="name">Warehouse → Vehicle</field>
-            <field name="action">move</field>
-            <field name="location_id" ref="stock_location_vehicle_storage"/>
-            <field name="location_src_id" ref="stock.stock_location_stock"/>
-            <field name="procure_method">make_to_stock</field>
-            <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
-            <field name="picking_type_id" ref="picking_type_output_to_vehicle"/>
-        </record>
-
-        <!-- Location Return Operations -->
-        <record id="route_location_return" model='stock.location.route'>
-            <field name="name">Location Return</field>
-            <field name="sequence">3</field>
-            <field name="company_id"></field>
-        </record>
-
-        <!-- Location Return to Vehicle operations -->
-        <record id="seq_picking_type_location_to_vehicle" model="ir.sequence">
-            <field name="name">Location Pickup</field>
-            <field name="prefix">LP</field>
-            <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
-        </record>
-
-        <record id="picking_type_location_to_vehicle" model="stock.picking.type">
-            <field name="name">Location Pickup</field>
-            <field name="sequence_id" ref="seq_picking_type_location_to_vehicle"/>
-            <field name="code">internal</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_dest_id" ref="stock_location_vehicle"/>
-        </record>
-
-        <record id="procurement_rule_location_to_vehicle" model="procurement.rule">
-            <field name="name">Warehouse → Vehicle</field>
-            <field name="action">move</field>
-            <field name="location_id" ref="stock_location_vehicle"/>
-            <field name="location_src_id" ref="stock.stock_location_stock"/>
-            <field name="procure_method">make_to_stock</field>
-            <field name="route_id" ref="route_location_return"/>
-            <field name="picking_type_id" ref="picking_type_location_to_vehicle"/>
-        </record>
-
-
-        <!-- Vehicle to Input -->
-        <record id="seq_picking_type_vehicle_to_input" model="ir.sequence">
-            <field name="name">Vehicle Returns</field>
-            <field name="prefix">VR</field>
-            <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
-        </record>
-        
-        <record id="picking_type_vehicle_to_input" model="stock.picking.type">
-            <field name="name">Vehicle Returns</field>
-            <field name="sequence_id" ref="seq_picking_type_vehicle_to_input"/>
-            <field name="code">internal</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id" ref="stock_location_vehicle"/>
-            <field name="default_location_dest_id" ref="stock.stock_location_stock"/>
-        </record>
-
-        <record id="stock_location_path_vehicle_to_input" model="stock.location.path">
-            <field name="name">Vehicle → Warehouse</field>
-            <field name="location_from_id" ref="stock_location_vehicle"/>
-            <field name="location_dest_id" ref="stock.stock_location_stock"/>
-            <field name="auto">manual</field>
-            <field name="picking_type_id" ref="picking_type_vehicle_to_input"/>
-            <field name="route_id" ref="route_location_return"/>
-        </record>
-
-    </data>
 </odoo>
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index beae0f7109..bacddd4307 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -3,7 +3,6 @@
 
 from . import (
     fsm_location,
-    fsm_vehicle,
     fsm_order,
     stock,
 )
diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
index e11989ba5b..bfe38d6d09 100644
--- a/fieldservice_stock/models/fsm_location.py
+++ b/fieldservice_stock/models/fsm_location.py
@@ -1,10 +1,11 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import fields
+from odoo.addons.base_geoengine import geo_model
 
 
-class FSMLocation(models.Model):
+class FSMLocation(geo_model.GeoModel):
     _inherit = 'fsm.location'
 
     inventory_location = fields.Many2one('stock.location',
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 0bb0849dac..efc930d188 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -3,7 +3,7 @@
 
 from datetime import datetime, timedelta
 
-from odoo import api, fields, models
+from odoo import api, fields, models, _
 
 from odoo.tools import (DEFAULT_SERVER_DATETIME_FORMAT,
                         float_is_zero, float_compare)
@@ -20,13 +20,42 @@ class FSMOrder(geo_model.GeoModel):
         'fsm.order.line', 'order_id', string="Order Lines",)
     picking_ids = fields.One2many('stock.picking', 'fsm_order_id',
                                   string='Transfers')
+    delivery_count = fields.Integer(string='Delivery Orders',
+                                    compute='_compute_picking_ids')
     procurement_group_id = fields.Many2one(
         'procurement.group', 'Procurement Group', copy=False)
+    warehouse_id = fields.Many2one('stock.warehouse', string='Warehouse',
+                                   help="Warehouse used to ship the materials")
+
+    @api.depends('picking_ids')
+    def _compute_picking_ids(self):
+        for order in self:
+            order.delivery_count = len(order.picking_ids)
 
     def action_confirm(self):
-        self.line_ids._confirm_picking()
-        return super(FSMOrder, self).action_confirm()
+        if self.location_id and self.line_ids and self.warehouse_id:
+            self.line_ids._confirm_picking()
+            return super(FSMOrder, self).action_confirm()
+        else:
+            raise UserError(_('Please select the location, a warehouse and a'
+                              ' product.'))
 
+    @api.multi
+    def action_view_delivery(self):
+        '''
+        This function returns an action that display existing delivery orders
+        of given fsm order ids. It can either be a in a list or in a form
+        view, if there is only one delivery order to show.
+        '''
+        action = self.env.ref('stock.action_picking_tree_all').read()[0]
+
+        pickings = self.mapped('picking_ids')
+        if len(pickings) > 1:
+            action['domain'] = [('id', 'in', pickings.ids)]
+        elif pickings:
+            action['views'] = [(self.env.ref('stock.view_picking_form').id, 'form')]
+            action['res_id'] = pickings.id
+        return action
 
 class FSMOrderLine(models.Model):
     _name = 'fsm.order.line'
@@ -42,7 +71,7 @@ class FSMOrderLine(models.Model):
     sequence = fields.Integer(string='Sequence', default=10, readonly=True,
                               states={'draft': [('readonly', False)]})
     product_id = fields.Many2one(
-        'product.product', string="Product", required=True,
+        'product.product', string="Product",
         domain=[('type', '=', 'product')], ondelete='restrict',
         readonly=True, states={'draft': [('readonly', False)]})
     product_uom_id = fields.Many2one(
@@ -119,15 +148,15 @@ def _prepare_procurement_values(self, group_id=False):
         self.ensure_one()
         values = {}
         date_planned = (self.order_id.scheduled_date_start
-                        or self.order_id.requested_date
+                        or self.order_id.request_early
+                        or self.order_id.request_late
                         or (datetime.now() + timedelta(days=1)).strftime(
                             DEFAULT_SERVER_DATETIME_FORMAT))
         values.update({
             'group_id': group_id,
             'fsm_order_line_id': self.id,
             'date_planned': date_planned,
-            'route_ids': self.env.ref(
-                'fieldservice_stock.route_stock_to_vehicle_to_location'),
+            'route_ids': self.order_id.warehouse_id.delivery_route_id,
             'partner_dest_id': self.order_id.customer_id
         })
         return values
@@ -170,6 +199,7 @@ def _confirm_picking(self):
             procurement_uom = line.product_uom_id
             quant_uom = line.product_id.uom_id
             get_param = self.env['ir.config_parameter'].sudo().get_param
+            import pdb;pdb.set_trace()
             if (procurement_uom.id != quant_uom.id
                     and get_param('stock.propagate_uom') != '1'):
                 qty_needed = line.product_uom_id._compute_quantity(
@@ -178,7 +208,7 @@ def _confirm_picking(self):
             try:
                 self.env['procurement.group'].run(
                     line.product_id, qty_needed, procurement_uom,
-                    line.order_id.fsm_location_id.inventory_location,
+                    line.order_id.location_id.inventory_location,
                     line.name, line.order_id.name, values)
             except UserError as error:
                 errors.append(error.name)
diff --git a/fieldservice_stock/models/fsm_vehicle.py b/fieldservice_stock/models/fsm_vehicle.py
deleted file mode 100644
index 06d78920d9..0000000000
--- a/fieldservice_stock/models/fsm_vehicle.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import fields, models
-
-
-class FSMVehicle(models.Model):
-    _inherit = 'fsm.vehicle'
-
-    inventory_location = fields.Many2one('stock.location',
-                                         'Inventory Location')
diff --git a/fieldservice_stock/readme/CONFIGURE.rst b/fieldservice_stock/readme/CONFIGURE.rst
index 6b50a28919..59e8366bd3 100644
--- a/fieldservice_stock/readme/CONFIGURE.rst
+++ b/fieldservice_stock/readme/CONFIGURE.rst
@@ -1,4 +1,4 @@
 To configure this module, you need to:
 
-* Set Inventory Locations for FSM Locations and FSM Vehicles
-* Verify procurement routes
+* Go to Field Service > Master Data > Locations
+* Create or select a location and set the inventory location
diff --git a/fieldservice_stock/readme/INSTALL.rst b/fieldservice_stock/readme/INSTALL.rst
index a7c9f727b2..c010f8f6a2 100644
--- a/fieldservice_stock/readme/INSTALL.rst
+++ b/fieldservice_stock/readme/INSTALL.rst
@@ -1,6 +1,4 @@
-You will first need to install:
+To install Field Service and have the mapping features, you need to install GeoEngine.
 
-* fieldservice
-
-Then go to Field Service > Configuration > Settings
-Enable the 'Use Odoo Stock Logistics' option under Integrations
+Please refer to the installation instructions available at:
+https://github.com/OCA/geospatial/tree/11.0/base_geoengine
diff --git a/fieldservice_stock/readme/USAGE.rst b/fieldservice_stock/readme/USAGE.rst
index 2934857b2b..a9332d58c5 100644
--- a/fieldservice_stock/readme/USAGE.rst
+++ b/fieldservice_stock/readme/USAGE.rst
@@ -1,7 +1,7 @@
 To use this module, you need to:
 
-* Create a new field service order
-* Under the Materials tab, add products with quantity
-* Confirm an order to create stock moves
-* Validate stock moves in the Inventory app
-* Quantities Delivered on FSM Order Line will be updated based on move
+* Create a new service order
+* Under the Inventory tab, select the warehouse and add products with quantity
+* Confirm the order to create the delivery orders
+* Validate the transfers in the Inventory app. Quantities delivered on FSM
+  Order Line will be updated.
diff --git a/fieldservice_stock/views/fsm_location.xml b/fieldservice_stock/views/fsm_location.xml
index 54d7738445..a255bd9bcb 100644
--- a/fieldservice_stock/views/fsm_location.xml
+++ b/fieldservice_stock/views/fsm_location.xml
@@ -6,7 +6,8 @@
         <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
         <field name="arch" type="xml">
             <xpath expr="//form/sheet/group/group[2]" position="inside">
-                <field name="inventory_location" domain="[('usage', 'in', ['internal','supplier','customer'])]"/>
+                <field name="inventory_location"
+                       domain="[('usage', 'in', ['internal', 'supplier', 'customer'])]"/>
             </xpath>
         </field>
     </record>
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index a165b4f6e2..8e422a26c7 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -6,31 +6,46 @@
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <field name="picking_ids" invisible="1"/>
+                <button type="object"
+                        name="action_view_delivery"
+                        class="oe_stat_button"
+                        icon="fa-truck"
+                        attrs="{'invisible': [('delivery_count', '=', 0)]}" groups="base.group_user">
+                    <field name="delivery_count" widget="statinfo" string="Delivery"/>
+                </button>
+            </div>
             <xpath expr="//notebook/page[1]" position="after">
-                <page string="Materials">
-                    <field name="line_ids" mode="tree">
-                        <tree string="Material Order Lines" editable="bottom">
+                <page string="Inventory">
+                    <group>
+                        <group>
+                            <field name="Warehouse"/>
+                        </group>
+                        <group></group>
+                    </group>
+                    <field name="line_ids" nolabel="1">
+                        <tree editable="bottom">
                             <field name="sequence" widget="handle"/>
                             <field name="product_id"
-                                context="{
-                                    'quantity':qty_ordered,
-                                    'uom':product_uom_id,
+                                   context="{
+                                    'quantity': qty_ordered,
+                                    'uom': product_uom_id,
                                 }"
                             />
                             <field name="name"/>
                             <field name="qty_ordered"
-                                string="Ordered Qty"
-                                context="{
-                                    'quantity':qty_ordered,
-                                    'uom':product_uom_id,
+                                   string="Ordered Qty"
+                                   context="{
+                                    'quantity': qty_ordered,
+                                    'uom': product_uom_id,
                                 }"
                             />
-                            <field name="qty_delivered"
-                                 />
+                            <field name="qty_delivered"/>
                             <field name="product_uom_id"
-                                attrs="{'readonly': [('state', 'in', ('sale','done', 'cancel'))]}"
-                                options='{"no_open": True, "no_create": True}'
-                                groups="product.group_uom"/>
+                                   attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
+                                   options='{"no_open": True, "no_create": True}'
+                                   groups="product.group_uom"/>
                             <field name="state" invisible="1"/>
                         </tree>
                     </field>
diff --git a/fieldservice_stock/views/fsm_vehicle.xml b/fieldservice_stock/views/fsm_vehicle.xml
deleted file mode 100644
index 84b559e8f0..0000000000
--- a/fieldservice_stock/views/fsm_vehicle.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="fsm_vehicle_stock_form_view" model="ir.ui.view">
-        <field name="model">fsm.vehicle</field>
-        <field name="inherit_id" ref="fieldservice.fsm_vehicle_form_view"/>
-        <field name="arch" type="xml">
-            <xpath expr="//form/sheet/group/group[2]" position="inside">
-                <field name="inventory_location" domain="[('usage', '=', 'internal')]"/>
-            </xpath>
-        </field>
-    </record>
-
-</odoo>
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 07dd7c5408..375d38977b 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <menuitem id="menu_fsm_product"
+              name="Products"
+              action="stock.product_template_action_product"
+              parent="fieldservice.data"
+              sequence="90"/>
+
     <menuitem id="menu_fsm_stock_inventory"
               name="Inventory"
               action="stock.quantsact"

From 8d3ac646e549a949dc3b02ff797c86d131449568 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 13 Dec 2018 19:48:34 -0600
Subject: [PATCH 066/631] [ADD] Security

[UPD] README.rst
---
 fieldservice_stock/README.rst                 | 22 ++++++++----------
 fieldservice_stock/__manifest__.py            |  1 +
 fieldservice_stock/models/fsm_order.py        |  5 ++--
 .../security/ir.model.access.csv              |  3 +++
 .../static/description/index.html             | 23 ++++++++-----------
 fieldservice_stock/views/fsm_order.xml        |  2 +-
 6 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 fieldservice_stock/security/ir.model.access.csv

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index 3510cd588b..8ab3047909 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -36,31 +36,29 @@ It provides inventory and stock operations.
 Installation
 ============
 
-You will first need to install:
+To install Field Service and have the mapping features, you need to install GeoEngine.
 
-* fieldservice
-
-Then go to Field Service > Configuration > Settings
-Enable the 'Use Odoo Stock Logistics' option under Integrations
+Please refer to the installation instructions available at:
+https://github.com/OCA/geospatial/tree/11.0/base_geoengine
 
 Configuration
 =============
 
 To configure this module, you need to:
 
-* Set Inventory Locations for FSM Locations and FSM Vehicles
-* Verify procurement routes
+* Go to Field Service > Master Data > Locations
+* Create or select a location and set the inventory location
 
 Usage
 =====
 
 To use this module, you need to:
 
-* Create a new field service order
-* Under the Materials tab, add products with quantity
-* Confirm an order to create stock moves
-* Validate stock moves in the Inventory app
-* Quantities Delivered on FSM Order Line will be updated based on move
+* Create a new service order
+* Under the Inventory tab, select the warehouse and add products with quantity
+* Confirm the order to create the delivery orders
+* Validate the transfers in the Inventory app. Quantities delivered on FSM
+  Order Line will be updated.
 
 Known issues / Roadmap
 ======================
diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 266983cc0a..43f953f45c 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -15,6 +15,7 @@
         'stock',
     ],
     'data': [
+        'security/ir.model.access.csv',
         'data/fsm_stock_data.xml',
         'views/fsm_location.xml',
         'views/fsm_order.xml',
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index efc930d188..94272b5a05 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -53,10 +53,12 @@ def action_view_delivery(self):
         if len(pickings) > 1:
             action['domain'] = [('id', 'in', pickings.ids)]
         elif pickings:
-            action['views'] = [(self.env.ref('stock.view_picking_form').id, 'form')]
+            action['views'] = [(self.env.ref('stock.view_picking_form').id,
+                                'form')]
             action['res_id'] = pickings.id
         return action
 
+
 class FSMOrderLine(models.Model):
     _name = 'fsm.order.line'
     _description = "FSM Order Lines"
@@ -199,7 +201,6 @@ def _confirm_picking(self):
             procurement_uom = line.product_uom_id
             quant_uom = line.product_id.uom_id
             get_param = self.env['ir.config_parameter'].sudo().get_param
-            import pdb;pdb.set_trace()
             if (procurement_uom.id != quant_uom.id
                     and get_param('stock.propagate_uom') != '1'):
                 qty_needed = line.product_uom_id._compute_quantity(
diff --git a/fieldservice_stock/security/ir.model.access.csv b/fieldservice_stock/security/ir.model.access.csv
new file mode 100644
index 0000000000..0db565d3d6
--- /dev/null
+++ b/fieldservice_stock/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_fsm_order_line_fsm_user,fsm.order.line.user,model_fsm_order_line,fieldservice.group_fsm_user,1,0,0,0
+access_fsm_order_line_fsm_dispatcher,fsm.order.line.dispatcher,model_fsm_order_line,fieldservice.group_fsm_dispatcher,1,1,1,1
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index 7cf0406b5e..76dc661c21 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/static/description/index.html
@@ -389,30 +389,27 @@ <h1 class="title">Field Service - Stock</h1>
 </div>
 <div class="section" id="installation">
 <h1><a class="toc-backref" href="#id1">Installation</a></h1>
-<p>You will first need to install:</p>
-<ul class="simple">
-<li>fieldservice</li>
-</ul>
-<p>Then go to Field Service &gt; Configuration &gt; Settings
-Enable the ‘Use Odoo Stock Logistics’ option under Integrations</p>
+<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>Set Inventory Locations for FSM Locations and FSM Vehicles</li>
-<li>Verify procurement routes</li>
+<li>Go to Field Service &gt; Master Data &gt; Locations</li>
+<li>Create or select a location and set the inventory location</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>Create a new field service order</li>
-<li>Under the Materials tab, add products with quantity</li>
-<li>Confirm an order to create stock moves</li>
-<li>Validate stock moves in the Inventory app</li>
-<li>Quantities Delivered on FSM Order Line will be updated based on move</li>
+<li>Create a new service order</li>
+<li>Under the Inventory tab, select the warehouse and add products with quantity</li>
+<li>Confirm the order to create the delivery orders</li>
+<li>Validate the transfers in the Inventory app. Quantities delivered on FSM
+Order Line will be updated.</li>
 </ul>
 </div>
 <div class="section" id="known-issues-roadmap">
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 8e422a26c7..bf7e07f684 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -20,7 +20,7 @@
                 <page string="Inventory">
                     <group>
                         <group>
-                            <field name="Warehouse"/>
+                            <field name="warehouse_id"/>
                         </group>
                         <group></group>
                     </group>

From 9125177f8a48985c8a69fc31b5edb66cc3dcaef2 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 14 Dec 2018 17:16:23 -0600
Subject: [PATCH 067/631] [IMP] fieldservice_stock

---
 fieldservice_stock/__manifest__.py     |   2 +-
 fieldservice_stock/models/fsm_order.py |  15 +++-
 fieldservice_stock/models/stock.py     |   6 ++
 fieldservice_stock/views/fsm_order.xml | 107 ++++++++++++++++++++++++-
 fieldservice_stock/views/stock.xml     |  18 +++++
 5 files changed, 142 insertions(+), 6 deletions(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 43f953f45c..31d548633d 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Inventory and Stock Operations for Field Services',
-    'version': '11.0.0.0.2',
+    'version': '11.0.0.1.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 94272b5a05..77a8670c2a 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -16,6 +16,13 @@
 class FSMOrder(geo_model.GeoModel):
     _inherit = 'fsm.order'
 
+    @api.model
+    def _default_warehouse_id(self):
+        company = self.env.user.company_id.id
+        warehouse_ids = self.env['stock.warehouse'].search(
+            [('company_id', '=', company)], limit=1)
+        return warehouse_ids
+
     line_ids = fields.One2many(
         'fsm.order.line', 'order_id', string="Order Lines",)
     picking_ids = fields.One2many('stock.picking', 'fsm_order_id',
@@ -25,6 +32,8 @@ class FSMOrder(geo_model.GeoModel):
     procurement_group_id = fields.Many2one(
         'procurement.group', 'Procurement Group', copy=False)
     warehouse_id = fields.Many2one('stock.warehouse', string='Warehouse',
+                                   required=True, readonly=True,
+                                   default=_default_warehouse_id,
                                    help="Warehouse used to ship the materials")
 
     @api.depends('picking_ids')
@@ -96,6 +105,9 @@ class FSMOrderLine(models.Model):
     move_ids = fields.One2many(
         'stock.move', 'fsm_order_line_id', string='Stock Moves',
         readonly=True, states={'draft': [('readonly', False)]})
+    route_id = fields.Many2one('stock.location.route', string='Route',
+                               domain=[('fsm_selectable', '=', True)],
+                               ondelete='restrict')
 
     @api.depends('move_ids', 'qty_ordered', 'qty_delivered')
     def _compute_state(self):
@@ -158,7 +170,8 @@ def _prepare_procurement_values(self, group_id=False):
             'group_id': group_id,
             'fsm_order_line_id': self.id,
             'date_planned': date_planned,
-            'route_ids': self.order_id.warehouse_id.delivery_route_id,
+            'route_ids':
+                self.route_id or self.order_id.warehouse_id.delivery_route_id,
             'partner_dest_id': self.order_id.customer_id
         })
         return values
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index e2ccc4f590..88995103f6 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -51,3 +51,9 @@ class StockPicking(models.Model):
     fsm_order_id = fields.Many2one(
         related="group_id.fsm_order_id", string="Field Service Order",
         store=True)
+
+
+class StockLocationRoute(models.Model):
+    _inherit = 'stock.location.route'
+
+    fsm_selectable = fields.Boolean(string="Field Service Order Lines")
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index bf7e07f684..6ad1bd6372 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -18,11 +18,12 @@
             </div>
             <xpath expr="//notebook/page[1]" position="after">
                 <page string="Inventory">
-                    <group>
-                        <group>
-                            <field name="warehouse_id"/>
+                    <group groups="stock.group_stock_user">
+                        <group id="stock-left">
+                            <field name="warehouse_id"
+                                   groups="stock.group_stock_multi_warehouses"/>
                         </group>
-                        <group></group>
+                        <group id="stock-right"></group>
                     </group>
                     <field name="line_ids" nolabel="1">
                         <tree editable="bottom">
@@ -34,6 +35,7 @@
                                 }"
                             />
                             <field name="name"/>
+                            <field name="route_id" groups="stock.group_stock_adv_location"/>
                             <field name="qty_ordered"
                                    string="Ordered Qty"
                                    context="{
@@ -54,4 +56,101 @@
         </field>
     </record>
 
+    <!-- Inventory / Operations / FSM Orders -->
+    <record id="stock_fsm_order_form" model="ir.ui.view">
+        <field name="name">fsm.order.form</field>
+        <field name="model">fsm.order</field>
+        <field name="arch" type="xml">
+            <form string="FSM Order" create="false">
+                <header>
+                    <button id="action_confirm"
+                            name="action_confirm" string="Confirm"
+                            class="oe_highlight"
+                            type="object" groups="fieldservice.group_fsm_dispatcher"
+                            attrs="{'invisible': [('stage_id', '!=', %(fieldservice.fsm_stage_new)d)]}"/>
+                    <field name="stage_id" widget="statusbar"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1><field name="name" readonly="1"/></h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="customer_id"/>
+                            <field name="location_id"/>
+                        </group>
+                        <group>
+                            <field name="priority" widget="priority"/>
+                            <field name="warehouse_id"
+                                   groups="stock.group_stock_multi_warehouses"/>
+                        </group>
+                    </group>
+                    <field name="line_ids" nolabel="1">
+                        <tree editable="bottom">
+                            <field name="sequence" widget="handle"/>
+                            <field name="product_id"
+                                   context="{
+                                    'quantity': qty_ordered,
+                                    'uom': product_uom_id,
+                                }"
+                            />
+                            <field name="name"/>
+                            <field name="route_id" groups="stock.group_adv_location"/>
+                            <field name="qty_ordered"
+                                   string="Ordered Qty"
+                                   context="{
+                                    'quantity': qty_ordered,
+                                    'uom': product_uom_id,
+                                }"
+                            />
+                            <field name="qty_delivered"/>
+                            <field name="product_uom_id"
+                                   attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
+                                   options='{"no_open": True, "no_create": True}'
+                                   groups="product.group_uom"/>
+                            <field name="state" invisible="1"/>
+                        </tree>
+                    </field>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="activity_ids" widget="mail_activity"/>
+                    <field name="message_ids" widget="mail_thread" options="{'post_refresh': 'recipients'}"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="stock_fsm_order_tree" model="ir.ui.view">
+        <field name="name">fsm.order.tree</field>
+        <field name="model">fsm.order</field>
+        <field name="arch" type="xml">
+            <tree string="FSM Orders"
+                  default_order="scheduled_date_start"
+                  create="false">
+                <field name="name"/>
+                <field name="customer_id"/>
+                <field name="location_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_stock_fsm_order" model="ir.actions.act_window">
+        <field name="name">FSM Orders</field>
+        <field name="res_model">fsm.order</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain"
+               eval="[('stage_id', '=', ref('fieldservice.fsm_stage_new'))]"/>
+        <field name="view_ids"
+               eval="[(5, 0, 0),
+                      (0, 0, {'view_mode': 'tree', 'view_id': ref('fieldservice_stock.stock_fsm_order_tree')}),
+                      (0, 0, {'view_mode': 'form', 'view_id': ref('fieldservice_stock.stock_fsm_order_form')})]"/>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                No Field Service Orders to confirm.
+            </p>
+        </field>
+    </record>
+
 </odoo>
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 375d38977b..9f03d5a4dd 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="stock_location_route_view_fsm" model="ir.ui.view">
+        <field name="name">stock.location.route.form</field>
+        <field name="model">stock.location.route</field>
+        <field name="inherit_id" ref="stock.stock_location_route_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='warehouse_ids']" position="after">
+                <field name="fsm_selectable" string="FSM Order Lines"/>
+            </xpath>
+        </field>
+    </record>
+
     <menuitem id="menu_fsm_product"
               name="Products"
               action="stock.product_template_action_product"
@@ -13,4 +24,11 @@
               parent="fieldservice.reporting"
               sequence="30"/>
 
+    <!--  Operations / FSM Orders -->
+    <menuitem id="menu_stock_fsm_order"
+              name="FSM Orders"
+              action="action_stock_fsm_order"
+              parent="stock.menu_stock_warehouse_mgmt"
+              sequence="50"/>
+
 </odoo>

From 0108b0e4ba4a1321f90d65756e23844a167f15e2 Mon Sep 17 00:00:00 2001
From: Sandip Mangukiya <smangukiya@ursainfosystems.com>
Date: Mon, 31 Dec 2018 02:54:31 -0800
Subject: [PATCH 068/631] [IMP] fieldservice_stock

[UPD] README.rst
---
 fieldservice_stock/README.rst                 |   6 +-
 fieldservice_stock/__manifest__.py            |   2 +
 fieldservice_stock/models/__init__.py         |   1 +
 fieldservice_stock/models/fsm_equipment.py    |  28 +++
 fieldservice_stock/models/fsm_order.py        | 234 +++++++++++++++++-
 fieldservice_stock/models/stock.py            |   9 +
 fieldservice_stock/readme/CONTRIBUTORS.rst    |   1 +
 .../security/ir.model.access.csv              |   2 +
 .../static/description/index.html             |   3 +-
 fieldservice_stock/views/fsm_equipment.xml    |  24 ++
 fieldservice_stock/views/fsm_order.xml        |  61 +++++
 fieldservice_stock/views/stock.xml            |   2 +
 12 files changed, 363 insertions(+), 10 deletions(-)
 create mode 100644 fieldservice_stock/models/fsm_equipment.py
 create mode 100644 fieldservice_stock/views/fsm_equipment.xml

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index 8ab3047909..152727d3ac 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -89,6 +89,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Brian McMaster <brian@mcmpest.com>
+* Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -119,10 +120,13 @@ promote its widespread use.
 .. |maintainer-max3903| image:: https://github.com/max3903.png?size=40px
     :target: https://github.com/max3903
     :alt: max3903
+.. |maintainer-smangukiya| image:: https://github.com/smangukiya.png?size=40px
+    :target: https://github.com/smangukiya
+    :alt: smangukiya
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-brian10048| |maintainer-wolfhall| |maintainer-max3903| 
+|maintainer-brian10048| |maintainer-wolfhall| |maintainer-max3903| |maintainer-smangukiya| 
 
 This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_stock>`_ project on GitHub.
 
diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 31d548633d..642b44845b 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -20,6 +20,7 @@
         'views/fsm_location.xml',
         'views/fsm_order.xml',
         'views/stock.xml',
+        'views/fsm_equipment.xml',
     ],
     'installable': True,
     'license': 'AGPL-3',
@@ -28,5 +29,6 @@
         'brian10048',
         'wolfhall',
         'max3903',
+        'smangukiya',
     ],
 }
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index bacddd4307..0a2022e17b 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -5,4 +5,5 @@
     fsm_location,
     fsm_order,
     stock,
+    fsm_equipment,
 )
diff --git a/fieldservice_stock/models/fsm_equipment.py b/fieldservice_stock/models/fsm_equipment.py
new file mode 100644
index 0000000000..103790dee2
--- /dev/null
+++ b/fieldservice_stock/models/fsm_equipment.py
@@ -0,0 +1,28 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMEquipment(models.Model):
+    _inherit = 'fsm.equipment'
+    _description = "FSM Equipment Inherits"
+
+    product_id = fields.Many2one(
+        'product.product', string='Product', required=True)
+    lot_id = fields.Many2one(
+        'stock.production.lot', string='Serial #', required=True)
+    current_stock_location_id = fields.Many2one(
+        'stock.location', string='Current Inventory Location',
+        compute='_compute_current_stock_loc_id')
+
+    @api.multi
+    def _compute_current_stock_loc_id(self):
+        for equipment in self:
+            quants = self.env['stock.quant'].search(
+                [('lot_id', '=', self.lot_id.id)], order="id desc")
+            if quants:
+                equipment.current_stock_location_id = \
+                    quants[0].location_id.id or False
+            else:
+                equipment.current_stock_location_id = False
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 77a8670c2a..75dc76b912 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -24,7 +24,7 @@ def _default_warehouse_id(self):
         return warehouse_ids
 
     line_ids = fields.One2many(
-        'fsm.order.line', 'order_id', string="Order Lines",)
+        'fsm.order.line', 'order_id', string="Order Lines", )
     picking_ids = fields.One2many('stock.picking', 'fsm_order_id',
                                   string='Transfers')
     delivery_count = fields.Integer(string='Delivery Orders',
@@ -35,15 +35,33 @@ def _default_warehouse_id(self):
                                    required=True, readonly=True,
                                    default=_default_warehouse_id,
                                    help="Warehouse used to ship the materials")
+    # FSM Order return
+    return_ids = fields.One2many('fsm.order.return', 'order_id',
+                                 string="Return Lines")
+    return_count = fields.Integer(string='Return Orders',
+                                  compute='_compute_picking_ids')
 
     @api.depends('picking_ids')
     def _compute_picking_ids(self):
         for order in self:
-            order.delivery_count = len(order.picking_ids)
+            order.delivery_count = len(
+                [picking for picking in order.picking_ids if
+                 picking.picking_type_id.code == 'outgoing'])
+            order.return_count = len(
+                [picking for picking in order.picking_ids if
+                 picking.picking_type_id.code == 'incoming'])
 
     def action_confirm(self):
-        if self.location_id and self.line_ids and self.warehouse_id:
-            self.line_ids._confirm_picking()
+        if self.location_id and (self.line_ids or self.return_ids) and\
+                self.warehouse_id:
+            if self.line_ids:
+                line_ids = self.mapped('line_ids').filtered(
+                    lambda l: l.state == 'draft')
+                line_ids._confirm_picking()
+            if self.return_ids:
+                return_ids = self.mapped('return_ids').filtered(
+                    lambda l: l.state == 'draft')
+                return_ids._confirm_picking()
             return super(FSMOrder, self).action_confirm()
         else:
             raise UserError(_('Please select the location, a warehouse and a'
@@ -57,10 +75,30 @@ def action_view_delivery(self):
         view, if there is only one delivery order to show.
         '''
         action = self.env.ref('stock.action_picking_tree_all').read()[0]
+        pickings = self.mapped('picking_ids')
+        delivery_ids = [picking.id for picking in pickings if
+                        picking.picking_type_id.code == 'outgoing']
+        if len(pickings) > 1:
+            action['domain'] = [('id', 'in', delivery_ids)]
+        elif pickings:
+            action['views'] = [(self.env.ref('stock.view_picking_form').id,
+                                'form')]
+            action['res_id'] = pickings.id
+        return action
 
+    @api.multi
+    def action_view_returns(self):
+        '''
+        This function returns an action that display existing return orders
+        of given fsm order ids. It can either be a in a list or in a form
+        view, if there is only one return order to show.
+        '''
+        action = self.env.ref('stock.action_picking_tree_all').read()[0]
         pickings = self.mapped('picking_ids')
+        receipt_ids = [picking.id for picking in pickings if
+                       picking.picking_type_id.code == 'incoming']
         if len(pickings) > 1:
-            action['domain'] = [('id', 'in', pickings.ids)]
+            action['domain'] = [('id', 'in', receipt_ids)]
         elif pickings:
             action['views'] = [(self.env.ref('stock.view_picking_form').id,
                                 'form')]
@@ -234,15 +272,195 @@ def _confirm_picking(self):
     def _get_delivered_qty(self):
         self.ensure_one()
         qty = 0.0
-        for move in self.move_ids.filtered(lambda r: r.state == 'done'
-                                           and not r.scrapped):
+        for move in self.move_ids.filtered(
+                lambda r: r.state == 'done' and not r.scrapped):
             if move.location_dest_id.usage == "customer":
                 if (not move.origin_returned_move_id
                         or (move.origin_returned_move_id and move.to_refund)):
                     qty += move.product_uom._compute_quantity(
                         move.product_uom_qty, self.product_uom_id)
             elif (move.location_dest_id.usage != "customer"
-                    and move.to_refund):
+                  and move.to_refund):
+                qty -= move.product_uom._compute_quantity(
+                    move.product_uom_qty, self.product_uom_id)
+        return qty
+
+
+class FSMOrderReturn(models.Model):
+    _name = 'fsm.order.return'
+    _description = "FSM Order Return"
+    _order = 'order_id, sequence, id'
+
+    order_id = fields.Many2one(
+        'fsm.order', string="FSM Order", required=True,
+        ondelete='cascade', index=True, copy=False,
+        readonly=True, states={'draft': [('readonly', False)]})
+    name = fields.Char(string='Description', required=True,
+                       readonly=True, states={'draft': [('readonly', False)]})
+    sequence = fields.Integer(string='Sequence', default=10, readonly=True,
+                              states={'draft': [('readonly', False)]})
+    product_id = fields.Many2one(
+        'product.product', string="Product",
+        domain=[('type', '=', 'product')], ondelete='restrict',
+        readonly=True, states={'draft': [('readonly', False)]})
+    product_uom_id = fields.Many2one(
+        'product.uom', string='Unit of Measure', required=True,
+        readonly=True, states={'draft': [('readonly', False)]})
+    qty_returned = fields.Float(
+        string='Quantity Returned', readonly=True,
+        states={'draft': [('readonly', False)]},
+        digits=dp.get_precision('Product Unit of Measure'))
+    qty_received = fields.Float(
+        string='Quantity Received', readonly=True, copy=False,
+        digits=dp.get_precision('Product Unit of Measure'))
+    state = fields.Selection([
+        ('draft', 'Draft'),
+        ('confirmed', 'Confirmed'),
+        ('partial', 'Partially Shipped'),
+        ('done', 'Done')],
+        string='State', compute='_compute_state', copy=False, index=True,
+        readonly=True, store=True)
+    move_ids = fields.One2many(
+        'stock.move', 'fsm_order_return_line_id', string='Stock Moves',
+        readonly=True, states={'draft': [('readonly', False)]})
+    route_id = fields.Many2one('stock.location.route', string='Route',
+                               domain=[('fsm_return_selectable', '=', True)],
+                               ondelete='restrict')
+
+    @api.depends('move_ids', 'qty_returned', 'qty_received')
+    def _compute_state(self):
+        precision = self.env['decimal.precision'].precision_get(
+            'Product Unit of Measure')
+        for line in self:
+            if line.move_ids and not float_is_zero(line.qty_received,
+                                                   precision_digits=precision):
+                if float_compare(line.qty_received, line.qty_returned,
+                                 precision_digits=precision) == -1:
+                    line.state = 'partial'
+                elif float_compare(line.qty_received, line.qty_returned,
+                                   precision_digits=precision) >= 0:
+                    line.state = 'done'
+            elif line.move_ids:
+                line.state = 'confirmed'
+            else:
+                line.state = 'draft'
+
+    @api.multi
+    @api.onchange('product_id')
+    def onchange_product_id(self):
+        if not self.product_id:
+            return {'domain': {'product_uom': []}}
+
+        vals = {}
+        domain = {'product_uom': [('category_id', '=',
+                                   self.product_id.uom_id.category_id.id)]}
+
+        if (not self.product_uom_id
+                or (self.product_id.uom_id.id != self.product_uom_id.id)):
+            vals['product_uom_id'] = self.product_id.uom_id
+            vals['qty_returned'] = 1.0
+
+        product = self.product_id.with_context(
+            quantity=vals.get('qty_returned') or self.qty_returned,
+            uom=self.product_uom_id.id,
+        )
+
+        result = {'domain': domain}
+
+        name = product.name_get()[0][1]
+        if product.description_sale:
+            name += '\n' + product.description_sale
+        vals['name'] = name
+
+        self.update(vals)
+        return result
+
+    @api.multi
+    def _prepare_procurement_values(self, group_id=False):
+        self.ensure_one()
+        values = {}
+        date_planned = (self.order_id.scheduled_date_start
+                        or self.order_id.request_early
+                        or self.order_id.request_late
+                        or (datetime.now() + timedelta(days=1)).strftime(
+                            DEFAULT_SERVER_DATETIME_FORMAT))
+        values.update({
+            'group_id': group_id,
+            'fsm_order_return_line_id': self.id,
+            'date_planned': date_planned,
+            'route_ids':
+                self.route_id or self.order_id.warehouse_id.reception_route_id,
+            'partner_dest_id': self.order_id.warehouse_id
+        })
+        return values
+
+    def _get_procurement_qty(self):
+        self.ensure_one()
+        qty = 0.0
+        for move in self.move_ids.filtered(lambda r: r.state != 'cancel'):
+            if move.picking_code == 'incoming':
+                qty += move.product_uom._compute_quantity(
+                    move.product_uom_qty, self.product_uom_id,
+                    rounding_method='HALF-UP')
+            elif move.picking_code == 'outoging':
+                qty -= move.product_uom._compute_quantity(
+                    move.product_uom_qty, self.product_uom_id,
+                    rounding_method='HALF-UP')
+        return qty
+
+    @api.multi
+    def _confirm_picking(self):
+        precision = self.env['decimal.precision'].precision_get(
+            'Product Unit of Measure')
+        errors = []
+        for line in self:
+            qty_procured = line._get_procurement_qty()
+            if float_compare(qty_procured, line.qty_returned,
+                             precision_digits=precision) >= 0:
+                continue
+            group_id = line.order_id.procurement_group_id
+            if not group_id:
+                group_id = self.env['procurement.group'].create({
+                    'name': line.order_id.name,
+                    'move_type': 'direct',
+                    'fsm_order_id': line.order_id.id,
+                    'partner_id': line.order_id.customer_id.id,
+                })
+                line.order_id.procurement_group_id = group_id
+            values = line._prepare_procurement_values(group_id=group_id)
+            qty_needed = line.qty_returned - qty_procured
+            procurement_uom = line.product_uom_id
+            quant_uom = line.product_id.uom_id
+            get_param = self.env['ir.config_parameter'].sudo().get_param
+            if (procurement_uom.id != quant_uom.id
+                    and get_param('stock.propagate_uom') != '1'):
+                qty_needed = line.product_uom_id._compute_quantity(
+                    qty_needed, quant_uom, rounding_method='HALF-UP')
+                procurement_uom = quant_uom
+            try:
+                self.env['procurement.group'].run(
+                    line.product_id, qty_needed, procurement_uom,
+                    line.order_id.location_id.inventory_location,
+                    line.name, line.order_id.name, values)
+            except UserError as error:
+                errors.append(error.name)
+        if errors:
+            raise UserError('\n'.join(errors))
+        return True
+
+    @api.multi
+    def _get_received_qty(self):
+        self.ensure_one()
+        qty = 0.0
+        for move in self.move_ids.filtered(
+                lambda r: r.state == 'done' and not r.scrapped):
+            if move.location_dest_id.usage != "customer":
+                if (not move.origin_returned_move_id
+                        or (move.origin_returned_move_id and move.to_refund)):
+                    qty += move.product_uom._compute_quantity(
+                        move.product_uom_qty, self.product_uom_id)
+            elif (move.location_dest_id.usage == "customer"
+                  and move.to_refund):
                 qty -= move.product_uom._compute_quantity(
                     move.product_uom_qty, self.product_uom_id)
         return qty
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 88995103f6..cec0467504 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -8,11 +8,15 @@ class StockMove(models.Model):
     _inherit = "stock.move"
 
     fsm_order_line_id = fields.Many2one('fsm.order.line', 'FSM Order Line')
+    fsm_order_return_line_id = fields.Many2one(
+        'fsm.order.return', 'FSM Order Return Line')
 
     def _action_done(self):
         result = super(StockMove, self)._action_done()
         for line in result.mapped('fsm_order_line_id').sudo():
             line.qty_delivered = line._get_delivered_qty()
+        for line in result.mapped('fsm_order_return_line_id').sudo():
+            line.qty_received = line._get_received_qty()
         return result
 
     @api.multi
@@ -42,6 +46,9 @@ def _get_stock_move_values(self, product_id, product_qty, product_uom,
             location_id, name, origin, values, group_id)
         if values.get('fsm_order_line_id', False):
             result['fsm_order_line_id'] = values['fsm_order_line_id']
+        if values.get('fsm_order_return_line_id', False):
+            result['fsm_order_return_line_id'] = \
+                values['fsm_order_return_line_id']
         return result
 
 
@@ -57,3 +64,5 @@ class StockLocationRoute(models.Model):
     _inherit = 'stock.location.route'
 
     fsm_selectable = fields.Boolean(string="Field Service Order Lines")
+    fsm_return_selectable = fields.Boolean(
+        string="Field Service Return Order Lines")
diff --git a/fieldservice_stock/readme/CONTRIBUTORS.rst b/fieldservice_stock/readme/CONTRIBUTORS.rst
index 39ef3fa3d7..a3606b15df 100644
--- a/fieldservice_stock/readme/CONTRIBUTORS.rst
+++ b/fieldservice_stock/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Brian McMaster <brian@mcmpest.com>
+* Sandip Mangukiya <smangukiya@opensourceintegrators.com>
diff --git a/fieldservice_stock/security/ir.model.access.csv b/fieldservice_stock/security/ir.model.access.csv
index 0db565d3d6..f7bbd49d5d 100644
--- a/fieldservice_stock/security/ir.model.access.csv
+++ b/fieldservice_stock/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_fsm_order_line_fsm_user,fsm.order.line.user,model_fsm_order_line,fieldservice.group_fsm_user,1,0,0,0
 access_fsm_order_line_fsm_dispatcher,fsm.order.line.dispatcher,model_fsm_order_line,fieldservice.group_fsm_dispatcher,1,1,1,1
+access_fsm_order_return_fsm_user,fsm.order.return.user,model_fsm_order_return,fieldservice.group_fsm_user,1,0,0,0
+access_fsm_order_return_fsm_dispatcher,fsm.order.return.dispatcher,model_fsm_order_return,fieldservice.group_fsm_dispatcher,1,1,1,1
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index 76dc661c21..7b4547acab 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/static/description/index.html
@@ -438,6 +438,7 @@ <h2><a class="toc-backref" href="#id7">Authors</a></h2>
 <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
+<li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -455,7 +456,7 @@ <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>
-<p><a class="reference external" href="https://github.com/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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><a class="reference external" href="https://github.com/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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_stock">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>
diff --git a/fieldservice_stock/views/fsm_equipment.xml b/fieldservice_stock/views/fsm_equipment.xml
new file mode 100644
index 0000000000..64e485b287
--- /dev/null
+++ b/fieldservice_stock/views/fsm_equipment.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="fsm_equipment_form_view_stock" model="ir.ui.view">
+        <field name="name">fsm.equipment.form.stock</field>
+        <field name="model">fsm.equipment</field>
+        <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//notebook/page[2]" position="after">
+                <page string="Inventory">
+                    <group groups="stock.group_stock_user">
+                        <group id="stock-left">
+                            <field name="product_id"/>
+                            <field name="lot_id" domain="[('product_id', '=', product_id)]"/>
+                            <field name="current_stock_location_id"/>
+                        </group>
+                        <group id="stock-right"></group>
+                    </group>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 6ad1bd6372..00fed00649 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -15,6 +15,13 @@
                         attrs="{'invisible': [('delivery_count', '=', 0)]}" groups="base.group_user">
                     <field name="delivery_count" widget="statinfo" string="Delivery"/>
                 </button>
+                <button type="object"
+                        name="action_view_returns"
+                        class="oe_stat_button"
+                        icon="fa-truck"
+                        attrs="{'invisible': [('return_count', '=', 0)]}" groups="base.group_user">
+                    <field name="return_count" widget="statinfo" string="Receipts"/>
+                </button>
             </div>
             <xpath expr="//notebook/page[1]" position="after">
                 <page string="Inventory">
@@ -25,6 +32,7 @@
                         </group>
                         <group id="stock-right"></group>
                     </group>
+                    <separator string="Outbound"/>
                     <field name="line_ids" nolabel="1">
                         <tree editable="bottom">
                             <field name="sequence" widget="handle"/>
@@ -51,6 +59,33 @@
                             <field name="state" invisible="1"/>
                         </tree>
                     </field>
+                    <separator string="Inbound"/>
+                    <field name="return_ids" nolabel="1">
+                        <tree editable="bottom">
+                            <field name="sequence" widget="handle"/>
+                            <field name="product_id"
+                                   context="{
+                                    'quantity': qty_returned,
+                                    'uom': product_uom_id,
+                                }"
+                            />
+                            <field name="name"/>
+                            <field name="route_id" groups="stock.group_stock_adv_location"/>
+                            <field name="qty_returned"
+                                   string="Returned Qty"
+                                   context="{
+                                    'quantity': qty_returned,
+                                    'uom': product_uom_id,
+                                }"
+                            />
+                            <field name="qty_received"/>
+                            <field name="product_uom_id"
+                                   attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
+                                   options='{"no_open": True, "no_create": True}'
+                                   groups="product.group_uom"/>
+                            <field name="state" invisible="1"/>
+                        </tree>
+                    </field>
                 </page>
             </xpath>
         </field>
@@ -111,6 +146,32 @@
                             <field name="state" invisible="1"/>
                         </tree>
                     </field>
+                    <field name="return_ids" nolabel="1">
+                        <tree editable="bottom">
+                            <field name="sequence" widget="handle"/>
+                            <field name="product_id"
+                                   context="{
+                                    'quantity': qty_returned,
+                                    'uom': product_uom_id,
+                                }"
+                            />
+                            <field name="name"/>
+                            <field name="route_id" groups="stock.group_stock_adv_location"/>
+                            <field name="qty_returned"
+                                   string="Returned Qty"
+                                   context="{
+                                    'quantity': qty_returned,
+                                    'uom': product_uom_id,
+                                }"
+                            />
+                            <field name="qty_received"/>
+                            <field name="product_uom_id"
+                                   attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
+                                   options='{"no_open": True, "no_create": True}'
+                                   groups="product.group_uom"/>
+                            <field name="state" invisible="1"/>
+                        </tree>
+                    </field>
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 9f03d5a4dd..9b6636bc1a 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -8,6 +8,8 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='warehouse_ids']" position="after">
                 <field name="fsm_selectable" string="FSM Order Lines"/>
+                <field name="fsm_return_selectable"
+                string="FSM Order Return Lines"/>
             </xpath>
         </field>
     </record>

From 288f08fb2ca434cea2c0b1aaa8a640975a425533 Mon Sep 17 00:00:00 2001
From: Michael Allen <mallen@opensourceintegrators.com>
Date: Wed, 2 Jan 2019 10:52:21 -0700
Subject: [PATCH 069/631] [IMP] fieldservice_stock

[UPD] README.rst
---
 fieldservice_stock/README.rst                 |  16 +++
 fieldservice_stock/data/fsm_stock_data.xml    |   1 +
 fieldservice_stock/models/fsm_location.py     |   5 +-
 fieldservice_stock/models/fsm_order.py        | 116 +++++++++++++-----
 fieldservice_stock/models/stock.py            |  37 +++++-
 fieldservice_stock/readme/CONFIGURE.rst       |  16 +++
 .../static/description/index.html             |  16 +++
 fieldservice_stock/views/fsm_location.xml     |   2 +-
 fieldservice_stock/views/fsm_order.xml        |  98 ++++++++++-----
 fieldservice_stock/views/stock.xml            |  23 ++++
 10 files changed, 260 insertions(+), 70 deletions(-)

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index 152727d3ac..7205cf40a3 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -48,6 +48,22 @@ To configure this module, you need to:
 
 * Go to Field Service > Master Data > Locations
 * Create or select a location and set the inventory location
+* Go to Inventory > Configuration > Routes
+* Select the routes that you want to use from a FSM order
+* Check the box 'FSM Order Line' for outbound transfer
+* Check the box 'FSM Return Line' for inbound transfer
+
+The route 'Receipt in 1 step' has no procurement rule so if you want items to be
+returned from the service location to your warehouse, you need to create a new
+procurement rule for that route:
+
+* Name: YourCompany: Return
+* Action: Move From Another Location
+* Procurement Location:	WH/Stock
+* Served Warehouse:	YourCompany
+* Source Location: Partner Locations/Customers
+* Move Supply Method: Take From Stock
+* Operation Type: YourCompany: Receipts
 
 Usage
 =====
diff --git a/fieldservice_stock/data/fsm_stock_data.xml b/fieldservice_stock/data/fsm_stock_data.xml
index c74036dae3..290cd237e7 100644
--- a/fieldservice_stock/data/fsm_stock_data.xml
+++ b/fieldservice_stock/data/fsm_stock_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <!-- stock.location -->
     <record id="stock_location_field" model="stock.location">
         <field name="name">Field</field>
         <field name="usage">view</field>
diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
index bfe38d6d09..2ffc4aa075 100644
--- a/fieldservice_stock/models/fsm_location.py
+++ b/fieldservice_stock/models/fsm_location.py
@@ -8,5 +8,6 @@
 class FSMLocation(geo_model.GeoModel):
     _inherit = 'fsm.location'
 
-    inventory_location = fields.Many2one('stock.location',
-                                         'Inventory Location')
+    inventory_location_id = fields.Many2one('stock.location',
+                                            string='Inventory Location',
+                                            required=True)
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 75dc76b912..34cc5f28c5 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -12,6 +12,13 @@
 
 from odoo.addons.base_geoengine import geo_model
 
+STOCK_STAGES = [('draft', 'Draft'),
+                ('requested', 'Requested'),
+                ('confirmed', 'Confirmed'),
+                ('partial', 'Partially Shipped'),
+                ('done', 'Done'),
+                ('cancelled', 'Cancelled')]
+
 
 class FSMOrder(geo_model.GeoModel):
     _inherit = 'fsm.order'
@@ -23,14 +30,16 @@ def _default_warehouse_id(self):
             [('company_id', '=', company)], limit=1)
         return warehouse_ids
 
-    line_ids = fields.One2many(
-        'fsm.order.line', 'order_id', string="Order Lines", )
+    line_ids = fields.One2many('fsm.order.line', 'order_id',
+                               string="Order Lines")
     picking_ids = fields.One2many('stock.picking', 'fsm_order_id',
                                   string='Transfers')
     delivery_count = fields.Integer(string='Delivery Orders',
                                     compute='_compute_picking_ids')
     procurement_group_id = fields.Many2one(
         'procurement.group', 'Procurement Group', copy=False)
+    inventory_location_id = fields.Many2one(
+        related='location_id.inventory_location_id', readonly=True)
     warehouse_id = fields.Many2one('stock.warehouse', string='Warehouse',
                                    required=True, readonly=True,
                                    default=_default_warehouse_id,
@@ -40,6 +49,9 @@ def _default_warehouse_id(self):
                                  string="Return Lines")
     return_count = fields.Integer(string='Return Orders',
                                   compute='_compute_picking_ids')
+    inventory_stage = fields.Selection(STOCK_STAGES, string='State',
+                                       default='draft', required=True,
+                                       readonly=True, store=True)
 
     @api.depends('picking_ids')
     def _compute_picking_ids(self):
@@ -51,21 +63,63 @@ def _compute_picking_ids(self):
                 [picking for picking in order.picking_ids if
                  picking.picking_type_id.code == 'incoming'])
 
-    def action_confirm(self):
+    def action_request_inventory(self):
+        if self.location_id and (self.line_ids or self.return_ids) and\
+                self.warehouse_id:
+            for line in self.line_ids:
+                if line.state == 'draft':
+                    line.state = 'requested'
+                    line.qty_ordered = line.qty_requested
+            for line in self.return_ids:
+                if line.state == 'draft':
+                    line.state = 'requested'
+                    line.qty_ordered = line.qty_requested
+            self.inventory_stage = 'requested'
+        else:
+            raise UserError(
+                _('Please select the location, a warehouse and a product.'))
+
+    def action_confirm_inventory(self):
         if self.location_id and (self.line_ids or self.return_ids) and\
                 self.warehouse_id:
             if self.line_ids:
                 line_ids = self.mapped('line_ids').filtered(
-                    lambda l: l.state == 'draft')
+                    lambda l: l.state == 'requested')
                 line_ids._confirm_picking()
             if self.return_ids:
                 return_ids = self.mapped('return_ids').filtered(
-                    lambda l: l.state == 'draft')
+                    lambda l: l.state == 'requested')
                 return_ids._confirm_picking()
-            return super(FSMOrder, self).action_confirm()
+            self.inventory_stage = 'confirmed'
         else:
-            raise UserError(_('Please select the location, a warehouse and a'
-                              ' product.'))
+            raise UserError(
+                _('Please select the location, a warehouse and a product.'))
+
+    def action_cancel_inventory(self):
+        if self.line_ids:
+            line_ids = self.mapped('line_ids').filtered(
+                lambda l: l.state == 'requested')
+            for line in line_ids:
+                line.state = 'cancelled'
+        if self.return_ids:
+            return_ids = self.mapped('return_ids').filtered(
+                lambda l: l.state == 'requested')
+            for line in return_ids:
+                line.state = 'cancelled'
+        self.inventory_stage = 'cancelled'
+
+    def action_reset_inventory(self):
+        if self.line_ids:
+            line_ids = self.mapped('line_ids').filtered(
+                lambda l: l.state == 'cancelled')
+            for line in line_ids:
+                line.state = 'draft'
+        if self.return_ids:
+            return_ids = self.mapped('return_ids').filtered(
+                lambda l: l.state == 'cancelled')
+            for line in return_ids:
+                line.state = 'draft'
+        self.inventory_stage = 'draft'
 
     @api.multi
     def action_view_delivery(self):
@@ -126,20 +180,20 @@ class FSMOrderLine(models.Model):
     product_uom_id = fields.Many2one(
         'product.uom', string='Unit of Measure', required=True,
         readonly=True, states={'draft': [('readonly', False)]})
-    qty_ordered = fields.Float(
+    qty_requested = fields.Float(
         string='Quantity Requested', readonly=True,
         states={'draft': [('readonly', False)]},
         digits=dp.get_precision('Product Unit of Measure'))
+    qty_ordered = fields.Float(
+        string='Quantity Ordered', readonly=True,
+        states={'requested': [('readonly', False)]},
+        digits=dp.get_precision('Product Unit of Measure'))
     qty_delivered = fields.Float(
         string='Quantity Delivered', readonly=True, copy=False,
         digits=dp.get_precision('Product Unit of Measure'))
-    state = fields.Selection([
-        ('draft', 'Draft'),
-        ('confirmed', 'Confirmed'),
-        ('partial', 'Partially Shipped'),
-        ('done', 'Done')],
-        string='State', compute='_compute_state', copy=False, index=True,
-        readonly=True, store=True)
+    state = fields.Selection(STOCK_STAGES, string='State', required=True,
+                             compute='_compute_state', default='draft',
+                             copy=False, index=True, readonly=True, store=True)
     move_ids = fields.One2many(
         'stock.move', 'fsm_order_line_id', string='Stock Moves',
         readonly=True, states={'draft': [('readonly', False)]})
@@ -163,7 +217,10 @@ def _compute_state(self):
             elif line.move_ids:
                 line.state = 'confirmed'
             else:
-                line.state = 'draft'
+                if line.state == 'requested':
+                    break
+                else:
+                    line.state = 'draft'
 
     @api.multi
     @api.onchange('product_id')
@@ -260,7 +317,7 @@ def _confirm_picking(self):
             try:
                 self.env['procurement.group'].run(
                     line.product_id, qty_needed, procurement_uom,
-                    line.order_id.location_id.inventory_location,
+                    line.order_id.inventory_location_id,
                     line.name, line.order_id.name, values)
             except UserError as error:
                 errors.append(error.name)
@@ -306,20 +363,20 @@ class FSMOrderReturn(models.Model):
     product_uom_id = fields.Many2one(
         'product.uom', string='Unit of Measure', required=True,
         readonly=True, states={'draft': [('readonly', False)]})
+    qty_requested = fields.Float(
+        string='Quantity Requested', readonly=True,
+        states={'draft': [('readonly', False)]},
+        digits=dp.get_precision('Product Unit of Measure'))
     qty_returned = fields.Float(
         string='Quantity Returned', readonly=True,
-        states={'draft': [('readonly', False)]},
+        states={'requested': [('readonly', False)]},
         digits=dp.get_precision('Product Unit of Measure'))
     qty_received = fields.Float(
         string='Quantity Received', readonly=True, copy=False,
         digits=dp.get_precision('Product Unit of Measure'))
-    state = fields.Selection([
-        ('draft', 'Draft'),
-        ('confirmed', 'Confirmed'),
-        ('partial', 'Partially Shipped'),
-        ('done', 'Done')],
-        string='State', compute='_compute_state', copy=False, index=True,
-        readonly=True, store=True)
+    state = fields.Selection(STOCK_STAGES, string='State', required=True,
+                             compute='_compute_state', default='draft',
+                             copy=False, index=True, readonly=True, store=True)
     move_ids = fields.One2many(
         'stock.move', 'fsm_order_return_line_id', string='Stock Moves',
         readonly=True, states={'draft': [('readonly', False)]})
@@ -364,14 +421,11 @@ def onchange_product_id(self):
             quantity=vals.get('qty_returned') or self.qty_returned,
             uom=self.product_uom_id.id,
         )
-
         result = {'domain': domain}
-
         name = product.name_get()[0][1]
         if product.description_sale:
             name += '\n' + product.description_sale
         vals['name'] = name
-
         self.update(vals)
         return result
 
@@ -402,7 +456,7 @@ def _get_procurement_qty(self):
                 qty += move.product_uom._compute_quantity(
                     move.product_uom_qty, self.product_uom_id,
                     rounding_method='HALF-UP')
-            elif move.picking_code == 'outoging':
+            elif move.picking_code == 'outgoing':
                 qty -= move.product_uom._compute_quantity(
                     move.product_uom_qty, self.product_uom_id,
                     rounding_method='HALF-UP')
@@ -440,7 +494,7 @@ def _confirm_picking(self):
             try:
                 self.env['procurement.group'].run(
                     line.product_id, qty_needed, procurement_uom,
-                    line.order_id.location_id.inventory_location,
+                    line.order_id.warehouse_id.lot_stock_id,
                     line.name, line.order_id.name, values)
             except UserError as error:
                 errors.append(error.name)
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index cec0467504..0707722424 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -64,5 +64,38 @@ class StockLocationRoute(models.Model):
     _inherit = 'stock.location.route'
 
     fsm_selectable = fields.Boolean(string="Field Service Order Lines")
-    fsm_return_selectable = fields.Boolean(
-        string="Field Service Return Order Lines")
+    fsm_return_selectable = fields.Boolean(string="Field Service Return Lines")
+
+
+class StockPickingType(models.Model):
+    _inherit = 'stock.picking.type'
+
+    count_fsm_requests = fields.Integer(compute='_compute_fsm_request')
+
+    def _compute_fsm_request(self):
+        for ptype in self:
+            if ptype.code == 'outgoing':
+                res = self.env['fsm.order'].search([('warehouse_id',
+                                                     '=',
+                                                     ptype.warehouse_id.id),
+                                                    ('inventory_stage', '=',
+                                                     'requested')])
+                for order in res:
+                    for line in order.line_ids:
+                        if line.state == 'requested':
+                            ptype.count_fsm_requests += 1
+                            break
+            if ptype.code == 'incoming':
+                res = self.env['fsm.order'].search([('warehouse_id',
+                                                     '=',
+                                                     ptype.warehouse_id.id),
+                                                    ('inventory_stage', '=',
+                                                     'requested')])
+                for order in res:
+                    for line in order.return_ids:
+                        if line.state == 'requested':
+                            ptype.count_fsm_requests += 1
+                            break
+
+    def get_action_fsm_requests(self):
+        return self._get_action('fieldservice_stock.action_stock_fsm_order')
diff --git a/fieldservice_stock/readme/CONFIGURE.rst b/fieldservice_stock/readme/CONFIGURE.rst
index 59e8366bd3..60a1a510d9 100644
--- a/fieldservice_stock/readme/CONFIGURE.rst
+++ b/fieldservice_stock/readme/CONFIGURE.rst
@@ -2,3 +2,19 @@ To configure this module, you need to:
 
 * Go to Field Service > Master Data > Locations
 * Create or select a location and set the inventory location
+* Go to Inventory > Configuration > Routes
+* Select the routes that you want to use from a FSM order
+* Check the box 'FSM Order Line' for outbound transfer
+* Check the box 'FSM Return Line' for inbound transfer
+
+The route 'Receipt in 1 step' has no procurement rule so if you want items to be
+returned from the service location to your warehouse, you need to create a new
+procurement rule for that route:
+
+* Name: YourCompany: Return
+* Action: Move From Another Location
+* Procurement Location:	WH/Stock
+* Served Warehouse:	YourCompany
+* Source Location: Partner Locations/Customers
+* Move Supply Method: Take From Stock
+* Operation Type: YourCompany: Receipts
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index 7b4547acab..c8e6fcf34b 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/static/description/index.html
@@ -399,6 +399,22 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
 <ul class="simple">
 <li>Go to Field Service &gt; Master Data &gt; Locations</li>
 <li>Create or select a location and set the inventory location</li>
+<li>Go to Inventory &gt; Configuration &gt; Routes</li>
+<li>Select the routes that you want to use from a FSM order</li>
+<li>Check the box ‘FSM Order Line’ for outbound transfer</li>
+<li>Check the box ‘FSM Return Line’ for inbound transfer</li>
+</ul>
+<p>The route ‘Receipt in 1 step’ has no procurement rule so if you want items to be
+returned from the service location to your warehouse, you need to create a new
+procurement rule for that route:</p>
+<ul class="simple">
+<li>Name: YourCompany: Return</li>
+<li>Action: Move From Another Location</li>
+<li>Procurement Location: WH/Stock</li>
+<li>Served Warehouse:     YourCompany</li>
+<li>Source Location: Partner Locations/Customers</li>
+<li>Move Supply Method: Take From Stock</li>
+<li>Operation Type: YourCompany: Receipts</li>
 </ul>
 </div>
 <div class="section" id="usage">
diff --git a/fieldservice_stock/views/fsm_location.xml b/fieldservice_stock/views/fsm_location.xml
index a255bd9bcb..658e2758bf 100644
--- a/fieldservice_stock/views/fsm_location.xml
+++ b/fieldservice_stock/views/fsm_location.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
         <field name="arch" type="xml">
             <xpath expr="//form/sheet/group/group[2]" position="inside">
-                <field name="inventory_location"
+                <field name="inventory_location_id"
                        domain="[('usage', 'in', ['internal', 'supplier', 'customer'])]"/>
             </xpath>
         </field>
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 00fed00649..750ef3e3e4 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -13,7 +13,7 @@
                         class="oe_stat_button"
                         icon="fa-truck"
                         attrs="{'invisible': [('delivery_count', '=', 0)]}" groups="base.group_user">
-                    <field name="delivery_count" widget="statinfo" string="Delivery"/>
+                    <field name="delivery_count" widget="statinfo" string="Deliveries"/>
                 </button>
                 <button type="object"
                         name="action_view_returns"
@@ -37,26 +37,27 @@
                         <tree editable="bottom">
                             <field name="sequence" widget="handle"/>
                             <field name="product_id"
-                                   context="{
-                                    'quantity': qty_ordered,
-                                    'uom': product_uom_id,
-                                }"
-                            />
+                                   context="{'quantity': qty_ordered,
+                                             'uom': product_uom_id}"/>
                             <field name="name"/>
                             <field name="route_id" groups="stock.group_stock_adv_location"/>
+                            <field name="qty_requested"
+                                   string="Requested Qty"
+                                   context="{'quantity': qty_requested,
+                                             'uom': product_uom_id}"/>
                             <field name="qty_ordered"
                                    string="Ordered Qty"
                                    context="{
                                     'quantity': qty_ordered,
-                                    'uom': product_uom_id,
-                                }"
-                            />
-                            <field name="qty_delivered"/>
+                                    'uom': product_uom_id}"
+                                   attrs="{'invisible': [('state', '=', 'draft')]}"/>
+                            <field name="qty_delivered"
+                                   attrs="{'invisible': [('state', '=', 'draft')]}"/>
                             <field name="product_uom_id"
                                    attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
                                    options='{"no_open": True, "no_create": True}'
                                    groups="product.group_uom"/>
-                            <field name="state" invisible="1"/>
+                            <field name="state"/>
                         </tree>
                     </field>
                     <separator string="Inbound"/>
@@ -64,28 +65,46 @@
                         <tree editable="bottom">
                             <field name="sequence" widget="handle"/>
                             <field name="product_id"
-                                   context="{
-                                    'quantity': qty_returned,
-                                    'uom': product_uom_id,
-                                }"
-                            />
+                                   context="{'quantity': qty_returned,
+                                             'uom': product_uom_id}"/>
                             <field name="name"/>
                             <field name="route_id" groups="stock.group_stock_adv_location"/>
+                            <field name="qty_requested"
+                                   string="Requested Qty"
+                                   context="{
+                                    'quantity': qty_requested,
+                                    'uom': product_uom_id}"/>
                             <field name="qty_returned"
                                    string="Returned Qty"
                                    context="{
                                     'quantity': qty_returned,
-                                    'uom': product_uom_id,
-                                }"
+                                    'uom': product_uom_id}"
+                                   attrs="{'invisible': [('state', '=', 'draft')]}"
                             />
                             <field name="qty_received"/>
                             <field name="product_uom_id"
                                    attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
                                    options='{"no_open": True, "no_create": True}'
                                    groups="product.group_uom"/>
-                            <field name="state" invisible="1"/>
+                            <field name="state"/>
                         </tree>
                     </field>
+                    <group>
+                        <field name='inventory_stage' invisible='0'/>
+                    </group>
+                    <button id="action_request_inventory"
+                            name="action_request_inventory" string="Request"
+                            class="oe_highlight"
+                            attrs="{'invisible': [('inventory_stage', '!=', 'draft')]}"
+                            type="object"/>
+                    <button id="action_cancel"
+                            name="action_cancel_inventory" string="Cancel"
+                            type="object"
+                            attrs="{'invisible': [('inventory_stage', '!=', 'requested')]}"/>
+                    <button id="action_reset_draft"
+                            name="action_reset_inventory" string="Reset to Draft"
+                            type="object"
+                            attrs="{'invisible': [('inventory_stage', '!=', 'cancelled')]}"/>
                 </page>
             </xpath>
         </field>
@@ -99,11 +118,19 @@
             <form string="FSM Order" create="false">
                 <header>
                     <button id="action_confirm"
-                            name="action_confirm" string="Confirm"
+                            name="action_confirm_inventory" string="Confirm"
                             class="oe_highlight"
                             type="object" groups="fieldservice.group_fsm_dispatcher"
-                            attrs="{'invisible': [('stage_id', '!=', %(fieldservice.fsm_stage_new)d)]}"/>
-                    <field name="stage_id" widget="statusbar"/>
+                            attrs="{'invisible': [('inventory_stage', '!=', 'requested')]}"/>
+                    <button id="action_cancel"
+                            name="action_cancel_inventory" string="Cancel"
+                            type="object" groups="fieldservice.group_fsm_dispatcher"
+                            attrs="{'invisible': [('inventory_stage', '!=', 'requested')]}"/>
+                    <button id="action_reset_draft"
+                            name="action_reset_inventory" string="Reset to Draft"
+                            type="object" groups="fieldservice.group_fsm_dispatcher"
+                            attrs="{'invisible': [('inventory_stage', '!=', 'cancelled')]}"/>
+                    <field name="inventory_stage" widget="statusbar"/>
                 </header>
                 <sheet>
                     <div class="oe_title">
@@ -111,15 +138,16 @@
                     </div>
                     <group>
                         <group>
-                            <field name="customer_id"/>
-                            <field name="location_id"/>
+                            <field name="customer_id" readonly="1"/>
+                            <field name="inventory_location_id"/>
                         </group>
                         <group>
-                            <field name="priority" widget="priority"/>
+                            <field name="priority" widget="priority" readonly="1"/>
                             <field name="warehouse_id"
                                    groups="stock.group_stock_multi_warehouses"/>
                         </group>
                     </group>
+                    <separator string="Outbound"/>
                     <field name="line_ids" nolabel="1">
                         <tree editable="bottom">
                             <field name="sequence" widget="handle"/>
@@ -131,21 +159,21 @@
                             />
                             <field name="name"/>
                             <field name="route_id" groups="stock.group_adv_location"/>
+                            <field name="qty_requested"
+                                   string="Requested Qty"/>
                             <field name="qty_ordered"
                                    string="Ordered Qty"
-                                   context="{
-                                    'quantity': qty_ordered,
-                                    'uom': product_uom_id,
-                                }"
-                            />
+                                   context="{'quantity': qty_ordered,
+                                             'uom': product_uom_id}"/>
                             <field name="qty_delivered"/>
                             <field name="product_uom_id"
                                    attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
                                    options='{"no_open": True, "no_create": True}'
                                    groups="product.group_uom"/>
-                            <field name="state" invisible="1"/>
+                            <field name="state"/>
                         </tree>
                     </field>
+                    <separator string="Inbound"/>
                     <field name="return_ids" nolabel="1">
                         <tree editable="bottom">
                             <field name="sequence" widget="handle"/>
@@ -156,7 +184,9 @@
                                 }"
                             />
                             <field name="name"/>
-                            <field name="route_id" groups="stock.group_stock_adv_location"/>
+                            <field name="route_id" groups="stock.group_adv_location"/>
+                            <field name="qty_requested"
+                                   string="Requested Qty"/>
                             <field name="qty_returned"
                                    string="Returned Qty"
                                    context="{
@@ -169,7 +199,7 @@
                                    attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
                                    options='{"no_open": True, "no_create": True}'
                                    groups="product.group_uom"/>
-                            <field name="state" invisible="1"/>
+                            <field name="state"/>
                         </tree>
                     </field>
                 </sheet>
@@ -202,7 +232,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain"
-               eval="[('stage_id', '=', ref('fieldservice.fsm_stage_new'))]"/>
+               eval="[('inventory_stage', '=', 'requested')]"/>
         <field name="view_ids"
                eval="[(5, 0, 0),
                       (0, 0, {'view_mode': 'tree', 'view_id': ref('fieldservice_stock.stock_fsm_order_tree')}),
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 9b6636bc1a..0c9d299102 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -14,6 +14,29 @@
         </field>
     </record>
 
+    <record id="stock_picking_type_kanban_helpdesk" model="ir.ui.view">
+        <field name="name">stock.picking.type.kanban.helpdesk</field>
+        <field name="model">stock.picking.type</field>
+        <field name="inherit_id" ref="stock.stock_picking_type_kanban"/>
+        <field name="arch" type="xml">
+            <field name='count_picking_backorders' position='after'>
+                <field name='count_fsm_requests'/>
+            </field>
+            <xpath expr="//div[@class='col-xs-6 o_kanban_primary_right']/div[4]" position='after'>
+                <div t-if="record.count_fsm_requests.raw_value > 0" class="row">
+                    <div class="col-xs-9">
+                        <a name="get_action_fsm_requests" type="object">
+                            Field Service
+                        </a>
+                    </div>
+                    <div class="col-xs-3">
+                        <field name="count_fsm_requests"/>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
     <menuitem id="menu_fsm_product"
               name="Products"
               action="stock.product_template_action_product"

From 965c40d6cf5ad623dd0bf7081fc2133a6375f665 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 9 Jan 2019 09:06:32 -0600
Subject: [PATCH 070/631] [IMP] action_inventory_*

---
 fieldservice_stock/models/fsm_order.py |  8 ++++----
 fieldservice_stock/views/fsm_order.xml | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 34cc5f28c5..ee5b81df83 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -63,7 +63,7 @@ def _compute_picking_ids(self):
                 [picking for picking in order.picking_ids if
                  picking.picking_type_id.code == 'incoming'])
 
-    def action_request_inventory(self):
+    def action_inventory_request(self):
         if self.location_id and (self.line_ids or self.return_ids) and\
                 self.warehouse_id:
             for line in self.line_ids:
@@ -79,7 +79,7 @@ def action_request_inventory(self):
             raise UserError(
                 _('Please select the location, a warehouse and a product.'))
 
-    def action_confirm_inventory(self):
+    def action_inventory_confirm(self):
         if self.location_id and (self.line_ids or self.return_ids) and\
                 self.warehouse_id:
             if self.line_ids:
@@ -95,7 +95,7 @@ def action_confirm_inventory(self):
             raise UserError(
                 _('Please select the location, a warehouse and a product.'))
 
-    def action_cancel_inventory(self):
+    def action_inventory_cancel(self):
         if self.line_ids:
             line_ids = self.mapped('line_ids').filtered(
                 lambda l: l.state == 'requested')
@@ -108,7 +108,7 @@ def action_cancel_inventory(self):
                 line.state = 'cancelled'
         self.inventory_stage = 'cancelled'
 
-    def action_reset_inventory(self):
+    def action_inventory_reset(self):
         if self.line_ids:
             line_ids = self.mapped('line_ids').filtered(
                 lambda l: l.state == 'cancelled')
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 750ef3e3e4..b05de2a806 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -92,17 +92,17 @@
                     <group>
                         <field name='inventory_stage' invisible='0'/>
                     </group>
-                    <button id="action_request_inventory"
-                            name="action_request_inventory" string="Request"
+                    <button id="action_inventory_request"
+                            name="action_inventory_request" string="Request"
                             class="oe_highlight"
                             attrs="{'invisible': [('inventory_stage', '!=', 'draft')]}"
                             type="object"/>
-                    <button id="action_cancel"
-                            name="action_cancel_inventory" string="Cancel"
+                    <button id="action_inventory_cancel"
+                            name="action_inventory_cancel" string="Cancel"
                             type="object"
                             attrs="{'invisible': [('inventory_stage', '!=', 'requested')]}"/>
-                    <button id="action_reset_draft"
-                            name="action_reset_inventory" string="Reset to Draft"
+                    <button id="action_inventory_reset"
+                            name="action_inventory_reset" string="Reset to Draft"
                             type="object"
                             attrs="{'invisible': [('inventory_stage', '!=', 'cancelled')]}"/>
                 </page>
@@ -117,17 +117,17 @@
         <field name="arch" type="xml">
             <form string="FSM Order" create="false">
                 <header>
-                    <button id="action_confirm"
-                            name="action_confirm_inventory" string="Confirm"
+                    <button id="action_inventory_confirm"
+                            name="action_inventory_confirm" string="Confirm"
                             class="oe_highlight"
                             type="object" groups="fieldservice.group_fsm_dispatcher"
                             attrs="{'invisible': [('inventory_stage', '!=', 'requested')]}"/>
-                    <button id="action_cancel"
-                            name="action_cancel_inventory" string="Cancel"
+                    <button id="action_inventory_cancel"
+                            name="action_inventory_cancel" string="Cancel"
                             type="object" groups="fieldservice.group_fsm_dispatcher"
                             attrs="{'invisible': [('inventory_stage', '!=', 'requested')]}"/>
-                    <button id="action_reset_draft"
-                            name="action_reset_inventory" string="Reset to Draft"
+                    <button id="action_inventory_reset"
+                            name="action_inventory_reset" string="Reset to Draft"
                             type="object" groups="fieldservice.group_fsm_dispatcher"
                             attrs="{'invisible': [('inventory_stage', '!=', 'cancelled')]}"/>
                     <field name="inventory_stage" widget="statusbar"/>

From 9b36240e45d27d45c44a230a0e98e261bba5665b Mon Sep 17 00:00:00 2001
From: osi-scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 3 Jan 2019 13:25:02 -0700
Subject: [PATCH 071/631] [IMP] Various

---
 fieldservice_stock/__manifest__.py               |  2 ++
 fieldservice_stock/models/__init__.py            |  2 ++
 fieldservice_stock/models/product_template.py    | 10 ++++++++++
 fieldservice_stock/models/stock.py               |  5 +++++
 .../models/stock_production_lot.py               | 11 +++++++++++
 fieldservice_stock/views/product_template.xml    | 14 ++++++++++++++
 .../views/stock_production_lot.xml               | 16 ++++++++++++++++
 7 files changed, 60 insertions(+)
 create mode 100644 fieldservice_stock/models/product_template.py
 create mode 100644 fieldservice_stock/models/stock_production_lot.py
 create mode 100644 fieldservice_stock/views/product_template.xml
 create mode 100644 fieldservice_stock/views/stock_production_lot.xml

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 642b44845b..89fd9a13ff 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -21,6 +21,8 @@
         'views/fsm_order.xml',
         'views/stock.xml',
         'views/fsm_equipment.xml',
+        'views/product_template.xml',
+        'views/stock_production_lot.xml',
     ],
     'installable': True,
     'license': 'AGPL-3',
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index 0a2022e17b..92b982c014 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -6,4 +6,6 @@
     fsm_order,
     stock,
     fsm_equipment,
+    product_template,
+    stock_production_lot
 )
diff --git a/fieldservice_stock/models/product_template.py b/fieldservice_stock/models/product_template.py
new file mode 100644
index 0000000000..54195f55d7
--- /dev/null
+++ b/fieldservice_stock/models/product_template.py
@@ -0,0 +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, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    create_fsm_equipment = fields.Boolean(string='Creates a FSM Equipment')
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 0707722424..55180ea9c5 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -17,6 +17,11 @@ def _action_done(self):
             line.qty_delivered = line._get_delivered_qty()
         for line in result.mapped('fsm_order_return_line_id').sudo():
             line.qty_received = line._get_received_qty()
+        if self.picking_code == 'outgoing':
+            if self.state == 'done':
+                if self.product_tmpl_id.create_fsm_equipment:
+                    self.env['fsm.equipment'].obj.create(
+                        {'name': self.product_tmpl_id.name})
         return result
 
     @api.multi
diff --git a/fieldservice_stock/models/stock_production_lot.py b/fieldservice_stock/models/stock_production_lot.py
new file mode 100644
index 0000000000..b63d267867
--- /dev/null
+++ b/fieldservice_stock/models/stock_production_lot.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class StockProductionLot(models.Model):
+    _inherit = 'stock.production.lot'
+
+    equipment_id = fields.Many2one('fsm.equipment',
+                                   string='Equipment', readonly=True)
diff --git a/fieldservice_stock/views/product_template.xml b/fieldservice_stock/views/product_template.xml
new file mode 100644
index 0000000000..0c05ac23e8
--- /dev/null
+++ b/fieldservice_stock/views/product_template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="product_template_extend_warranty" model="ir.ui.view">
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_only_form_view"/>
+        <field name="arch" type="xml">
+            <field name="tracking" position="after">
+                <field name="create_fsm_equipment"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/fieldservice_stock/views/stock_production_lot.xml b/fieldservice_stock/views/stock_production_lot.xml
new file mode 100644
index 0000000000..a692e0fa54
--- /dev/null
+++ b/fieldservice_stock/views/stock_production_lot.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="stock_production_lot_extend_equipment" model="ir.ui.view">
+        <field name="model">stock.production.lot</field>
+        <field name="inherit_id" ref="stock.view_production_lot_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='main_group']/group[1]" position="after" sequence="0">
+                <group>
+                    <field name="equipment_id"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
\ No newline at end of file

From a8ccf62231fc7b8d60f14cd32e9c6a8ab076512e Mon Sep 17 00:00:00 2001
From: osi-scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 9 Jan 2019 12:36:49 -0700
Subject: [PATCH 072/631] [IMP] fieldservice_stock

---
 fieldservice_stock/models/fsm_equipment.py    | 19 +++++++++++-
 fieldservice_stock/models/stock.py            | 30 ++++++++++++-------
 fieldservice_stock/views/product_template.xml |  4 +--
 .../views/stock_production_lot.xml            |  3 +-
 4 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/fieldservice_stock/models/fsm_equipment.py b/fieldservice_stock/models/fsm_equipment.py
index 103790dee2..c4b2ae5315 100644
--- a/fieldservice_stock/models/fsm_equipment.py
+++ b/fieldservice_stock/models/fsm_equipment.py
@@ -20,9 +20,26 @@ class FSMEquipment(models.Model):
     def _compute_current_stock_loc_id(self):
         for equipment in self:
             quants = self.env['stock.quant'].search(
-                [('lot_id', '=', self.lot_id.id)], order="id desc")
+                [('lot_id', '=', equipment.lot_id.id)], order="id desc")
             if quants:
                 equipment.current_stock_location_id = \
                     quants[0].location_id.id or False
             else:
                 equipment.current_stock_location_id = False
+
+    @api.model
+    def create(self, vals):
+        res = super(FSMEquipment, self).create(vals)
+        if 'lot_id' in vals:
+            res.lot_id.equipment_id = res.id
+        return res
+
+    @api.multi
+    def write(self, vals):
+        for equipment in self:
+            prev_lot = equipment.lot_id
+            res = super(FSMEquipment, equipment).write(vals)
+            if 'lot_id' in vals:
+                prev_lot.equipment_id = False
+                equipment.lot_id.equipment_id = equipment.id
+        return res
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 55180ea9c5..c6ab22fea4 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -11,18 +11,26 @@ class StockMove(models.Model):
     fsm_order_return_line_id = fields.Many2one(
         'fsm.order.return', 'FSM Order Return Line')
 
+    def prepare_equipment_values(self, move_line):
+        return {'name': '%s (%s)' % (move_line.product_id.name,
+                                     move_line.lot_id.name),
+                'product_id': move_line.product_id.id,
+                'lot_id': move_line.lot_id.id}
+
     def _action_done(self):
-        result = super(StockMove, self)._action_done()
-        for line in result.mapped('fsm_order_line_id').sudo():
-            line.qty_delivered = line._get_delivered_qty()
-        for line in result.mapped('fsm_order_return_line_id').sudo():
-            line.qty_received = line._get_received_qty()
-        if self.picking_code == 'outgoing':
-            if self.state == 'done':
-                if self.product_tmpl_id.create_fsm_equipment:
-                    self.env['fsm.equipment'].obj.create(
-                        {'name': self.product_tmpl_id.name})
-        return result
+        for rec in self:
+            res = super(StockMove, rec)._action_done()
+            for line in res.mapped('fsm_order_line_id').sudo():
+                line.qty_delivered = line._get_delivered_qty()
+            for line in res.mapped('fsm_order_return_line_id').sudo():
+                line.qty_received = line._get_received_qty()
+            if rec.picking_code == 'outgoing' and rec.state == 'done':
+                if rec.product_tmpl_id.create_fsm_equipment:
+                    for line in rec.move_line_ids:
+                        vals = self.prepare_equipment_values(line)
+                        line.lot_id.equipment_id = rec.env['fsm.equipment'].\
+                            create(vals)
+        return res
 
     @api.multi
     def write(self, vals):
diff --git a/fieldservice_stock/views/product_template.xml b/fieldservice_stock/views/product_template.xml
index 0c05ac23e8..473781425d 100644
--- a/fieldservice_stock/views/product_template.xml
+++ b/fieldservice_stock/views/product_template.xml
@@ -6,9 +6,9 @@
         <field name="inherit_id" ref="product.product_template_only_form_view"/>
         <field name="arch" type="xml">
             <field name="tracking" position="after">
-                <field name="create_fsm_equipment"/>
+                <field name="create_fsm_equipment" attrs="{'invisible': [('tracking', '!=', 'serial')]}"/>
             </field>
         </field>
     </record>
 
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/fieldservice_stock/views/stock_production_lot.xml b/fieldservice_stock/views/stock_production_lot.xml
index a692e0fa54..b47451b5d3 100644
--- a/fieldservice_stock/views/stock_production_lot.xml
+++ b/fieldservice_stock/views/stock_production_lot.xml
@@ -12,5 +12,4 @@
             </xpath>
         </field>
     </record>
-
-</odoo>
\ No newline at end of file
+</odoo>

From cbdcf549d730b94fc090901a0c04e1dff1222f80 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 10 Jan 2019 16:21:24 -0600
Subject: [PATCH 073/631] [FIX] fieldservice_stock

---
 fieldservice_stock/models/fsm_order.py |  4 ++--
 fieldservice_stock/views/fsm_order.xml | 32 +++++++++++++-------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index ee5b81df83..d3c257b3e7 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -217,8 +217,8 @@ def _compute_state(self):
             elif line.move_ids:
                 line.state = 'confirmed'
             else:
-                if line.state == 'requested':
-                    break
+                if line.qty_ordered != 0:
+                    line.state = 'requested'
                 else:
                     line.state = 'draft'
 
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index b05de2a806..46a6ea9a19 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -25,6 +25,22 @@
             </div>
             <xpath expr="//notebook/page[1]" position="after">
                 <page string="Inventory">
+                    <header>
+                        <button id="action_inventory_request"
+                                name="action_inventory_request" string="Request"
+                                class="oe_highlight"
+                                attrs="{'invisible': [('inventory_stage', '!=', 'draft')]}"
+                                type="object"/>
+                        <button id="action_inventory_cancel"
+                                name="action_inventory_cancel" string="Cancel"
+                                type="object"
+                                attrs="{'invisible': [('inventory_stage', '!=', 'requested')]}"/>
+                        <button id="action_inventory_reset"
+                                name="action_inventory_reset" string="Reset to Draft"
+                                type="object"
+                                attrs="{'invisible': [('inventory_stage', '!=', 'cancelled')]}"/>
+                        <field name='inventory_stage' widget='statusbar'/>
+                    </header>
                     <group groups="stock.group_stock_user">
                         <group id="stock-left">
                             <field name="warehouse_id"
@@ -89,22 +105,6 @@
                             <field name="state"/>
                         </tree>
                     </field>
-                    <group>
-                        <field name='inventory_stage' invisible='0'/>
-                    </group>
-                    <button id="action_inventory_request"
-                            name="action_inventory_request" string="Request"
-                            class="oe_highlight"
-                            attrs="{'invisible': [('inventory_stage', '!=', 'draft')]}"
-                            type="object"/>
-                    <button id="action_inventory_cancel"
-                            name="action_inventory_cancel" string="Cancel"
-                            type="object"
-                            attrs="{'invisible': [('inventory_stage', '!=', 'requested')]}"/>
-                    <button id="action_inventory_reset"
-                            name="action_inventory_reset" string="Reset to Draft"
-                            type="object"
-                            attrs="{'invisible': [('inventory_stage', '!=', 'cancelled')]}"/>
                 </page>
             </xpath>
         </field>

From a6c3a1253f6c81c8456febeff16ec0e2eb1eab15 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 11 Jan 2019 16:11:56 -0600
Subject: [PATCH 074/631] [FIX] fieldservice_stock

---
 fieldservice_stock/models/fsm_order.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index d3c257b3e7..a83616a8f3 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -342,6 +342,12 @@ def _get_delivered_qty(self):
                     move.product_uom_qty, self.product_uom_id)
         return qty
 
+    def create(self, vals):
+        res = super(FSMOrderLine, self).create(vals)
+        if 'order_id' in vals:
+            res.order_id.inventory_stage = 'draft'
+        return res
+
 
 class FSMOrderReturn(models.Model):
     _name = 'fsm.order.return'

From e7b26b042bbeebfbc6cb9b64da81aa4a37081ae8 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 1 Feb 2019 19:06:16 -0600
Subject: [PATCH 075/631] [FIX] fieldservice_stock

---
 fieldservice_stock/__manifest__.py                | 2 +-
 fieldservice_stock/models/fsm_location.py         | 8 +++++++-
 fieldservice_stock/views/fsm_equipment.xml        | 4 +++-
 fieldservice_stock/views/stock_production_lot.xml | 6 ++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 89fd9a13ff..1e54d5665c 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Inventory and Stock Operations for Field Services',
-    'version': '11.0.0.1.0',
+    'version': '11.0.0.2.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
index 2ffc4aa075..b239c84dc1 100644
--- a/fieldservice_stock/models/fsm_location.py
+++ b/fieldservice_stock/models/fsm_location.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields
+from odoo import api, fields
 from odoo.addons.base_geoengine import geo_model
 
 
@@ -11,3 +11,9 @@ class FSMLocation(geo_model.GeoModel):
     inventory_location_id = fields.Many2one('stock.location',
                                             string='Inventory Location',
                                             required=True)
+
+    @api.onchange('parent_id')
+    def _onchange_parent_id(self):
+        super(FSMLocation, self)._onchange_parent_id()
+        self.inventory_location_id = \
+            self.parent_id.inventory_location_id or False
diff --git a/fieldservice_stock/views/fsm_equipment.xml b/fieldservice_stock/views/fsm_equipment.xml
index 64e485b287..2890a4e5a4 100644
--- a/fieldservice_stock/views/fsm_equipment.xml
+++ b/fieldservice_stock/views/fsm_equipment.xml
@@ -11,7 +11,9 @@
                     <group groups="stock.group_stock_user">
                         <group id="stock-left">
                             <field name="product_id"/>
-                            <field name="lot_id" domain="[('product_id', '=', product_id)]"/>
+                            <field name="lot_id"
+                                   domain="[('product_id', '=', product_id)]"
+                                   context="{'default_product_id': product_id}"/>
                             <field name="current_stock_location_id"/>
                         </group>
                         <group id="stock-right"></group>
diff --git a/fieldservice_stock/views/stock_production_lot.xml b/fieldservice_stock/views/stock_production_lot.xml
index b47451b5d3..f2424434a0 100644
--- a/fieldservice_stock/views/stock_production_lot.xml
+++ b/fieldservice_stock/views/stock_production_lot.xml
@@ -12,4 +12,10 @@
             </xpath>
         </field>
     </record>
+
+    <record id="stock.action_production_lot_form" model="ir.actions.act_window">
+        <field name="context">{'search_default_group_by_product': 1,
+            'default_product_id': context.get('product_id', False)}</field>
+    </record>
+
 </odoo>

From 572b1012687f1d8449d1dfa05795ec7b67a6cb67 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 6 Feb 2019 11:44:05 -0600
Subject: [PATCH 076/631] [FIX] fieldservice_stock

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

diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index c6ab22fea4..619865b259 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -38,7 +38,7 @@ def write(self, vals):
         if 'product_uom_qty' in vals:
             for move in self:
                 if move.state == 'done':
-                    for line in res.mapped('fsm_order_line_id').sudo():
+                    for line in self.mapped('fsm_order_line_id').sudo():
                         line.qty_delivered = line._get_delivered_qty()
         return res
 

From 664b518e46b204614c2c6b1fcaaa4ebb3a7a30fb Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 8 Feb 2019 00:11:51 -0600
Subject: [PATCH 077/631] [IMP] UI stuff

---
 fieldservice_stock/views/fsm_equipment.xml    | 24 ++++++++-----------
 fieldservice_stock/views/stock.xml            |  2 +-
 .../views/stock_production_lot.xml            |  2 +-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/fieldservice_stock/views/fsm_equipment.xml b/fieldservice_stock/views/fsm_equipment.xml
index 2890a4e5a4..1183ad45ca 100644
--- a/fieldservice_stock/views/fsm_equipment.xml
+++ b/fieldservice_stock/views/fsm_equipment.xml
@@ -6,20 +6,16 @@
         <field name="model">fsm.equipment</field>
         <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view"/>
         <field name="arch" type="xml">
-            <xpath expr="//notebook/page[2]" position="after">
-                <page string="Inventory">
-                    <group groups="stock.group_stock_user">
-                        <group id="stock-left">
-                            <field name="product_id"/>
-                            <field name="lot_id"
-                                   domain="[('product_id', '=', product_id)]"
-                                   context="{'default_product_id': product_id}"/>
-                            <field name="current_stock_location_id"/>
-                        </group>
-                        <group id="stock-right"></group>
-                    </group>
-                </page>
-            </xpath>
+            <group id="secondary" position="inside">
+                <group string="Inventory"
+                       groups="stock.group_stock_user">
+                    <field name="product_id"/>
+                    <field name="lot_id"
+                           domain="[('product_id', '=', product_id)]"
+                           context="{'default_product_id': product_id}"/>
+                    <field name="current_stock_location_id"/>
+                </group>
+            </group>
         </field>
     </record>
 
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 0c9d299102..8e1dbc114d 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -22,7 +22,7 @@
             <field name='count_picking_backorders' position='after'>
                 <field name='count_fsm_requests'/>
             </field>
-            <xpath expr="//div[@class='col-xs-6 o_kanban_primary_right']/div[4]" position='after'>
+            <xpath expr="//div[hasclass('col-xs-6','o_kanban_primary_right')]/div[4]" position='after'>
                 <div t-if="record.count_fsm_requests.raw_value > 0" class="row">
                     <div class="col-xs-9">
                         <a name="get_action_fsm_requests" type="object">
diff --git a/fieldservice_stock/views/stock_production_lot.xml b/fieldservice_stock/views/stock_production_lot.xml
index f2424434a0..817dcbf981 100644
--- a/fieldservice_stock/views/stock_production_lot.xml
+++ b/fieldservice_stock/views/stock_production_lot.xml
@@ -15,7 +15,7 @@
 
     <record id="stock.action_production_lot_form" model="ir.actions.act_window">
         <field name="context">{'search_default_group_by_product': 1,
-            'default_product_id': context.get('product_id', False)}</field>
+                               'default_product_id': context.get('product_id', False)}</field>
     </record>
 
 </odoo>

From cfdfba93a943308246328363f20884577bf1c045 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 8 Feb 2019 08:04:38 -0600
Subject: [PATCH 078/631] [FIX] UnboundLocalError: local variable 'res'
 referenced before assignment

---
 fieldservice_stock/models/stock.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 619865b259..dcf15708dd 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -18,6 +18,7 @@ def prepare_equipment_values(self, move_line):
                 'lot_id': move_line.lot_id.id}
 
     def _action_done(self):
+        res = False
         for rec in self:
             res = super(StockMove, rec)._action_done()
             for line in res.mapped('fsm_order_line_id').sudo():

From 86c84ff908879297a4dfc514cd54da60f01ed76a Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 8 Feb 2019 12:37:47 -0600
Subject: [PATCH 079/631] [FIX] Default value of requested quantity

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

diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index a83616a8f3..030386ebe3 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -235,10 +235,10 @@ def onchange_product_id(self):
         if (not self.product_uom_id
                 or (self.product_id.uom_id.id != self.product_uom_id.id)):
             vals['product_uom_id'] = self.product_id.uom_id
-            vals['qty_ordered'] = 1.0
+            vals['qty_requested'] = 1.0
 
         product = self.product_id.with_context(
-            quantity=vals.get('qty_ordered') or self.qty_ordered,
+            quantity=vals.get('qty_requested') or self.qty_requested,
             uom=self.product_uom_id.id,
         )
 
@@ -421,10 +421,10 @@ def onchange_product_id(self):
         if (not self.product_uom_id
                 or (self.product_id.uom_id.id != self.product_uom_id.id)):
             vals['product_uom_id'] = self.product_id.uom_id
-            vals['qty_returned'] = 1.0
+            vals['qty_requested'] = 1.0
 
         product = self.product_id.with_context(
-            quantity=vals.get('qty_returned') or self.qty_returned,
+            quantity=vals.get('qty_requested') or self.qty_requested,
             uom=self.product_uom_id.id,
         )
         result = {'domain': domain}

From acb91ff7e7c2025301c5b7a88a42cc08ba505257 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 21 Feb 2019 09:58:16 -0600
Subject: [PATCH 080/631] [FIX] Conflict with parent_id field of res.partner

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

diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
index b239c84dc1..f27a56fbb4 100644
--- a/fieldservice_stock/models/fsm_location.py
+++ b/fieldservice_stock/models/fsm_location.py
@@ -12,8 +12,8 @@ class FSMLocation(geo_model.GeoModel):
                                             string='Inventory Location',
                                             required=True)
 
-    @api.onchange('parent_id')
-    def _onchange_parent_id(self):
-        super(FSMLocation, self)._onchange_parent_id()
+    @api.onchange('fsm_parent_id')
+    def _onchange_fsm_parent_id(self):
+        super(FSMLocation, self)._onchange_fsm_parent_id()
         self.inventory_location_id = \
-            self.parent_id.inventory_location_id or False
+            self.fsm_parent_id.inventory_location_id or False

From 64232569c6f3598538747878d35e306229d94633 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@ursainfosystems.com>
Date: Fri, 8 Mar 2019 13:22:04 -0800
Subject: [PATCH 081/631] [IMP] Fieldservice Stock Bug Fix

---
 fieldservice_stock/views/fsm_equipment.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/fieldservice_stock/views/fsm_equipment.xml b/fieldservice_stock/views/fsm_equipment.xml
index 1183ad45ca..1ce8ae287f 100644
--- a/fieldservice_stock/views/fsm_equipment.xml
+++ b/fieldservice_stock/views/fsm_equipment.xml
@@ -19,4 +19,15 @@
         </field>
     </record>
 
+    <record id="fsm_equipment_tree_view_model" model="ir.ui.view">
+        <field name="name">fsm.equipment.model</field>
+        <field name="model">fsm.equipment</field>
+        <field name="inherit_id"
+               ref="fieldservice.fsm_equipment_tree_view"/>
+        <field name="arch" type="xml">
+            <field name="person_id" position="before">
+                <field name="product_id"/>
+            </field>
+        </field>
+    </record>
 </odoo>

From 43724ef634cd3abd76a50461be6f4e53ffda4058 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@ursainfosystems.com>
Date: Thu, 14 Mar 2019 16:29:30 -0700
Subject: [PATCH 082/631] [IMP] fieldservice_stock

---
 fieldservice_stock/models/fsm_order.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 030386ebe3..1dc7104c11 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -292,9 +292,6 @@ def _confirm_picking(self):
         errors = []
         for line in self:
             qty_procured = line._get_procurement_qty()
-            if float_compare(qty_procured, line.qty_ordered,
-                             precision_digits=precision) >= 0:
-                continue
             group_id = line.order_id.procurement_group_id
             if not group_id:
                 group_id = self.env['procurement.group'].create({
@@ -304,6 +301,9 @@ def _confirm_picking(self):
                     'partner_id': line.order_id.customer_id.id,
                 })
                 line.order_id.procurement_group_id = group_id
+            if float_compare(qty_procured, line.qty_ordered,
+                             precision_digits=precision) >= 0:
+                continue
             values = line._prepare_procurement_values(group_id=group_id)
             qty_needed = line.qty_ordered - qty_procured
             procurement_uom = line.product_uom_id
@@ -475,9 +475,6 @@ def _confirm_picking(self):
         errors = []
         for line in self:
             qty_procured = line._get_procurement_qty()
-            if float_compare(qty_procured, line.qty_returned,
-                             precision_digits=precision) >= 0:
-                continue
             group_id = line.order_id.procurement_group_id
             if not group_id:
                 group_id = self.env['procurement.group'].create({
@@ -487,6 +484,9 @@ def _confirm_picking(self):
                     'partner_id': line.order_id.customer_id.id,
                 })
                 line.order_id.procurement_group_id = group_id
+            if float_compare(qty_procured, line.qty_returned,
+                             precision_digits=precision) >= 0:
+                continue
             values = line._prepare_procurement_values(group_id=group_id)
             qty_needed = line.qty_returned - qty_procured
             procurement_uom = line.product_uom_id

From 0feb6017eef970ed31967a4b51226ef2392a44eb Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Thu, 4 Apr 2019 20:50:10 +0530
Subject: [PATCH 083/631] [MIG][WIP][12.0] fieldservice_stock

[UPD] README.rst
---
 fieldservice_stock/README.rst                 |  11 +-
 fieldservice_stock/__manifest__.py            |   4 +-
 fieldservice_stock/models/fsm_equipment.py    |  13 +-
 fieldservice_stock/models/fsm_location.py     |   7 +-
 fieldservice_stock/models/fsm_order.py        | 513 +++---------------
 fieldservice_stock/models/stock.py            | 113 ++--
 .../models/stock_production_lot.py            |   4 +-
 fieldservice_stock/readme/CONTRIBUTORS.rst    |   1 +
 .../security/ir.model.access.csv              |   6 +-
 .../static/description/index.html             |   7 +-
 fieldservice_stock/views/fsm_order.xml        | 202 +++----
 fieldservice_stock/views/product_template.xml |   6 +-
 fieldservice_stock/views/stock.xml            |  12 +-
 .../views/stock_production_lot.xml            |  11 +-
 14 files changed, 229 insertions(+), 681 deletions(-)

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index 7205cf40a3..f5c2166892 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -14,13 +14,13 @@ Field Service - Stock
     :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_stock
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_stock
     :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_stock
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock
     :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| 
@@ -88,7 +88,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_stock%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_stock%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.
 
@@ -106,6 +106,7 @@ Contributors
 
 * Brian McMaster <brian@mcmpest.com>
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -144,6 +145,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-brian10048| |maintainer-wolfhall| |maintainer-max3903| |maintainer-smangukiya| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_stock>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_stock>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 1e54d5665c..9182d93375 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Inventory and Stock Operations for Field Services',
-    'version': '11.0.0.2.0',
+    'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
@@ -12,7 +12,7 @@
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice',
-        'stock',
+        'stock_request',
     ],
     'data': [
         'security/ir.model.access.csv',
diff --git a/fieldservice_stock/models/fsm_equipment.py b/fieldservice_stock/models/fsm_equipment.py
index c4b2ae5315..158fa8962f 100644
--- a/fieldservice_stock/models/fsm_equipment.py
+++ b/fieldservice_stock/models/fsm_equipment.py
@@ -20,10 +20,11 @@ class FSMEquipment(models.Model):
     def _compute_current_stock_loc_id(self):
         for equipment in self:
             quants = self.env['stock.quant'].search(
-                [('lot_id', '=', equipment.lot_id.id)], order="id desc")
-            if quants:
+                [('lot_id', '=', equipment.lot_id.id)], order="id desc",
+                limit=1)
+            if quants and quants.location_id:
                 equipment.current_stock_location_id = \
-                    quants[0].location_id.id or False
+                    quants.location_id.id
             else:
                 equipment.current_stock_location_id = False
 
@@ -31,7 +32,7 @@ def _compute_current_stock_loc_id(self):
     def create(self, vals):
         res = super(FSMEquipment, self).create(vals)
         if 'lot_id' in vals:
-            res.lot_id.equipment_id = res.id
+            res.lot_id.fsm_equipment_id = res.id
         return res
 
     @api.multi
@@ -40,6 +41,6 @@ def write(self, vals):
             prev_lot = equipment.lot_id
             res = super(FSMEquipment, equipment).write(vals)
             if 'lot_id' in vals:
-                prev_lot.equipment_id = False
-                equipment.lot_id.equipment_id = equipment.id
+                prev_lot.fsm_equipment_id = False
+                equipment.lot_id.fsm_equipment_id = equipment.id
         return res
diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
index f27a56fbb4..8dd0cd9eec 100644
--- a/fieldservice_stock/models/fsm_location.py
+++ b/fieldservice_stock/models/fsm_location.py
@@ -1,11 +1,10 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields
-from odoo.addons.base_geoengine import geo_model
+from odoo import api, fields, models
 
 
-class FSMLocation(geo_model.GeoModel):
+class FSMLocation(models.Model):
     _inherit = 'fsm.location'
 
     inventory_location_id = fields.Many2one('stock.location',
@@ -16,4 +15,4 @@ class FSMLocation(geo_model.GeoModel):
     def _onchange_fsm_parent_id(self):
         super(FSMLocation, self)._onchange_fsm_parent_id()
         self.inventory_location_id = \
-            self.fsm_parent_id.inventory_location_id or False
+            self.fsm_parent_id.inventory_location_id.id
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 1dc7104c11..2d77dbb547 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -1,26 +1,19 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from datetime import datetime, timedelta
-
 from odoo import api, fields, models, _
 
-from odoo.tools import (DEFAULT_SERVER_DATETIME_FORMAT,
-                        float_is_zero, float_compare)
-from odoo.addons import decimal_precision as dp
 from odoo.exceptions import UserError
 
-from odoo.addons.base_geoengine import geo_model
 
-STOCK_STAGES = [('draft', 'Draft'),
-                ('requested', 'Requested'),
-                ('confirmed', 'Confirmed'),
-                ('partial', 'Partially Shipped'),
-                ('done', 'Done'),
-                ('cancelled', 'Cancelled')]
+REQUEST_STATES = [
+    ('draft', 'Draft'),
+    ('open', 'In progress'),
+    ('done', 'Done'),
+    ('cancel', 'Cancelled')]
 
 
-class FSMOrder(geo_model.GeoModel):
+class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
     @api.model
@@ -28,10 +21,11 @@ def _default_warehouse_id(self):
         company = self.env.user.company_id.id
         warehouse_ids = self.env['stock.warehouse'].search(
             [('company_id', '=', company)], limit=1)
-        return warehouse_ids
+        return warehouse_ids and warehouse_ids.id
+
+    stock_request_ids = fields.One2many('stock.request', 'fsm_order_id',
+                                        string="Order Lines")
 
-    line_ids = fields.One2many('fsm.order.line', 'order_id',
-                               string="Order Lines")
     picking_ids = fields.One2many('stock.picking', 'fsm_order_id',
                                   string='Transfers')
     delivery_count = fields.Integer(string='Delivery Orders',
@@ -44,14 +38,57 @@ def _default_warehouse_id(self):
                                    required=True, readonly=True,
                                    default=_default_warehouse_id,
                                    help="Warehouse used to ship the materials")
-    # FSM Order return
-    return_ids = fields.One2many('fsm.order.return', 'order_id',
-                                 string="Return Lines")
     return_count = fields.Integer(string='Return Orders',
                                   compute='_compute_picking_ids')
-    inventory_stage = fields.Selection(STOCK_STAGES, string='State',
-                                       default='draft', required=True,
-                                       readonly=True, store=True)
+    request_stage = fields.Selection(REQUEST_STATES, string='Request State',
+                                     default='draft', readonly=True,
+                                     store=True)
+
+    @api.multi
+    def action_request_confirm(self):
+        for rec in self:
+            if not rec.stock_request_ids:
+                raise UserError(_('Please select a Order Lines.'))
+            group_id = rec.procurement_group_id or False
+            if not group_id:
+                group_id = self.env['procurement.group'].create({
+                    'name': rec.name,
+                    'move_type': 'direct',
+                    'fsm_order_id': rec.id,
+                    'partner_id': rec.customer_id.id,
+                })
+                rec.procurement_group_id = group_id.id
+            for line in rec.stock_request_ids:
+                line.write({'procurement_group_id': group_id.id,
+                            'location_id': rec.inventory_location_id.id})
+                line.action_confirm()
+            rec.request_stage = 'open'
+
+    def action_request_cancel(self):
+        for rec in self:
+            if not rec.stock_request_ids:
+                raise UserError(_('Please select a Order Lines.'))
+            for line in rec.stock_request_ids:
+                line.action_cancel()
+            rec.request_stage = 'cancel'
+
+    @api.multi
+    def action_request_draft(self):
+        for rec in self:
+            if not rec.stock_request_ids:
+                raise UserError(_('Please select a Order Lines.'))
+            for line in rec.stock_request_ids:
+                line.action_draft()
+            rec.request_stage = 'draft'
+
+    @api.multi
+    def action_request_done(self):
+        for rec in self:
+            if not rec.stock_request_ids:
+                raise UserError(_('Please select a Order Lines.'))
+            for line in rec.stock_request_ids:
+                line.action_done()
+            rec.request_stage = 'done'
 
     @api.depends('picking_ids')
     def _compute_picking_ids(self):
@@ -63,71 +100,13 @@ def _compute_picking_ids(self):
                 [picking for picking in order.picking_ids if
                  picking.picking_type_id.code == 'incoming'])
 
-    def action_inventory_request(self):
-        if self.location_id and (self.line_ids or self.return_ids) and\
-                self.warehouse_id:
-            for line in self.line_ids:
-                if line.state == 'draft':
-                    line.state = 'requested'
-                    line.qty_ordered = line.qty_requested
-            for line in self.return_ids:
-                if line.state == 'draft':
-                    line.state = 'requested'
-                    line.qty_ordered = line.qty_requested
-            self.inventory_stage = 'requested'
-        else:
-            raise UserError(
-                _('Please select the location, a warehouse and a product.'))
-
-    def action_inventory_confirm(self):
-        if self.location_id and (self.line_ids or self.return_ids) and\
-                self.warehouse_id:
-            if self.line_ids:
-                line_ids = self.mapped('line_ids').filtered(
-                    lambda l: l.state == 'requested')
-                line_ids._confirm_picking()
-            if self.return_ids:
-                return_ids = self.mapped('return_ids').filtered(
-                    lambda l: l.state == 'requested')
-                return_ids._confirm_picking()
-            self.inventory_stage = 'confirmed'
-        else:
-            raise UserError(
-                _('Please select the location, a warehouse and a product.'))
-
-    def action_inventory_cancel(self):
-        if self.line_ids:
-            line_ids = self.mapped('line_ids').filtered(
-                lambda l: l.state == 'requested')
-            for line in line_ids:
-                line.state = 'cancelled'
-        if self.return_ids:
-            return_ids = self.mapped('return_ids').filtered(
-                lambda l: l.state == 'requested')
-            for line in return_ids:
-                line.state = 'cancelled'
-        self.inventory_stage = 'cancelled'
-
-    def action_inventory_reset(self):
-        if self.line_ids:
-            line_ids = self.mapped('line_ids').filtered(
-                lambda l: l.state == 'cancelled')
-            for line in line_ids:
-                line.state = 'draft'
-        if self.return_ids:
-            return_ids = self.mapped('return_ids').filtered(
-                lambda l: l.state == 'cancelled')
-            for line in return_ids:
-                line.state = 'draft'
-        self.inventory_stage = 'draft'
-
     @api.multi
     def action_view_delivery(self):
-        '''
+        """
         This function returns an action that display existing delivery orders
         of given fsm order ids. It can either be a in a list or in a form
         view, if there is only one delivery order to show.
-        '''
+        """
         action = self.env.ref('stock.action_picking_tree_all').read()[0]
         pickings = self.mapped('picking_ids')
         delivery_ids = [picking.id for picking in pickings if
@@ -142,11 +121,11 @@ def action_view_delivery(self):
 
     @api.multi
     def action_view_returns(self):
-        '''
+        """
         This function returns an action that display existing return orders
         of given fsm order ids. It can either be a in a list or in a form
         view, if there is only one return order to show.
-        '''
+        """
         action = self.env.ref('stock.action_picking_tree_all').read()[0]
         pickings = self.mapped('picking_ids')
         receipt_ids = [picking.id for picking in pickings if
@@ -158,369 +137,3 @@ def action_view_returns(self):
                                 'form')]
             action['res_id'] = pickings.id
         return action
-
-
-class FSMOrderLine(models.Model):
-    _name = 'fsm.order.line'
-    _description = "FSM Order Lines"
-    _order = 'order_id, sequence, id'
-
-    order_id = fields.Many2one(
-        'fsm.order', string="FSM Order", required=True,
-        ondelete='cascade', index=True, copy=False,
-        readonly=True, states={'draft': [('readonly', False)]})
-    name = fields.Char(string='Description', required=True,
-                       readonly=True, states={'draft': [('readonly', False)]})
-    sequence = fields.Integer(string='Sequence', default=10, readonly=True,
-                              states={'draft': [('readonly', False)]})
-    product_id = fields.Many2one(
-        'product.product', string="Product",
-        domain=[('type', '=', 'product')], ondelete='restrict',
-        readonly=True, states={'draft': [('readonly', False)]})
-    product_uom_id = fields.Many2one(
-        'product.uom', string='Unit of Measure', required=True,
-        readonly=True, states={'draft': [('readonly', False)]})
-    qty_requested = fields.Float(
-        string='Quantity Requested', readonly=True,
-        states={'draft': [('readonly', False)]},
-        digits=dp.get_precision('Product Unit of Measure'))
-    qty_ordered = fields.Float(
-        string='Quantity Ordered', readonly=True,
-        states={'requested': [('readonly', False)]},
-        digits=dp.get_precision('Product Unit of Measure'))
-    qty_delivered = fields.Float(
-        string='Quantity Delivered', readonly=True, copy=False,
-        digits=dp.get_precision('Product Unit of Measure'))
-    state = fields.Selection(STOCK_STAGES, string='State', required=True,
-                             compute='_compute_state', default='draft',
-                             copy=False, index=True, readonly=True, store=True)
-    move_ids = fields.One2many(
-        'stock.move', 'fsm_order_line_id', string='Stock Moves',
-        readonly=True, states={'draft': [('readonly', False)]})
-    route_id = fields.Many2one('stock.location.route', string='Route',
-                               domain=[('fsm_selectable', '=', True)],
-                               ondelete='restrict')
-
-    @api.depends('move_ids', 'qty_ordered', 'qty_delivered')
-    def _compute_state(self):
-        precision = self.env['decimal.precision'].precision_get(
-            'Product Unit of Measure')
-        for line in self:
-            if line.move_ids and not float_is_zero(line.qty_delivered,
-                                                   precision_digits=precision):
-                if float_compare(line.qty_delivered, line.qty_ordered,
-                                 precision_digits=precision) == -1:
-                    line.state = 'partial'
-                elif float_compare(line.qty_delivered, line.qty_ordered,
-                                   precision_digits=precision) >= 0:
-                    line.state = 'done'
-            elif line.move_ids:
-                line.state = 'confirmed'
-            else:
-                if line.qty_ordered != 0:
-                    line.state = 'requested'
-                else:
-                    line.state = 'draft'
-
-    @api.multi
-    @api.onchange('product_id')
-    def onchange_product_id(self):
-        if not self.product_id:
-            return {'domain': {'product_uom': []}}
-
-        vals = {}
-        domain = {'product_uom': [('category_id', '=',
-                                   self.product_id.uom_id.category_id.id)]}
-
-        if (not self.product_uom_id
-                or (self.product_id.uom_id.id != self.product_uom_id.id)):
-            vals['product_uom_id'] = self.product_id.uom_id
-            vals['qty_requested'] = 1.0
-
-        product = self.product_id.with_context(
-            quantity=vals.get('qty_requested') or self.qty_requested,
-            uom=self.product_uom_id.id,
-        )
-
-        result = {'domain': domain}
-
-        name = product.name_get()[0][1]
-        if product.description_sale:
-            name += '\n' + product.description_sale
-        vals['name'] = name
-
-        self.update(vals)
-        return result
-
-    @api.multi
-    def _prepare_procurement_values(self, group_id=False):
-        self.ensure_one()
-        values = {}
-        date_planned = (self.order_id.scheduled_date_start
-                        or self.order_id.request_early
-                        or self.order_id.request_late
-                        or (datetime.now() + timedelta(days=1)).strftime(
-                            DEFAULT_SERVER_DATETIME_FORMAT))
-        values.update({
-            'group_id': group_id,
-            'fsm_order_line_id': self.id,
-            'date_planned': date_planned,
-            'route_ids':
-                self.route_id or self.order_id.warehouse_id.delivery_route_id,
-            'partner_dest_id': self.order_id.customer_id
-        })
-        return values
-
-    def _get_procurement_qty(self):
-        self.ensure_one()
-        qty = 0.0
-        for move in self.move_ids.filtered(lambda r: r.state != 'cancel'):
-            if move.picking_code == 'outgoing':
-                qty += move.product_uom._compute_quantity(
-                    move.product_uom_qty, self.product_uom_id,
-                    rounding_method='HALF-UP')
-            elif move.picking_code == 'incoming':
-                qty -= move.product_uom._compute_quantity(
-                    move.product_uom_qty, self.product_uom_id,
-                    rounding_method='HALF-UP')
-        return qty
-
-    @api.multi
-    def _confirm_picking(self):
-        precision = self.env['decimal.precision'].precision_get(
-            'Product Unit of Measure')
-        errors = []
-        for line in self:
-            qty_procured = line._get_procurement_qty()
-            group_id = line.order_id.procurement_group_id
-            if not group_id:
-                group_id = self.env['procurement.group'].create({
-                    'name': line.order_id.name,
-                    'move_type': 'direct',
-                    'fsm_order_id': line.order_id.id,
-                    'partner_id': line.order_id.customer_id.id,
-                })
-                line.order_id.procurement_group_id = group_id
-            if float_compare(qty_procured, line.qty_ordered,
-                             precision_digits=precision) >= 0:
-                continue
-            values = line._prepare_procurement_values(group_id=group_id)
-            qty_needed = line.qty_ordered - qty_procured
-            procurement_uom = line.product_uom_id
-            quant_uom = line.product_id.uom_id
-            get_param = self.env['ir.config_parameter'].sudo().get_param
-            if (procurement_uom.id != quant_uom.id
-                    and get_param('stock.propagate_uom') != '1'):
-                qty_needed = line.product_uom_id._compute_quantity(
-                    qty_needed, quant_uom, rounding_method='HALF-UP')
-                procurement_uom = quant_uom
-            try:
-                self.env['procurement.group'].run(
-                    line.product_id, qty_needed, procurement_uom,
-                    line.order_id.inventory_location_id,
-                    line.name, line.order_id.name, values)
-            except UserError as error:
-                errors.append(error.name)
-        if errors:
-            raise UserError('\n'.join(errors))
-        return True
-
-    @api.multi
-    def _get_delivered_qty(self):
-        self.ensure_one()
-        qty = 0.0
-        for move in self.move_ids.filtered(
-                lambda r: r.state == 'done' and not r.scrapped):
-            if move.location_dest_id.usage == "customer":
-                if (not move.origin_returned_move_id
-                        or (move.origin_returned_move_id and move.to_refund)):
-                    qty += move.product_uom._compute_quantity(
-                        move.product_uom_qty, self.product_uom_id)
-            elif (move.location_dest_id.usage != "customer"
-                  and move.to_refund):
-                qty -= move.product_uom._compute_quantity(
-                    move.product_uom_qty, self.product_uom_id)
-        return qty
-
-    def create(self, vals):
-        res = super(FSMOrderLine, self).create(vals)
-        if 'order_id' in vals:
-            res.order_id.inventory_stage = 'draft'
-        return res
-
-
-class FSMOrderReturn(models.Model):
-    _name = 'fsm.order.return'
-    _description = "FSM Order Return"
-    _order = 'order_id, sequence, id'
-
-    order_id = fields.Many2one(
-        'fsm.order', string="FSM Order", required=True,
-        ondelete='cascade', index=True, copy=False,
-        readonly=True, states={'draft': [('readonly', False)]})
-    name = fields.Char(string='Description', required=True,
-                       readonly=True, states={'draft': [('readonly', False)]})
-    sequence = fields.Integer(string='Sequence', default=10, readonly=True,
-                              states={'draft': [('readonly', False)]})
-    product_id = fields.Many2one(
-        'product.product', string="Product",
-        domain=[('type', '=', 'product')], ondelete='restrict',
-        readonly=True, states={'draft': [('readonly', False)]})
-    product_uom_id = fields.Many2one(
-        'product.uom', string='Unit of Measure', required=True,
-        readonly=True, states={'draft': [('readonly', False)]})
-    qty_requested = fields.Float(
-        string='Quantity Requested', readonly=True,
-        states={'draft': [('readonly', False)]},
-        digits=dp.get_precision('Product Unit of Measure'))
-    qty_returned = fields.Float(
-        string='Quantity Returned', readonly=True,
-        states={'requested': [('readonly', False)]},
-        digits=dp.get_precision('Product Unit of Measure'))
-    qty_received = fields.Float(
-        string='Quantity Received', readonly=True, copy=False,
-        digits=dp.get_precision('Product Unit of Measure'))
-    state = fields.Selection(STOCK_STAGES, string='State', required=True,
-                             compute='_compute_state', default='draft',
-                             copy=False, index=True, readonly=True, store=True)
-    move_ids = fields.One2many(
-        'stock.move', 'fsm_order_return_line_id', string='Stock Moves',
-        readonly=True, states={'draft': [('readonly', False)]})
-    route_id = fields.Many2one('stock.location.route', string='Route',
-                               domain=[('fsm_return_selectable', '=', True)],
-                               ondelete='restrict')
-
-    @api.depends('move_ids', 'qty_returned', 'qty_received')
-    def _compute_state(self):
-        precision = self.env['decimal.precision'].precision_get(
-            'Product Unit of Measure')
-        for line in self:
-            if line.move_ids and not float_is_zero(line.qty_received,
-                                                   precision_digits=precision):
-                if float_compare(line.qty_received, line.qty_returned,
-                                 precision_digits=precision) == -1:
-                    line.state = 'partial'
-                elif float_compare(line.qty_received, line.qty_returned,
-                                   precision_digits=precision) >= 0:
-                    line.state = 'done'
-            elif line.move_ids:
-                line.state = 'confirmed'
-            else:
-                line.state = 'draft'
-
-    @api.multi
-    @api.onchange('product_id')
-    def onchange_product_id(self):
-        if not self.product_id:
-            return {'domain': {'product_uom': []}}
-
-        vals = {}
-        domain = {'product_uom': [('category_id', '=',
-                                   self.product_id.uom_id.category_id.id)]}
-
-        if (not self.product_uom_id
-                or (self.product_id.uom_id.id != self.product_uom_id.id)):
-            vals['product_uom_id'] = self.product_id.uom_id
-            vals['qty_requested'] = 1.0
-
-        product = self.product_id.with_context(
-            quantity=vals.get('qty_requested') or self.qty_requested,
-            uom=self.product_uom_id.id,
-        )
-        result = {'domain': domain}
-        name = product.name_get()[0][1]
-        if product.description_sale:
-            name += '\n' + product.description_sale
-        vals['name'] = name
-        self.update(vals)
-        return result
-
-    @api.multi
-    def _prepare_procurement_values(self, group_id=False):
-        self.ensure_one()
-        values = {}
-        date_planned = (self.order_id.scheduled_date_start
-                        or self.order_id.request_early
-                        or self.order_id.request_late
-                        or (datetime.now() + timedelta(days=1)).strftime(
-                            DEFAULT_SERVER_DATETIME_FORMAT))
-        values.update({
-            'group_id': group_id,
-            'fsm_order_return_line_id': self.id,
-            'date_planned': date_planned,
-            'route_ids':
-                self.route_id or self.order_id.warehouse_id.reception_route_id,
-            'partner_dest_id': self.order_id.warehouse_id
-        })
-        return values
-
-    def _get_procurement_qty(self):
-        self.ensure_one()
-        qty = 0.0
-        for move in self.move_ids.filtered(lambda r: r.state != 'cancel'):
-            if move.picking_code == 'incoming':
-                qty += move.product_uom._compute_quantity(
-                    move.product_uom_qty, self.product_uom_id,
-                    rounding_method='HALF-UP')
-            elif move.picking_code == 'outgoing':
-                qty -= move.product_uom._compute_quantity(
-                    move.product_uom_qty, self.product_uom_id,
-                    rounding_method='HALF-UP')
-        return qty
-
-    @api.multi
-    def _confirm_picking(self):
-        precision = self.env['decimal.precision'].precision_get(
-            'Product Unit of Measure')
-        errors = []
-        for line in self:
-            qty_procured = line._get_procurement_qty()
-            group_id = line.order_id.procurement_group_id
-            if not group_id:
-                group_id = self.env['procurement.group'].create({
-                    'name': line.order_id.name,
-                    'move_type': 'direct',
-                    'fsm_order_id': line.order_id.id,
-                    'partner_id': line.order_id.customer_id.id,
-                })
-                line.order_id.procurement_group_id = group_id
-            if float_compare(qty_procured, line.qty_returned,
-                             precision_digits=precision) >= 0:
-                continue
-            values = line._prepare_procurement_values(group_id=group_id)
-            qty_needed = line.qty_returned - qty_procured
-            procurement_uom = line.product_uom_id
-            quant_uom = line.product_id.uom_id
-            get_param = self.env['ir.config_parameter'].sudo().get_param
-            if (procurement_uom.id != quant_uom.id
-                    and get_param('stock.propagate_uom') != '1'):
-                qty_needed = line.product_uom_id._compute_quantity(
-                    qty_needed, quant_uom, rounding_method='HALF-UP')
-                procurement_uom = quant_uom
-            try:
-                self.env['procurement.group'].run(
-                    line.product_id, qty_needed, procurement_uom,
-                    line.order_id.warehouse_id.lot_stock_id,
-                    line.name, line.order_id.name, values)
-            except UserError as error:
-                errors.append(error.name)
-        if errors:
-            raise UserError('\n'.join(errors))
-        return True
-
-    @api.multi
-    def _get_received_qty(self):
-        self.ensure_one()
-        qty = 0.0
-        for move in self.move_ids.filtered(
-                lambda r: r.state == 'done' and not r.scrapped):
-            if move.location_dest_id.usage != "customer":
-                if (not move.origin_returned_move_id
-                        or (move.origin_returned_move_id and move.to_refund)):
-                    qty += move.product_uom._compute_quantity(
-                        move.product_uom_qty, self.product_uom_id)
-            elif (move.location_dest_id.usage == "customer"
-                  and move.to_refund):
-                qty -= move.product_uom._compute_quantity(
-                    move.product_uom_qty, self.product_uom_id)
-        return qty
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index dcf15708dd..5b35a62f08 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -4,43 +4,64 @@
 from odoo import api, fields, models
 
 
+class StockRequest(models.Model):
+    _inherit = "stock.request"
+
+    fsm_order_id = fields.Many2one(
+        'fsm.order', string="FSM Order", ondelete='cascade',
+        index=True, copy=False)
+    direction = fields.Selection([('outbound', 'Outbound'),
+                                  ('inbound', 'Inbound')], string='Direction')
+
+    @api.onchange('direction')
+    def onchange_direction(self):
+        """To set route based on direction."""
+        route_ids = False
+        if self.direction == 'outbound':
+            route_ids = self.env['stock.location.route'].search(
+                [('fsm_selectable', '=', True)])
+        if self.direction == 'inbound':
+            route_ids = self.env['stock.location.route'].search(
+                [('fsm_return_selectable', '=', True)])
+        return {'domain': {'route_id': [('id', 'in',
+                                         route_ids and route_ids.ids)]}}
+
+
+class StockMoveLine(models.Model):
+    _inherit = "stock.move.line"
+
+    def _action_done(self):
+        res = super(StockMoveLine, self)._action_done()
+        for rec in self:
+            for all_rec in rec.move_id.allocation_ids:
+                request = all_rec.stock_request_id
+                if request.state == 'done' and request.fsm_order_id:
+                    request.fsm_order_id.request_stage = 'done'
+        return res
+
+
 class StockMove(models.Model):
     _inherit = "stock.move"
 
-    fsm_order_line_id = fields.Many2one('fsm.order.line', 'FSM Order Line')
-    fsm_order_return_line_id = fields.Many2one(
-        'fsm.order.return', 'FSM Order Return Line')
-
     def prepare_equipment_values(self, move_line):
-        return {'name': '%s (%s)' % (move_line.product_id.name,
-                                     move_line.lot_id.name),
-                'product_id': move_line.product_id.id,
-                'lot_id': move_line.lot_id.id}
+        return {'name': '%s (%s)' % (
+            move_line.product_id.name, move_line.lot_id.name),
+            'product_id': move_line.product_id.id,
+            'lot_id': move_line.lot_id.id,
+            'current_location_id':
+            move_line.request_id.fsm_order_id.location_id.id,
+            'current_stock_location_id': move_line.dest_location_id.id}
 
     def _action_done(self):
         res = False
         for rec in self:
             res = super(StockMove, rec)._action_done()
-            for line in res.mapped('fsm_order_line_id').sudo():
-                line.qty_delivered = line._get_delivered_qty()
-            for line in res.mapped('fsm_order_return_line_id').sudo():
-                line.qty_received = line._get_received_qty()
             if rec.picking_code == 'outgoing' and rec.state == 'done':
                 if rec.product_tmpl_id.create_fsm_equipment:
                     for line in rec.move_line_ids:
                         vals = self.prepare_equipment_values(line)
-                        line.lot_id.equipment_id = rec.env['fsm.equipment'].\
-                            create(vals)
-        return res
-
-    @api.multi
-    def write(self, vals):
-        res = super(StockMove, self).write(vals)
-        if 'product_uom_qty' in vals:
-            for move in self:
-                if move.state == 'done':
-                    for line in self.mapped('fsm_order_line_id').sudo():
-                        line.qty_delivered = line._get_delivered_qty()
+                        line.lot_id.fsm_equipment_id = \
+                            rec.env['fsm.equipment'].create(vals)
         return res
 
 
@@ -50,22 +71,6 @@ class ProcurementGroup(models.Model):
     fsm_order_id = fields.Many2one('fsm.order', 'Field Service Order')
 
 
-class ProcurementRule(models.Model):
-    _inherit = 'procurement.rule'
-
-    def _get_stock_move_values(self, product_id, product_qty, product_uom,
-                               location_id, name, origin, values, group_id):
-        result = super(ProcurementRule, self)._get_stock_move_values(
-            product_id, product_qty, product_uom,
-            location_id, name, origin, values, group_id)
-        if values.get('fsm_order_line_id', False):
-            result['fsm_order_line_id'] = values['fsm_order_line_id']
-        if values.get('fsm_order_return_line_id', False):
-            result['fsm_order_return_line_id'] = \
-                values['fsm_order_return_line_id']
-        return result
-
-
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
@@ -89,27 +94,15 @@ class StockPickingType(models.Model):
     def _compute_fsm_request(self):
         for ptype in self:
             if ptype.code == 'outgoing':
-                res = self.env['fsm.order'].search([('warehouse_id',
-                                                     '=',
-                                                     ptype.warehouse_id.id),
-                                                    ('inventory_stage', '=',
-                                                     'requested')])
-                for order in res:
-                    for line in order.line_ids:
-                        if line.state == 'requested':
-                            ptype.count_fsm_requests += 1
-                            break
+                res = self.env['fsm.order'].search(
+                    [('request_stage', '=', 'draft'),
+                     ('warehouse_id', '=', ptype.warehouse_id.id)])
+                ptype.count_fsm_requests = len(res)
             if ptype.code == 'incoming':
-                res = self.env['fsm.order'].search([('warehouse_id',
-                                                     '=',
-                                                     ptype.warehouse_id.id),
-                                                    ('inventory_stage', '=',
-                                                     'requested')])
-                for order in res:
-                    for line in order.return_ids:
-                        if line.state == 'requested':
-                            ptype.count_fsm_requests += 1
-                            break
+                res = self.env['fsm.order'].search(
+                    [('request_stage', '=', 'draft'),
+                     ('warehouse_id', '=', ptype.warehouse_id.id)])
+                ptype.count_fsm_requests = len(res)
 
     def get_action_fsm_requests(self):
         return self._get_action('fieldservice_stock.action_stock_fsm_order')
diff --git a/fieldservice_stock/models/stock_production_lot.py b/fieldservice_stock/models/stock_production_lot.py
index b63d267867..5e52651e3e 100644
--- a/fieldservice_stock/models/stock_production_lot.py
+++ b/fieldservice_stock/models/stock_production_lot.py
@@ -7,5 +7,5 @@
 class StockProductionLot(models.Model):
     _inherit = 'stock.production.lot'
 
-    equipment_id = fields.Many2one('fsm.equipment',
-                                   string='Equipment', readonly=True)
+    fsm_equipment_id = fields.Many2one('fsm.equipment',
+                                       string='Equipment', readonly=True)
diff --git a/fieldservice_stock/readme/CONTRIBUTORS.rst b/fieldservice_stock/readme/CONTRIBUTORS.rst
index a3606b15df..61e9fc4dc3 100644
--- a/fieldservice_stock/readme/CONTRIBUTORS.rst
+++ b/fieldservice_stock/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
 * Brian McMaster <brian@mcmpest.com>
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_stock/security/ir.model.access.csv b/fieldservice_stock/security/ir.model.access.csv
index f7bbd49d5d..110e052a34 100644
--- a/fieldservice_stock/security/ir.model.access.csv
+++ b/fieldservice_stock/security/ir.model.access.csv
@@ -1,5 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_fsm_order_line_fsm_user,fsm.order.line.user,model_fsm_order_line,fieldservice.group_fsm_user,1,0,0,0
-access_fsm_order_line_fsm_dispatcher,fsm.order.line.dispatcher,model_fsm_order_line,fieldservice.group_fsm_dispatcher,1,1,1,1
-access_fsm_order_return_fsm_user,fsm.order.return.user,model_fsm_order_return,fieldservice.group_fsm_user,1,0,0,0
-access_fsm_order_return_fsm_dispatcher,fsm.order.return.dispatcher,model_fsm_order_return,fieldservice.group_fsm_dispatcher,1,1,1,1
+access_stock_request_fsm_user,stock.request.user,stock_request.model_stock_request,fieldservice.group_fsm_user,1,0,0,0
+access_stock_request_fsm_dispatcher,stock.request.dispatcher,stock_request.model_stock_request,fieldservice.group_fsm_dispatcher,1,1,1,1
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index c8e6fcf34b..c85772438a 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Stock</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_stock"><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_stock"><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_stock"><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_stock"><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>This module is an add-on for the Field Service application in Odoo.
 It provides inventory and stock operations.</p>
 <p><strong>Table of contents</strong></p>
@@ -438,7 +438,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_stock%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_stock%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">
@@ -455,6 +455,7 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
 <li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#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">
@@ -473,7 +474,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/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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_stock">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_stock">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_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 46a6ea9a19..a26e839e19 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -26,20 +26,16 @@
             <xpath expr="//notebook/page[1]" position="after">
                 <page string="Inventory">
                     <header>
-                        <button id="action_inventory_request"
-                                name="action_inventory_request" string="Request"
-                                class="oe_highlight"
-                                attrs="{'invisible': [('inventory_stage', '!=', 'draft')]}"
-                                type="object"/>
-                        <button id="action_inventory_cancel"
-                                name="action_inventory_cancel" string="Cancel"
-                                type="object"
-                                attrs="{'invisible': [('inventory_stage', '!=', 'requested')]}"/>
-                        <button id="action_inventory_reset"
-                                name="action_inventory_reset" string="Reset to Draft"
-                                type="object"
-                                attrs="{'invisible': [('inventory_stage', '!=', 'cancelled')]}"/>
-                        <field name='inventory_stage' widget='statusbar'/>
+                        <button name="action_request_cancel"
+                                attrs="{'invisible': [('request_stage', 'not in', ['draft','open'])]}"
+                                type="object" string="Cancel"/>
+                        <button name="action_request_draft" type="object"
+                                attrs="{'invisible': [('request_stage', 'not in', ['cancel'])]}"
+                                string="Set to Draft"/>
+                        <button name="action_request_done"
+                            string="Done" type="object"
+                            attrs="{'invisible': [('request_stage', 'not in', ['open'])]}"/>
+                        <field name='request_stage' widget="statusbar"/>
                     </header>
                     <group groups="stock.group_stock_user">
                         <group id="stock-left">
@@ -48,60 +44,29 @@
                         </group>
                         <group id="stock-right"></group>
                     </group>
-                    <separator string="Outbound"/>
-                    <field name="line_ids" nolabel="1">
+                    <field name="stock_request_ids" nolabel="1">
                         <tree editable="bottom">
-                            <field name="sequence" widget="handle"/>
-                            <field name="product_id"
-                                   context="{'quantity': qty_ordered,
-                                             'uom': product_uom_id}"/>
-                            <field name="name"/>
-                            <field name="route_id" groups="stock.group_stock_adv_location"/>
-                            <field name="qty_requested"
-                                   string="Requested Qty"
-                                   context="{'quantity': qty_requested,
-                                             'uom': product_uom_id}"/>
-                            <field name="qty_ordered"
-                                   string="Ordered Qty"
-                                   context="{
-                                    'quantity': qty_ordered,
-                                    'uom': product_uom_id}"
-                                   attrs="{'invisible': [('state', '=', 'draft')]}"/>
-                            <field name="qty_delivered"
-                                   attrs="{'invisible': [('state', '=', 'draft')]}"/>
+                            <field name="name" readonly="1"/>
+                            <field name="product_id"/>
                             <field name="product_uom_id"
-                                   attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
-                                   options='{"no_open": True, "no_create": True}'
-                                   groups="product.group_uom"/>
-                            <field name="state"/>
-                        </tree>
-                    </field>
-                    <separator string="Inbound"/>
-                    <field name="return_ids" nolabel="1">
-                        <tree editable="bottom">
-                            <field name="sequence" widget="handle"/>
-                            <field name="product_id"
-                                   context="{'quantity': qty_returned,
-                                             'uom': product_uom_id}"/>
-                            <field name="name"/>
-                            <field name="route_id" groups="stock.group_stock_adv_location"/>
-                            <field name="qty_requested"
-                                   string="Requested Qty"
-                                   context="{
-                                    'quantity': qty_requested,
-                                    'uom': product_uom_id}"/>
-                            <field name="qty_returned"
-                                   string="Returned Qty"
-                                   context="{
-                                    'quantity': qty_returned,
-                                    'uom': product_uom_id}"
-                                   attrs="{'invisible': [('state', '=', 'draft')]}"
-                            />
-                            <field name="qty_received"/>
-                            <field name="product_uom_id"
-                                   attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
-                                   options='{"no_open": True, "no_create": True}'
-                                   groups="product.group_uom"/>
+                                   options="{'no_open': True, 'no_create': True}"
+                                   groups="uom.group_uom"/>
+                            <field name="direction" required="1"/>
+                            <field name="route_id"
+                                   options="{'no_create': True}"
+                                   groups="stock.group_stock_multi_locations"/>
+                            <field name="route_ids" invisible="1"/>
+                            <field name="product_uom_qty"/>
+                            <field name="qty_in_progress"/>
+                            <field name="qty_done"/>
+                            <field name="expected_date" invisible="1"/>
+                            <field name="picking_policy"
+                                   invisible="1"/>
+                            <field name="warehouse_id" invisible="1"/>
+                            <field name="location_id" invisible="1"/>
+                            <field name="procurement_group_id"
+                                   invisible="1"/>
+                            <field name="company_id" invisible="1"/>
                             <field name="state"/>
                         </tree>
                     </field>
@@ -117,20 +82,19 @@
         <field name="arch" type="xml">
             <form string="FSM Order" create="false">
                 <header>
-                    <button id="action_inventory_confirm"
-                            name="action_inventory_confirm" string="Confirm"
-                            class="oe_highlight"
-                            type="object" groups="fieldservice.group_fsm_dispatcher"
-                            attrs="{'invisible': [('inventory_stage', '!=', 'requested')]}"/>
-                    <button id="action_inventory_cancel"
-                            name="action_inventory_cancel" string="Cancel"
-                            type="object" groups="fieldservice.group_fsm_dispatcher"
-                            attrs="{'invisible': [('inventory_stage', '!=', 'requested')]}"/>
-                    <button id="action_inventory_reset"
-                            name="action_inventory_reset" string="Reset to Draft"
-                            type="object" groups="fieldservice.group_fsm_dispatcher"
-                            attrs="{'invisible': [('inventory_stage', '!=', 'cancelled')]}"/>
-                    <field name="inventory_stage" widget="statusbar"/>
+                    <button name="action_request_confirm"
+                        string="Confirm" type="object"
+                        attrs="{'invisible': [('request_stage', 'not in', ['draft'])]}"/>
+                    <button name="action_request_cancel"
+                            attrs="{'invisible': [('request_stage', 'not in', ['draft','open'])]}"
+                            type="object" string="Cancel"/>
+                    <button name="action_request_draft" type="object"
+                            attrs="{'invisible': [('request_stage', 'not in', ['cancel'])]}"
+                            string="Set to Draft"/>
+                    <button name="action_request_done"
+                        string="Done" type="object"
+                        attrs="{'invisible': [('request_stage', 'not in', ['open'])]}"/>
+                    <field name='request_stage' widget="statusbar"/>
                 </header>
                 <sheet>
                     <div class="oe_title">
@@ -147,58 +111,29 @@
                                    groups="stock.group_stock_multi_warehouses"/>
                         </group>
                     </group>
-                    <separator string="Outbound"/>
-                    <field name="line_ids" nolabel="1">
-                        <tree editable="bottom">
-                            <field name="sequence" widget="handle"/>
-                            <field name="product_id"
-                                   context="{
-                                    'quantity': qty_ordered,
-                                    'uom': product_uom_id,
-                                }"
-                            />
-                            <field name="name"/>
-                            <field name="route_id" groups="stock.group_adv_location"/>
-                            <field name="qty_requested"
-                                   string="Requested Qty"/>
-                            <field name="qty_ordered"
-                                   string="Ordered Qty"
-                                   context="{'quantity': qty_ordered,
-                                             'uom': product_uom_id}"/>
-                            <field name="qty_delivered"/>
-                            <field name="product_uom_id"
-                                   attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
-                                   options='{"no_open": True, "no_create": True}'
-                                   groups="product.group_uom"/>
-                            <field name="state"/>
-                        </tree>
-                    </field>
-                    <separator string="Inbound"/>
-                    <field name="return_ids" nolabel="1">
+                    <field name="stock_request_ids" nolabel="1">
                         <tree editable="bottom">
-                            <field name="sequence" widget="handle"/>
-                            <field name="product_id"
-                                   context="{
-                                    'quantity': qty_returned,
-                                    'uom': product_uom_id,
-                                }"
-                            />
-                            <field name="name"/>
-                            <field name="route_id" groups="stock.group_adv_location"/>
-                            <field name="qty_requested"
-                                   string="Requested Qty"/>
-                            <field name="qty_returned"
-                                   string="Returned Qty"
-                                   context="{
-                                    'quantity': qty_returned,
-                                    'uom': product_uom_id,
-                                }"
-                            />
-                            <field name="qty_received"/>
+                            <field name="name" readonly="1"/>
+                            <field name="product_id"/>
                             <field name="product_uom_id"
-                                   attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
-                                   options='{"no_open": True, "no_create": True}'
-                                   groups="product.group_uom"/>
+                                   options="{'no_open': True, 'no_create': True}"
+                                   groups="uom.group_uom"/>
+                            <field name="direction" required="1"/>
+                            <field name="route_id"
+                                   options="{'no_create': True}"
+                                   groups="stock.group_stock_multi_locations"/>
+                            <field name="route_ids" invisible="1"/>
+                            <field name="product_uom_qty"/>
+                            <field name="qty_in_progress"/>
+                            <field name="qty_done"/>
+                            <field name="expected_date" invisible="1"/>
+                            <field name="picking_policy"
+                                   invisible="1"/>
+                            <field name="warehouse_id" invisible="1"/>
+                            <field name="location_id" invisible="1"/>
+                            <field name="procurement_group_id"
+                                   invisible="1"/>
+                            <field name="company_id" invisible="1"/>
                             <field name="state"/>
                         </tree>
                     </field>
@@ -220,8 +155,8 @@
                   default_order="scheduled_date_start"
                   create="false">
                 <field name="name"/>
-                <field name="customer_id"/>
-                <field name="location_id"/>
+                <field name="customer_id" />
+                <field name="request_stage"/>
             </tree>
         </field>
     </record>
@@ -231,8 +166,7 @@
         <field name="res_model">fsm.order</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain"
-               eval="[('inventory_stage', '=', 'requested')]"/>
+        <field name="domain" eval="[('request_stage', '=', 'draft'), ('stock_request_ids', '!=', False)]"/>
         <field name="view_ids"
                eval="[(5, 0, 0),
                       (0, 0, {'view_mode': 'tree', 'view_id': ref('fieldservice_stock.stock_fsm_order_tree')}),
diff --git a/fieldservice_stock/views/product_template.xml b/fieldservice_stock/views/product_template.xml
index 473781425d..67c6ff5919 100644
--- a/fieldservice_stock/views/product_template.xml
+++ b/fieldservice_stock/views/product_template.xml
@@ -3,10 +3,12 @@
 
     <record id="product_template_extend_warranty" model="ir.ui.view">
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="product.product_template_only_form_view"/>
+        <field name="inherit_id"
+               ref="product.product_template_only_form_view"/>
         <field name="arch" type="xml">
             <field name="tracking" position="after">
-                <field name="create_fsm_equipment" attrs="{'invisible': [('tracking', '!=', 'serial')]}"/>
+                <field name="create_fsm_equipment"
+                       attrs="{'invisible': [('tracking', '!=', 'serial')]}"/>
             </field>
         </field>
     </record>
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 8e1dbc114d..6817fc4d0c 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -9,7 +9,7 @@
             <xpath expr="//field[@name='warehouse_ids']" position="after">
                 <field name="fsm_selectable" string="FSM Order Lines"/>
                 <field name="fsm_return_selectable"
-                string="FSM Order Return Lines"/>
+                       string="FSM Order Return Lines"/>
             </xpath>
         </field>
     </record>
@@ -22,14 +22,16 @@
             <field name='count_picking_backorders' position='after'>
                 <field name='count_fsm_requests'/>
             </field>
-            <xpath expr="//div[hasclass('col-xs-6','o_kanban_primary_right')]/div[4]" position='after'>
-                <div t-if="record.count_fsm_requests.raw_value > 0" class="row">
-                    <div class="col-xs-9">
+            <xpath expr="//div[hasclass('col-6','o_kanban_primary_right')]/div[4]"
+                   position='after'>
+                <div t-if="record.count_fsm_requests.raw_value > 0"
+                     class="row">
+                    <div class="col-9">
                         <a name="get_action_fsm_requests" type="object">
                             Field Service
                         </a>
                     </div>
-                    <div class="col-xs-3">
+                    <div class="col-3">
                         <field name="count_fsm_requests"/>
                     </div>
                 </div>
diff --git a/fieldservice_stock/views/stock_production_lot.xml b/fieldservice_stock/views/stock_production_lot.xml
index 817dcbf981..4f23b37cad 100644
--- a/fieldservice_stock/views/stock_production_lot.xml
+++ b/fieldservice_stock/views/stock_production_lot.xml
@@ -5,17 +5,20 @@
         <field name="model">stock.production.lot</field>
         <field name="inherit_id" ref="stock.view_production_lot_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='main_group']/group[1]" position="after" sequence="0">
+            <xpath expr="//group[@name='main_group']/group[1]" position="after"
+                   sequence="0">
                 <group>
-                    <field name="equipment_id"/>
+                    <field name="fsm_equipment_id"/>
                 </group>
             </xpath>
         </field>
     </record>
 
-    <record id="stock.action_production_lot_form" model="ir.actions.act_window">
+    <record id="stock.action_production_lot_form"
+            model="ir.actions.act_window">
         <field name="context">{'search_default_group_by_product': 1,
-                               'default_product_id': context.get('product_id', False)}</field>
+            'default_product_id': context.get('product_id', False)}
+        </field>
     </record>
 
 </odoo>

From 86a3c5239b419cc9402acfb25dc83334808fb5b3 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Wed, 17 Apr 2019 20:25:24 +0530
Subject: [PATCH 084/631] [12.0][IMP] fieldservice_stock:Improved code.

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

diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 5b35a62f08..2edc37ee2f 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -24,7 +24,7 @@ def onchange_direction(self):
             route_ids = self.env['stock.location.route'].search(
                 [('fsm_return_selectable', '=', True)])
         return {'domain': {'route_id': [('id', 'in',
-                                         route_ids and route_ids.ids)]}}
+                                         route_ids and route_ids.ids or [])]}}
 
 
 class StockMoveLine(models.Model):

From 8a81f2a302ed538ca08f33873e8f316ccad858f5 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 3 May 2019 12:22:47 -0700
Subject: [PATCH 085/631] [IMP] #122 Convert Locations from Contact

---
 fieldservice_stock/models/__init__.py   |  3 ++-
 fieldservice_stock/models/fsm_wizard.py | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_stock/models/fsm_wizard.py

diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index 92b982c014..f4642be675 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -7,5 +7,6 @@
     stock,
     fsm_equipment,
     product_template,
-    stock_production_lot
+    stock_production_lot,
+    fsm_wizard
 )
diff --git a/fieldservice_stock/models/fsm_wizard.py b/fieldservice_stock/models/fsm_wizard.py
new file mode 100644
index 0000000000..c0b06186b0
--- /dev/null
+++ b/fieldservice_stock/models/fsm_wizard.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2018 - TODAY, 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 UserError
+
+
+class FSMWizard(models.TransientModel):
+    _inherit = 'fsm.wizard'
+
+
+    def action_convert_location(self, partner):
+        res = self.env['fsm.location'].search_count(
+            [('partner_id', '=', partner.id)])
+        if res == 0:
+            vals = {'partner_id': partner.id,
+                    'owner_id': partner.id,
+                    'customer_id': partner.id,
+                    'inventory_location_id': partner.property_stock_customer.id}
+            self.env['fsm.location'].create(vals)
+            partner.write({'fsm_location': True})
+        else:
+            raise UserError(_('A Field Service Location related to that'
+                              ' partner already exists.'))
+        return res
\ No newline at end of file

From 2a307c5ad26597feed38a111c6c5608748929b54 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Tue, 7 May 2019 10:53:07 -0700
Subject: [PATCH 086/631] [IMP] Max Comments

---
 fieldservice_stock/models/fsm_wizard.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fieldservice_stock/models/fsm_wizard.py b/fieldservice_stock/models/fsm_wizard.py
index c0b06186b0..6c0cf94a35 100644
--- a/fieldservice_stock/models/fsm_wizard.py
+++ b/fieldservice_stock/models/fsm_wizard.py
@@ -8,7 +8,6 @@
 class FSMWizard(models.TransientModel):
     _inherit = 'fsm.wizard'
 
-
     def action_convert_location(self, partner):
         res = self.env['fsm.location'].search_count(
             [('partner_id', '=', partner.id)])
@@ -22,4 +21,4 @@ def action_convert_location(self, partner):
         else:
             raise UserError(_('A Field Service Location related to that'
                               ' partner already exists.'))
-        return res
\ No newline at end of file
+        return res

From d9e187b2fccd5510711efef44eada91a3a46e6d6 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Tue, 7 May 2019 14:22:11 -0700
Subject: [PATCH 087/631] [IMP] Flake8 Errors

---
 fieldservice_stock/models/fsm_wizard.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fieldservice_stock/models/fsm_wizard.py b/fieldservice_stock/models/fsm_wizard.py
index 6c0cf94a35..cb5f4a2ccf 100644
--- a/fieldservice_stock/models/fsm_wizard.py
+++ b/fieldservice_stock/models/fsm_wizard.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models, _
+from odoo import models, _
 from odoo.exceptions import UserError
 
 
@@ -15,7 +15,8 @@ def action_convert_location(self, partner):
             vals = {'partner_id': partner.id,
                     'owner_id': partner.id,
                     'customer_id': partner.id,
-                    'inventory_location_id': partner.property_stock_customer.id}
+                    'inventory_location_id':
+                    partner.property_stock_customer.id}
             self.env['fsm.location'].create(vals)
             partner.write({'fsm_location': True})
         else:

From e97139313eee2c9744372126b6f517c959b3c2ac Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 9 May 2019 17:00:58 -0700
Subject: [PATCH 088/631] [ADD] Stock Request Confirm on Order

---
 fieldservice_stock/views/fsm_order.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index a26e839e19..17cfc0dd7d 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -26,15 +26,18 @@
             <xpath expr="//notebook/page[1]" position="after">
                 <page string="Inventory">
                     <header>
-                        <button name="action_request_cancel"
-                                attrs="{'invisible': [('request_stage', 'not in', ['draft','open'])]}"
-                                type="object" string="Cancel"/>
+                        <button name="action_request_confirm"
+                                attrs="{'invisible': [('request_stage', 'not in', ['draft'])]}"
+                                type="object" class="oe_highlight" string="Submit"/>
                         <button name="action_request_draft" type="object"
                                 attrs="{'invisible': [('request_stage', 'not in', ['cancel'])]}"
-                                string="Set to Draft"/>
+                                class="oe_highlight" string="Set to Draft"/>
                         <button name="action_request_done"
                             string="Done" type="object"
-                            attrs="{'invisible': [('request_stage', 'not in', ['open'])]}"/>
+                            class="oe_highlight" attrs="{'invisible': [('request_stage', 'not in', ['open'])]}"/>
+                        <button name="action_request_cancel"
+                                attrs="{'invisible': [('request_stage', 'not in', ['draft','open'])]}"
+                                type="object" class="oe_highlight" string="Cancel"/>
                         <field name='request_stage' widget="statusbar"/>
                     </header>
                     <group groups="stock.group_stock_user">

From da8f2627e0862c943ff1cf23bd28d3103f7a557f Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 10 May 2019 08:37:44 -0700
Subject: [PATCH 089/631] [IMP] Remove Unnecessary Fields

---
 fieldservice_stock/models/stock.py | 22 ----------------------
 fieldservice_stock/views/stock.xml | 14 --------------
 2 files changed, 36 deletions(-)

diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 2edc37ee2f..57e001542a 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -13,20 +13,6 @@ class StockRequest(models.Model):
     direction = fields.Selection([('outbound', 'Outbound'),
                                   ('inbound', 'Inbound')], string='Direction')
 
-    @api.onchange('direction')
-    def onchange_direction(self):
-        """To set route based on direction."""
-        route_ids = False
-        if self.direction == 'outbound':
-            route_ids = self.env['stock.location.route'].search(
-                [('fsm_selectable', '=', True)])
-        if self.direction == 'inbound':
-            route_ids = self.env['stock.location.route'].search(
-                [('fsm_return_selectable', '=', True)])
-        return {'domain': {'route_id': [('id', 'in',
-                                         route_ids and route_ids.ids or [])]}}
-
-
 class StockMoveLine(models.Model):
     _inherit = "stock.move.line"
 
@@ -78,14 +64,6 @@ class StockPicking(models.Model):
         related="group_id.fsm_order_id", string="Field Service Order",
         store=True)
 
-
-class StockLocationRoute(models.Model):
-    _inherit = 'stock.location.route'
-
-    fsm_selectable = fields.Boolean(string="Field Service Order Lines")
-    fsm_return_selectable = fields.Boolean(string="Field Service Return Lines")
-
-
 class StockPickingType(models.Model):
     _inherit = 'stock.picking.type'
 
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 6817fc4d0c..0c7bced2fc 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
-    <record id="stock_location_route_view_fsm" model="ir.ui.view">
-        <field name="name">stock.location.route.form</field>
-        <field name="model">stock.location.route</field>
-        <field name="inherit_id" ref="stock.stock_location_route_form_view"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='warehouse_ids']" position="after">
-                <field name="fsm_selectable" string="FSM Order Lines"/>
-                <field name="fsm_return_selectable"
-                       string="FSM Order Return Lines"/>
-            </xpath>
-        </field>
-    </record>
-
     <record id="stock_picking_type_kanban_helpdesk" model="ir.ui.view">
         <field name="name">stock.picking.type.kanban.helpdesk</field>
         <field name="model">stock.picking.type</field>

From 8a03330e16ef6316c438e16b20eb18ada424e718 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 10 May 2019 11:06:06 -0700
Subject: [PATCH 090/631] [FIX] Flake8 Error

---
 fieldservice_stock/models/stock.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 57e001542a..1c642f83e8 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class StockRequest(models.Model):
@@ -13,6 +13,7 @@ class StockRequest(models.Model):
     direction = fields.Selection([('outbound', 'Outbound'),
                                   ('inbound', 'Inbound')], string='Direction')
 
+
 class StockMoveLine(models.Model):
     _inherit = "stock.move.line"
 
@@ -64,6 +65,7 @@ class StockPicking(models.Model):
         related="group_id.fsm_order_id", string="Field Service Order",
         store=True)
 
+
 class StockPickingType(models.Model):
     _inherit = 'stock.picking.type'
 

From f513b6870363218ef728eec7023be2059766b672 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 10 May 2019 16:36:04 -0700
Subject: [PATCH 091/631] [IMP] Stock View Cleanup

---
 fieldservice_stock/views/stock.xml | 31 ------------------------------
 1 file changed, 31 deletions(-)

diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 0c7bced2fc..375d38977b 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -1,29 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="stock_picking_type_kanban_helpdesk" model="ir.ui.view">
-        <field name="name">stock.picking.type.kanban.helpdesk</field>
-        <field name="model">stock.picking.type</field>
-        <field name="inherit_id" ref="stock.stock_picking_type_kanban"/>
-        <field name="arch" type="xml">
-            <field name='count_picking_backorders' position='after'>
-                <field name='count_fsm_requests'/>
-            </field>
-            <xpath expr="//div[hasclass('col-6','o_kanban_primary_right')]/div[4]"
-                   position='after'>
-                <div t-if="record.count_fsm_requests.raw_value > 0"
-                     class="row">
-                    <div class="col-9">
-                        <a name="get_action_fsm_requests" type="object">
-                            Field Service
-                        </a>
-                    </div>
-                    <div class="col-3">
-                        <field name="count_fsm_requests"/>
-                    </div>
-                </div>
-            </xpath>
-        </field>
-    </record>
 
     <menuitem id="menu_fsm_product"
               name="Products"
@@ -37,11 +13,4 @@
               parent="fieldservice.reporting"
               sequence="30"/>
 
-    <!--  Operations / FSM Orders -->
-    <menuitem id="menu_stock_fsm_order"
-              name="FSM Orders"
-              action="action_stock_fsm_order"
-              parent="stock.menu_stock_warehouse_mgmt"
-              sequence="50"/>
-
 </odoo>

From 93072ef00e86afd275d916337ccfbe49f9ae2041 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 10 May 2019 19:14:11 -0500
Subject: [PATCH 092/631] Update stock.py

---
 fieldservice_stock/models/stock.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 1c642f83e8..1f682b53a4 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -64,25 +64,3 @@ class StockPicking(models.Model):
     fsm_order_id = fields.Many2one(
         related="group_id.fsm_order_id", string="Field Service Order",
         store=True)
-
-
-class StockPickingType(models.Model):
-    _inherit = 'stock.picking.type'
-
-    count_fsm_requests = fields.Integer(compute='_compute_fsm_request')
-
-    def _compute_fsm_request(self):
-        for ptype in self:
-            if ptype.code == 'outgoing':
-                res = self.env['fsm.order'].search(
-                    [('request_stage', '=', 'draft'),
-                     ('warehouse_id', '=', ptype.warehouse_id.id)])
-                ptype.count_fsm_requests = len(res)
-            if ptype.code == 'incoming':
-                res = self.env['fsm.order'].search(
-                    [('request_stage', '=', 'draft'),
-                     ('warehouse_id', '=', ptype.warehouse_id.id)])
-                ptype.count_fsm_requests = len(res)
-
-    def get_action_fsm_requests(self):
-        return self._get_action('fieldservice_stock.action_stock_fsm_order')

From de1dd616321688d95f4b59cebd935af1439187c0 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 10 May 2019 19:16:53 -0500
Subject: [PATCH 093/631] Update fsm_order.xml

---
 fieldservice_stock/views/fsm_order.xml | 103 -------------------------
 1 file changed, 103 deletions(-)

diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 17cfc0dd7d..472a56b85c 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -78,107 +78,4 @@
         </field>
     </record>
 
-    <!-- Inventory / Operations / FSM Orders -->
-    <record id="stock_fsm_order_form" model="ir.ui.view">
-        <field name="name">fsm.order.form</field>
-        <field name="model">fsm.order</field>
-        <field name="arch" type="xml">
-            <form string="FSM Order" create="false">
-                <header>
-                    <button name="action_request_confirm"
-                        string="Confirm" type="object"
-                        attrs="{'invisible': [('request_stage', 'not in', ['draft'])]}"/>
-                    <button name="action_request_cancel"
-                            attrs="{'invisible': [('request_stage', 'not in', ['draft','open'])]}"
-                            type="object" string="Cancel"/>
-                    <button name="action_request_draft" type="object"
-                            attrs="{'invisible': [('request_stage', 'not in', ['cancel'])]}"
-                            string="Set to Draft"/>
-                    <button name="action_request_done"
-                        string="Done" type="object"
-                        attrs="{'invisible': [('request_stage', 'not in', ['open'])]}"/>
-                    <field name='request_stage' widget="statusbar"/>
-                </header>
-                <sheet>
-                    <div class="oe_title">
-                        <h1><field name="name" readonly="1"/></h1>
-                    </div>
-                    <group>
-                        <group>
-                            <field name="customer_id" readonly="1"/>
-                            <field name="inventory_location_id"/>
-                        </group>
-                        <group>
-                            <field name="priority" widget="priority" readonly="1"/>
-                            <field name="warehouse_id"
-                                   groups="stock.group_stock_multi_warehouses"/>
-                        </group>
-                    </group>
-                    <field name="stock_request_ids" nolabel="1">
-                        <tree editable="bottom">
-                            <field name="name" readonly="1"/>
-                            <field name="product_id"/>
-                            <field name="product_uom_id"
-                                   options="{'no_open': True, 'no_create': True}"
-                                   groups="uom.group_uom"/>
-                            <field name="direction" required="1"/>
-                            <field name="route_id"
-                                   options="{'no_create': True}"
-                                   groups="stock.group_stock_multi_locations"/>
-                            <field name="route_ids" invisible="1"/>
-                            <field name="product_uom_qty"/>
-                            <field name="qty_in_progress"/>
-                            <field name="qty_done"/>
-                            <field name="expected_date" invisible="1"/>
-                            <field name="picking_policy"
-                                   invisible="1"/>
-                            <field name="warehouse_id" invisible="1"/>
-                            <field name="location_id" invisible="1"/>
-                            <field name="procurement_group_id"
-                                   invisible="1"/>
-                            <field name="company_id" invisible="1"/>
-                            <field name="state"/>
-                        </tree>
-                    </field>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="activity_ids" widget="mail_activity"/>
-                    <field name="message_ids" widget="mail_thread" options="{'post_refresh': 'recipients'}"/>
-                </div>
-            </form>
-        </field>
-    </record>
-
-    <record id="stock_fsm_order_tree" model="ir.ui.view">
-        <field name="name">fsm.order.tree</field>
-        <field name="model">fsm.order</field>
-        <field name="arch" type="xml">
-            <tree string="FSM Orders"
-                  default_order="scheduled_date_start"
-                  create="false">
-                <field name="name"/>
-                <field name="customer_id" />
-                <field name="request_stage"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="action_stock_fsm_order" model="ir.actions.act_window">
-        <field name="name">FSM Orders</field>
-        <field name="res_model">fsm.order</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain" eval="[('request_stage', '=', 'draft'), ('stock_request_ids', '!=', False)]"/>
-        <field name="view_ids"
-               eval="[(5, 0, 0),
-                      (0, 0, {'view_mode': 'tree', 'view_id': ref('fieldservice_stock.stock_fsm_order_tree')}),
-                      (0, 0, {'view_mode': 'form', 'view_id': ref('fieldservice_stock.stock_fsm_order_form')})]"/>
-        <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
-                No Field Service Orders to confirm.
-            </p>
-        </field>
-    </record>
-
 </odoo>

From e99a6c9314cc8368e6d7bc94df11896414d82a77 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 10 May 2019 19:39:38 -0500
Subject: [PATCH 094/631] Update __manifest__.py

---
 fieldservice_stock/__manifest__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 9182d93375..c02e0e6ca5 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -12,7 +12,7 @@
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice',
-        'stock_request',
+        'stock_request_picking_type',
     ],
     'data': [
         'security/ir.model.access.csv',
@@ -24,7 +24,6 @@
         'views/product_template.xml',
         'views/stock_production_lot.xml',
     ],
-    'installable': True,
     'license': 'AGPL-3',
     'development_status': 'Beta',
     'maintainers': [

From 8b0968139918e72030461a65698561b9e6dc8427 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Mon, 13 May 2019 16:05:03 -0700
Subject: [PATCH 095/631] [IMP] fieldservice

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

diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
index 8dd0cd9eec..eb8f3b4b38 100644
--- a/fieldservice_stock/models/fsm_location.py
+++ b/fieldservice_stock/models/fsm_location.py
@@ -12,7 +12,7 @@ class FSMLocation(models.Model):
                                             required=True)
 
     @api.onchange('fsm_parent_id')
-    def _onchange_fsm_parent_id(self):
-        super(FSMLocation, self)._onchange_fsm_parent_id()
+    def _onchange_parent_id(self):
+        super(FSMLocation, self)._onchange_parent_id()
         self.inventory_location_id = \
             self.fsm_parent_id.inventory_location_id.id

From 42ff87bbf16ab01a8725656a95aed884636fb792 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 24 May 2019 08:52:41 -0700
Subject: [PATCH 096/631] [IMP] Github Comments

---
 fieldservice_stock/views/stock.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 375d38977b..41cf3f79e0 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -13,4 +13,13 @@
               parent="fieldservice.reporting"
               sequence="30"/>
 
+<<<<<<< HEAD
+=======
+    <menuitem id="menu_fsm_stock_request"
+              name="Stock Requests"
+              action="stock_request.stock_request_order_action"
+              parent="fieldservice.operations"
+              sequence="20"/>
+
+>>>>>>> d945fc7... [IMP] Github Comments
 </odoo>

From dc95f8b863ee0889e9db987512c4645d58e95c15 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 24 May 2019 17:52:52 -0500
Subject: [PATCH 097/631] [IMP] fieldservice_account: #135 Contractor Cost
 Check

---
 fieldservice_stock/models/fsm_location.py | 4 ++--
 fieldservice_stock/views/stock.xml        | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
index eb8f3b4b38..8dd0cd9eec 100644
--- a/fieldservice_stock/models/fsm_location.py
+++ b/fieldservice_stock/models/fsm_location.py
@@ -12,7 +12,7 @@ class FSMLocation(models.Model):
                                             required=True)
 
     @api.onchange('fsm_parent_id')
-    def _onchange_parent_id(self):
-        super(FSMLocation, self)._onchange_parent_id()
+    def _onchange_fsm_parent_id(self):
+        super(FSMLocation, self)._onchange_fsm_parent_id()
         self.inventory_location_id = \
             self.fsm_parent_id.inventory_location_id.id
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 41cf3f79e0..d89ea7d83e 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -13,13 +13,10 @@
               parent="fieldservice.reporting"
               sequence="30"/>
 
-<<<<<<< HEAD
-=======
     <menuitem id="menu_fsm_stock_request"
               name="Stock Requests"
               action="stock_request.stock_request_order_action"
               parent="fieldservice.operations"
               sequence="20"/>
 
->>>>>>> d945fc7... [IMP] Github Comments
 </odoo>

From e561d5f3daa70e736daf152e37e771161fefca3b Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 27 May 2019 08:30:50 -0500
Subject: [PATCH 098/631] [FIX] fieldservice_stock

---
 fieldservice_stock/models/fsm_order.py | 31 +++++---------------------
 fieldservice_stock/models/stock.py     |  8 +++----
 fieldservice_stock/views/fsm_order.xml |  5 +----
 3 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 2d77dbb547..b16f31b0e1 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -8,6 +8,7 @@
 
 REQUEST_STATES = [
     ('draft', 'Draft'),
+    ('submit', 'Submitted'),
     ('open', 'In progress'),
     ('done', 'Done'),
     ('cancel', 'Cancelled')]
@@ -45,29 +46,18 @@ def _default_warehouse_id(self):
                                      store=True)
 
     @api.multi
-    def action_request_confirm(self):
+    def action_request_submit(self):
         for rec in self:
             if not rec.stock_request_ids:
-                raise UserError(_('Please select a Order Lines.'))
-            group_id = rec.procurement_group_id or False
-            if not group_id:
-                group_id = self.env['procurement.group'].create({
-                    'name': rec.name,
-                    'move_type': 'direct',
-                    'fsm_order_id': rec.id,
-                    'partner_id': rec.customer_id.id,
-                })
-                rec.procurement_group_id = group_id.id
+                raise UserError(_('Please create a stock request.'))
             for line in rec.stock_request_ids:
-                line.write({'procurement_group_id': group_id.id,
-                            'location_id': rec.inventory_location_id.id})
                 line.action_confirm()
-            rec.request_stage = 'open'
+            rec.request_stage = 'submitted'
 
     def action_request_cancel(self):
         for rec in self:
             if not rec.stock_request_ids:
-                raise UserError(_('Please select a Order Lines.'))
+                raise UserError(_('Please create a stock request.'))
             for line in rec.stock_request_ids:
                 line.action_cancel()
             rec.request_stage = 'cancel'
@@ -76,20 +66,11 @@ def action_request_cancel(self):
     def action_request_draft(self):
         for rec in self:
             if not rec.stock_request_ids:
-                raise UserError(_('Please select a Order Lines.'))
+                raise UserError(_('Please create a stock request.'))
             for line in rec.stock_request_ids:
                 line.action_draft()
             rec.request_stage = 'draft'
 
-    @api.multi
-    def action_request_done(self):
-        for rec in self:
-            if not rec.stock_request_ids:
-                raise UserError(_('Please select a Order Lines.'))
-            for line in rec.stock_request_ids:
-                line.action_done()
-            rec.request_stage = 'done'
-
     @api.depends('picking_ids')
     def _compute_picking_ids(self):
         for order in self:
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 1f682b53a4..e273ebebfc 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -20,10 +20,10 @@ class StockMoveLine(models.Model):
     def _action_done(self):
         res = super(StockMoveLine, self)._action_done()
         for rec in self:
-            for all_rec in rec.move_id.allocation_ids:
-                request = all_rec.stock_request_id
-                if request.state == 'done' and request.fsm_order_id:
-                    request.fsm_order_id.request_stage = 'done'
+            if rec.move_id and rec.move_id.allocation_ids:
+                for request in rec.move_id.allocation_ids:
+                    if request.state == 'done' and request.fsm_order_id:
+                        request.fsm_order_id.request_stage = 'done'
         return res
 
 
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 472a56b85c..cc6e1791a8 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -26,15 +26,12 @@
             <xpath expr="//notebook/page[1]" position="after">
                 <page string="Inventory">
                     <header>
-                        <button name="action_request_confirm"
+                        <button name="action_request_submit"
                                 attrs="{'invisible': [('request_stage', 'not in', ['draft'])]}"
                                 type="object" class="oe_highlight" string="Submit"/>
                         <button name="action_request_draft" type="object"
                                 attrs="{'invisible': [('request_stage', 'not in', ['cancel'])]}"
                                 class="oe_highlight" string="Set to Draft"/>
-                        <button name="action_request_done"
-                            string="Done" type="object"
-                            class="oe_highlight" attrs="{'invisible': [('request_stage', 'not in', ['open'])]}"/>
                         <button name="action_request_cancel"
                                 attrs="{'invisible': [('request_stage', 'not in', ['draft','open'])]}"
                                 type="object" class="oe_highlight" string="Cancel"/>

From a15311ab6a18379cd4d04740484d8e423b3feb9e Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 29 May 2019 23:03:47 -0500
Subject: [PATCH 099/631] [IMP] fieldservice_stock: Add direction to views

---
 fieldservice_stock/views/fsm_order.xml |  2 +-
 fieldservice_stock/views/stock.xml     | 36 +++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index cc6e1791a8..348e8a5119 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -34,7 +34,7 @@
                                 class="oe_highlight" string="Set to Draft"/>
                         <button name="action_request_cancel"
                                 attrs="{'invisible': [('request_stage', 'not in', ['draft','open'])]}"
-                                type="object" class="oe_highlight" string="Cancel"/>
+                                type="object" string="Cancel"/>
                         <field name='request_stage' widget="statusbar"/>
                     </header>
                     <group groups="stock.group_stock_user">
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index d89ea7d83e..cee0ecfecc 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -1,6 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <!-- Stock Request Views -->
+    <record id="stock_request_tree" model="ir.ui.view">
+        <field name="name">stock.request.tree.direction</field>
+        <field name="model">stock.request</field>
+        <field name="inherit_id" ref="stock_request.view_stock_request_tree"/>
+        <field name="arch" type="xml">
+            <field name="location_id" position="after">
+                <field name="direction"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="stock_request_form" model="ir.ui.view">
+        <field name="name">stock.request.form.direction</field>
+        <field name="model">stock.request</field>
+        <field name="inherit_id" ref="stock_request.view_stock_request_form"/>
+        <field name="arch" type="xml">
+            <field name="location_id" position="after">
+                <field name="direction"/>
+            </field>
+        </field>
+    </record>
+
+    <!-- Menu Items -->
+    <menuitem id="menu_fsm_stock_request"
+              name="Stock Requests"
+              action="stock_request.stock_request_order_action"
+              parent="fieldservice.operations"
+              sequence="90"/>
+
     <menuitem id="menu_fsm_product"
               name="Products"
               action="stock.product_template_action_product"
@@ -13,10 +43,4 @@
               parent="fieldservice.reporting"
               sequence="30"/>
 
-    <menuitem id="menu_fsm_stock_request"
-              name="Stock Requests"
-              action="stock_request.stock_request_order_action"
-              parent="fieldservice.operations"
-              sequence="20"/>
-
 </odoo>

From f341de1e95408d9b796f4986ded1797d33055a3f Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 30 May 2019 00:25:44 -0500
Subject: [PATCH 100/631] [FIX] fieldservice_stock

---
 fieldservice_stock/models/fsm_order.py |  2 +-
 fieldservice_stock/models/stock.py     | 18 ++++++++++++++++--
 fieldservice_stock/views/fsm_order.xml |  8 +++-----
 fieldservice_stock/views/stock.xml     |  2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index b16f31b0e1..6b3db36a86 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -8,7 +8,7 @@
 
 REQUEST_STATES = [
     ('draft', 'Draft'),
-    ('submit', 'Submitted'),
+    ('submitted', 'Submitted'),
     ('open', 'In progress'),
     ('done', 'Done'),
     ('cancel', 'Cancelled')]
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index e273ebebfc..77ec424720 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class StockRequest(models.Model):
@@ -11,7 +11,21 @@ class StockRequest(models.Model):
         'fsm.order', string="FSM Order", ondelete='cascade',
         index=True, copy=False)
     direction = fields.Selection([('outbound', 'Outbound'),
-                                  ('inbound', 'Inbound')], string='Direction')
+                                  ('inbound', 'Inbound')],
+                                 string='Direction',
+                                 states={'draft': [('readonly', False)]},
+                                 readonly=True)
+
+    @api.onchange('direction', 'fsm_order_id')
+    def _onchange_location_id(self):
+        if self.direction == 'outbound':
+            # Inventory location of the FSM location of the order
+            self.location_id = \
+                self.fsm_order_id.location_id.inventory_location_id.id
+        else:
+            # Otherwise the stock location of the warehouse
+            self.location_id = \
+                self.fsm_order_id.warehouse_id.lot_stock_id.id
 
 
 class StockMoveLine(models.Model):
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 348e8a5119..1f86cf3560 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -59,13 +59,11 @@
                             <field name="product_uom_qty"/>
                             <field name="qty_in_progress"/>
                             <field name="qty_done"/>
-                            <field name="expected_date" invisible="1"/>
-                            <field name="picking_policy"
-                                   invisible="1"/>
+                            <field name="expected_date"/>
+                            <field name="picking_policy" invisible="1"/>
                             <field name="warehouse_id" invisible="1"/>
                             <field name="location_id" invisible="1"/>
-                            <field name="procurement_group_id"
-                                   invisible="1"/>
+                            <field name="procurement_group_id" invisible="1"/>
                             <field name="company_id" invisible="1"/>
                             <field name="state"/>
                         </tree>
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index cee0ecfecc..382375f1ae 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -27,7 +27,7 @@
     <!-- Menu Items -->
     <menuitem id="menu_fsm_stock_request"
               name="Stock Requests"
-              action="stock_request.stock_request_order_action"
+              action="stock_request.action_stock_request_form"
               parent="fieldservice.operations"
               sequence="90"/>
 

From f9c5bd1fcd99a92a1d8bcd489d5ffcc79c05fb11 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 30 May 2019 01:42:47 -0500
Subject: [PATCH 101/631] [FIX] fieldservice_stock: reset the stage

---
 fieldservice_stock/models/stock.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 77ec424720..3bedd24afa 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -27,6 +27,13 @@ def _onchange_location_id(self):
             self.location_id = \
                 self.fsm_order_id.warehouse_id.lot_stock_id.id
 
+    @api.model
+    def create(self, vals):
+        res = super().create(vals)
+        if 'fsm_order_id' in vals:
+            fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
+            fsm_order.write({'request_stage': 'draft'})
+        return res
 
 class StockMoveLine(models.Model):
     _inherit = "stock.move.line"

From f65afb490ad153292ae69ea5b0e6da2b1acafbf2 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 30 May 2019 13:36:19 -0500
Subject: [PATCH 102/631] Update stock.py

---
 fieldservice_stock/models/stock.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 3bedd24afa..c396b281f6 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -35,6 +35,7 @@ def create(self, vals):
             fsm_order.write({'request_stage': 'draft'})
         return res
 
+
 class StockMoveLine(models.Model):
     _inherit = "stock.move.line"
 

From d4dfecb36c1b5afe8cb6b9bfc18757a1674bea43 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 20 Jun 2019 08:33:28 -0700
Subject: [PATCH 103/631] [IMP] Add FSM Order to Request, Submit Draft

[IMP] Hide Route

[IMP] Travis Greenlight

[IMP] Stock Move Update

[IMP] Remove pdb
---
 fieldservice_stock/__manifest__.py         |  1 +
 fieldservice_stock/models/__init__.py      |  3 ++-
 fieldservice_stock/models/fsm_order.py     |  3 ++-
 fieldservice_stock/models/stock.py         | 10 ++++++----
 fieldservice_stock/models/stock_request.py | 10 ++++++++++
 fieldservice_stock/views/fsm_order.xml     |  3 ++-
 fieldservice_stock/views/stock_request.xml | 14 ++++++++++++++
 7 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 fieldservice_stock/models/stock_request.py
 create mode 100644 fieldservice_stock/views/stock_request.xml

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index c02e0e6ca5..cadbca2555 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -23,6 +23,7 @@
         'views/fsm_equipment.xml',
         'views/product_template.xml',
         'views/stock_production_lot.xml',
+        'views/stock_request.xml'
     ],
     'license': 'AGPL-3',
     'development_status': 'Beta',
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index f4642be675..d29faa52d6 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -8,5 +8,6 @@
     fsm_equipment,
     product_template,
     stock_production_lot,
-    fsm_wizard
+    fsm_wizard,
+    stock_request
 )
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 6b3db36a86..49f82a5608 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -51,7 +51,8 @@ def action_request_submit(self):
             if not rec.stock_request_ids:
                 raise UserError(_('Please create a stock request.'))
             for line in rec.stock_request_ids:
-                line.action_confirm()
+                if line.state == 'draft':
+                    line.action_confirm()
             rec.request_stage = 'submitted'
 
     def action_request_cancel(self):
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index c396b281f6..6ba941ab63 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -44,8 +44,10 @@ def _action_done(self):
         for rec in self:
             if rec.move_id and rec.move_id.allocation_ids:
                 for request in rec.move_id.allocation_ids:
-                    if request.state == 'done' and request.fsm_order_id:
-                        request.fsm_order_id.request_stage = 'done'
+                    if (request.stock_request_id.state == 'done'
+                            and request.stock_request_id.fsm_order_id):
+                        request.stock_request_id.\
+                            fsm_order_id.request_stage = 'done'
         return res
 
 
@@ -58,8 +60,8 @@ def prepare_equipment_values(self, move_line):
             'product_id': move_line.product_id.id,
             'lot_id': move_line.lot_id.id,
             'current_location_id':
-            move_line.request_id.fsm_order_id.location_id.id,
-            'current_stock_location_id': move_line.dest_location_id.id}
+            move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
+            'current_stock_location_id': move_line.location_dest_id.id}
 
     def _action_done(self):
         res = False
diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
new file mode 100644
index 0000000000..bf665eb12e
--- /dev/null
+++ b/fieldservice_stock/models/stock_request.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class StockRequest(models.Model):
+    _inherit = 'stock.request'
+
+    fsm_order_id = fields.Many2one('fsm.order', string="FSM Order")
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 1f86cf3560..0842178aed 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -54,7 +54,8 @@
                             <field name="direction" required="1"/>
                             <field name="route_id"
                                    options="{'no_create': True}"
-                                   groups="stock.group_stock_multi_locations"/>
+                                   groups="stock.group_stock_multi_locations"
+                                   invisible="1"/>
                             <field name="route_ids" invisible="1"/>
                             <field name="product_uom_qty"/>
                             <field name="qty_in_progress"/>
diff --git a/fieldservice_stock/views/stock_request.xml b/fieldservice_stock/views/stock_request.xml
new file mode 100644
index 0000000000..b8ca24b32a
--- /dev/null
+++ b/fieldservice_stock/views/stock_request.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="stock_request_fsm_order" model="ir.ui.view">
+        <field name="model">stock.request</field>
+        <field name="inherit_id" ref="stock_request.view_stock_request_form"/>
+        <field name="arch" type="xml">
+            <field name="picking_policy" position="after">
+                <field name="fsm_order_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>

From 9e37510ace863db88a9cc9e2bf848cc67c50dc76 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 17 Jul 2019 14:08:50 -0500
Subject: [PATCH 104/631] [IMP] fieldservice_stock: Remove description

[UPD] README.rst
---
 fieldservice_stock/models/fsm_equipment.py       | 1 -
 fieldservice_stock/static/description/index.html | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/fieldservice_stock/models/fsm_equipment.py b/fieldservice_stock/models/fsm_equipment.py
index 158fa8962f..b395666caf 100644
--- a/fieldservice_stock/models/fsm_equipment.py
+++ b/fieldservice_stock/models/fsm_equipment.py
@@ -6,7 +6,6 @@
 
 class FSMEquipment(models.Model):
     _inherit = 'fsm.equipment'
-    _description = "FSM Equipment Inherits"
 
     product_id = fields.Many2one(
         'product.product', string='Product', required=True)
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index c85772438a..6177036f81 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/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 - Stock</title>
 <style type="text/css">
 

From 4ee43fb738778c3999e7920da41bd8816f3f4377 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 13 Jun 2019 15:18:27 -0700
Subject: [PATCH 105/631] [IMP] fieldservice_stock: Use stock request

---
 fieldservice_stock/__manifest__.py            |  4 +-
 fieldservice_stock/models/__init__.py         |  3 +-
 fieldservice_stock/models/fsm_order.py        | 18 +++-
 fieldservice_stock/models/stock.py            | 49 ++++------
 fieldservice_stock/models/stock_request.py    | 89 ++++++++++++++++++-
 .../models/stock_request_order.py             | 54 +++++++++++
 fieldservice_stock/views/fsm_order.xml        |  2 +-
 fieldservice_stock/views/stock.xml            | 24 -----
 fieldservice_stock/views/stock_request.xml    | 12 ++-
 .../views/stock_request_order.xml             | 53 +++++++++++
 10 files changed, 242 insertions(+), 66 deletions(-)
 create mode 100644 fieldservice_stock/models/stock_request_order.py
 create mode 100644 fieldservice_stock/views/stock_request_order.xml

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index cadbca2555..8664c6e26f 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -12,6 +12,7 @@
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice',
+        'stock_request_direction',
         'stock_request_picking_type',
     ],
     'data': [
@@ -23,7 +24,8 @@
         'views/fsm_equipment.xml',
         'views/product_template.xml',
         'views/stock_production_lot.xml',
-        'views/stock_request.xml'
+        'views/stock_request.xml',
+        'views/stock_request_order.xml',
     ],
     'license': 'AGPL-3',
     'development_status': 'Beta',
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index d29faa52d6..5fe2a60c1d 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -9,5 +9,6 @@
     product_template,
     stock_production_lot,
     fsm_wizard,
-    stock_request
+    stock_request,
+    stock_request_order,
 )
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 49f82a5608..7531180efa 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -52,15 +52,23 @@ def action_request_submit(self):
                 raise UserError(_('Please create a stock request.'))
             for line in rec.stock_request_ids:
                 if line.state == 'draft':
-                    line.action_confirm()
+                    if line.order_id:
+                        line.order_id.action_confirm()
+                    else:
+                        line.action_confirm()
             rec.request_stage = 'submitted'
 
+    @api.multi
     def action_request_cancel(self):
         for rec in self:
             if not rec.stock_request_ids:
                 raise UserError(_('Please create a stock request.'))
             for line in rec.stock_request_ids:
-                line.action_cancel()
+                if line.state in ('draft', 'submitted'):
+                    if line.order_id:
+                        line.order_id.action_cancel()
+                    else:
+                        line.action_cancel()
             rec.request_stage = 'cancel'
 
     @api.multi
@@ -69,7 +77,11 @@ def action_request_draft(self):
             if not rec.stock_request_ids:
                 raise UserError(_('Please create a stock request.'))
             for line in rec.stock_request_ids:
-                line.action_draft()
+                if line.state == 'cancel':
+                    if line.order_id:
+                        line.order_id.action_draft()
+                    else:
+                        line.action_draft()
             rec.request_stage = 'draft'
 
     @api.depends('picking_ids')
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 6ba941ab63..18b1804974 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -1,39 +1,7 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
-
-
-class StockRequest(models.Model):
-    _inherit = "stock.request"
-
-    fsm_order_id = fields.Many2one(
-        'fsm.order', string="FSM Order", ondelete='cascade',
-        index=True, copy=False)
-    direction = fields.Selection([('outbound', 'Outbound'),
-                                  ('inbound', 'Inbound')],
-                                 string='Direction',
-                                 states={'draft': [('readonly', False)]},
-                                 readonly=True)
-
-    @api.onchange('direction', 'fsm_order_id')
-    def _onchange_location_id(self):
-        if self.direction == 'outbound':
-            # Inventory location of the FSM location of the order
-            self.location_id = \
-                self.fsm_order_id.location_id.inventory_location_id.id
-        else:
-            # Otherwise the stock location of the warehouse
-            self.location_id = \
-                self.fsm_order_id.warehouse_id.lot_stock_id.id
-
-    @api.model
-    def create(self, vals):
-        res = super().create(vals)
-        if 'fsm_order_id' in vals:
-            fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
-            fsm_order.write({'request_stage': 'draft'})
-        return res
+from odoo import fields, models
 
 
 class StockMoveLine(models.Model):
@@ -54,6 +22,8 @@ def _action_done(self):
 class StockMove(models.Model):
     _inherit = "stock.move"
 
+    fsm_order_id = fields.Many2one('fsm.order', string='Field Service Order')
+
     def prepare_equipment_values(self, move_line):
         return {'name': '%s (%s)' % (
             move_line.product_id.name, move_line.lot_id.name),
@@ -82,6 +52,19 @@ class ProcurementGroup(models.Model):
     fsm_order_id = fields.Many2one('fsm.order', 'Field Service Order')
 
 
+class StockRule(models.Model):
+    _inherit = 'stock.rule'
+
+    def _get_stock_move_values(self, product_id, product_qty, product_uom,
+                               location_id, name, origin, values, group_id):
+        vals = super()._get_stock_move_values(
+            product_id, product_qty, product_uom, location_id, name, origin,
+            values, group_id)
+        vals.update({
+            'fsm_order_id': values.get('fsm_order_id'),
+        })
+        return vals
+
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
index bf665eb12e..92433b3247 100644
--- a/fieldservice_stock/models/stock_request.py
+++ b/fieldservice_stock/models/stock_request.py
@@ -1,10 +1,95 @@
 # Copyright (C) 2019 - TODAY, 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 StockRequest(models.Model):
     _inherit = 'stock.request'
 
-    fsm_order_id = fields.Many2one('fsm.order', string="FSM Order")
+    fsm_order_id = fields.Many2one(
+        'fsm.order', string="FSM Order", ondelete='cascade',
+        index=True, copy=False)
+
+    @api.onchange('direction', 'fsm_order_id')
+    def _onchange_location_id(self):
+        super()._onchange_location_id()
+        if self.fsm_order_id:
+            if self.direction == 'outbound':
+                # Inventory location of the FSM location of the order
+                self.location_id = \
+                    self.fsm_order_id.location_id.inventory_location_id.id
+            else:
+                # Otherwise the stock location of the warehouse
+                self.location_id = \
+                    self.fsm_order_id.warehouse_id.lot_stock_id.id
+
+    def prepare_order_values(self, vals):
+        res = {
+            'expected_date': vals['expected_date'],
+            'picking_policy': vals['picking_policy'],
+            'warehouse_id': vals['warehouse_id'],
+            'direction': vals['direction'],
+            'location_id': vals['location_id'],
+        }
+        if 'fsm_order_id' in vals and vals['fsm_order_id']:
+            res.update({'fsm_order_id': vals['fsm_order_id']})
+        return res
+
+    @api.model
+    def create(self, vals):
+        res = super().create(vals)
+        if 'fsm_order_id' in vals and vals['fsm_order_id']:
+            fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
+            fsm_order.request_stage = 'draft'
+            order = self.env['stock.request.order'].search([
+                ('fsm_order_id', '=', vals['fsm_order_id']),
+                ('direction', '=', vals['direction']),
+                ('expected_date', '=', vals['expected_date']),
+                ('state', '=', 'draft')
+            ])
+            if order:
+                res.order_id = order.id
+            else:
+                values = self.prepare_order_values(vals)
+                res.order_id = self.env['stock.request.order'].create(values)
+        return res
+
+    def _prepare_procurement_values(self, group_id=False):
+        res = super()._prepare_procurement_values(group_id=group_id)
+        if self.fsm_order_id:
+            res.update({
+                'fsm_order_id': self.fsm_order_id.id,
+                'partner_id':
+                    self.fsm_order_id.location_id.shipping_address_id.id or
+                    self.fsm_order_id.location_id.partner_id.id
+            })
+        return res
+
+    def _prepare_procurement_group_values(self):
+        if self.fsm_order_id:
+            order = self.env['fsm.order'].browse(self.fsm_order_id.id)
+            return {'name': order.name,
+                    'fsm_order_id': order.id,
+                    'move_type': 'direct'}
+        else:
+            return {}
+
+    @api.multi
+    def _action_confirm(self):
+        for req in self:
+            if (not req.procurement_group_id) and req.fsm_order_id:
+                fsm_order = self.env['fsm.order'].browse(req.fsm_order_id.id)
+                group = self.env['procurement.group'].search([
+                    ('fsm_order_id', '=', fsm_order.id)])
+                if not group:
+                    values = req._prepare_procurement_group_values()
+                    group = req.env['procurement.group'].create(values)
+                if req.order_id:
+                    req.order_id.procurement_group_id = group.id
+                req.procurement_group_id = group.id
+                res = super(StockRequest, req)._action_confirm()
+                fsm_order.request_stage = 'open'
+            else:
+                res = super(StockRequest, req)._action_confirm()
+        return res
diff --git a/fieldservice_stock/models/stock_request_order.py b/fieldservice_stock/models/stock_request_order.py
new file mode 100644
index 0000000000..827f047a56
--- /dev/null
+++ b/fieldservice_stock/models/stock_request_order.py
@@ -0,0 +1,54 @@
+# 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 StockRequestOrder(models.Model):
+    _inherit = 'stock.request.order'
+
+    fsm_order_id = fields.Many2one(
+        'fsm.order', string="FSM Order", ondelete='cascade',
+        index=True, copy=False)
+
+    @api.onchange('direction', 'fsm_order_id')
+    def _onchange_location_id(self):
+        super()._onchange_location_id()
+        if self.fsm_order_id:
+            if self.direction == 'outbound':
+                # Inventory location of the FSM location of the order
+                self.location_id = \
+                    self.fsm_order_id.location_id.inventory_location_id.id
+            else:
+                # Otherwise the stock location of the warehouse
+                self.location_id = \
+                    self.fsm_order_id.warehouse_id.lot_stock_id.id
+        self.change_childs()
+
+    def change_childs(self):
+        super().change_childs()
+        if not self._context.get('no_change_childs', False):
+            for line in self.stock_request_ids:
+                line.fsm_order_id = self.fsm_order_id.id
+
+    def _prepare_procurement_group_values(self):
+        if self.fsm_order_id:
+            order = self.env['fsm.order'].browse(self.fsm_order_id.id)
+            return {'name': order.name,
+                    'fsm_order_id': order.id,
+                    'move_type': 'direct'}
+        else:
+            return {}
+
+    @api.multi
+    def _action_confirm(self):
+        if self.fsm_order_id:
+            fsm_order = self.env['fsm.order'].browse(self.fsm_order_id.id)
+            group = self.env['procurement.group'].search([
+                ('fsm_order_id', '=', fsm_order.id)])
+            if not group:
+                values = self._prepare_procurement_group_values()
+                group = self.env['procurement.group'].create(values)
+            self.procurement_group_id = group.id
+            self.change_childs()
+        return super()._action_confirm()
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 0842178aed..8efde56e0e 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -33,7 +33,7 @@
                                 attrs="{'invisible': [('request_stage', 'not in', ['cancel'])]}"
                                 class="oe_highlight" string="Set to Draft"/>
                         <button name="action_request_cancel"
-                                attrs="{'invisible': [('request_stage', 'not in', ['draft','open'])]}"
+                                attrs="{'invisible': [('request_stage', 'not in', ['draft','submitted','open'])]}"
                                 type="object" string="Cancel"/>
                         <field name='request_stage' widget="statusbar"/>
                     </header>
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 382375f1ae..edabe5eb06 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -1,29 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <!-- Stock Request Views -->
-    <record id="stock_request_tree" model="ir.ui.view">
-        <field name="name">stock.request.tree.direction</field>
-        <field name="model">stock.request</field>
-        <field name="inherit_id" ref="stock_request.view_stock_request_tree"/>
-        <field name="arch" type="xml">
-            <field name="location_id" position="after">
-                <field name="direction"/>
-            </field>
-        </field>
-    </record>
-
-    <record id="stock_request_form" model="ir.ui.view">
-        <field name="name">stock.request.form.direction</field>
-        <field name="model">stock.request</field>
-        <field name="inherit_id" ref="stock_request.view_stock_request_form"/>
-        <field name="arch" type="xml">
-            <field name="location_id" position="after">
-                <field name="direction"/>
-            </field>
-        </field>
-    </record>
-
     <!-- Menu Items -->
     <menuitem id="menu_fsm_stock_request"
               name="Stock Requests"
diff --git a/fieldservice_stock/views/stock_request.xml b/fieldservice_stock/views/stock_request.xml
index b8ca24b32a..c7736fbde7 100644
--- a/fieldservice_stock/views/stock_request.xml
+++ b/fieldservice_stock/views/stock_request.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="stock_request_fsm_order" model="ir.ui.view">
+    <record id="stock_request_fsm_order_form" model="ir.ui.view">
         <field name="model">stock.request</field>
         <field name="inherit_id" ref="stock_request.view_stock_request_form"/>
         <field name="arch" type="xml">
@@ -11,4 +11,14 @@
         </field>
     </record>
 
+    <record id="stock_request_fsm_order_tree" model="ir.ui.view">
+        <field name="model">stock.request</field>
+        <field name="inherit_id" ref="stock_request.view_stock_request_tree"/>
+        <field name="arch" type="xml">
+            <field name="product_id" position="after">
+                <field name="fsm_order_id"/>
+            </field>
+        </field>
+    </record>
+
 </odoo>
diff --git a/fieldservice_stock/views/stock_request_order.xml b/fieldservice_stock/views/stock_request_order.xml
new file mode 100644
index 0000000000..0a8c434efb
--- /dev/null
+++ b/fieldservice_stock/views/stock_request_order.xml
@@ -0,0 +1,53 @@
+<odoo>
+
+    <record id="stock_request_order_fsm_order_form" model="ir.ui.view">
+        <field name="model">stock.request.order</field>
+        <field name="inherit_id" ref="stock_request.stock_request_order_form"/>
+        <field name="arch" type="xml">
+            <field name="picking_policy" position="after">
+                <field name="fsm_order_id"/>
+            </field>
+            <field name="stock_request_ids" position="attributes">
+              <attribute name="context">{
+                  'default_fsm_order_id': fsm_order_id,
+                  'default_expected_date': expected_date,
+                  'default_picking_policy': picking_policy,
+                  'default_warehouse_id': warehouse_id,
+                  'default_direction': direction,
+                  'default_location_id': location_id,
+                  'default_procurement_group_id': procurement_group_id,
+                  'default_company_id': company_id,
+                  'default_state': state}</attribute>
+            </field>
+            <xpath expr="//field[@name='stock_request_ids']/tree/field[@name='direction']"
+                   position="after">
+                <field name="fsm_order_id" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="stock_request_order_fsm_order_tree" model="ir.ui.view">
+        <field name="model">stock.request.order</field>
+        <field name="inherit_id" ref="stock_request.stock_request_order_tree"/>
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="fsm_order_id"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="stock_request_order_fsm_order_search" model="ir.ui.view">
+        <field name="model">stock.request.order</field>
+        <field name="inherit_id" ref="stock_request_picking_type.view_stock_request_order_filter"/>
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="fsm_order_id"/>
+            </field>
+            <filter name="state" position="before">
+                <filter string="FSM Order" name="fsm_order_id" domain="[]"
+                        context="{'group_by': 'fsm_order_id'}"/>
+            </filter>
+        </field>
+    </record>
+
+</odoo>

From 85a4f8a872294d7a73542fa419bd10670965f57b Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 1 Aug 2019 13:39:49 -0500
Subject: [PATCH 106/631] [FIX] fieldservice_stock: Missing shipping_address_id
 field

---
 fieldservice_stock/models/fsm_location.py | 2 ++
 fieldservice_stock/views/fsm_location.xml | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
index 8dd0cd9eec..371c2c66a8 100644
--- a/fieldservice_stock/models/fsm_location.py
+++ b/fieldservice_stock/models/fsm_location.py
@@ -10,6 +10,8 @@ class FSMLocation(models.Model):
     inventory_location_id = fields.Many2one('stock.location',
                                             string='Inventory Location',
                                             required=True)
+    shipping_address_id = fields.Many2one('res.partner',
+                                          string='Shipping Location')
 
     @api.onchange('fsm_parent_id')
     def _onchange_fsm_parent_id(self):
diff --git a/fieldservice_stock/views/fsm_location.xml b/fieldservice_stock/views/fsm_location.xml
index 658e2758bf..3e492e30d1 100644
--- a/fieldservice_stock/views/fsm_location.xml
+++ b/fieldservice_stock/views/fsm_location.xml
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <!-- Copyright (C) 2018 Brian McMaster
+         Copyright (C) 2019 Open Source Integrators
+         License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
     <record id="fsm_location_stock_form_view" model="ir.ui.view">
         <field name="model">fsm.location</field>
         <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
         <field name="arch" type="xml">
+            <xpath expr="//field[@name='customer_id']" position="after">
+                <field name="shipping_address_id"/>
+            </xpath>
             <xpath expr="//form/sheet/group/group[2]" position="inside">
                 <field name="inventory_location_id"
                        domain="[('usage', 'in', ['internal', 'supplier', 'customer'])]"/>

From a50dc8899760794ede2960ac4208fa03c854ec47 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 2 Aug 2019 09:54:26 -0500
Subject: [PATCH 107/631] [FIX] fieldservice_stock: Element cannot be located
 in parent view

---
 fieldservice_stock/views/stock_request_order.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_stock/views/stock_request_order.xml b/fieldservice_stock/views/stock_request_order.xml
index 0a8c434efb..b13d8b4b35 100644
--- a/fieldservice_stock/views/stock_request_order.xml
+++ b/fieldservice_stock/views/stock_request_order.xml
@@ -19,7 +19,7 @@
                   'default_company_id': company_id,
                   'default_state': state}</attribute>
             </field>
-            <xpath expr="//field[@name='stock_request_ids']/tree/field[@name='direction']"
+            <xpath expr="//field[@name='stock_request_ids']/tree/field[@name='product_id']"
                    position="after">
                 <field name="fsm_order_id" invisible="1"/>
             </xpath>

From 00cf494d90fe0d051a5a4e1b7acd3e7fcd1ef77e Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Tue, 6 Aug 2019 09:08:35 -0700
Subject: [PATCH 108/631] [FIX] Group SR's into same SRO

---
 fieldservice_stock/models/stock_request.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
index 92433b3247..5ec5d69b58 100644
--- a/fieldservice_stock/models/stock_request.py
+++ b/fieldservice_stock/models/stock_request.py
@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models
+from datetime import datetime, timedelta
 
 
 class StockRequest(models.Model):
@@ -42,13 +43,16 @@ def create(self, vals):
         if 'fsm_order_id' in vals and vals['fsm_order_id']:
             fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
             fsm_order.request_stage = 'draft'
+            val_date = datetime.strptime(vals['expected_date'], '%Y-%m-%d %H:%M:%S')
+            date_window_after = val_date - timedelta(hours=1)
             order = self.env['stock.request.order'].search([
                 ('fsm_order_id', '=', vals['fsm_order_id']),
                 ('direction', '=', vals['direction']),
-                ('expected_date', '=', vals['expected_date']),
+                ('expected_date', '>', date_window_after),
                 ('state', '=', 'draft')
             ])
             if order:
+                res.expected_date = order.expected_date
                 res.order_id = order.id
             else:
                 values = self.prepare_order_values(vals)

From e6873fa04445cbfea3cbc4ea9d4e735d80d64125 Mon Sep 17 00:00:00 2001
From: Steve Campbell <scampbell@opensourceintegrators.com>
Date: Tue, 13 Aug 2019 17:43:20 -0700
Subject: [PATCH 109/631] [FIX] fieldservice_stock: Expected Date Error (#15)

---
 fieldservice_stock/models/stock.py         |  1 +
 fieldservice_stock/models/stock_request.py | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
index 18b1804974..d30b92d67f 100644
--- a/fieldservice_stock/models/stock.py
+++ b/fieldservice_stock/models/stock.py
@@ -65,6 +65,7 @@ def _get_stock_move_values(self, product_id, product_qty, product_uom,
         })
         return vals
 
+
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
index 5ec5d69b58..00313b3e30 100644
--- a/fieldservice_stock/models/stock_request.py
+++ b/fieldservice_stock/models/stock_request.py
@@ -39,11 +39,11 @@ def prepare_order_values(self, vals):
 
     @api.model
     def create(self, vals):
-        res = super().create(vals)
         if 'fsm_order_id' in vals and vals['fsm_order_id']:
             fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
             fsm_order.request_stage = 'draft'
-            val_date = datetime.strptime(vals['expected_date'], '%Y-%m-%d %H:%M:%S')
+            val_date = datetime.strptime(vals['expected_date'],
+                                         '%Y-%m-%d %H:%M:%S')
             date_window_after = val_date - timedelta(hours=1)
             order = self.env['stock.request.order'].search([
                 ('fsm_order_id', '=', vals['fsm_order_id']),
@@ -52,12 +52,13 @@ def create(self, vals):
                 ('state', '=', 'draft')
             ])
             if order:
-                res.expected_date = order.expected_date
-                res.order_id = order.id
+                vals['expected_date'] = order.expected_date
+                vals['order_id'] = order.id
             else:
                 values = self.prepare_order_values(vals)
-                res.order_id = self.env['stock.request.order'].create(values)
-        return res
+                vals['order_id'] = self.env['stock.request.order'].\
+                    create(values).id
+        return super().create(vals)
 
     def _prepare_procurement_values(self, group_id=False):
         res = super()._prepare_procurement_values(group_id=group_id)

From 494415b0060a859d4ffdb5e34fdefb5a0510a807 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 14 Aug 2019 16:13:53 -0700
Subject: [PATCH 110/631] [FIX] Datetime catch

---
 fieldservice_stock/models/stock_request.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
index 00313b3e30..381b1c8c19 100644
--- a/fieldservice_stock/models/stock_request.py
+++ b/fieldservice_stock/models/stock_request.py
@@ -42,9 +42,14 @@ def create(self, vals):
         if 'fsm_order_id' in vals and vals['fsm_order_id']:
             fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
             fsm_order.request_stage = 'draft'
-            val_date = datetime.strptime(vals['expected_date'],
-                                         '%Y-%m-%d %H:%M:%S')
+
+            val_date = vals['expected_date']
+            if not isinstance(vals['expected_date'], str):
+                val_date = datetime.strftime(vals['expected_date'], '%Y-%m-%d %H:%M:%S')
+
+            val_date = datetime.strptime(val_date, '%Y-%m-%d %H:%M:%S')
             date_window_after = val_date - timedelta(hours=1)
+
             order = self.env['stock.request.order'].search([
                 ('fsm_order_id', '=', vals['fsm_order_id']),
                 ('direction', '=', vals['direction']),

From fe76c28f97e6808cfc73e4b81d22261f02081157 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 15 Aug 2019 10:17:59 -0700
Subject: [PATCH 111/631] [IMP] Action Confirm

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

diff --git a/fieldservice_stock/models/stock_request_order.py b/fieldservice_stock/models/stock_request_order.py
index 827f047a56..5485e25463 100644
--- a/fieldservice_stock/models/stock_request_order.py
+++ b/fieldservice_stock/models/stock_request_order.py
@@ -41,7 +41,7 @@ def _prepare_procurement_group_values(self):
             return {}
 
     @api.multi
-    def _action_confirm(self):
+    def action_confirm(self):
         if self.fsm_order_id:
             fsm_order = self.env['fsm.order'].browse(self.fsm_order_id.id)
             group = self.env['procurement.group'].search([
@@ -51,4 +51,4 @@ def _action_confirm(self):
                 group = self.env['procurement.group'].create(values)
             self.procurement_group_id = group.id
             self.change_childs()
-        return super()._action_confirm()
+        return super().action_confirm()

From a4985d4bd1c2bf9c2479a80426ff41948171284b Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 15 Aug 2019 12:33:33 -0700
Subject: [PATCH 112/631] [IMP] Acount or multiple groups

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

diff --git a/fieldservice_stock/models/stock_request_order.py b/fieldservice_stock/models/stock_request_order.py
index 5485e25463..21cb0707ce 100644
--- a/fieldservice_stock/models/stock_request_order.py
+++ b/fieldservice_stock/models/stock_request_order.py
@@ -49,6 +49,6 @@ def action_confirm(self):
             if not group:
                 values = self._prepare_procurement_group_values()
                 group = self.env['procurement.group'].create(values)
-            self.procurement_group_id = group.id
+            self.procurement_group_id = group[0].id
             self.change_childs()
         return super().action_confirm()

From 7c517f3ab977f46b0a260bc5748dc39966855be8 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 19 Aug 2019 06:16:57 -0700
Subject: [PATCH 113/631] Update fieldservice_stock/models/stock_request.py

Co-Authored-By: Bhavesh Odedra <bodedra@opensourceintegrators.com>
---
 fieldservice_stock/models/stock_request.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
index 381b1c8c19..b4af73038c 100644
--- a/fieldservice_stock/models/stock_request.py
+++ b/fieldservice_stock/models/stock_request.py
@@ -45,7 +45,8 @@ def create(self, vals):
 
             val_date = vals['expected_date']
             if not isinstance(vals['expected_date'], str):
-                val_date = datetime.strftime(vals['expected_date'], '%Y-%m-%d %H:%M:%S')
+                val_date = datetime.strftime(vals['expected_date'],
+                                             '%Y-%m-%d %H:%M:%S')
 
             val_date = datetime.strptime(val_date, '%Y-%m-%d %H:%M:%S')
             date_window_after = val_date - timedelta(hours=1)

From 343396a8036c4d92ed79f2dfadbb9f7f9afaa4fd Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 20 Aug 2019 19:06:55 -0500
Subject: [PATCH 114/631] [IMP] fieldservice_stock

---
 fieldservice_stock/__manifest__.py         |  2 +-
 fieldservice_stock/models/stock_request.py | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 8664c6e26f..005e24c1e3 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Inventory and Stock Operations for Field Services',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.0.1',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
index b4af73038c..0be4547ff1 100644
--- a/fieldservice_stock/models/stock_request.py
+++ b/fieldservice_stock/models/stock_request.py
@@ -1,8 +1,7 @@
 # Copyright (C) 2019 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, fields, models
 from datetime import datetime, timedelta
+from odoo import api, fields, models
 
 
 class StockRequest(models.Model):
@@ -42,15 +41,9 @@ def create(self, vals):
         if 'fsm_order_id' in vals and vals['fsm_order_id']:
             fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
             fsm_order.request_stage = 'draft'
-
-            val_date = vals['expected_date']
-            if not isinstance(vals['expected_date'], str):
-                val_date = datetime.strftime(vals['expected_date'],
-                                             '%Y-%m-%d %H:%M:%S')
-
-            val_date = datetime.strptime(val_date, '%Y-%m-%d %H:%M:%S')
+            val_date = datetime.strptime(vals['expected_date'],
+                                         '%Y-%m-%d %H:%M:%S')
             date_window_after = val_date - timedelta(hours=1)
-
             order = self.env['stock.request.order'].search([
                 ('fsm_order_id', '=', vals['fsm_order_id']),
                 ('direction', '=', vals['direction']),

From 77f26ce54f45948f495fe7864422e95b3ca884c9 Mon Sep 17 00:00:00 2001
From: hparfr <raph@hpar.fr>
Date: Fri, 6 Sep 2019 17:37:25 +0200
Subject: [PATCH 115/631] Fix customer_id

---
 fieldservice_stock/models/fsm_wizard.py   | 20 ++++----------------
 fieldservice_stock/views/fsm_location.xml |  2 +-
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/fieldservice_stock/models/fsm_wizard.py b/fieldservice_stock/models/fsm_wizard.py
index cb5f4a2ccf..509bbdba63 100644
--- a/fieldservice_stock/models/fsm_wizard.py
+++ b/fieldservice_stock/models/fsm_wizard.py
@@ -1,25 +1,13 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import models, _
-from odoo.exceptions import UserError
+from odoo import models
 
 
 class FSMWizard(models.TransientModel):
     _inherit = 'fsm.wizard'
 
-    def action_convert_location(self, partner):
-        res = self.env['fsm.location'].search_count(
-            [('partner_id', '=', partner.id)])
-        if res == 0:
-            vals = {'partner_id': partner.id,
-                    'owner_id': partner.id,
-                    'customer_id': partner.id,
-                    'inventory_location_id':
-                    partner.property_stock_customer.id}
-            self.env['fsm.location'].create(vals)
-            partner.write({'fsm_location': True})
-        else:
-            raise UserError(_('A Field Service Location related to that'
-                              ' partner already exists.'))
+    def _prepare_fsm_location(self, partner):
+        res = super(FSMWizard)._prepare_fsm_location(partner)
+        res['inventory_location_id'] = partner.property_stock_customer.id
         return res
diff --git a/fieldservice_stock/views/fsm_location.xml b/fieldservice_stock/views/fsm_location.xml
index 3e492e30d1..2de8f469b9 100644
--- a/fieldservice_stock/views/fsm_location.xml
+++ b/fieldservice_stock/views/fsm_location.xml
@@ -8,7 +8,7 @@
         <field name="model">fsm.location</field>
         <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='customer_id']" position="after">
+            <xpath expr="//field[@name='contact_id']" position="before">
                 <field name="shipping_address_id"/>
             </xpath>
             <xpath expr="//form/sheet/group/group[2]" position="inside">

From e57a0bb69dd106143a4d1be03e17af39c9d44283 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Mon, 16 Sep 2019 16:08:24 -0700
Subject: [PATCH 116/631] [IMP] Warehouse Not Readonly + Submit Stage Fix

---
 fieldservice_stock/models/fsm_order.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 7531180efa..5a4a665e01 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -36,7 +36,7 @@ def _default_warehouse_id(self):
     inventory_location_id = fields.Many2one(
         related='location_id.inventory_location_id', readonly=True)
     warehouse_id = fields.Many2one('stock.warehouse', string='Warehouse',
-                                   required=True, readonly=True,
+                                   required=True,
                                    default=_default_warehouse_id,
                                    help="Warehouse used to ship the materials")
     return_count = fields.Integer(string='Return Orders',
@@ -53,9 +53,9 @@ def action_request_submit(self):
             for line in rec.stock_request_ids:
                 if line.state == 'draft':
                     if line.order_id:
-                        line.order_id.action_confirm()
+                        line.order_id.action_submit()
                     else:
-                        line.action_confirm()
+                        line.action_submit()
             rec.request_stage = 'submitted'
 
     @api.multi

From 856b26404dc79d0270b5886e3d08566084aa071f Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 20 Sep 2019 10:58:15 -0700
Subject: [PATCH 117/631] [FIX] Datetime Error

---
 fieldservice_stock/models/stock_request.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
index 0be4547ff1..465ef46848 100644
--- a/fieldservice_stock/models/stock_request.py
+++ b/fieldservice_stock/models/stock_request.py
@@ -41,9 +41,14 @@ def create(self, vals):
         if 'fsm_order_id' in vals and vals['fsm_order_id']:
             fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
             fsm_order.request_stage = 'draft'
-            val_date = datetime.strptime(vals['expected_date'],
-                                         '%Y-%m-%d %H:%M:%S')
+            
+            val_date = vals['expected_date']
+            if not isinstance(vals['expected_date'], str):
+                val_date = datetime.strftime(vals['expected_date'], '%Y-%m-%d %H:%M:%S')
+
+            val_date = datetime.strptime(val_date, '%Y-%m-%d %H:%M:%S')
             date_window_after = val_date - timedelta(hours=1)
+
             order = self.env['stock.request.order'].search([
                 ('fsm_order_id', '=', vals['fsm_order_id']),
                 ('direction', '=', vals['direction']),

From 023130a0e9365623237ec02595b7c91d66b07eb2 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 9 Oct 2019 21:32:13 -0500
Subject: [PATCH 118/631] [FIX] fieldservice_stock

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

diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
index 465ef46848..42cd18a0f0 100644
--- a/fieldservice_stock/models/stock_request.py
+++ b/fieldservice_stock/models/stock_request.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators
+# Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from datetime import datetime, timedelta
 from odoo import api, fields, models
@@ -41,10 +41,11 @@ def create(self, vals):
         if 'fsm_order_id' in vals and vals['fsm_order_id']:
             fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
             fsm_order.request_stage = 'draft'
-            
+
             val_date = vals['expected_date']
             if not isinstance(vals['expected_date'], str):
-                val_date = datetime.strftime(vals['expected_date'], '%Y-%m-%d %H:%M:%S')
+                val_date = datetime.strftime(vals['expected_date'],
+                                             '%Y-%m-%d %H:%M:%S')
 
             val_date = datetime.strptime(val_date, '%Y-%m-%d %H:%M:%S')
             date_window_after = val_date - timedelta(hours=1)

From afbfb21b536f994e42b56b0d01966cf60eceace7 Mon Sep 17 00:00:00 2001
From: Steve Campbell <scampbell@opensourceintegrators.com>
Date: Thu, 31 Oct 2019 08:03:47 -0700
Subject: [PATCH 119/631] [IMP] fieldservice_stock: SRO to SR Tree (#375)

---
 fieldservice_stock/models/stock_request.py | 17 ++++++++++++-----
 fieldservice_stock/views/fsm_order.xml     |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
index 42cd18a0f0..37da87b48a 100644
--- a/fieldservice_stock/models/stock_request.py
+++ b/fieldservice_stock/models/stock_request.py
@@ -41,17 +41,20 @@ def create(self, vals):
         if 'fsm_order_id' in vals and vals['fsm_order_id']:
             fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
             fsm_order.request_stage = 'draft'
-
+            vals['warehouse_id'] = fsm_order.warehouse_id.id
             val_date = vals['expected_date']
             if not isinstance(vals['expected_date'], str):
-                val_date = datetime.strftime(vals['expected_date'],
-                                             '%Y-%m-%d %H:%M:%S')
-
+                val_date = datetime.strftime(vals['expected_date'], '%Y-%m-%d %H:%M:%S')
             val_date = datetime.strptime(val_date, '%Y-%m-%d %H:%M:%S')
+            picking_type_id = self.env['stock.picking.type'].search(
+                [('code', '=', 'stock_request_order'),
+                 ('warehouse_id', '=', vals['warehouse_id'])],
+                limit=1)
             date_window_after = val_date - timedelta(hours=1)
-
             order = self.env['stock.request.order'].search([
                 ('fsm_order_id', '=', vals['fsm_order_id']),
+                ('warehouse_id', '=', vals['warehouse_id']),
+                ('picking_type_id', '=', picking_type_id.id),
                 ('direction', '=', vals['direction']),
                 ('expected_date', '>', date_window_after),
                 ('state', '=', 'draft')
@@ -61,6 +64,10 @@ def create(self, vals):
                 vals['order_id'] = order.id
             else:
                 values = self.prepare_order_values(vals)
+                values.update({
+                    'picking_type_id': picking_type_id.id,
+                    'warehouse_id': vals['warehouse_id'],
+                    })
                 vals['order_id'] = self.env['stock.request.order'].\
                     create(values).id
         return super().create(vals)
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 8efde56e0e..f3c25de0da 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -48,6 +48,7 @@
                         <tree editable="bottom">
                             <field name="name" readonly="1"/>
                             <field name="product_id"/>
+                            <field name="order_id"/>
                             <field name="product_uom_id"
                                    options="{'no_open': True, 'no_create': True}"
                                    groups="uom.group_uom"/>

From 5a80af054606a8348484c397adfbb589ea284bf5 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 11 Oct 2019 11:54:16 -0500
Subject: [PATCH 120/631] [FIX] fieldservice_stock

---
 fieldservice_stock/__manifest__.py            |  2 +-
 fieldservice_stock/models/__init__.py         |  6 +-
 fieldservice_stock/models/fsm_location.py     |  6 +-
 .../models/procurement_group.py               |  9 +++
 fieldservice_stock/models/stock.py            | 74 -------------------
 fieldservice_stock/models/stock_move.py       | 30 ++++++++
 fieldservice_stock/models/stock_move_line.py  | 18 +++++
 fieldservice_stock/models/stock_picking.py    | 10 +++
 fieldservice_stock/models/stock_request.py    |  3 +-
 fieldservice_stock/models/stock_rule.py       | 15 ++++
 .../security/ir.model.access.csv              |  1 +
 11 files changed, 94 insertions(+), 80 deletions(-)
 create mode 100644 fieldservice_stock/models/procurement_group.py
 delete mode 100644 fieldservice_stock/models/stock.py
 create mode 100644 fieldservice_stock/models/stock_move.py
 create mode 100644 fieldservice_stock/models/stock_move_line.py
 create mode 100644 fieldservice_stock/models/stock_picking.py
 create mode 100644 fieldservice_stock/models/stock_rule.py

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 005e24c1e3..d70f4e77b5 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Stock',
-    'summary': 'Inventory and Stock Operations for Field Services',
+    'summary': 'Integrate the logistics operations with Field Service',
     'version': '12.0.1.0.1',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index 5fe2a60c1d..c34c5a24a9 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -4,7 +4,11 @@
 from . import (
     fsm_location,
     fsm_order,
-    stock,
+    stock_move_line,
+    stock_move,
+    procurement_group,
+    stock_rule,
+    stock_picking,
     fsm_equipment,
     product_template,
     stock_production_lot,
diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
index 371c2c66a8..d5b35bcd8b 100644
--- a/fieldservice_stock/models/fsm_location.py
+++ b/fieldservice_stock/models/fsm_location.py
@@ -7,9 +7,9 @@
 class FSMLocation(models.Model):
     _inherit = 'fsm.location'
 
-    inventory_location_id = fields.Many2one('stock.location',
-                                            string='Inventory Location',
-                                            required=True)
+    inventory_location_id = fields.Many2one(
+        'stock.location', string='Inventory Location', required=True,
+        default=lambda self: self.env.ref('stock.stock_location_customers'))
     shipping_address_id = fields.Many2one('res.partner',
                                           string='Shipping Location')
 
diff --git a/fieldservice_stock/models/procurement_group.py b/fieldservice_stock/models/procurement_group.py
new file mode 100644
index 0000000000..39e60cda88
--- /dev/null
+++ b/fieldservice_stock/models/procurement_group.py
@@ -0,0 +1,9 @@
+# Copyright (C) 2018 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class ProcurementGroup(models.Model):
+    _inherit = 'procurement.group'
+
+    fsm_order_id = fields.Many2one('fsm.order', 'Field Service Order')
diff --git a/fieldservice_stock/models/stock.py b/fieldservice_stock/models/stock.py
deleted file mode 100644
index d30b92d67f..0000000000
--- a/fieldservice_stock/models/stock.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import fields, models
-
-
-class StockMoveLine(models.Model):
-    _inherit = "stock.move.line"
-
-    def _action_done(self):
-        res = super(StockMoveLine, self)._action_done()
-        for rec in self:
-            if rec.move_id and rec.move_id.allocation_ids:
-                for request in rec.move_id.allocation_ids:
-                    if (request.stock_request_id.state == 'done'
-                            and request.stock_request_id.fsm_order_id):
-                        request.stock_request_id.\
-                            fsm_order_id.request_stage = 'done'
-        return res
-
-
-class StockMove(models.Model):
-    _inherit = "stock.move"
-
-    fsm_order_id = fields.Many2one('fsm.order', string='Field Service Order')
-
-    def prepare_equipment_values(self, move_line):
-        return {'name': '%s (%s)' % (
-            move_line.product_id.name, move_line.lot_id.name),
-            'product_id': move_line.product_id.id,
-            'lot_id': move_line.lot_id.id,
-            'current_location_id':
-            move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
-            'current_stock_location_id': move_line.location_dest_id.id}
-
-    def _action_done(self):
-        res = False
-        for rec in self:
-            res = super(StockMove, rec)._action_done()
-            if rec.picking_code == 'outgoing' and rec.state == 'done':
-                if rec.product_tmpl_id.create_fsm_equipment:
-                    for line in rec.move_line_ids:
-                        vals = self.prepare_equipment_values(line)
-                        line.lot_id.fsm_equipment_id = \
-                            rec.env['fsm.equipment'].create(vals)
-        return res
-
-
-class ProcurementGroup(models.Model):
-    _inherit = 'procurement.group'
-
-    fsm_order_id = fields.Many2one('fsm.order', 'Field Service Order')
-
-
-class StockRule(models.Model):
-    _inherit = 'stock.rule'
-
-    def _get_stock_move_values(self, product_id, product_qty, product_uom,
-                               location_id, name, origin, values, group_id):
-        vals = super()._get_stock_move_values(
-            product_id, product_qty, product_uom, location_id, name, origin,
-            values, group_id)
-        vals.update({
-            'fsm_order_id': values.get('fsm_order_id'),
-        })
-        return vals
-
-
-class StockPicking(models.Model):
-    _inherit = 'stock.picking'
-
-    fsm_order_id = fields.Many2one(
-        related="group_id.fsm_order_id", string="Field Service Order",
-        store=True)
diff --git a/fieldservice_stock/models/stock_move.py b/fieldservice_stock/models/stock_move.py
new file mode 100644
index 0000000000..9a495ae800
--- /dev/null
+++ b/fieldservice_stock/models/stock_move.py
@@ -0,0 +1,30 @@
+# Copyright (C) 2018 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class StockMove(models.Model):
+    _inherit = "stock.move"
+
+    fsm_order_id = fields.Many2one('fsm.order', string='Field Service Order')
+
+    def prepare_equipment_values(self, move_line):
+        return {'name': '%s (%s)' % (
+            move_line.product_id.name, move_line.lot_id.name),
+            'product_id': move_line.product_id.id,
+            'lot_id': move_line.lot_id.id,
+            'current_location_id':
+            move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
+            'current_stock_location_id': move_line.location_dest_id.id}
+
+    def _action_done(self):
+        res = False
+        for rec in self:
+            res = super(StockMove, rec)._action_done()
+            if rec.picking_code == 'outgoing' and rec.state == 'done':
+                if rec.product_tmpl_id.create_fsm_equipment:
+                    for line in rec.move_line_ids:
+                        vals = self.prepare_equipment_values(line)
+                        line.lot_id.fsm_equipment_id = \
+                            rec.env['fsm.equipment'].create(vals)
+        return res
diff --git a/fieldservice_stock/models/stock_move_line.py b/fieldservice_stock/models/stock_move_line.py
new file mode 100644
index 0000000000..bda774e0c1
--- /dev/null
+++ b/fieldservice_stock/models/stock_move_line.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2018 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import models
+
+
+class StockMoveLine(models.Model):
+    _inherit = "stock.move.line"
+
+    def _action_done(self):
+        res = super(StockMoveLine, self)._action_done()
+        for rec in self:
+            if rec.move_id:
+                for request in rec.move_id.allocation_ids:
+                    if (request.stock_request_id.state == 'done'
+                            and request.stock_request_id.fsm_order_id):
+                        request.stock_request_id.\
+                            fsm_order_id.request_stage = 'done'
+        return res
diff --git a/fieldservice_stock/models/stock_picking.py b/fieldservice_stock/models/stock_picking.py
new file mode 100644
index 0000000000..076eb5174f
--- /dev/null
+++ b/fieldservice_stock/models/stock_picking.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2018 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class StockPicking(models.Model):
+    _inherit = 'stock.picking'
+
+    fsm_order_id = fields.Many2one(related="group_id.fsm_order_id",
+                                   string="Field Service Order", store=True)
diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
index 37da87b48a..882ff13ca9 100644
--- a/fieldservice_stock/models/stock_request.py
+++ b/fieldservice_stock/models/stock_request.py
@@ -44,7 +44,8 @@ def create(self, vals):
             vals['warehouse_id'] = fsm_order.warehouse_id.id
             val_date = vals['expected_date']
             if not isinstance(vals['expected_date'], str):
-                val_date = datetime.strftime(vals['expected_date'], '%Y-%m-%d %H:%M:%S')
+                val_date = datetime.strftime(vals['expected_date'],
+                                             '%Y-%m-%d %H:%M:%S')
             val_date = datetime.strptime(val_date, '%Y-%m-%d %H:%M:%S')
             picking_type_id = self.env['stock.picking.type'].search(
                 [('code', '=', 'stock_request_order'),
diff --git a/fieldservice_stock/models/stock_rule.py b/fieldservice_stock/models/stock_rule.py
new file mode 100644
index 0000000000..63c0ec3dff
--- /dev/null
+++ b/fieldservice_stock/models/stock_rule.py
@@ -0,0 +1,15 @@
+# Copyright (C) 2018 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import models
+
+
+class StockRule(models.Model):
+    _inherit = 'stock.rule'
+
+    def _get_stock_move_values(self, product_id, product_qty, product_uom,
+                               location_id, name, origin, values, group_id):
+        vals = super()._get_stock_move_values(
+            product_id, product_qty, product_uom, location_id, name, origin,
+            values, group_id)
+        vals.update({'fsm_order_id': values.get('fsm_order_id')})
+        return vals
diff --git a/fieldservice_stock/security/ir.model.access.csv b/fieldservice_stock/security/ir.model.access.csv
index 110e052a34..310dd94a39 100644
--- a/fieldservice_stock/security/ir.model.access.csv
+++ b/fieldservice_stock/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_stock_request_allocation_fsm_user,stock.request.allocation.user,stock_request.model_stock_request_allocation,base.group_user,1,0,0,0
 access_stock_request_fsm_user,stock.request.user,stock_request.model_stock_request,fieldservice.group_fsm_user,1,0,0,0
 access_stock_request_fsm_dispatcher,stock.request.dispatcher,stock_request.model_stock_request,fieldservice.group_fsm_dispatcher,1,1,1,1

From be142cc99aa1c2793630e359c7f7210b2d8b9b84 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 9 Oct 2019 09:40:22 -0500
Subject: [PATCH 121/631] [REN] default_flow --> isp_flow

---
 fieldservice_isp_flow/README.rst              | 114 +++++
 fieldservice_isp_flow/__init__.py             |   1 +
 fieldservice_isp_flow/__manifest__.py         |  23 +
 fieldservice_isp_flow/data/fsm_stage.xml      |  51 ++
 fieldservice_isp_flow/models/__init__.py      |   1 +
 fieldservice_isp_flow/models/fsm_order.py     |  62 +++
 fieldservice_isp_flow/readme/CONFIGURE.rst    |  10 +
 fieldservice_isp_flow/readme/CONTRIBUTORS.rst |   3 +
 fieldservice_isp_flow/readme/CREDITS.rst      |   3 +
 fieldservice_isp_flow/readme/DESCRIPTION.rst  |   2 +
 fieldservice_isp_flow/readme/ROADMAP.rst      |   2 +
 fieldservice_isp_flow/readme/USAGE.rst        |   6 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 463 ++++++++++++++++++
 fieldservice_isp_flow/views/fsm_order.xml     | 116 +++++
 15 files changed, 857 insertions(+)
 create mode 100644 fieldservice_isp_flow/README.rst
 create mode 100644 fieldservice_isp_flow/__init__.py
 create mode 100644 fieldservice_isp_flow/__manifest__.py
 create mode 100644 fieldservice_isp_flow/data/fsm_stage.xml
 create mode 100644 fieldservice_isp_flow/models/__init__.py
 create mode 100644 fieldservice_isp_flow/models/fsm_order.py
 create mode 100644 fieldservice_isp_flow/readme/CONFIGURE.rst
 create mode 100644 fieldservice_isp_flow/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_isp_flow/readme/CREDITS.rst
 create mode 100644 fieldservice_isp_flow/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_isp_flow/readme/ROADMAP.rst
 create mode 100644 fieldservice_isp_flow/readme/USAGE.rst
 create mode 100644 fieldservice_isp_flow/static/description/icon.png
 create mode 100644 fieldservice_isp_flow/static/description/index.html
 create mode 100644 fieldservice_isp_flow/views/fsm_order.xml

diff --git a/fieldservice_isp_flow/README.rst b/fieldservice_isp_flow/README.rst
new file mode 100644
index 0000000000..dbfb75599c
--- /dev/null
+++ b/fieldservice_isp_flow/README.rst
@@ -0,0 +1,114 @@
+============================
+Field Service - Flow for ISP
+============================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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/12.0/fieldservice_default_flow
+    :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_default_flow
+    :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
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module is an add-on for the Field Service application in Odoo.
+It provides default stages for orders and some validation logic when changing current stage.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+The stage of an order is used to monitor its progress. Stages can be configured
+based on your company's specific business needs. A basic set of order stages
+comes pre-configured for use.
+
+#. Go to *Field Service > Configuration > Stages*
+#. Create or edit a stage
+#. Set the name for the stage.
+#. Set the sequence order for the stage.
+#. Select *Order* type to apply this stage to your orders.
+#. Additonally, you can set a color for the stage.
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Create a new service order
+* Under the Inventory tab, select the warehouse, the delivery method and add
+  products with quantity
+* Confirm the order to create the delivery orders with the selected method
+
+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_default_flow%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+* Akretion
+
+Contributors
+~~~~~~~~~~~~
+
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.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
+~~~~~~~~~~~
+
+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.
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_default_flow>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_isp_flow/__init__.py b/fieldservice_isp_flow/__init__.py
new file mode 100644
index 0000000000..9a7e03eded
--- /dev/null
+++ b/fieldservice_isp_flow/__init__.py
@@ -0,0 +1 @@
+from . import models
\ No newline at end of file
diff --git a/fieldservice_isp_flow/__manifest__.py b/fieldservice_isp_flow/__manifest__.py
new file mode 100644
index 0000000000..a1ec087293
--- /dev/null
+++ b/fieldservice_isp_flow/__manifest__.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2019 - Akretion
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - Flow for ISP',
+    'summary': 'FSM Stages for Internet Service Providers',
+    'version': '12.0.1.2.0',
+    'category': 'Field Service',
+    'author':
+        'Open Source Integrators,'
+        ' Akretion, Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice',
+    ],
+    'data': [
+        'data/fsm_stage.xml',
+        'views/fsm_order.xml',
+    ],
+    'application': False,
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+}
diff --git a/fieldservice_isp_flow/data/fsm_stage.xml b/fieldservice_isp_flow/data/fsm_stage.xml
new file mode 100644
index 0000000000..25e17db8f8
--- /dev/null
+++ b/fieldservice_isp_flow/data/fsm_stage.xml
@@ -0,0 +1,51 @@
+<odoo noupdate="1">
+
+    <record id="fsm_stage_confirmed" model="fsm.stage">
+        <field name="name">Confirmed</field>
+        <field name="sequence">20</field>
+        <field name="stage_type">order</field>
+        <field name="is_default">True</field>
+        <field name="custom_color">#F1C40F</field>
+    </record>
+
+    <record id="fsm_stage_requested" model="fsm.stage">
+        <field name="name">Requested</field>
+        <field name="sequence">30</field>
+        <field name="stage_type">order</field>
+        <field name="is_default">True</field>
+        <field name="custom_color">#F39C12</field>
+    </record>
+
+    <record id="fsm_stage_assigned" model="fsm.stage">
+        <field name="name">Assigned</field>
+        <field name="sequence">40</field>
+        <field name="stage_type">order</field>
+        <field name="is_default">True</field>
+        <field name="custom_color">#16A085</field>
+    </record>
+
+    <record id="fsm_stage_scheduled" model="fsm.stage">
+        <field name="name">Scheduled</field>
+        <field name="sequence">50</field>
+        <field name="stage_type">order</field>
+        <field name="is_default">True</field>
+        <field name="custom_color">#9B59B6</field>
+    </record>
+
+    <record id="fsm_stage_enroute" model="fsm.stage">
+        <field name="name">En Route</field>
+        <field name="sequence">60</field>
+        <field name="stage_type">order</field>
+        <field name="is_default">True</field>
+        <field name="custom_color">#C0392B</field>
+    </record>
+
+    <record id="fsm_stage_started" model="fsm.stage">
+        <field name="name">Started</field>
+        <field name="sequence">70</field>
+        <field name="stage_type">order</field>
+        <field name="is_default">True</field>
+        <field name="custom_color">#95A5A6</field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_isp_flow/models/__init__.py b/fieldservice_isp_flow/models/__init__.py
new file mode 100644
index 0000000000..f10b49a918
--- /dev/null
+++ b/fieldservice_isp_flow/models/__init__.py
@@ -0,0 +1 @@
+from . import fsm_order
\ No newline at end of file
diff --git a/fieldservice_isp_flow/models/fsm_order.py b/fieldservice_isp_flow/models/fsm_order.py
new file mode 100644
index 0000000000..cffaa01e55
--- /dev/null
+++ b/fieldservice_isp_flow/models/fsm_order.py
@@ -0,0 +1,62 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models, _
+from odoo.exceptions import ValidationError
+
+
+class FSMOrder(models.Model):
+    _inherit = 'fsm.order'
+
+    def action_confirm(self):
+        return self.write({'stage_id': self.env.ref(
+            'fieldservice_isp_flow.fsm_stage_confirmed').id})
+
+    def action_request(self):
+        if not self.person_ids:
+            raise ValidationError(_("Cannot move to Requested " +
+                                    "until 'Request Workers' is filled in"))
+        return self.write({'stage_id': self.env.ref(
+            'fieldservice_isp_flow.fsm_stage_requested').id})
+
+    def action_assign(self):
+        if self.person_id:
+            return self.write({'stage_id': self.env.ref(
+                'fieldservice_isp_flow.fsm_stage_assigned').id})
+        else:
+            raise ValidationError(_("Cannot move to Assigned " +
+                                    "until 'Assigned To' is filled in"))
+
+    def action_schedule(self):
+        if self.scheduled_date_start and self.person_id:
+            return self.write({'stage_id': self.env.ref(
+                'fieldservice_isp_flow.fsm_stage_scheduled').id})
+        else:
+            raise ValidationError(_("Cannot move to Scheduled " +
+                                    "until both 'Assigned To' and " +
+                                    "'Scheduled Start Date' are filled in"))
+
+    def action_enroute(self):
+        return self.write({'stage_id': self.env.ref(
+            'fieldservice_isp_flow.fsm_stage_enroute').id})
+
+    def action_start(self):
+        if not self.date_start:
+            raise ValidationError(_("Cannot move to Start " +
+                                    "until 'Actual Start' is filled in"))
+        return self.write({'stage_id': self.env.ref(
+            'fieldservice_isp_flow.fsm_stage_started').id})
+
+    def action_complete(self):
+        if not self.date_end:
+            raise ValidationError(_("Cannot move to Complete " +
+                                    "until 'Actual End' is filled in"))
+        if not self.resolution:
+            raise ValidationError(_("Cannot move to Complete " +
+                                    "until 'Resolution' is filled in"))
+        return self.write({'stage_id': self.env.ref(
+            'fieldservice.fsm_stage_completed').id})
+
+    def action_cancel(self):
+        return self.write({'stage_id': self.env.ref(
+            'fieldservice.fsm_stage_cancelled').id})
diff --git a/fieldservice_isp_flow/readme/CONFIGURE.rst b/fieldservice_isp_flow/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..4d278bc30f
--- /dev/null
+++ b/fieldservice_isp_flow/readme/CONFIGURE.rst
@@ -0,0 +1,10 @@
+The stage of an order is used to monitor its progress. Stages can be configured
+based on your company's specific business needs. A basic set of order stages
+comes pre-configured for use.
+
+#. Go to *Field Service > Configuration > Stages*
+#. Create or edit a stage
+#. Set the name for the stage.
+#. Set the sequence order for the stage.
+#. Select *Order* type to apply this stage to your orders.
+#. Additonally, you can set a color for the stage.
\ No newline at end of file
diff --git a/fieldservice_isp_flow/readme/CONTRIBUTORS.rst b/fieldservice_isp_flow/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..6bd8a35358
--- /dev/null
+++ b/fieldservice_isp_flow/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Raphaël Reverdy <raphael.reverdy@akretion.com>
diff --git a/fieldservice_isp_flow/readme/CREDITS.rst b/fieldservice_isp_flow/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_isp_flow/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_isp_flow/readme/DESCRIPTION.rst b/fieldservice_isp_flow/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..f9021ebd17
--- /dev/null
+++ b/fieldservice_isp_flow/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module is an add-on for the Field Service application in Odoo.
+It provides default stages for orders and some validation logic when changing current stage.
diff --git a/fieldservice_isp_flow/readme/ROADMAP.rst b/fieldservice_isp_flow/readme/ROADMAP.rst
new file mode 100644
index 0000000000..f607015959
--- /dev/null
+++ b/fieldservice_isp_flow/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_isp_flow/readme/USAGE.rst b/fieldservice_isp_flow/readme/USAGE.rst
new file mode 100644
index 0000000000..e0b17ff885
--- /dev/null
+++ b/fieldservice_isp_flow/readme/USAGE.rst
@@ -0,0 +1,6 @@
+To use this module, you need to:
+
+* Create a new service order
+* Under the Inventory tab, select the warehouse, the delivery method and add
+  products with quantity
+* Confirm the order to create the delivery orders with the selected method
diff --git a/fieldservice_isp_flow/static/description/icon.png b/fieldservice_isp_flow/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_isp_flow/static/description/index.html b/fieldservice_isp_flow/static/description/index.html
new file mode 100644
index 0000000000..6dc05bc0f4
--- /dev/null
+++ b/fieldservice_isp_flow/static/description/index.html
@@ -0,0 +1,463 @@
+<?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 - Default Flow</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-default-flow">
+<h1 class="title">Field Service - Default Flow</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_default_flow"><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_default_flow"><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>This module is an add-on for the Field Service application in Odoo.
+It provides default stages for orders and some validation logic when changing current stage.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id3">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id8">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id9">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<p>The stage of an order is used to monitor its progress. Stages can be configured
+based on your company’s specific business needs. A basic set of order stages
+comes pre-configured for use.</p>
+<ol class="arabic simple">
+<li>Go to <em>Field Service &gt; Configuration &gt; Stages</em></li>
+<li>Create or edit a stage</li>
+<li>Set the name for the stage.</li>
+<li>Set the sequence order for the stage.</li>
+<li>Select <em>Order</em> type to apply this stage to your orders.</li>
+<li>Additonally, you can set a color for the stage.</li>
+</ol>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<p>To use this module, you need to:</p>
+<ul class="simple">
+<li>Create a new service order</li>
+<li>Under the Inventory tab, select the warehouse, the delivery method and add
+products with quantity</li>
+<li>Confirm the order to create the delivery orders with the selected method</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id3">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="#id4">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_default_flow%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="#id5">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id6">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+<li>Akretion</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
+<ul class="simple">
+<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#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>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="#id8">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="#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>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/12.0/fieldservice_default_flow">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_isp_flow/views/fsm_order.xml b/fieldservice_isp_flow/views/fsm_order.xml
new file mode 100644
index 0000000000..dfe24d6944
--- /dev/null
+++ b/fieldservice_isp_flow/views/fsm_order.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Operations -->
+    <record id="fsm_order_form" model="ir.ui.view">
+        <field name="name">fsm.order.form</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id"
+               ref="fieldservice.fsm_order_form"/>
+        <field name="arch" type="xml">
+            <button name="action_complete" position="before">
+                <button id="action_confirm"
+                        name="action_confirm" string="Confirm"
+                        class="oe_highlight"
+                        type="object"
+                        groups="fieldservice.group_fsm_dispatcher"
+                        attrs="{'invisible': [('stage_id', '!=', %(fieldservice.fsm_stage_new)d)]}"/>
+                <button id="action_request"
+                        name="action_request" string="Request"
+                        class="oe_highlight"
+                        type="object"
+                        groups="fieldservice.group_fsm_dispatcher"
+                        attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_confirmed)d, %(fieldservice_isp_flow.fsm_stage_requested)d))]}"/>
+                <button id="action_assign"
+                        name="action_assign" string="Assign"
+                        class="oe_highlight"
+                        type="object"
+                        groups="fieldservice.group_fsm_dispatcher"
+                        attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_confirmed)d, %(fieldservice_isp_flow.fsm_stage_requested)d))]}"/>
+                <button id="action_schedule"
+                        name="action_schedule" string="Schedule"
+                        class="oe_highlight"
+                        type="object"
+                        groups="fieldservice.group_fsm_dispatcher"
+                        attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_assigned)d, %(fieldservice_isp_flow.fsm_stage_confirmed)d, %(fieldservice_isp_flow.fsm_stage_requested)d))]}"/>
+                <button id="action_enroute"
+                        name="action_enroute" string="En Route"
+                        class="oe_highlight"
+                        type="object"
+                        groups="fieldservice.group_fsm_dispatcher"
+                        attrs="{'invisible': [('stage_id', '!=', %(fieldservice_isp_flow.fsm_stage_scheduled)d)]}"/>
+                <button id="action_start"
+                        name="action_start" string="Start"
+                        class="oe_highlight"
+                        type="object"
+                        groups="fieldservice.group_fsm_dispatcher"
+                        attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_scheduled)d, %(fieldservice_isp_flow.fsm_stage_enroute)d))]}"/>
+            </button>
+            <field name="scheduled_date_start" position="attributes">
+                <attribute name="invisible">[('stage_id', 'in',
+                       (%(fieldservice.fsm_stage_new)d,
+                        %(fieldservice_isp_flow.fsm_stage_confirmed)d,
+                        %(fieldservice_isp_flow.fsm_stage_requested)d,
+                        %(fieldservice_isp_flow.fsm_stage_assigned)d))]</attribute>
+            </field>
+
+            <field name="scheduled_date_start" position="attributes">
+                <attribute name="invisible">[('stage_id', 'in',
+                       (%(fieldservice_isp_flow.fsm_stage_scheduled)d,
+                        %(fieldservice_isp_flow.fsm_stage_enroute)d,
+                        %(fieldservice_isp_flow.fsm_stage_started)d,
+                        %(fieldservice.fsm_stage_completed)d))]</attribute>
+            </field>   
+        </field>       
+    </record>
+
+    <record id="fsm_order_tree_view" model="ir.ui.view">
+        <field name="name">fsm.order.tree</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id"
+               ref="fieldservice.fsm_order_tree_view"/>
+        <field name="arch" type="xml">
+            <tree name="orders" position="attributes">
+                <attribute name="decoration-danger">stage_id in (
+                    %(fieldservice.fsm_stage_new)d,
+                    %(fieldservice_isp_flow.fsm_stage_confirmed)d,
+                    %(fieldservice_isp_flow.fsm_stage_requested)d,
+                    %(fieldservice_isp_flow.fsm_stage_assigned)d)</attribute>
+
+                <attribute name="decoration-info">stage_id in (
+                    %(fieldservice_isp_flow.fsm_stage_scheduled)d,
+                    %(fieldservice_isp_flow.fsm_stage_enroute)d,
+                    %(fieldservice_isp_flow.fsm_stage_started)d,
+                    %(fieldservice.fsm_stage_completed)d)</attribute>
+            </tree>
+        </field>
+    </record>
+
+
+    <!-- Search for fsm.order-->
+    <record id="fsm_order_search_view" model="ir.ui.view">
+        <field name="name">fsm.order.search</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id"
+               ref="fieldservice.fsm_order_search_view"/>
+        <field name="arch" type="xml">
+            <search string="Orders">
+                
+                <filter name="todo" position="after">
+                    <filter string="Unassigned"
+                            domain="[('person_id', '=', False)]"
+                            name="unassigned"/>
+                    <filter string="Unscheduled"
+                            domain="[('scheduled_date_start', '=', False)]"
+                            name="unscheduled"/>
+                </filter>
+                <filter name="order_today" position="before">
+                    <filter string="Past Due Orders"
+                            domain="[('stage_id.name', 'not in', ['Started', 'Completed', 'Cancelled']), ('scheduled_date_start', '&lt;', current_date)]"
+                            name="past_due"/>
+                </filter>
+            </search>
+        </field>
+    </record>
+
+</odoo>

From c8335a13b0d253ecd81d8e36d285eb6fefc2e569 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 9 Oct 2019 09:45:52 -0500
Subject: [PATCH 122/631] [FIX] fieldservice_isp_flow: Add maintainers

---
 fieldservice_isp_flow/__init__.py        | 2 +-
 fieldservice_isp_flow/__manifest__.py    | 7 ++++---
 fieldservice_isp_flow/models/__init__.py | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fieldservice_isp_flow/__init__.py b/fieldservice_isp_flow/__init__.py
index 9a7e03eded..0650744f6b 100644
--- a/fieldservice_isp_flow/__init__.py
+++ b/fieldservice_isp_flow/__init__.py
@@ -1 +1 @@
-from . import models
\ No newline at end of file
+from . import models
diff --git a/fieldservice_isp_flow/__manifest__.py b/fieldservice_isp_flow/__manifest__.py
index a1ec087293..60e7abfbca 100644
--- a/fieldservice_isp_flow/__manifest__.py
+++ b/fieldservice_isp_flow/__manifest__.py
@@ -4,11 +4,11 @@
 {
     'name': 'Field Service - Flow for ISP',
     'summary': 'FSM Stages for Internet Service Providers',
-    'version': '12.0.1.2.0',
+    'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author':
-        'Open Source Integrators,'
-        ' Akretion, Odoo Community Association (OCA)',
+        'Open Source Integrators, '
+        'Akretion, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice',
@@ -20,4 +20,5 @@
     'application': False,
     'license': 'AGPL-3',
     'development_status': 'Beta',
+    'maintainers': ['osi-scampbell'],
 }
diff --git a/fieldservice_isp_flow/models/__init__.py b/fieldservice_isp_flow/models/__init__.py
index f10b49a918..ed384d514e 100644
--- a/fieldservice_isp_flow/models/__init__.py
+++ b/fieldservice_isp_flow/models/__init__.py
@@ -1 +1 @@
-from . import fsm_order
\ No newline at end of file
+from . import fsm_order

From 387dcc13299790364b599d38c48f4957e03eb4a6 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 26 Nov 2019 16:59:14 -0500
Subject: [PATCH 123/631] [IMP] fieldservice_account: Simplify module

- This change removes most of the invoicing logic from fieldservice_account and puts it into its own module
---
 fieldservice_account_analytic/README.rst      | 121 +++++
 fieldservice_account_analytic/__init__.py     |   4 +
 fieldservice_account_analytic/__manifest__.py |  25 +
 .../data/ir_rule.xml                          |  28 ++
 .../models/account_invoice_line.py            |  21 +
 .../models/analytic_account.py                |  28 ++
 .../models/fsm_location.py                    |  11 +
 .../readme/CONFIGURE.rst                      |   4 +
 .../readme/CONTRIBUTORS.rst                   |   3 +
 .../readme/CREDITS.rst                        |   3 +
 .../readme/DESCRIPTION.rst                    |   2 +
 .../readme/INSTALL.rst                        |   1 +
 .../readme/USAGE.rst                          |   1 +
 .../security/ir.model.access.csv              |   5 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 460 ++++++++++++++++++
 .../views/fsm_location.xml                    |  20 +
 17 files changed, 737 insertions(+)
 create mode 100644 fieldservice_account_analytic/README.rst
 create mode 100644 fieldservice_account_analytic/__init__.py
 create mode 100644 fieldservice_account_analytic/__manifest__.py
 create mode 100644 fieldservice_account_analytic/data/ir_rule.xml
 create mode 100644 fieldservice_account_analytic/models/account_invoice_line.py
 create mode 100644 fieldservice_account_analytic/models/analytic_account.py
 create mode 100644 fieldservice_account_analytic/models/fsm_location.py
 create mode 100644 fieldservice_account_analytic/readme/CONFIGURE.rst
 create mode 100644 fieldservice_account_analytic/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_account_analytic/readme/CREDITS.rst
 create mode 100644 fieldservice_account_analytic/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_account_analytic/readme/INSTALL.rst
 create mode 100644 fieldservice_account_analytic/readme/USAGE.rst
 create mode 100644 fieldservice_account_analytic/security/ir.model.access.csv
 create mode 100644 fieldservice_account_analytic/static/description/icon.png
 create mode 100644 fieldservice_account_analytic/static/description/index.html
 create mode 100644 fieldservice_account_analytic/views/fsm_location.xml

diff --git a/fieldservice_account_analytic/README.rst b/fieldservice_account_analytic/README.rst
new file mode 100644
index 0000000000..278e295c55
--- /dev/null
+++ b/fieldservice_account_analytic/README.rst
@@ -0,0 +1,121 @@
+==========================
+Field Service - Accounting
+==========================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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/12.0/fieldservice_account
+    :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_account
+    :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
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module adds the ability to track employee time and contractor
+costs for Field Service Orders. It also adds functionality to create
+a customer invoice and a vendor bill when a Field Service Order is
+completed.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Installation
+============
+
+No special installation instructions
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+* Go to Field Service > Master Data > Locations
+* Create or select a location and set their analytic account
+
+Usage
+=====
+
+To use the module:
+
+On a field service order, open the "Accounting" tab. Depending on 
+whether the logged in user or an employee or not, they will see 
+either a place to enter timesheet records or contractor costs.
+
+The total cost of the order is calculated based on the entries in 
+the employee timesheet entries and contractor costs.
+
+When an order is completed, a customer invoice will be generated for
+the employee time and the contractor costs. A vendor bill will be 
+created for the contractor costs.
+
+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_account%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+
+Contributors
+~~~~~~~~~~~~
+
+* Michael Allen <mallen@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.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-osimallen| image:: https://github.com/osimallen.png?size=40px
+    :target: https://github.com/osimallen
+    :alt: osimallen
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-osimallen| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_account>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_account_analytic/__init__.py b/fieldservice_account_analytic/__init__.py
new file mode 100644
index 0000000000..66ca882fcc
--- /dev/null
+++ b/fieldservice_account_analytic/__init__.py
@@ -0,0 +1,4 @@
+# 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_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
new file mode 100644
index 0000000000..88cbae6efc
--- /dev/null
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2018 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - Analytic Accounting',
+    'summary': """Track analytic accounts on Field Service locations
+                  and orders""",
+    'version': '12.0.2.0.1',
+    'category': 'Field Service',
+    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice_account',
+        'analytic',
+        'product',
+    ],
+    'data': [
+        'data/ir_rule.xml',
+        'security/ir.model.access.csv',
+        'views/fsm_location.xml',
+    ],
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': ['osimallen'],
+}
diff --git a/fieldservice_account_analytic/data/ir_rule.xml b/fieldservice_account_analytic/data/ir_rule.xml
new file mode 100644
index 0000000000..622bca4ee7
--- /dev/null
+++ b/fieldservice_account_analytic/data/ir_rule.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="analytic_account_fsm_manager" model="ir.rule">
+        <field name="name">account.analytic.line.fsm.manager</field>
+        <field name="model_id" ref="model_account_analytic_line"/>
+        <field name="global" eval="False"/>
+        <field name="domain_force">[(1, '=', 1)]</field>
+        <field name="groups" eval="[(4, ref('fieldservice.group_fsm_manager'))]"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_write" eval="True"/>
+        <field name="perm_create" eval="True"/>
+        <field name="perm_unlink" eval="True"/>
+    </record>
+
+    <record id="analytic_account_fsm_dispatcher" model="ir.rule">
+        <field name="name">account.analytic.line.fsm.dispatcher</field>
+        <field name="model_id" ref="model_account_analytic_line"/>
+        <field name="global" eval="False"/>
+        <field name="domain_force">[(1, '=', 1)]</field>
+        <field name="groups" eval="[(4, ref('fieldservice.group_fsm_dispatcher'))]"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_write" eval="True"/>
+        <field name="perm_create" eval="True"/>
+        <field name="perm_unlink" eval="True"/>
+    </record>
+
+</odoo>
diff --git a/fieldservice_account_analytic/models/account_invoice_line.py b/fieldservice_account_analytic/models/account_invoice_line.py
new file mode 100644
index 0000000000..ca90dab2b1
--- /dev/null
+++ b/fieldservice_account_analytic/models/account_invoice_line.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models, _
+from odoo.exceptions import ValidationError
+
+
+class AccountInvoiceLine(models.Model):
+    _inherit = "account.invoice.line"
+
+    @api.model
+    def create(self, vals):
+        order = self.env['fsm.order'].browse(vals.get('fsm_order_id'))
+        if order:
+            if order.location_id.analytic_account_id:
+                vals['account_analytic_id'] = order.location_id.\
+                    analytic_account_id.id
+            else:
+                raise ValidationError(_("No analytic account "
+                                        "set on the order's Location."))
+        return super(AccountInvoiceLine, self).create(vals)
diff --git a/fieldservice_account_analytic/models/analytic_account.py b/fieldservice_account_analytic/models/analytic_account.py
new file mode 100644
index 0000000000..62bb9c12a7
--- /dev/null
+++ b/fieldservice_account_analytic/models/analytic_account.py
@@ -0,0 +1,28 @@
+# Copyright (C) 2018 - TODAY, 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
+
+
+class AccountAnalyticLine(models.Model):
+    _inherit = 'account.analytic.line'
+
+    fsm_order_id = fields.Many2one('fsm.order', string='FSM Order')
+    product_id = fields.Many2one('product.product', string='Time Type')
+
+    @api.model
+    def create(self, vals):
+        order = self.env['fsm.order'].browse(vals.get('fsm_order_id'))
+        if order:
+            if order.location_id.analytic_account_id:
+                vals['account_id'] = order.location_id.analytic_account_id.id
+            else:
+                raise ValidationError(_("No analytic account set "
+                                        "on the order's Location."))
+        return super(AccountAnalyticLine, self).create(vals)
+
+    @api.onchange('product_id')
+    def onchange_product_id(self):
+        if self.product_id:
+            self.name = self.product_id.name
diff --git a/fieldservice_account_analytic/models/fsm_location.py b/fieldservice_account_analytic/models/fsm_location.py
new file mode 100644
index 0000000000..07d4f5c450
--- /dev/null
+++ b/fieldservice_account_analytic/models/fsm_location.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2018 - TODAY, 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'
+
+    analytic_account_id = fields.Many2one('account.analytic.account',
+                                          string='Analytic Account')
diff --git a/fieldservice_account_analytic/readme/CONFIGURE.rst b/fieldservice_account_analytic/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..ecc5d5f7a7
--- /dev/null
+++ b/fieldservice_account_analytic/readme/CONFIGURE.rst
@@ -0,0 +1,4 @@
+To configure this module, you need to:
+
+* Go to Field Service > Master Data > Locations
+* Create or select a location and set their analytic account
diff --git a/fieldservice_account_analytic/readme/CONTRIBUTORS.rst b/fieldservice_account_analytic/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..e9143c46f2
--- /dev/null
+++ b/fieldservice_account_analytic/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* Michael Allen <mallen@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_account_analytic/readme/CREDITS.rst b/fieldservice_account_analytic/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_account_analytic/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_account_analytic/readme/DESCRIPTION.rst b/fieldservice_account_analytic/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..67dffec1b1
--- /dev/null
+++ b/fieldservice_account_analytic/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module adds the ability to track your analytic accounts on field
+service orders.
diff --git a/fieldservice_account_analytic/readme/INSTALL.rst b/fieldservice_account_analytic/readme/INSTALL.rst
new file mode 100644
index 0000000000..54fea7becb
--- /dev/null
+++ b/fieldservice_account_analytic/readme/INSTALL.rst
@@ -0,0 +1 @@
+No special installation instructions
diff --git a/fieldservice_account_analytic/readme/USAGE.rst b/fieldservice_account_analytic/readme/USAGE.rst
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/fieldservice_account_analytic/readme/USAGE.rst
@@ -0,0 +1 @@
+
diff --git a/fieldservice_account_analytic/security/ir.model.access.csv b/fieldservice_account_analytic/security/ir.model.access.csv
new file mode 100644
index 0000000000..07c8b38ef7
--- /dev/null
+++ b/fieldservice_account_analytic/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_analytic_line_fsm_manager,account.analytic.line.manager,model_account_analytic_line,fieldservice.group_fsm_manager,1,1,1,1
+access_account_analytic_line_fsm_dispatcher,account.analytic.line.dispatcher,model_account_analytic_line,fieldservice.group_fsm_dispatcher,1,1,1,0
+access_analytic_account_fsm_manager,account.analytic.account.manager,analytic.model_account_analytic_account,fieldservice.group_fsm_manager,1,1,1,1
+access_analytic_account_fsm_dispatcher,account.analytic.account.dispatcher,analytic.model_account_analytic_account,fieldservice.group_fsm_dispatcher,1,1,1,0
diff --git a/fieldservice_account_analytic/static/description/icon.png b/fieldservice_account_analytic/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_account_analytic/static/description/index.html b/fieldservice_account_analytic/static/description/index.html
new file mode 100644
index 0000000000..be45db7518
--- /dev/null
+++ b/fieldservice_account_analytic/static/description/index.html
@@ -0,0 +1,460 @@
+<?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 - Accounting</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-accounting">
+<h1 class="title">Field Service - Accounting</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_account"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_account"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" 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>This module adds the ability to track employee time and contractor
+costs for Field Service Orders. It also adds functionality to create
+a customer invoice and a vendor bill when a Field Service Order is
+completed.</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="#bug-tracker" id="id4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id8">Other credits</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>No special installation instructions</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; Master Data &gt; Locations</li>
+<li>Create or select a location and set their analytic account</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id3">Usage</a></h1>
+<p>To use the module:</p>
+<p>On a field service order, open the “Accounting” tab. Depending on
+whether the logged in user or an employee or not, they will see
+either a place to enter timesheet records or contractor costs.</p>
+<p>The total cost of the order is calculated based on the entries in
+the employee timesheet entries and contractor costs.</p>
+<p>When an order is completed, a customer invoice will be generated for
+the employee time and the contractor costs. A vendor bill will be
+created for the contractor costs.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id4">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_account%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="#id5">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id6">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
+<ul class="simple">
+<li>Michael Allen &lt;<a class="reference external" href="mailto:mallen&#64;opensourceintegrators.com">mallen&#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">
+<h2><a class="toc-backref" href="#id8">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="#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">maintainer</a>:</p>
+<p><a class="reference external" href="https://github.com/osimallen"><img alt="osimallen" src="https://github.com/osimallen.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_account">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_account_analytic/views/fsm_location.xml b/fieldservice_account_analytic/views/fsm_location.xml
new file mode 100644
index 0000000000..80477e2838
--- /dev/null
+++ b/fieldservice_account_analytic/views/fsm_location.xml
@@ -0,0 +1,20 @@
+<odoo>
+
+    <!-- Field Service Location Form View-->
+    <record id="fsm_location_form_view_analytic" model="ir.ui.view">
+        <field name="name">fsm.location.form.analytic</field>
+        <field name="model">fsm.location</field>
+        <field name="inherit_id"
+               ref="fieldservice_account.fsm_location_form_view_accounting"/>
+        <field name="arch" type="xml">
+            <page id="accounting" position="inside">
+                <group>
+                    <group>
+                        <field name="analytic_account_id"/>
+                    </group>
+                </group>
+            </page>
+        </field>
+    </record>
+
+</odoo>

From 7381a2c94b7e4bd096de4b0db638eadd2038b3b2 Mon Sep 17 00:00:00 2001
From: hparfr <raph@hpar.fr>
Date: Wed, 27 Nov 2019 15:30:48 +0100
Subject: [PATCH 124/631] Clean up customer_id (billing), cost and change link
 between account_invoice* and fsm_order

---
 fieldservice_account_analytic/__init__.py     |  1 +
 fieldservice_account_analytic/__manifest__.py |  8 +++
 .../demo/fsm_location.xml                     | 20 ++++++
 .../migrations/12.0.2.0.0/post-migration.py   | 10 +++
 .../models/fsm_location.py                    | 10 ++-
 .../models/fsm_location_person.py             | 13 ++++
 .../models/fsm_order.py                       | 47 ++++++++++++++
 .../readme/DESCRIPTION.rst                    |  2 +
 .../report/fsm_order_report_template.xml      | 16 +++++
 .../views/fsm_location.xml                    | 46 +++++++++++---
 .../views/fsm_order.xml                       | 62 +++++++++++++++++++
 .../views/fsm_person.xml                      | 26 ++++++++
 .../views/fsm_route.xml                       | 14 +++++
 .../wizard/__init__.py                        |  1 +
 .../wizard/fsm_wizard.py                      | 13 ++++
 15 files changed, 281 insertions(+), 8 deletions(-)
 create mode 100644 fieldservice_account_analytic/demo/fsm_location.xml
 create mode 100644 fieldservice_account_analytic/migrations/12.0.2.0.0/post-migration.py
 create mode 100644 fieldservice_account_analytic/models/fsm_location_person.py
 create mode 100644 fieldservice_account_analytic/models/fsm_order.py
 create mode 100644 fieldservice_account_analytic/report/fsm_order_report_template.xml
 create mode 100644 fieldservice_account_analytic/views/fsm_order.xml
 create mode 100644 fieldservice_account_analytic/views/fsm_person.xml
 create mode 100644 fieldservice_account_analytic/views/fsm_route.xml
 create mode 100644 fieldservice_account_analytic/wizard/__init__.py
 create mode 100644 fieldservice_account_analytic/wizard/fsm_wizard.py

diff --git a/fieldservice_account_analytic/__init__.py b/fieldservice_account_analytic/__init__.py
index 66ca882fcc..f272a247d4 100644
--- a/fieldservice_account_analytic/__init__.py
+++ b/fieldservice_account_analytic/__init__.py
@@ -2,3 +2,4 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
+from . import wizard
\ No newline at end of file
diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index 88cbae6efc..4d93f31191 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -17,8 +17,16 @@
     'data': [
         'data/ir_rule.xml',
         'security/ir.model.access.csv',
+        'report/fsm_order_report_template.xml',
         'views/fsm_location.xml',
+        'views/fsm_order.xml',
+        'views/fsm_person.xml',
+        'views/fsm_route.xml',
     ],
+    'demo': [
+        'demo/fsm_location.xml',
+    ],
+    'pre_init_hook': 'pre_init_hook',
     'license': 'AGPL-3',
     'development_status': 'Beta',
     'maintainers': ['osimallen'],
diff --git a/fieldservice_account_analytic/demo/fsm_location.xml b/fieldservice_account_analytic/demo/fsm_location.xml
new file mode 100644
index 0000000000..fc3a0e6201
--- /dev/null
+++ b/fieldservice_account_analytic/demo/fsm_location.xml
@@ -0,0 +1,20 @@
+<odoo>
+
+    <!-- fsm.location -->
+    <record id="fieldservice.test_location" model="fsm.location">
+        <field name="customer_id" eval="ref('fieldservice.test_loc_partner')"/>
+    </record>
+
+    <!-- Other locations -->
+    <record id="fieldservice.location_1" model="fsm.location">
+        <field name="customer_id" eval="ref('fieldservice.location_partner_1')"/>
+    </record>
+
+    <record id="fieldservice.location_2" model="fsm.location">
+        <field name="customer_id" eval="ref('fieldservice.location_partner_2')"/>
+    </record>
+
+    <record id="fieldservice.location_3" model="fsm.location">
+        <field name="customer_id" eval="ref('fieldservice.location_partner_3')"/>
+    </record>
+</odoo>
diff --git a/fieldservice_account_analytic/migrations/12.0.2.0.0/post-migration.py b/fieldservice_account_analytic/migrations/12.0.2.0.0/post-migration.py
new file mode 100644
index 0000000000..7218f7ce5e
--- /dev/null
+++ b/fieldservice_account_analytic/migrations/12.0.2.0.0/post-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 fsm_order SET bill_to = 'location' "
+                "WHERE bill_to IS NULL;")
diff --git a/fieldservice_account_analytic/models/fsm_location.py b/fieldservice_account_analytic/models/fsm_location.py
index 07d4f5c450..92611bcbc0 100644
--- a/fieldservice_account_analytic/models/fsm_location.py
+++ b/fieldservice_account_analytic/models/fsm_location.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, 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, api
 
 
 class FSMLocation(models.Model):
@@ -9,3 +9,11 @@ class FSMLocation(models.Model):
 
     analytic_account_id = fields.Many2one('account.analytic.account',
                                           string='Analytic Account')
+
+    customer_id = fields.Many2one(
+        'res.partner', string='Billed Customer', required=True,
+        ondelete='restrict', auto_join=True, track_visibility='onchange')
+
+    @api.onchange('fsm_parent_id')
+    def _onchange_fsm_parent_id_account(self):
+        self.customer_id = self.fsm_parent_id.customer_id or False
diff --git a/fieldservice_account_analytic/models/fsm_location_person.py b/fieldservice_account_analytic/models/fsm_location_person.py
new file mode 100644
index 0000000000..d6e3a1f2e1
--- /dev/null
+++ b/fieldservice_account_analytic/models/fsm_location_person.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, models
+
+
+class FSMLocationPerson(models.Model):
+    _inherit = 'fsm.location.person'
+
+    customer_id = fields.Many2one('res.partner', string='Billed Customer',
+                                  required=True, ondelete='restrict',
+                                  auto_join=True,
+                                  track_visibility='onchange')
diff --git a/fieldservice_account_analytic/models/fsm_order.py b/fieldservice_account_analytic/models/fsm_order.py
new file mode 100644
index 0000000000..d88ac6091a
--- /dev/null
+++ b/fieldservice_account_analytic/models/fsm_order.py
@@ -0,0 +1,47 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMOrder(models.Model):
+    _inherit = 'fsm.order'
+
+    total_cost = fields.Float(compute='_compute_total_cost',
+                              string='Total Cost')
+    bill_to = fields.Selection([('location', 'Bill Location'),
+                                ('contact', 'Bill Contact')],
+                               string="Bill to",
+                               required=True,
+                               default="location")
+    customer_id = fields.Many2one('res.partner', string='Contact',
+                                  domain=[('customer', '=', True)],
+                                  change_default=True,
+                                  index=True,
+                                  track_visibility='always')
+
+    def _compute_total_cost(self):
+        """ To be overridden as needed from other modules """
+        for order in self:
+            order.total_cost = 0.0
+
+    @api.onchange('location_id')
+    def _onchange_location_id_customer_account(self):
+        if self.location_id:
+            return {'domain': {'customer_id': [('service_location_id', '=',
+                                                self.location_id.name)]}}
+        else:
+            return {'domain': {'customer_id': [('id', '!=', None)]}}
+
+    @api.onchange('customer_id')
+    def _onchange_customer_id_location(self):
+        if self.customer_id:
+            self.location_id = self.customer_id.service_location_id
+
+    @api.multi
+    def write(self, vals):
+        res = super(FSMOrder, self).write(vals)
+        for order in self:
+            if 'customer_id' not in vals and order.customer_id is False:
+                order.customer_id = order.location_id.customer_id.id
+        return res
diff --git a/fieldservice_account_analytic/readme/DESCRIPTION.rst b/fieldservice_account_analytic/readme/DESCRIPTION.rst
index 67dffec1b1..2941a900e3 100644
--- a/fieldservice_account_analytic/readme/DESCRIPTION.rst
+++ b/fieldservice_account_analytic/readme/DESCRIPTION.rst
@@ -1,2 +1,4 @@
 This module adds the ability to track your analytic accounts on field
 service orders.
+It also adds the option to track the billing partner for field service
+locations and orders.
diff --git a/fieldservice_account_analytic/report/fsm_order_report_template.xml b/fieldservice_account_analytic/report/fsm_order_report_template.xml
new file mode 100644
index 0000000000..e00d75f2c7
--- /dev/null
+++ b/fieldservice_account_analytic/report/fsm_order_report_template.xml
@@ -0,0 +1,16 @@
+<odoo>
+
+    <template id="report_fsm_order_document_account" inherit_id="fieldservice.report_fsm_order_document">
+        <xpath expr="//div[hasclass('page')]" position="before">
+            <t t-if="doc.customer_id">
+                <t t-set="information_block">
+                    <t t-if="doc.customer_id">
+                        <div t-field="doc.customer_id"
+                             t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;, &quot;phone&quot;, &quot;email&quot;]}"/>
+                    </t>
+                </t>
+            </t>
+        </xpath>
+    </template>
+
+</odoo>
diff --git a/fieldservice_account_analytic/views/fsm_location.xml b/fieldservice_account_analytic/views/fsm_location.xml
index 80477e2838..3a5e23cdcf 100644
--- a/fieldservice_account_analytic/views/fsm_location.xml
+++ b/fieldservice_account_analytic/views/fsm_location.xml
@@ -1,19 +1,51 @@
 <odoo>
 
+    <!-- Field Service Location Tree View-->
+    <record id="fsm_location_tree_view_analytic" model="ir.ui.view">
+        <field name="name">fsm.location.tree.accounting</field>
+        <field name="model">fsm.location</field>
+        <field name="inherit_id" ref="fieldservice.fsm_location_tree_view"/>
+        <field name="arch" type="xml">
+            <field name="owner_id" position="after">
+                <field name="customer_id"/>
+            </field>
+        </field>
+    </record>
+
+
     <!-- Field Service Location Form View-->
     <record id="fsm_location_form_view_analytic" model="ir.ui.view">
-        <field name="name">fsm.location.form.analytic</field>
+        <field name="name">fsm.location.form.accounting</field>
         <field name="model">fsm.location</field>
-        <field name="inherit_id"
-               ref="fieldservice_account.fsm_location_form_view_accounting"/>
+        <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
         <field name="arch" type="xml">
-            <page id="accounting" position="inside">
-                <group>
+            <page id="others-page" position="before">
+                <page name="accounting" string="Accounting">
                     <group>
-                        <field name="analytic_account_id"/>
+                        <group>
+                            <field name="analytic_account_id"/>
+                        </group>
                     </group>
-                </group>
+                </page>
             </page>
+            <field name="owner_id" position="after">
+                <field name="customer_id"/>
+            </field>
+        </field>
+    </record>
+    
+    <!-- Field Service Location Search View-->
+    <record id="fsm_location_search_view_analytic" model="ir.ui.view">
+        <field name="name">fsm.location.search</field>
+        <field name="model">fsm.location</field>
+        <field name="inherit_id" ref="fieldservice.fsm_location_search_view"/>
+        <field name="arch" type="xml">
+            <field name="owner_id" position="after">
+                <field name="customer_id"/>
+            </field>
+            <filter name="owner_id" position="after">
+                <filter name="customer_id" string="Customer" domain="[]" context="{'group_by':'customer_id'}"/>
+            </filter>
         </field>
     </record>
 
diff --git a/fieldservice_account_analytic/views/fsm_order.xml b/fieldservice_account_analytic/views/fsm_order.xml
new file mode 100644
index 0000000000..db0ccee063
--- /dev/null
+++ b/fieldservice_account_analytic/views/fsm_order.xml
@@ -0,0 +1,62 @@
+<odoo>
+
+    <record id="fsm_order_form_analytic" model="ir.ui.view">
+        <field name="name">fsm.order.form.account</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
+        <field name="arch" type="xml">
+            <notebook position="inside">
+                <page name="accounting" string="Accounting">
+                    <group name="bill_to">
+                        <field name="bill_to" widget="radio" options="{'horizontal': true}"/>
+                    </group>
+                </page>
+            </notebook>
+            <field name="region_id" position="after">
+                <field name="customer_id" />
+            </field>
+        </field>
+    </record>
+
+    <record id="fsm_order_tree_view" model="ir.ui.view">
+        <field name="name">fsm.order.tree</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_tree_view"/>
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="customer_id"/>
+            </field>
+        </field>
+    </record>
+
+    <!-- Dashboard -->
+    <record id="fsm_order_kanban_view" model="ir.ui.view">
+        <field name="name">fsm.order.kanban</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_kanban_view"/>
+        <field name="arch" type="xml">
+            <field name="priority" position="after">
+                <field name="customer_id"/>
+            </field>
+            <xpath expr="//div[hasclass('oe_kanban_content')]/div[2]" position="after">
+                <div class="text-muted o_kanban_record_subtitle">
+                    <span t-if="record.customer_id.value">
+                        <t t-esc="record.customer_id.value"/>
+                    </span>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="fsm_order_calendar_view" model="ir.ui.view">
+        <field name="name">Orders</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_calendar_view"/>
+        <field name="arch" type="xml">
+            <field name="phone" position="after">
+                <field name="customer_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_account_analytic/views/fsm_person.xml b/fieldservice_account_analytic/views/fsm_person.xml
new file mode 100644
index 0000000000..1e8581675e
--- /dev/null
+++ b/fieldservice_account_analytic/views/fsm_person.xml
@@ -0,0 +1,26 @@
+<odoo>
+
+    <record id="fsm_person_form" model="ir.ui.view">
+        <field name="name">fsm.person.form</field>
+        <field name="model">fsm.person</field>
+        <field name="inherit_id" ref="fieldservice.fsm_person_form"/>
+        <field name="arch" type="xml">
+            <field name="owner_id" position="after">
+                <field name="customer_id"/>
+            </field>
+        </field>
+    </record>
+
+    <!-- Field Service Location Person Form View-->
+    <record id="fsm_location_person_form_view_analytic" model="ir.ui.view">
+        <field name="name">fsm.location.person.form</field>
+        <field name="model">fsm.location.person</field>
+        <field name="inherit_id" ref="fieldservice.fsm_location_person_form_view"/>
+        <field name="arch" type="xml">
+            <field name="owner_id" position="after">
+                <field name="customer_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_account_analytic/views/fsm_route.xml b/fieldservice_account_analytic/views/fsm_route.xml
new file mode 100644
index 0000000000..4f1df4b04b
--- /dev/null
+++ b/fieldservice_account_analytic/views/fsm_route.xml
@@ -0,0 +1,14 @@
+<odoo>
+
+    <record id="fsm_route_form" model="ir.ui.view">
+        <field name="name">fsm.route.form</field>
+        <field name="model">fsm.route</field>
+        <field name='inherit_id' ref='fieldservice.fsm_route_form'/>
+        <field name="arch" type="xml">
+            <field name="location_id" position="before">
+                <field name="customer_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_account_analytic/wizard/__init__.py b/fieldservice_account_analytic/wizard/__init__.py
new file mode 100644
index 0000000000..c013f4b7c3
--- /dev/null
+++ b/fieldservice_account_analytic/wizard/__init__.py
@@ -0,0 +1 @@
+from . import fsm_wizard
diff --git a/fieldservice_account_analytic/wizard/fsm_wizard.py b/fieldservice_account_analytic/wizard/fsm_wizard.py
new file mode 100644
index 0000000000..a3050f737d
--- /dev/null
+++ b/fieldservice_account_analytic/wizard/fsm_wizard.py
@@ -0,0 +1,13 @@
+# Copyright (C) 2018 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import models
+
+
+class FSMWizard(models.TransientModel):
+    _inherit = 'fsm.wizard'
+
+    def _prepare_fsm_location(self, partner):
+        res = super()._prepare_fsm_location(partner)
+        res['customer_id'] = partner.id
+        res['owner_id'] = partner.id
+        return res

From cae4f72706abd011617043cb9311ddad16c1d1e2 Mon Sep 17 00:00:00 2001
From: hparfr <raph@hpar.fr>
Date: Wed, 27 Nov 2019 15:31:46 +0100
Subject: [PATCH 125/631] add missing files

---
 fieldservice_account_analytic/models/__init__.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 fieldservice_account_analytic/models/__init__.py

diff --git a/fieldservice_account_analytic/models/__init__.py b/fieldservice_account_analytic/models/__init__.py
new file mode 100644
index 0000000000..5c0842d55d
--- /dev/null
+++ b/fieldservice_account_analytic/models/__init__.py
@@ -0,0 +1,10 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import (
+    account_invoice,
+    analytic_account,
+    fsm_location,
+    fsm_location_person,
+    fsm_order,
+    fsm_person,
+)

From 85a08526f0f9b5a21e0c0a7c43a9e626e292a202 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 2 Dec 2019 17:32:47 -0500
Subject: [PATCH 126/631] [FIX] fieldservice_account: tests and travis

---
 fieldservice_account_analytic/__init__.py     |  3 +-
 fieldservice_account_analytic/__manifest__.py |  1 -
 fieldservice_account_analytic/init_hook.py    |  8 +++++
 .../models/__init__.py                        |  3 +-
 .../tests/__init__.py                         |  4 +++
 .../tests/test_fsm_account_wizard.py          | 30 +++++++++++++++++++
 .../views/fsm_person.xml                      | 26 ----------------
 7 files changed, 45 insertions(+), 30 deletions(-)
 create mode 100644 fieldservice_account_analytic/init_hook.py
 create mode 100644 fieldservice_account_analytic/tests/__init__.py
 create mode 100644 fieldservice_account_analytic/tests/test_fsm_account_wizard.py
 delete mode 100644 fieldservice_account_analytic/views/fsm_person.xml

diff --git a/fieldservice_account_analytic/__init__.py b/fieldservice_account_analytic/__init__.py
index f272a247d4..a60aec2546 100644
--- a/fieldservice_account_analytic/__init__.py
+++ b/fieldservice_account_analytic/__init__.py
@@ -2,4 +2,5 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
-from . import wizard
\ No newline at end of file
+from . import wizard
+from .init_hook import pre_init_hook
diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index 4d93f31191..5b98148f4f 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -20,7 +20,6 @@
         'report/fsm_order_report_template.xml',
         'views/fsm_location.xml',
         'views/fsm_order.xml',
-        'views/fsm_person.xml',
         'views/fsm_route.xml',
     ],
     'demo': [
diff --git a/fieldservice_account_analytic/init_hook.py b/fieldservice_account_analytic/init_hook.py
new file mode 100644
index 0000000000..730d91faac
--- /dev/null
+++ b/fieldservice_account_analytic/init_hook.py
@@ -0,0 +1,8 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+def pre_init_hook(cr):
+    cr.execute("""ALTER TABLE "fsm_location" ADD "customer_id" INT;""")
+    cr.execute("""UPDATE "fsm_location" SET customer_id = owner_id
+    WHERE customer_id IS NULL;""")
diff --git a/fieldservice_account_analytic/models/__init__.py b/fieldservice_account_analytic/models/__init__.py
index 5c0842d55d..173f04e574 100644
--- a/fieldservice_account_analytic/models/__init__.py
+++ b/fieldservice_account_analytic/models/__init__.py
@@ -1,10 +1,9 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
-    account_invoice,
+    account_invoice_line,
     analytic_account,
     fsm_location,
     fsm_location_person,
     fsm_order,
-    fsm_person,
 )
diff --git a/fieldservice_account_analytic/tests/__init__.py b/fieldservice_account_analytic/tests/__init__.py
new file mode 100644
index 0000000000..3eb82c6555
--- /dev/null
+++ b/fieldservice_account_analytic/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright 2019 Brian McMaster <brian@mcmpest.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from . import test_fsm_account_wizard
diff --git a/fieldservice_account_analytic/tests/test_fsm_account_wizard.py b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
new file mode 100644
index 0000000000..5a3eaf84ae
--- /dev/null
+++ b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
@@ -0,0 +1,30 @@
+# Copyright 2019 Ecosoft Co., Ltd (http://ecosoft.co.th/)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from odoo.addons.fieldservice_account.tests.test_fsm_account import (
+    FSMAccountCase
+)
+
+
+class FSMAccountCase(FSMAccountCase):
+
+    def setUp(self):
+        super(FSMAccountCase, self).setUp()
+
+    def test_convert_contact_to_fsm_location(self):
+        """
+        Test converting a contact to a location to make sure the customer_id
+        and owner_id get set correctly
+        :return:
+        """
+        self.Wizard.action_convert_location(self.test_loc_partner2)
+
+        # check if there is a new FSM Location with the same name
+        self.wiz_location = self.env['fsm.location']. \
+            search([('name', '=', self.test_loc_partner2.name)])
+
+        # check if location is created successfully and fields copied over
+        self.assertEqual(self.test_loc_partner2,
+                         self.wiz_location.customer_id)
+        self.assertEqual(self.test_loc_partner2,
+                         self.wiz_location.owner_id)
diff --git a/fieldservice_account_analytic/views/fsm_person.xml b/fieldservice_account_analytic/views/fsm_person.xml
deleted file mode 100644
index 1e8581675e..0000000000
--- a/fieldservice_account_analytic/views/fsm_person.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<odoo>
-
-    <record id="fsm_person_form" model="ir.ui.view">
-        <field name="name">fsm.person.form</field>
-        <field name="model">fsm.person</field>
-        <field name="inherit_id" ref="fieldservice.fsm_person_form"/>
-        <field name="arch" type="xml">
-            <field name="owner_id" position="after">
-                <field name="customer_id"/>
-            </field>
-        </field>
-    </record>
-
-    <!-- Field Service Location Person Form View-->
-    <record id="fsm_location_person_form_view_analytic" model="ir.ui.view">
-        <field name="name">fsm.location.person.form</field>
-        <field name="model">fsm.location.person</field>
-        <field name="inherit_id" ref="fieldservice.fsm_location_person_form_view"/>
-        <field name="arch" type="xml">
-            <field name="owner_id" position="after">
-                <field name="customer_id"/>
-            </field>
-        </field>
-    </record>
-
-</odoo>

From 38b18d1e1b657cbab2dd5d8b34713d036c348556 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Thu, 5 Dec 2019 13:28:31 -0500
Subject: [PATCH 127/631] [IMP] fieldservice_account: Update maintainers

---
 fieldservice_account_analytic/README.rst      |  44 ++++---
 fieldservice_account_analytic/__manifest__.py |   6 +-
 .../i18n/fieldservice_account_analytic.pot    | 109 ++++++++++++++++++
 .../static/description/index.html             |  34 +++---
 4 files changed, 147 insertions(+), 46 deletions(-)
 create mode 100644 fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot

diff --git a/fieldservice_account_analytic/README.rst b/fieldservice_account_analytic/README.rst
index 278e295c55..aeb2336ff6 100644
--- a/fieldservice_account_analytic/README.rst
+++ b/fieldservice_account_analytic/README.rst
@@ -1,6 +1,6 @@
-==========================
-Field Service - Accounting
-==========================
+===================================
+Field Service - Analytic Accounting
+===================================
 
 .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
@@ -14,10 +14,10 @@ Field Service - Accounting
     :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_account
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_account_analytic
     :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_account
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_account_analytic
     :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
@@ -25,10 +25,10 @@ Field Service - Accounting
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
-This module adds the ability to track employee time and contractor
-costs for Field Service Orders. It also adds functionality to create
-a customer invoice and a vendor bill when a Field Service Order is
-completed.
+This module adds the ability to track your analytic accounts on field
+service orders.
+It also adds the option to track the billing partner for field service
+locations and orders.
 
 **Table of contents**
 
@@ -51,18 +51,7 @@ To configure this module, you need to:
 Usage
 =====
 
-To use the module:
 
-On a field service order, open the "Accounting" tab. Depending on 
-whether the logged in user or an employee or not, they will see 
-either a place to enter timesheet records or contractor costs.
-
-The total cost of the order is calculated based on the entries in 
-the employee timesheet entries and contractor costs.
-
-When an order is completed, a customer invoice will be generated for
-the employee time and the contractor costs. A vendor bill will be 
-created for the contractor costs.
 
 Bug Tracker
 ===========
@@ -70,7 +59,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_account%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_account_analytic%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.
 
@@ -87,6 +76,7 @@ Contributors
 
 * Michael Allen <mallen@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Brian McMaster <brian@mcmpest.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -111,11 +101,17 @@ promote its widespread use.
 .. |maintainer-osimallen| image:: https://github.com/osimallen.png?size=40px
     :target: https://github.com/osimallen
     :alt: osimallen
+.. |maintainer-brian10048| image:: https://github.com/brian10048.png?size=40px
+    :target: https://github.com/brian10048
+    :alt: brian10048
+.. |maintainer-bodedra| image:: https://github.com/bodedra.png?size=40px
+    :target: https://github.com/bodedra
+    :alt: bodedra
 
-Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-osimallen| 
+|maintainer-osimallen| |maintainer-brian10048| |maintainer-bodedra| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_account>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_account_analytic>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index 5b98148f4f..b7e1330238 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -28,5 +28,9 @@
     'pre_init_hook': 'pre_init_hook',
     'license': 'AGPL-3',
     'development_status': 'Beta',
-    'maintainers': ['osimallen'],
+    'maintainers': [
+        'osimallen',
+        'brian10048',
+        'bodedra',
+    ],
 }
diff --git a/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
new file mode 100644
index 0000000000..c68a6c0d8f
--- /dev/null
+++ b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
@@ -0,0 +1,109 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_account_analytic
+#
+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_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_order_form_analytic
+msgid "Accounting"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__analytic_account_id
+msgid "Analytic Account"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
+msgid "Bill to"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location_person__customer_id
+msgid "Billed Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
+msgid "Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_search_view_analytic
+msgid "Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location_person
+msgid "Field Service Location Person Info"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#, python-format
+msgid "No analytic account set on the order's Location."
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
+msgid "Time Type"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
+msgid "Total Cost"
+msgstr ""
+
diff --git a/fieldservice_account_analytic/static/description/index.html b/fieldservice_account_analytic/static/description/index.html
index be45db7518..ac71aa178f 100644
--- a/fieldservice_account_analytic/static/description/index.html
+++ b/fieldservice_account_analytic/static/description/index.html
@@ -4,7 +4,7 @@
 <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 - Accounting</title>
+<title>Field Service - Analytic Accounting</title>
 <style type="text/css">
 
 /*
@@ -360,18 +360,18 @@
 </style>
 </head>
 <body>
-<div class="document" id="field-service-accounting">
-<h1 class="title">Field Service - Accounting</h1>
+<div class="document" id="field-service-analytic-accounting">
+<h1 class="title">Field Service - Analytic Accounting</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_account"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_account"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" 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>This module adds the ability to track employee time and contractor
-costs for Field Service Orders. It also adds functionality to create
-a customer invoice and a vendor bill when a Field Service Order is
-completed.</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_account_analytic"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_account_analytic"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" 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>This module adds the ability to track your analytic accounts on field
+service orders.
+It also adds the option to track the billing partner for field service
+locations and orders.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -402,22 +402,13 @@ <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>To use the module:</p>
-<p>On a field service order, open the “Accounting” tab. Depending on
-whether the logged in user or an employee or not, they will see
-either a place to enter timesheet records or contractor costs.</p>
-<p>The total cost of the order is calculated based on the entries in
-the employee timesheet entries and contractor costs.</p>
-<p>When an order is completed, a customer invoice will be generated for
-the employee time and the contractor costs. A vendor bill will be
-created for the contractor costs.</p>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#id4">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_account%0Aversion:%2012.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_account_analytic%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">
@@ -433,6 +424,7 @@ <h2><a class="toc-backref" href="#id7">Contributors</a></h2>
 <ul class="simple">
 <li>Michael Allen &lt;<a class="reference external" href="mailto:mallen&#64;opensourceintegrators.com">mallen&#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">
@@ -449,9 +441,9 @@ <h2><a class="toc-backref" href="#id9">Maintainers</a></h2>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
-<p><a class="reference external" href="https://github.com/osimallen"><img alt="osimallen" src="https://github.com/osimallen.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_account">OCA/field-service</a> project on GitHub.</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/osimallen"><img alt="osimallen" src="https://github.com/osimallen.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> <a class="reference external" href="https://github.com/bodedra"><img alt="bodedra" src="https://github.com/bodedra.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_account_analytic">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 12d8844d936ff7327ad176137b5e52be029de8d6 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 5 Dec 2019 19:10:31 +0000
Subject: [PATCH 128/631] fieldservice_account_analytic 12.0.2.0.2

---
 fieldservice_account_analytic/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index b7e1330238..6857117776 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - Analytic Accounting',
     'summary': """Track analytic accounts on Field Service locations
                   and orders""",
-    'version': '12.0.2.0.1',
+    'version': '12.0.2.0.2',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',

From dfafd9533fbfd40f37a5aca1cec4052cee91bfb1 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 11 Dec 2019 15:28:09 -0800
Subject: [PATCH 129/631] [IMP] Analytic Account Company Dependant

---
 fieldservice_account_analytic/models/fsm_location.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fieldservice_account_analytic/models/fsm_location.py b/fieldservice_account_analytic/models/fsm_location.py
index 92611bcbc0..bf9ed97b7b 100644
--- a/fieldservice_account_analytic/models/fsm_location.py
+++ b/fieldservice_account_analytic/models/fsm_location.py
@@ -8,7 +8,8 @@ class FSMLocation(models.Model):
     _inherit = 'fsm.location'
 
     analytic_account_id = fields.Many2one('account.analytic.account',
-                                          string='Analytic Account')
+                                          string='Analytic Account',
+                                          company_dependent=True)
 
     customer_id = fields.Many2one(
         'res.partner', string='Billed Customer', required=True,

From b3d6d421dbd2a5ec9b27b39970a7f5a2b4a6f3d4 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 12 Dec 2019 15:52:24 +0000
Subject: [PATCH 130/631] fieldservice_account_analytic 12.0.2.1.0

---
 fieldservice_account_analytic/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index 6857117776..d041e45c72 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - Analytic Accounting',
     'summary': """Track analytic accounts on Field Service locations
                   and orders""",
-    'version': '12.0.2.0.2',
+    'version': '12.0.2.1.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',

From 1ade4d75fe6cade96c6846f474a18e7c34401baf Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Tue, 17 Dec 2019 13:51:21 +0530
Subject: [PATCH 131/631] [12.0][IMP] fieldservice

---
 fieldservice_account_analytic/__manifest__.py     |  1 -
 fieldservice_account_analytic/views/fsm_route.xml | 14 --------------
 2 files changed, 15 deletions(-)
 delete mode 100644 fieldservice_account_analytic/views/fsm_route.xml

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index d041e45c72..de1e8f178e 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -20,7 +20,6 @@
         'report/fsm_order_report_template.xml',
         'views/fsm_location.xml',
         'views/fsm_order.xml',
-        'views/fsm_route.xml',
     ],
     'demo': [
         'demo/fsm_location.xml',
diff --git a/fieldservice_account_analytic/views/fsm_route.xml b/fieldservice_account_analytic/views/fsm_route.xml
deleted file mode 100644
index 4f1df4b04b..0000000000
--- a/fieldservice_account_analytic/views/fsm_route.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<odoo>
-
-    <record id="fsm_route_form" model="ir.ui.view">
-        <field name="name">fsm.route.form</field>
-        <field name="model">fsm.route</field>
-        <field name='inherit_id' ref='fieldservice.fsm_route_form'/>
-        <field name="arch" type="xml">
-            <field name="location_id" position="before">
-                <field name="customer_id"/>
-            </field>
-        </field>
-    </record>
-
-</odoo>

From e13ccb732fc3ec79414fb952e9d8a4fc3579c386 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 18 Dec 2019 15:26:50 +0000
Subject: [PATCH 132/631] fieldservice_account_analytic 12.0.3.0.0

---
 fieldservice_account_analytic/__manifest__.py |   2 +-
 fieldservice_account_analytic/i18n/es_CL.po   | 111 ++++++++++++++++++
 fieldservice_account_analytic/i18n/pt_BR.po   | 109 +++++++++++++++++
 3 files changed, 221 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_account_analytic/i18n/es_CL.po
 create mode 100644 fieldservice_account_analytic/i18n/pt_BR.po

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index de1e8f178e..945f00ca47 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - Analytic Accounting',
     'summary': """Track analytic accounts on Field Service locations
                   and orders""",
-    'version': '12.0.2.1.0',
+    'version': '12.0.3.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_account_analytic/i18n/es_CL.po b/fieldservice_account_analytic/i18n/es_CL.po
new file mode 100644
index 0000000000..87b385b095
--- /dev/null
+++ b/fieldservice_account_analytic/i18n/es_CL.po
@@ -0,0 +1,111 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_account_analytic
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-01-15 06:13+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.10\n"
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_order_form_analytic
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__analytic_account_id
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
+msgid "Bill to"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location_person__customer_id
+msgid "Billed Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
+msgid "Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_search_view_analytic
+msgid "Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location_person
+msgid "Field Service Location Person Info"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#, python-format
+msgid "No analytic account set on the order's Location."
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
+msgid "Time Type"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
+msgid "Total Cost"
+msgstr ""
diff --git a/fieldservice_account_analytic/i18n/pt_BR.po b/fieldservice_account_analytic/i18n/pt_BR.po
new file mode 100644
index 0000000000..199dd9b8bc
--- /dev/null
+++ b/fieldservice_account_analytic/i18n/pt_BR.po
@@ -0,0 +1,109 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_account_analytic
+#
+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_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_order_form_analytic
+msgid "Accounting"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__analytic_account_id
+msgid "Analytic Account"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
+msgid "Bill to"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location_person__customer_id
+msgid "Billed Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
+msgid "Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_search_view_analytic
+msgid "Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location_person
+msgid "Field Service Location Person Info"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#, python-format
+msgid "No analytic account set on the order's Location."
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
+msgid "Time Type"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
+msgid "Total Cost"
+msgstr ""

From e509ae317d7bacfc05a1c6efa308fb7e6d364019 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 15 Jan 2020 17:35:01 -0800
Subject: [PATCH 133/631] [IMP] Set Default Customer

[IMP] Move Method Up

[IMP] api.model + space

[IMP] fsm_parent_id

[FIX] Typo
---
 fieldservice_account_analytic/i18n/es.po      | 111 ++++++++++++++++++
 .../models/fsm_location.py                    |   9 +-
 2 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_account_analytic/i18n/es.po

diff --git a/fieldservice_account_analytic/i18n/es.po b/fieldservice_account_analytic/i18n/es.po
new file mode 100644
index 0000000000..b8c52b0790
--- /dev/null
+++ b/fieldservice_account_analytic/i18n/es.po
@@ -0,0 +1,111 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_account_analytic
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-01-15 06:13+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.10\n"
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_order_form_analytic
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__analytic_account_id
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
+msgid "Bill to"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location_person__customer_id
+msgid "Billed Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
+msgid "Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_search_view_analytic
+msgid "Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location_person
+msgid "Field Service Location Person Info"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#, python-format
+msgid "No analytic account set on the order's Location."
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
+msgid "Time Type"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
+msgid "Total Cost"
+msgstr ""
diff --git a/fieldservice_account_analytic/models/fsm_location.py b/fieldservice_account_analytic/models/fsm_location.py
index bf9ed97b7b..6885f1b1c1 100644
--- a/fieldservice_account_analytic/models/fsm_location.py
+++ b/fieldservice_account_analytic/models/fsm_location.py
@@ -11,9 +11,16 @@ class FSMLocation(models.Model):
                                           string='Analytic Account',
                                           company_dependent=True)
 
+    @api.model
+    def get_default_customer(self):
+        if self.fsm_parent_id:
+            return self.fsm_parent_id.customer_id.id
+        return self.owner_id.id
+
     customer_id = fields.Many2one(
         'res.partner', string='Billed Customer', required=True,
-        ondelete='restrict', auto_join=True, track_visibility='onchange')
+        ondelete='restrict', auto_join=True, track_visibility='onchange',
+        default=get_default_customer)
 
     @api.onchange('fsm_parent_id')
     def _onchange_fsm_parent_id_account(self):

From 6c95a6925dcf2078995389be1b845228a3ba6ea6 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 17 Jan 2020 00:35:14 +0000
Subject: [PATCH 134/631] fieldservice_account_analytic 12.0.3.1.0

---
 fieldservice_account_analytic/__manifest__.py |  2 +-
 fieldservice_account_analytic/i18n/es.po      | 34 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index 945f00ca47..8a4fd731d1 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - Analytic Accounting',
     'summary': """Track analytic accounts on Field Service locations
                   and orders""",
-    'version': '12.0.3.0.0',
+    'version': '12.0.3.1.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_account_analytic/i18n/es.po b/fieldservice_account_analytic/i18n/es.po
index b8c52b0790..53524f15f9 100644
--- a/fieldservice_account_analytic/i18n/es.po
+++ b/fieldservice_account_analytic/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: 2020-01-15 06:13+0000\n"
+"PO-Revision-Date: 2020-01-17 06:13+0000\n"
 "Last-Translator: Nelson Ramírez Sánchez <info@konos.cl>\n"
 "Language-Team: none\n"
 "Language: es\n"
@@ -30,82 +30,82 @@ msgstr "Cuenta Analítica"
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Linea Analitica"
 
 #. module: fieldservice_account_analytic
 #: selection:fsm.order,bill_to:0
 msgid "Bill Contact"
-msgstr ""
+msgstr "Contacto de Facturación"
 
 #. module: fieldservice_account_analytic
 #: selection:fsm.order,bill_to:0
 msgid "Bill Location"
-msgstr ""
+msgstr "Dirección de Facturación"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
 msgid "Bill to"
-msgstr ""
+msgstr "Facturar a"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location_person__customer_id
 msgid "Billed Customer"
-msgstr ""
+msgstr "Facturado a Cliente"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: fieldservice_account_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_search_view_analytic
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
-msgstr ""
+msgstr "Pedido FSM"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
 msgid "FSM Record Conversion"
-msgstr ""
+msgstr "Conversión de Registro FSM"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_location
 msgid "Field Service Location"
-msgstr ""
+msgstr "Ubicación del Servicio de Campo"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_location_person
 msgid "Field Service Location Person Info"
-msgstr ""
+msgstr "Servicio de campo Ubicación Información de la persona"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Orden de  Servicio de Campo"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Línea de factura"
 
 #. module: fieldservice_account_analytic
 #: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
 #: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
 #, python-format
 msgid "No analytic account set on the order's Location."
-msgstr ""
+msgstr "No hay una cuenta analítica establecida en la ubicación del pedido."
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
 msgid "Time Type"
-msgstr ""
+msgstr "Tipo de Tiempo"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
 msgid "Total Cost"
-msgstr ""
+msgstr "Coste Total"

From bc7c7b54d1384137a8545096500fa63ae23c78b9 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 31 Jan 2020 14:49:43 -0800
Subject: [PATCH 135/631] [DEL] Remove fsm_location_person.py

---
 .../i18n/fieldservice_account_analytic.pot          |  6 ------
 fieldservice_account_analytic/models/__init__.py    |  1 -
 .../models/fsm_location_person.py                   | 13 -------------
 3 files changed, 20 deletions(-)
 delete mode 100644 fieldservice_account_analytic/models/fsm_location_person.py

diff --git a/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
index c68a6c0d8f..a7729d23a4 100644
--- a/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
+++ b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
@@ -46,7 +46,6 @@ msgstr ""
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
-#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location_person__customer_id
 msgid "Billed Customer"
 msgstr ""
 
@@ -75,11 +74,6 @@ msgstr ""
 msgid "Field Service Location"
 msgstr ""
 
-#. module: fieldservice_account_analytic
-#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location_person
-msgid "Field Service Location Person Info"
-msgstr ""
-
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
 msgid "Field Service Order"
diff --git a/fieldservice_account_analytic/models/__init__.py b/fieldservice_account_analytic/models/__init__.py
index 173f04e574..59b98aeef2 100644
--- a/fieldservice_account_analytic/models/__init__.py
+++ b/fieldservice_account_analytic/models/__init__.py
@@ -4,6 +4,5 @@
     account_invoice_line,
     analytic_account,
     fsm_location,
-    fsm_location_person,
     fsm_order,
 )
diff --git a/fieldservice_account_analytic/models/fsm_location_person.py b/fieldservice_account_analytic/models/fsm_location_person.py
deleted file mode 100644
index d6e3a1f2e1..0000000000
--- a/fieldservice_account_analytic/models/fsm_location_person.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, models
-
-
-class FSMLocationPerson(models.Model):
-    _inherit = 'fsm.location.person'
-
-    customer_id = fields.Many2one('res.partner', string='Billed Customer',
-                                  required=True, ondelete='restrict',
-                                  auto_join=True,
-                                  track_visibility='onchange')

From 42628e1b847d07afe4f420350dca5481f9200880 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sat, 1 Feb 2020 20:06:12 +0000
Subject: [PATCH 136/631] fieldservice_account_analytic 12.0.3.2.0

---
 fieldservice_account_analytic/__manifest__.py |  2 +-
 fieldservice_account_analytic/i18n/es.po      | 11 ++---
 fieldservice_account_analytic/i18n/es_CL.po   |  8 +---
 fieldservice_account_analytic/i18n/pt_BR.po   | 46 +++++++++----------
 4 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index 8a4fd731d1..5fc8d3276f 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - Analytic Accounting',
     'summary': """Track analytic accounts on Field Service locations
                   and orders""",
-    'version': '12.0.3.1.0',
+    'version': '12.0.3.2.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_account_analytic/i18n/es.po b/fieldservice_account_analytic/i18n/es.po
index 53524f15f9..017a539d4e 100644
--- a/fieldservice_account_analytic/i18n/es.po
+++ b/fieldservice_account_analytic/i18n/es.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_account_analytic
+# 	* fieldservice_account_analytic
 #
 msgid ""
 msgstr ""
@@ -49,7 +49,6 @@ msgstr "Facturar a"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
-#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location_person__customer_id
 msgid "Billed Customer"
 msgstr "Facturado a Cliente"
 
@@ -78,11 +77,6 @@ msgstr "Conversión de Registro FSM"
 msgid "Field Service Location"
 msgstr "Ubicación del Servicio de Campo"
 
-#. module: fieldservice_account_analytic
-#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location_person
-msgid "Field Service Location Person Info"
-msgstr "Servicio de campo Ubicación Información de la persona"
-
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
 msgid "Field Service Order"
@@ -109,3 +103,6 @@ msgstr "Tipo de Tiempo"
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
 msgid "Total Cost"
 msgstr "Coste Total"
+
+#~ msgid "Field Service Location Person Info"
+#~ msgstr "Servicio de campo Ubicación Información de la persona"
diff --git a/fieldservice_account_analytic/i18n/es_CL.po b/fieldservice_account_analytic/i18n/es_CL.po
index 87b385b095..1ac61bd739 100644
--- a/fieldservice_account_analytic/i18n/es_CL.po
+++ b/fieldservice_account_analytic/i18n/es_CL.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_account_analytic
+# 	* fieldservice_account_analytic
 #
 msgid ""
 msgstr ""
@@ -49,7 +49,6 @@ msgstr ""
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
-#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location_person__customer_id
 msgid "Billed Customer"
 msgstr ""
 
@@ -78,11 +77,6 @@ msgstr ""
 msgid "Field Service Location"
 msgstr ""
 
-#. module: fieldservice_account_analytic
-#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location_person
-msgid "Field Service Location Person Info"
-msgstr ""
-
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
 msgid "Field Service Order"
diff --git a/fieldservice_account_analytic/i18n/pt_BR.po b/fieldservice_account_analytic/i18n/pt_BR.po
index 199dd9b8bc..5c3dc5dd7d 100644
--- a/fieldservice_account_analytic/i18n/pt_BR.po
+++ b/fieldservice_account_analytic/i18n/pt_BR.po
@@ -1,109 +1,105 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_account_analytic
+# 	* fieldservice_account_analytic
 #
 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_account_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_order_form_analytic
 msgid "Accounting"
-msgstr ""
+msgstr "Contabilidade"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__analytic_account_id
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta Analítica"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Linha Analitica"
 
 #. module: fieldservice_account_analytic
 #: selection:fsm.order,bill_to:0
 msgid "Bill Contact"
-msgstr ""
+msgstr "Conta do Contato"
 
 #. module: fieldservice_account_analytic
 #: selection:fsm.order,bill_to:0
 msgid "Bill Location"
-msgstr ""
+msgstr "Localização de Conta"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
 msgid "Bill to"
-msgstr ""
+msgstr "Conta para"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
-#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location_person__customer_id
 msgid "Billed Customer"
-msgstr ""
+msgstr "Cliente Faturado"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
-msgstr ""
+msgstr "Contato"
 
 #. module: fieldservice_account_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_search_view_analytic
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
-msgstr ""
+msgstr "Ordem FSM"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
 msgid "FSM Record Conversion"
-msgstr ""
+msgstr "Conversão do Registro FSM"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_location
 msgid "Field Service Location"
-msgstr ""
-
-#. module: fieldservice_account_analytic
-#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location_person
-msgid "Field Service Location Person Info"
-msgstr ""
+msgstr "Localização do Serviço de Campo"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Ordem de Serviço de Campo"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Linha de Fatura"
 
 #. module: fieldservice_account_analytic
 #: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
 #: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
 #, python-format
 msgid "No analytic account set on the order's Location."
-msgstr ""
+msgstr "Nenhuma conta analítica definida na Localização do ordem."
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
 msgid "Time Type"
-msgstr ""
+msgstr "Tipo de Tempo"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
 msgid "Total Cost"
-msgstr ""
+msgstr "Custo Total"

From c5034e52425f4775fe4a897e9eca7f96a0f7ab26 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 16 Jan 2020 15:33:27 -0800
Subject: [PATCH 137/631] [IMP] Filter Location/Contact

[IMP] Remove Unused Import

[IMP] Github Comments

[IMP] Add FSM to Variable
---
 fieldservice_account_analytic/__manifest__.py |  1 +
 .../i18n/fieldservice_account_analytic.pot    | 22 +++++++++++++++++
 .../models/__init__.py                        |  2 ++
 .../models/fsm_order.py                       | 19 +++++++++++----
 .../models/res_company.py                     | 18 ++++++++++++++
 .../models/res_config_settings.py             | 14 +++++++++++
 .../views/res_config_settings.xml             | 24 +++++++++++++++++++
 7 files changed, 95 insertions(+), 5 deletions(-)
 create mode 100644 fieldservice_account_analytic/models/res_company.py
 create mode 100644 fieldservice_account_analytic/models/res_config_settings.py
 create mode 100644 fieldservice_account_analytic/views/res_config_settings.xml

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index 5fc8d3276f..c9aae9b2d8 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -20,6 +20,7 @@
         'report/fsm_order_report_template.xml',
         'views/fsm_location.xml',
         'views/fsm_order.xml',
+        'views/res_config_settings.xml'
     ],
     'demo': [
         'demo/fsm_location.xml',
diff --git a/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
index a7729d23a4..9ec0a906fa 100644
--- a/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
+++ b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
@@ -49,6 +49,16 @@ msgstr ""
 msgid "Billed Customer"
 msgstr ""
 
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
@@ -79,6 +89,18 @@ msgstr ""
 msgid "Field Service Order"
 msgstr ""
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__fsm_filter_location_by_contact
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__fsm_filter_location_by_contact
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter Contacts with Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter the Location on an FSM Order by the Contact"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
 msgid "Invoice Line"
diff --git a/fieldservice_account_analytic/models/__init__.py b/fieldservice_account_analytic/models/__init__.py
index 59b98aeef2..a08d9949b4 100644
--- a/fieldservice_account_analytic/models/__init__.py
+++ b/fieldservice_account_analytic/models/__init__.py
@@ -5,4 +5,6 @@
     analytic_account,
     fsm_location,
     fsm_order,
+    res_company,
+    res_config_settings
 )
diff --git a/fieldservice_account_analytic/models/fsm_order.py b/fieldservice_account_analytic/models/fsm_order.py
index d88ac6091a..c2e5da8402 100644
--- a/fieldservice_account_analytic/models/fsm_order.py
+++ b/fieldservice_account_analytic/models/fsm_order.py
@@ -25,13 +25,22 @@ def _compute_total_cost(self):
         for order in self:
             order.total_cost = 0.0
 
-    @api.onchange('location_id')
+    @api.onchange('location_id', 'customer_id')
     def _onchange_location_id_customer_account(self):
-        if self.location_id:
-            return {'domain': {'customer_id': [('service_location_id', '=',
-                                                self.location_id.name)]}}
+        if self.env.user.company_id.fsm_filter_location_by_contact:
+            if self.location_id:
+                return {'domain': {'customer_id': [('service_location_id', '=',
+                                                    self.location_id.id)]}}
+            else:
+                return {'domain': {'customer_id': [],
+                                   'location_id': []}}
         else:
-            return {'domain': {'customer_id': [('id', '!=', None)]}}
+            if self.customer_id:
+                return {'domain': {'location_id': [('partner_id', '=',
+                                                    self.customer_id.id)]}}
+            else:
+                return {'domain': {'location_id': [],
+                                   'customer_id': []}}
 
     @api.onchange('customer_id')
     def _onchange_customer_id_location(self):
diff --git a/fieldservice_account_analytic/models/res_company.py b/fieldservice_account_analytic/models/res_company.py
new file mode 100644
index 0000000000..ed087f6ed9
--- /dev/null
+++ b/fieldservice_account_analytic/models/res_company.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2020 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class ResCompany(models.Model):
+    _inherit = 'res.company'
+
+    fsm_filter_location_by_contact = fields.Boolean(
+        string='Filter Contacts with Location'
+    )
+
+    @api.onchange('fsm_filter_location_by_contact')
+    def onchange_fsm_filter_location_by_contact(self):
+        fso_ids = self.env['fsm.order'].search([])
+        for fso_id in fso_ids:
+            fso_id._onchange_location_id_customer_account()
diff --git a/fieldservice_account_analytic/models/res_config_settings.py b/fieldservice_account_analytic/models/res_config_settings.py
new file mode 100644
index 0000000000..e8ea540845
--- /dev/null
+++ b/fieldservice_account_analytic/models/res_config_settings.py
@@ -0,0 +1,14 @@
+# Copyright (C) 2020, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    fsm_filter_location_by_contact = fields.Boolean(
+        string='Filter Contacts with Location',
+        related='company_id.fsm_filter_location_by_contact',
+        readonly=False
+    )
diff --git a/fieldservice_account_analytic/views/res_config_settings.xml b/fieldservice_account_analytic/views/res_config_settings.xml
new file mode 100644
index 0000000000..b7bb82f2f6
--- /dev/null
+++ b/fieldservice_account_analytic/views/res_config_settings.xml
@@ -0,0 +1,24 @@
+<odoo>
+    <record id="res_config_settings_view_form_filter" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.fsm.filter</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="40"/>
+        <field name="inherit_id" ref="fieldservice.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <div id="orders" position="inside">
+                <div class="col-xs-12 col-md-6 o_setting_box">
+                    <div class="o_setting_left_pane">
+                        <field name="fsm_filter_location_by_contact"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="fsm_filter_location_by_contact"
+                                string="Filter Contacts with Location"/>
+                        <div class="text-muted">
+                            Filter the Location on an FSM Order by the Contact
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </field>
+    </record>
+</odoo>

From a7e87f0518330a2f14cc3198c401c74e538e0ef3 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 14 Nov 2019 10:12:02 -0800
Subject: [PATCH 138/631] [IMP] Fix Convert Error

[UPD] Update fieldservice_stock.pot
---
 fieldservice_stock/i18n/de.po                 | 240 ++++++++++++++++++
 fieldservice_stock/i18n/es_CL.po              | 240 ++++++++++++++++++
 .../i18n/fieldservice_stock.pot               | 238 +++++++++++++++++
 fieldservice_stock/models/fsm_wizard.py       |   2 +-
 4 files changed, 719 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_stock/i18n/de.po
 create mode 100644 fieldservice_stock/i18n/es_CL.po
 create mode 100644 fieldservice_stock/i18n/fieldservice_stock.pot

diff --git a/fieldservice_stock/i18n/de.po b/fieldservice_stock/i18n/de.po
new file mode 100644
index 0000000000..8574da489c
--- /dev/null
+++ b/fieldservice_stock/i18n/de.po
@@ -0,0 +1,240 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-26 17:58+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_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
+#: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
+msgid "Creates a FSM Equipment"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__current_stock_location_id
+msgid "Current Inventory Location"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Deliveries"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__delivery_count
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Done"
+msgstr ""
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Draft"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_production_lot__fsm_equipment_id
+msgid "Equipment"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request_order__fsm_order_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.stock_request_order_fsm_order_search
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Service-Equipment"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_location
+msgid "Field Service Location"
+msgstr "Field-Service-Ort"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_order
+#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking__fsm_order_id
+msgid "Field Service Order"
+msgstr "Field-Service-Auftrag"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "In progress"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.fsm_equipment_form_view_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Inventory"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__inventory_location_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__inventory_location_id
+msgid "Inventory Location"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
+msgid "Order Lines"
+msgstr ""
+
+#. module: fieldservice_stock
+#: code:addons/fieldservice_stock/models/fsm_order.py:52
+#: code:addons/fieldservice_stock/models/fsm_order.py:65
+#: code:addons/fieldservice_stock/models/fsm_order.py:78
+#, python-format
+msgid "Please create a stock request."
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_procurement_group
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
+msgid "Procurement Group"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__product_id
+msgid "Product"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move_line
+msgid "Product Moves (Stock Move Line)"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_product_template
+msgid "Product Template"
+msgstr "Produktvorlage"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
+msgid "Products"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Receipts"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
+msgid "Request State"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
+msgid "Return Orders"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
+msgid "Serial #"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Set to Draft"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
+msgid "Shipping Location"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_request
+msgid "Stock Request"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_request_order
+msgid "Stock Request Order"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_request
+msgid "Stock Requests"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Submit"
+msgstr ""
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Submitted"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__picking_ids
+msgid "Transfers"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
+msgid "Warehouse"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
+msgid "Warehouse used to ship the materials"
+msgstr ""
diff --git a/fieldservice_stock/i18n/es_CL.po b/fieldservice_stock/i18n/es_CL.po
new file mode 100644
index 0000000000..27aada4e53
--- /dev/null
+++ b/fieldservice_stock/i18n/es_CL.po
@@ -0,0 +1,240 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-18 06:35+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.8\n"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
+#: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
+msgid "Creates a FSM Equipment"
+msgstr "Crea Equipos FSM"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__current_stock_location_id
+msgid "Current Inventory Location"
+msgstr "Ubicación Actual de Inventario"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Deliveries"
+msgstr "Entregas"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__delivery_count
+msgid "Delivery Orders"
+msgstr "Pedidos de Entrega"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_production_lot__fsm_equipment_id
+msgid "Equipment"
+msgstr "Equipo"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request_order__fsm_order_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.stock_request_order_fsm_order_search
+msgid "FSM Order"
+msgstr "Orden FSM"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr "Conversión de Registro FSM"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Equipo de Servicio de Campo"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación del Servicio de Campo"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_order
+#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking__fsm_order_id
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "In progress"
+msgstr "En progreso"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.fsm_equipment_form_view_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Inventory"
+msgstr "Inventario"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__inventory_location_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__inventory_location_id
+msgid "Inventory Location"
+msgstr "Ubicación de Inventario"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr "Lote / Serie"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
+msgid "Order Lines"
+msgstr "Líneas de Pedido"
+
+#. module: fieldservice_stock
+#: code:addons/fieldservice_stock/models/fsm_order.py:52
+#: code:addons/fieldservice_stock/models/fsm_order.py:65
+#: code:addons/fieldservice_stock/models/fsm_order.py:78
+#, python-format
+msgid "Please create a stock request."
+msgstr "Por favor cree una solicitud de stock."
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_procurement_group
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
+msgid "Procurement Group"
+msgstr "Grupo de Adquisiciones"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__product_id
+msgid "Product"
+msgstr "Producto"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move_line
+msgid "Product Moves (Stock Move Line)"
+msgstr "Movimientos de Producto (Línea de Movimiento de Stock)"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de Producto"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
+msgid "Products"
+msgstr "Productos"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Receipts"
+msgstr "Ingresos"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
+msgid "Request State"
+msgstr "Estado de Solicitud"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
+msgid "Return Orders"
+msgstr "Órdenes de Devolución"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
+msgid "Serial #"
+msgstr "# de Serial"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Set to Draft"
+msgstr "Establecer en Borrador"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
+msgid "Shipping Location"
+msgstr "Lugar de Envío"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de Stock"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_request
+msgid "Stock Request"
+msgstr "Solicitud de Stock"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_request_order
+msgid "Stock Request Order"
+msgstr "Pedido de Solicitud de Stock"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_request
+msgid "Stock Requests"
+msgstr "Solicitudes de Stock"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_rule
+msgid "Stock Rule"
+msgstr "Regla de Stock"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Submit"
+msgstr "Enviar"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Submitted"
+msgstr "Enviado"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_picking
+msgid "Transfer"
+msgstr "Transferir"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__picking_ids
+msgid "Transfers"
+msgstr "Transferencias"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
+msgid "Warehouse used to ship the materials"
+msgstr "Almacén utilizado para enviar los materiales"
diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
new file mode 100644
index 0000000000..81c9893edf
--- /dev/null
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -0,0 +1,238 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_stock
+#
+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_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Cancel"
+msgstr ""
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
+#: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
+msgid "Creates a FSM Equipment"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__current_stock_location_id
+msgid "Current Inventory Location"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Deliveries"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__delivery_count
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Done"
+msgstr ""
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Draft"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_production_lot__fsm_equipment_id
+msgid "Equipment"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request_order__fsm_order_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.stock_request_order_fsm_order_search
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_order
+#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking__fsm_order_id
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "In progress"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.fsm_equipment_form_view_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Inventory"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__inventory_location_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__inventory_location_id
+msgid "Inventory Location"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
+msgid "Order Lines"
+msgstr ""
+
+#. module: fieldservice_stock
+#: code:addons/fieldservice_stock/models/fsm_order.py:52
+#: code:addons/fieldservice_stock/models/fsm_order.py:65
+#: code:addons/fieldservice_stock/models/fsm_order.py:78
+#, python-format
+msgid "Please create a stock request."
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_procurement_group
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
+msgid "Procurement Group"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__product_id
+msgid "Product"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move_line
+msgid "Product Moves (Stock Move Line)"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
+msgid "Products"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Receipts"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
+msgid "Request State"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
+msgid "Return Orders"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
+msgid "Serial #"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Set to Draft"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
+msgid "Shipping Location"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_request
+msgid "Stock Request"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_request_order
+msgid "Stock Request Order"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_request
+msgid "Stock Requests"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Submit"
+msgstr ""
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Submitted"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__picking_ids
+msgid "Transfers"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
+msgid "Warehouse"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
+msgid "Warehouse used to ship the materials"
+msgstr ""
+
diff --git a/fieldservice_stock/models/fsm_wizard.py b/fieldservice_stock/models/fsm_wizard.py
index 509bbdba63..7b5be78958 100644
--- a/fieldservice_stock/models/fsm_wizard.py
+++ b/fieldservice_stock/models/fsm_wizard.py
@@ -8,6 +8,6 @@ class FSMWizard(models.TransientModel):
     _inherit = 'fsm.wizard'
 
     def _prepare_fsm_location(self, partner):
-        res = super(FSMWizard)._prepare_fsm_location(partner)
+        res = super()._prepare_fsm_location(partner)
         res['inventory_location_id'] = partner.property_stock_customer.id
         return res

From f8c50627ca74b1146e8bb1d6bae77d69adf00ea6 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 11 Dec 2019 18:40:20 -0600
Subject: [PATCH 139/631] [FIX] fieldservice_stock: Multiple back-orders if
 multiple moves

---
 fieldservice_stock/models/stock_move.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fieldservice_stock/models/stock_move.py b/fieldservice_stock/models/stock_move.py
index 9a495ae800..00ea84d474 100644
--- a/fieldservice_stock/models/stock_move.py
+++ b/fieldservice_stock/models/stock_move.py
@@ -18,9 +18,8 @@ def prepare_equipment_values(self, move_line):
             'current_stock_location_id': move_line.location_dest_id.id}
 
     def _action_done(self):
-        res = False
+        res = super()._action_done()
         for rec in self:
-            res = super(StockMove, rec)._action_done()
             if rec.picking_code == 'outgoing' and rec.state == 'done':
                 if rec.product_tmpl_id.create_fsm_equipment:
                     for line in rec.move_line_ids:

From a669e546967a80edbeaa9d21a938dd8a3498bf78 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 12 Dec 2019 16:23:27 +0000
Subject: [PATCH 140/631] fieldservice_stock 12.0.1.0.2

---
 fieldservice_stock/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index d70f4e77b5..7c46596a71 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.1.0.1',
+    'version': '12.0.1.0.2',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "

From 366d7b9e0b82a415b5999ed85bdec387af97f916 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Fri, 13 Dec 2019 13:43:36 +0530
Subject: [PATCH 141/631] [WIP][12.0][IMP] fieldservice_stock

[UPD] Update fieldservice_stock.pot
---
 fieldservice_stock/i18n/fieldservice_stock.pot | 11 ++++++++---
 fieldservice_stock/models/fsm_order.py         |  2 ++
 fieldservice_stock/views/fsm_order.xml         |  1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
index 81c9893edf..935f810a0c 100644
--- a/fieldservice_stock/i18n/fieldservice_stock.pot
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -112,15 +112,20 @@ msgstr ""
 msgid "Lot/Serial"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
+msgid "Operations"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
 msgid "Order Lines"
 msgstr ""
 
 #. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:52
-#: code:addons/fieldservice_stock/models/fsm_order.py:65
-#: code:addons/fieldservice_stock/models/fsm_order.py:78
+#: code:addons/fieldservice_stock/models/fsm_order.py:54
+#: code:addons/fieldservice_stock/models/fsm_order.py:67
+#: code:addons/fieldservice_stock/models/fsm_order.py:80
 #, python-format
 msgid "Please create a stock request."
 msgstr ""
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 5a4a665e01..8ae87befc1 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -44,6 +44,8 @@ def _default_warehouse_id(self):
     request_stage = fields.Selection(REQUEST_STATES, string='Request State',
                                      default='draft', readonly=True,
                                      store=True)
+    move_ids = fields.One2many('stock.move', 'fsm_order_id',
+                               string='Operations')
 
     @api.multi
     def action_request_submit(self):
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index f3c25de0da..2662684c43 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -70,6 +70,7 @@
                             <field name="state"/>
                         </tree>
                     </field>
+                    <field name="move_ids" readonly="1" attrs="{'invisible': [('move_ids', '=', False)]}"/>
                 </page>
             </xpath>
         </field>

From 693cc45dc9cc954c29551c84eddcc93d72e4fb4e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 18 Dec 2019 16:31:05 +0000
Subject: [PATCH 142/631] fieldservice_stock 12.0.1.1.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock/
---
 fieldservice_stock/__manifest__.py |  2 +-
 fieldservice_stock/i18n/de.po      | 13 +++++++++----
 fieldservice_stock/i18n/es_CL.po   | 13 +++++++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 7c46596a71..b25af0d471 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.1.0.2',
+    'version': '12.0.1.1.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_stock/i18n/de.po b/fieldservice_stock/i18n/de.po
index 8574da489c..8c35057e55 100644
--- a/fieldservice_stock/i18n/de.po
+++ b/fieldservice_stock/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_stock
+# 	* fieldservice_stock
 #
 msgid ""
 msgstr ""
@@ -115,15 +115,20 @@ msgstr ""
 msgid "Lot/Serial"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
+msgid "Operations"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
 msgid "Order Lines"
 msgstr ""
 
 #. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:52
-#: code:addons/fieldservice_stock/models/fsm_order.py:65
-#: code:addons/fieldservice_stock/models/fsm_order.py:78
+#: code:addons/fieldservice_stock/models/fsm_order.py:54
+#: code:addons/fieldservice_stock/models/fsm_order.py:67
+#: code:addons/fieldservice_stock/models/fsm_order.py:80
 #, python-format
 msgid "Please create a stock request."
 msgstr ""
diff --git a/fieldservice_stock/i18n/es_CL.po b/fieldservice_stock/i18n/es_CL.po
index 27aada4e53..47b27bf3e6 100644
--- a/fieldservice_stock/i18n/es_CL.po
+++ b/fieldservice_stock/i18n/es_CL.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_stock
+# 	* fieldservice_stock
 #
 msgid ""
 msgstr ""
@@ -115,15 +115,20 @@ msgstr "Ubicación de Inventario"
 msgid "Lot/Serial"
 msgstr "Lote / Serie"
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
+msgid "Operations"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
 msgid "Order Lines"
 msgstr "Líneas de Pedido"
 
 #. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:52
-#: code:addons/fieldservice_stock/models/fsm_order.py:65
-#: code:addons/fieldservice_stock/models/fsm_order.py:78
+#: code:addons/fieldservice_stock/models/fsm_order.py:54
+#: code:addons/fieldservice_stock/models/fsm_order.py:67
+#: code:addons/fieldservice_stock/models/fsm_order.py:80
 #, python-format
 msgid "Please create a stock request."
 msgstr "Por favor cree una solicitud de stock."

From fd10af654ed22f9cce94a86835717864004170bf Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 22 Dec 2019 10:55:47 -0600
Subject: [PATCH 143/631] [IMP] fieldervice_stock

---
 fieldservice_stock/models/fsm_order.py     | 12 ++++++------
 fieldservice_stock/models/stock_picking.py |  9 ++++++++-
 fieldservice_stock/views/fsm_order.xml     |  3 +--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 8ae87befc1..83187089df 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -107,12 +107,12 @@ def action_view_delivery(self):
         pickings = self.mapped('picking_ids')
         delivery_ids = [picking.id for picking in pickings if
                         picking.picking_type_id.code == 'outgoing']
-        if len(pickings) > 1:
+        if len(delivery_ids) > 1:
             action['domain'] = [('id', 'in', delivery_ids)]
         elif pickings:
             action['views'] = [(self.env.ref('stock.view_picking_form').id,
                                 'form')]
-            action['res_id'] = pickings.id
+            action['res_id'] = delivery_ids[0]
         return action
 
     @api.multi
@@ -124,12 +124,12 @@ def action_view_returns(self):
         """
         action = self.env.ref('stock.action_picking_tree_all').read()[0]
         pickings = self.mapped('picking_ids')
-        receipt_ids = [picking.id for picking in pickings if
+        return_ids = [picking.id for picking in pickings if
                        picking.picking_type_id.code == 'incoming']
-        if len(pickings) > 1:
-            action['domain'] = [('id', 'in', receipt_ids)]
+        if len(return_ids) > 1:
+            action['domain'] = [('id', 'in', return_ids)]
         elif pickings:
             action['views'] = [(self.env.ref('stock.view_picking_form').id,
                                 'form')]
-            action['res_id'] = pickings.id
+            action['res_id'] = return_ids[0]
         return action
diff --git a/fieldservice_stock/models/stock_picking.py b/fieldservice_stock/models/stock_picking.py
index 076eb5174f..06abdeb450 100644
--- a/fieldservice_stock/models/stock_picking.py
+++ b/fieldservice_stock/models/stock_picking.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2018 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class StockPicking(models.Model):
@@ -8,3 +8,10 @@ class StockPicking(models.Model):
 
     fsm_order_id = fields.Many2one(related="group_id.fsm_order_id",
                                    string="Field Service Order", store=True)
+
+    @api.model
+    def create(self, vals):
+        res = super().create(vals)
+        if vals.get('fsm_order_id'):
+            res.fsm_order_id = vals.get('fsm_order_id')
+        return res
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 2662684c43..22dea28a5a 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <record id="view_fsm_order_form_inherit_stock" model="ir.ui.view">
@@ -20,7 +19,7 @@
                         class="oe_stat_button"
                         icon="fa-truck"
                         attrs="{'invisible': [('return_count', '=', 0)]}" groups="base.group_user">
-                    <field name="return_count" widget="statinfo" string="Receipts"/>
+                    <field name="return_count" widget="statinfo" string="Returns"/>
                 </button>
             </div>
             <xpath expr="//notebook/page[1]" position="after">

From 5f0897a0a2a7b5b104c8449a03dcdf08f76bbd1d Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 22 Dec 2019 14:26:58 -0600
Subject: [PATCH 144/631] [FIX] fieldservice_stock: PEP8 error

[UPD] Update fieldservice_stock.pot
---
 fieldservice_stock/i18n/fieldservice_stock.pot | 10 +++++-----
 fieldservice_stock/models/fsm_order.py         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
index 935f810a0c..8f20a16c0e 100644
--- a/fieldservice_stock/i18n/fieldservice_stock.pot
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -156,11 +156,6 @@ msgstr ""
 msgid "Products"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Receipts"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
 msgid "Request State"
@@ -171,6 +166,11 @@ msgstr ""
 msgid "Return Orders"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Returns"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
 msgid "Serial #"
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 83187089df..ee0a3987db 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -125,7 +125,7 @@ def action_view_returns(self):
         action = self.env.ref('stock.action_picking_tree_all').read()[0]
         pickings = self.mapped('picking_ids')
         return_ids = [picking.id for picking in pickings if
-                       picking.picking_type_id.code == 'incoming']
+                      picking.picking_type_id.code == 'incoming']
         if len(return_ids) > 1:
             action['domain'] = [('id', 'in', return_ids)]
         elif pickings:

From afd6b5bfc7ab792fb5db0be65ed8f43b0cc9293d Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 30 Dec 2019 16:54:35 +0000
Subject: [PATCH 145/631] fieldservice_stock 12.0.1.2.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock/
---
 fieldservice_stock/__manifest__.py |   2 +-
 fieldservice_stock/i18n/de.po      |  10 +-
 fieldservice_stock/i18n/es.po      | 250 +++++++++++++++++++++++++++++
 fieldservice_stock/i18n/es_CL.po   |  15 +-
 4 files changed, 266 insertions(+), 11 deletions(-)
 create mode 100644 fieldservice_stock/i18n/es.po

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index b25af0d471..98bd750146 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.1.1.0',
+    'version': '12.0.1.2.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_stock/i18n/de.po b/fieldservice_stock/i18n/de.po
index 8c35057e55..7c65aff38c 100644
--- a/fieldservice_stock/i18n/de.po
+++ b/fieldservice_stock/i18n/de.po
@@ -159,11 +159,6 @@ msgstr "Produktvorlage"
 msgid "Products"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Receipts"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
 msgid "Request State"
@@ -174,6 +169,11 @@ msgstr ""
 msgid "Return Orders"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Returns"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
 msgid "Serial #"
diff --git a/fieldservice_stock/i18n/es.po b/fieldservice_stock/i18n/es.po
new file mode 100644
index 0000000000..5e1a62fa4d
--- /dev/null
+++ b/fieldservice_stock/i18n/es.po
@@ -0,0 +1,250 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-18 06:35+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.8\n"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
+#: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
+msgid "Creates a FSM Equipment"
+msgstr "Crea Equipos FSM"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__current_stock_location_id
+msgid "Current Inventory Location"
+msgstr "Ubicación Actual de Inventario"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Deliveries"
+msgstr "Entregas"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__delivery_count
+msgid "Delivery Orders"
+msgstr "Pedidos de Entrega"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_production_lot__fsm_equipment_id
+msgid "Equipment"
+msgstr "Equipo"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request_order__fsm_order_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.stock_request_order_fsm_order_search
+msgid "FSM Order"
+msgstr "Orden FSM"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr "Conversión de Registro FSM"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Equipo de Servicio de Campo"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación del Servicio de Campo"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_order
+#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking__fsm_order_id
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "In progress"
+msgstr "En progreso"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.fsm_equipment_form_view_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Inventory"
+msgstr "Inventario"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__inventory_location_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__inventory_location_id
+msgid "Inventory Location"
+msgstr "Ubicación de Inventario"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr "Lote / Serie"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
+msgid "Operations"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
+msgid "Order Lines"
+msgstr "Líneas de Pedido"
+
+#. module: fieldservice_stock
+#: code:addons/fieldservice_stock/models/fsm_order.py:54
+#: code:addons/fieldservice_stock/models/fsm_order.py:67
+#: code:addons/fieldservice_stock/models/fsm_order.py:80
+#, python-format
+msgid "Please create a stock request."
+msgstr "Por favor cree una solicitud de stock."
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_procurement_group
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
+msgid "Procurement Group"
+msgstr "Grupo de Adquisiciones"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__product_id
+msgid "Product"
+msgstr "Producto"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move_line
+msgid "Product Moves (Stock Move Line)"
+msgstr "Movimientos de Producto (Línea de Movimiento de Stock)"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de Producto"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
+msgid "Products"
+msgstr "Productos"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
+msgid "Request State"
+msgstr "Estado de Solicitud"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
+msgid "Return Orders"
+msgstr "Órdenes de Devolución"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+#, fuzzy
+#| msgid "Return Orders"
+msgid "Returns"
+msgstr "Órdenes de Devolución"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
+msgid "Serial #"
+msgstr "# de Serial"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Set to Draft"
+msgstr "Establecer en Borrador"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
+msgid "Shipping Location"
+msgstr "Lugar de Envío"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de Stock"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_request
+msgid "Stock Request"
+msgstr "Solicitud de Stock"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_request_order
+msgid "Stock Request Order"
+msgstr "Pedido de Solicitud de Stock"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_request
+msgid "Stock Requests"
+msgstr "Solicitudes de Stock"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_rule
+msgid "Stock Rule"
+msgstr "Regla de Stock"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Submit"
+msgstr "Enviar"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Submitted"
+msgstr "Enviado"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_picking
+msgid "Transfer"
+msgstr "Transferir"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__picking_ids
+msgid "Transfers"
+msgstr "Transferencias"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
+msgid "Warehouse used to ship the materials"
+msgstr "Almacén utilizado para enviar los materiales"
+
+#~ msgid "Receipts"
+#~ msgstr "Ingresos"
diff --git a/fieldservice_stock/i18n/es_CL.po b/fieldservice_stock/i18n/es_CL.po
index 47b27bf3e6..8d014d13c4 100644
--- a/fieldservice_stock/i18n/es_CL.po
+++ b/fieldservice_stock/i18n/es_CL.po
@@ -159,11 +159,6 @@ msgstr "Plantilla de Producto"
 msgid "Products"
 msgstr "Productos"
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Receipts"
-msgstr "Ingresos"
-
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
 msgid "Request State"
@@ -174,6 +169,13 @@ msgstr "Estado de Solicitud"
 msgid "Return Orders"
 msgstr "Órdenes de Devolución"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+#, fuzzy
+#| msgid "Return Orders"
+msgid "Returns"
+msgstr "Órdenes de Devolución"
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
 msgid "Serial #"
@@ -243,3 +245,6 @@ msgstr "Almacén"
 #: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
 msgid "Warehouse used to ship the materials"
 msgstr "Almacén utilizado para enviar los materiales"
+
+#~ msgid "Receipts"
+#~ msgstr "Ingresos"

From f9c92d6d72c088a62dea8efa1b8a85727b8e5b10 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 28 Jan 2020 14:32:25 -0600
Subject: [PATCH 146/631] [IMP] fieldservice_stock: Add warehouse to territory

---
 fieldservice_stock/__manifest__.py         |  1 +
 fieldservice_stock/models/__init__.py      |  1 +
 fieldservice_stock/models/fsm_territory.py |  9 ++++++++
 fieldservice_stock/views/fsm_territory.xml | 27 ++++++++++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 100644 fieldservice_stock/models/fsm_territory.py
 create mode 100644 fieldservice_stock/views/fsm_territory.xml

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 98bd750146..9e667a19e4 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -18,6 +18,7 @@
     'data': [
         'security/ir.model.access.csv',
         'data/fsm_stock_data.xml',
+        'views/fsm_territory.xml',
         'views/fsm_location.xml',
         'views/fsm_order.xml',
         'views/stock.xml',
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index c34c5a24a9..53c9270de6 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
+    fsm_territory,
     fsm_location,
     fsm_order,
     stock_move_line,
diff --git a/fieldservice_stock/models/fsm_territory.py b/fieldservice_stock/models/fsm_territory.py
new file mode 100644
index 0000000000..12959591af
--- /dev/null
+++ b/fieldservice_stock/models/fsm_territory.py
@@ -0,0 +1,9 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class FSMTerritory(models.Model):
+    _inherit = 'fsm.territory'
+
+    warehouse_id = fields.Many2one('stock.warehouse', string='Warehouse')
diff --git a/fieldservice_stock/views/fsm_territory.xml b/fieldservice_stock/views/fsm_territory.xml
new file mode 100644
index 0000000000..d6ec1dc11b
--- /dev/null
+++ b/fieldservice_stock/views/fsm_territory.xml
@@ -0,0 +1,27 @@
+<odoo>
+
+    <!-- Territory Tree View -->
+    <record id="fsm_territory_wh_tree_view" model="ir.ui.view">
+        <field name="name">fsm.territory.warehouse.tree</field>
+        <field name="model">fsm.territory</field>
+        <field name="inherit_id" ref="fieldservice.fsm_territory_tree_view"/>
+        <field name="arch" type="xml">
+            <field name="branch_id" position="after">
+                <field name="warehouse_id"/>
+            </field>
+        </field>
+    </record>
+
+    <!-- Territory Form View -->
+    <record id="fsm_territory_wh_form_view" model="ir.ui.view">
+        <field name="name">fsm.territory.warehouse.form</field>
+        <field name="model">fsm.territory</field>
+        <field name="inherit_id" ref="fieldservice.fsm_territory_form_view"/>
+        <field name="arch" type="xml">
+            <field name="person_id" position="after">
+                <field name="warehouse_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>

From ff778d8e7a171f6deb7948a5eb2b6c6986c22625 Mon Sep 17 00:00:00 2001
From: Daniel Reis <dreis@opensourceintegrators.com>
Date: Fri, 31 Jan 2020 08:57:22 +0000
Subject: [PATCH 147/631] [FIX] Don't error if some moves were deleted by
 previous logic

When partially receiving Products that require Lot numbers,
creating the backorder would raise an error, caused by missing records.
Invalidating cache or rebrowsing the records did not fix the issue.

Closes #492
---
 fieldservice_stock/i18n/es.po                | 10 ++++------
 fieldservice_stock/models/stock_move_line.py | 10 ++++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/fieldservice_stock/i18n/es.po b/fieldservice_stock/i18n/es.po
index 5e1a62fa4d..647a539d09 100644
--- a/fieldservice_stock/i18n/es.po
+++ b/fieldservice_stock/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-11-18 06:35+0000\n"
+"PO-Revision-Date: 2020-02-02 16:47+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.8\n"
+"X-Generator: Weblate 3.10\n"
 
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
@@ -118,7 +118,7 @@ msgstr "Lote / Serie"
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
 msgid "Operations"
-msgstr ""
+msgstr "Operaciones"
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
@@ -171,10 +171,8 @@ msgstr "Órdenes de Devolución"
 
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-#, fuzzy
-#| msgid "Return Orders"
 msgid "Returns"
-msgstr "Órdenes de Devolución"
+msgstr "Devoluciones"
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
diff --git a/fieldservice_stock/models/stock_move_line.py b/fieldservice_stock/models/stock_move_line.py
index bda774e0c1..92c6dbba1a 100644
--- a/fieldservice_stock/models/stock_move_line.py
+++ b/fieldservice_stock/models/stock_move_line.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2018 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import models
+from odoo import exceptions, models
 
 
 class StockMoveLine(models.Model):
@@ -9,7 +9,13 @@ class StockMoveLine(models.Model):
     def _action_done(self):
         res = super(StockMoveLine, self)._action_done()
         for rec in self:
-            if rec.move_id:
+            # cases were found where self contained deleted records
+            # example is creating a backorder for Products with lot number
+            try:
+                move_id = rec.move_id
+            except exceptions.MissingError:
+                move_id = None
+            if move_id:
                 for request in rec.move_id.allocation_ids:
                     if (request.stock_request_id.state == 'done'
                             and request.stock_request_id.fsm_order_id):

From e9cfa490c3bb193353c26bc21bc87fb9e73950d8 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 3 Feb 2020 08:38:22 -0600
Subject: [PATCH 148/631] [IMP] fieldservice_stock: Views and doc

---
 fieldservice_stock/readme/CONFIGURE.rst    | 6 ++++++
 fieldservice_stock/views/fsm_territory.xml | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fieldservice_stock/readme/CONFIGURE.rst b/fieldservice_stock/readme/CONFIGURE.rst
index 60a1a510d9..8c54175260 100644
--- a/fieldservice_stock/readme/CONFIGURE.rst
+++ b/fieldservice_stock/readme/CONFIGURE.rst
@@ -18,3 +18,9 @@ procurement rule for that route:
 * Source Location: Partner Locations/Customers
 * Move Supply Method: Take From Stock
 * Operation Type: YourCompany: Receipts
+
+If you are in a multi-warehouse situation:
+
+* Go to Field Service > Configuration > Territories
+* Create or select a territory
+* Set the warehouse that will serve this territory
diff --git a/fieldservice_stock/views/fsm_territory.xml b/fieldservice_stock/views/fsm_territory.xml
index d6ec1dc11b..68b17195b9 100644
--- a/fieldservice_stock/views/fsm_territory.xml
+++ b/fieldservice_stock/views/fsm_territory.xml
@@ -7,7 +7,7 @@
         <field name="inherit_id" ref="fieldservice.fsm_territory_tree_view"/>
         <field name="arch" type="xml">
             <field name="branch_id" position="after">
-                <field name="warehouse_id"/>
+                <field name="warehouse_id" groups="stock.stock_multi_warehouses"/>
             </field>
         </field>
     </record>
@@ -19,7 +19,7 @@
         <field name="inherit_id" ref="fieldservice.fsm_territory_form_view"/>
         <field name="arch" type="xml">
             <field name="person_id" position="after">
-                <field name="warehouse_id"/>
+                <field name="warehouse_id" groups="stock.stock_multi_warehouses"/>
             </field>
         </field>
     </record>

From 22b8c5bf1a5bb05608a69755de984a7bdea62094 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 3 Feb 2020 14:56:18 +0000
Subject: [PATCH 149/631] fieldservice_stock 12.0.1.2.1

---
 fieldservice_stock/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 9e667a19e4..eceb94a642 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.1.2.0',
+    'version': '12.0.1.2.1',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "

From d6bd605908bb7da0df510693469eefc5e1750505 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 5 Feb 2020 12:25:09 -0600
Subject: [PATCH 150/631] [FIX] fieldservice_stock

[UPD] Update fieldservice_stock.pot

[UPD] README.rst
---
 fieldservice_stock/README.rst                    | 6 ++++++
 fieldservice_stock/i18n/fieldservice_stock.pot   | 6 ++++++
 fieldservice_stock/static/description/index.html | 6 ++++++
 fieldservice_stock/views/fsm_territory.xml       | 6 ++++--
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index f5c2166892..87b9146ec3 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -65,6 +65,12 @@ procurement rule for that route:
 * Move Supply Method: Take From Stock
 * Operation Type: YourCompany: Receipts
 
+If you are in a multi-warehouse situation:
+
+* Go to Field Service > Configuration > Territories
+* Create or select a territory
+* Set the warehouse that will serve this territory
+
 Usage
 =====
 
diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
index 8f20a16c0e..915826d578 100644
--- a/fieldservice_stock/i18n/fieldservice_stock.pot
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -221,6 +221,11 @@ msgstr ""
 msgid "Submitted"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_territory
+msgid "Territory"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
@@ -233,6 +238,7 @@ msgstr ""
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_territory__warehouse_id
 msgid "Warehouse"
 msgstr ""
 
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index 6177036f81..fdd70ff60d 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/static/description/index.html
@@ -416,6 +416,12 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
 <li>Move Supply Method: Take From Stock</li>
 <li>Operation Type: YourCompany: Receipts</li>
 </ul>
+<p>If you are in a multi-warehouse situation:</p>
+<ul class="simple">
+<li>Go to Field Service &gt; Configuration &gt; Territories</li>
+<li>Create or select a territory</li>
+<li>Set the warehouse that will serve this territory</li>
+</ul>
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#id3">Usage</a></h1>
diff --git a/fieldservice_stock/views/fsm_territory.xml b/fieldservice_stock/views/fsm_territory.xml
index 68b17195b9..bc6698c152 100644
--- a/fieldservice_stock/views/fsm_territory.xml
+++ b/fieldservice_stock/views/fsm_territory.xml
@@ -7,7 +7,8 @@
         <field name="inherit_id" ref="fieldservice.fsm_territory_tree_view"/>
         <field name="arch" type="xml">
             <field name="branch_id" position="after">
-                <field name="warehouse_id" groups="stock.stock_multi_warehouses"/>
+                <field name="warehouse_id"
+                       groups="stock.group_stock_multi_warehouses"/>
             </field>
         </field>
     </record>
@@ -19,7 +20,8 @@
         <field name="inherit_id" ref="fieldservice.fsm_territory_form_view"/>
         <field name="arch" type="xml">
             <field name="person_id" position="after">
-                <field name="warehouse_id" groups="stock.stock_multi_warehouses"/>
+                <field name="warehouse_id"
+                       groups="stock.group_stock_multi_warehouses"/>
             </field>
         </field>
     </record>

From f2db555cd3123172f336fb1810b8af4a95e237fd Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 6 Feb 2020 21:15:16 +0000
Subject: [PATCH 151/631] fieldservice_stock 12.0.1.3.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock/
---
 fieldservice_stock/__manifest__.py | 2 +-
 fieldservice_stock/i18n/de.po      | 6 ++++++
 fieldservice_stock/i18n/es.po      | 6 ++++++
 fieldservice_stock/i18n/es_CL.po   | 6 ++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index eceb94a642..4a1be54e28 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.1.2.1',
+    'version': '12.0.1.3.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_stock/i18n/de.po b/fieldservice_stock/i18n/de.po
index 7c65aff38c..6edca03c30 100644
--- a/fieldservice_stock/i18n/de.po
+++ b/fieldservice_stock/i18n/de.po
@@ -224,6 +224,11 @@ msgstr ""
 msgid "Submitted"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_territory
+msgid "Territory"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
@@ -236,6 +241,7 @@ msgstr ""
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_territory__warehouse_id
 msgid "Warehouse"
 msgstr ""
 
diff --git a/fieldservice_stock/i18n/es.po b/fieldservice_stock/i18n/es.po
index 647a539d09..fade02de3b 100644
--- a/fieldservice_stock/i18n/es.po
+++ b/fieldservice_stock/i18n/es.po
@@ -224,6 +224,11 @@ msgstr "Enviar"
 msgid "Submitted"
 msgstr "Enviado"
 
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_territory
+msgid "Territory"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
@@ -236,6 +241,7 @@ msgstr "Transferencias"
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_territory__warehouse_id
 msgid "Warehouse"
 msgstr "Almacén"
 
diff --git a/fieldservice_stock/i18n/es_CL.po b/fieldservice_stock/i18n/es_CL.po
index 8d014d13c4..78a1371875 100644
--- a/fieldservice_stock/i18n/es_CL.po
+++ b/fieldservice_stock/i18n/es_CL.po
@@ -226,6 +226,11 @@ msgstr "Enviar"
 msgid "Submitted"
 msgstr "Enviado"
 
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_territory
+msgid "Territory"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
@@ -238,6 +243,7 @@ msgstr "Transferencias"
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_territory__warehouse_id
 msgid "Warehouse"
 msgstr "Almacén"
 

From ed586a24ecc428ff1f01c7e002626240aa31d313 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Mon, 24 Feb 2020 17:26:50 +0530
Subject: [PATCH 152/631] [12.0][IMP] fieldservice_stock

[UPD] Update fieldservice_stock.pot
---
 .../i18n/fieldservice_stock.pot               | 30 +++++++++++++++++++
 fieldservice_stock/views/fsm_order.xml        | 20 ++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
index 915826d578..a7cf57132d 100644
--- a/fieldservice_stock/i18n/fieldservice_stock.pot
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -13,6 +13,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Allocated Quantity"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Cancel"
@@ -49,6 +54,11 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Done Quantity"
+msgstr ""
+
 #. module: fieldservice_stock
 #: selection:fsm.order,request_stage:0
 msgid "Draft"
@@ -112,6 +122,11 @@ msgstr ""
 msgid "Lot/Serial"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Moves"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
 msgid "Operations"
@@ -156,11 +171,21 @@ msgstr ""
 msgid "Products"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Reference"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
 msgid "Request State"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Requested Quantity"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
 msgid "Return Orders"
@@ -236,6 +261,11 @@ msgstr ""
 msgid "Transfers"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_territory__warehouse_id
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 22dea28a5a..15af98d18a 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -69,7 +69,25 @@
                             <field name="state"/>
                         </tree>
                     </field>
-                    <field name="move_ids" readonly="1" attrs="{'invisible': [('move_ids', '=', False)]}"/>
+                    <field name="move_ids" readonly="1" attrs="{'invisible': [('move_ids', '=', False)]}">
+                        <tree decoration-muted="state == 'cancel'" default_order='date_expected, picking_id, sequence' string="Moves">
+                            <field name="reference"/>
+                            <field name="date_expected" widget='date'/>
+                            <field name="date" widget="date"/>
+                            <field name="picking_id" string="Reference" invisible="1"/>
+                            <field name="sequence" invisible="1"/>
+                            <field name="origin"/>
+                            <field name="product_id"/>
+                            <field name="product_uom_qty" string="Requested Quantity"/>
+                            <field name="reserved_availability" string="Allocated Quantity"/>
+                            <field name="quantity_done" string="Done Quantity"/>
+                            <field name="product_uom" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="uom.group_uom"/>
+                            <field name="location_id" invisible="1"/>
+                            <field name="location_dest_id" invisible="1"/>
+                            <field name="create_date" invisible="1"/>
+                            <field name="state"/>
+                        </tree>
+                    </field>
                 </page>
             </xpath>
         </field>

From 3c6135cbaeb7d9203ac70ed9fbdb4125c236df4d Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 24 Feb 2020 20:42:00 +0000
Subject: [PATCH 153/631] fieldservice_stock 12.0.1.4.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock/
---
 fieldservice_stock/__manifest__.py |  2 +-
 fieldservice_stock/i18n/de.po      | 30 ++++++++++++++++++++++++++
 fieldservice_stock/i18n/es.po      | 34 ++++++++++++++++++++++++++++--
 fieldservice_stock/i18n/es_CL.po   | 32 ++++++++++++++++++++++++++++
 4 files changed, 95 insertions(+), 3 deletions(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 4a1be54e28..3c9f806eb4 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.1.3.0',
+    'version': '12.0.1.4.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_stock/i18n/de.po b/fieldservice_stock/i18n/de.po
index 6edca03c30..54786115ee 100644
--- a/fieldservice_stock/i18n/de.po
+++ b/fieldservice_stock/i18n/de.po
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.8\n"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Allocated Quantity"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Cancel"
@@ -52,6 +57,11 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Done Quantity"
+msgstr ""
+
 #. module: fieldservice_stock
 #: selection:fsm.order,request_stage:0
 msgid "Draft"
@@ -115,6 +125,11 @@ msgstr ""
 msgid "Lot/Serial"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Moves"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
 msgid "Operations"
@@ -159,11 +174,21 @@ msgstr "Produktvorlage"
 msgid "Products"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Reference"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
 msgid "Request State"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Requested Quantity"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
 msgid "Return Orders"
@@ -239,6 +264,11 @@ msgstr ""
 msgid "Transfers"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_territory__warehouse_id
diff --git a/fieldservice_stock/i18n/es.po b/fieldservice_stock/i18n/es.po
index fade02de3b..b1efb49689 100644
--- a/fieldservice_stock/i18n/es.po
+++ b/fieldservice_stock/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: 2020-02-02 16:47+0000\n"
+"PO-Revision-Date: 2020-03-04 00:14+0000\n"
 "Last-Translator: Nelson Ramírez Sánchez <info@konos.cl>\n"
 "Language-Team: none\n"
 "Language: es\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Allocated Quantity"
+msgstr "Cantidad Asignada"
+
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Cancel"
@@ -52,6 +57,11 @@ msgstr "Pedidos de Entrega"
 msgid "Done"
 msgstr "Hecho"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Done Quantity"
+msgstr "Cantidad Hecha"
+
 #. module: fieldservice_stock
 #: selection:fsm.order,request_stage:0
 msgid "Draft"
@@ -115,6 +125,11 @@ msgstr "Ubicación de Inventario"
 msgid "Lot/Serial"
 msgstr "Lote / Serie"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Moves"
+msgstr "Movimientos"
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
 msgid "Operations"
@@ -159,11 +174,21 @@ msgstr "Plantilla de Producto"
 msgid "Products"
 msgstr "Productos"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Reference"
+msgstr "Referencia"
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
 msgid "Request State"
 msgstr "Estado de Solicitud"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Requested Quantity"
+msgstr "Cantidad Requerida"
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
 msgid "Return Orders"
@@ -227,7 +252,7 @@ msgstr "Enviado"
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_territory
 msgid "Territory"
-msgstr ""
+msgstr "Territorio"
 
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
@@ -239,6 +264,11 @@ msgstr "Transferir"
 msgid "Transfers"
 msgstr "Transferencias"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Unit of Measure"
+msgstr "Unidad de Medida"
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_territory__warehouse_id
diff --git a/fieldservice_stock/i18n/es_CL.po b/fieldservice_stock/i18n/es_CL.po
index 78a1371875..4fa58755d2 100644
--- a/fieldservice_stock/i18n/es_CL.po
+++ b/fieldservice_stock/i18n/es_CL.po
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.8\n"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Allocated Quantity"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Cancel"
@@ -52,6 +57,11 @@ msgstr "Pedidos de Entrega"
 msgid "Done"
 msgstr "Hecho"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Done Quantity"
+msgstr ""
+
 #. module: fieldservice_stock
 #: selection:fsm.order,request_stage:0
 msgid "Draft"
@@ -115,6 +125,11 @@ msgstr "Ubicación de Inventario"
 msgid "Lot/Serial"
 msgstr "Lote / Serie"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Moves"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
 msgid "Operations"
@@ -159,11 +174,23 @@ msgstr "Plantilla de Producto"
 msgid "Products"
 msgstr "Productos"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Reference"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
 msgid "Request State"
 msgstr "Estado de Solicitud"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+#, fuzzy
+#| msgid "Request State"
+msgid "Requested Quantity"
+msgstr "Estado de Solicitud"
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
 msgid "Return Orders"
@@ -241,6 +268,11 @@ msgstr "Transferir"
 msgid "Transfers"
 msgstr "Transferencias"
 
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_territory__warehouse_id

From 0f4173d5d6a270aa31f7e13fbb544c4ee9cfca72 Mon Sep 17 00:00:00 2001
From: Daniel Reis <dreis@opensourceintegrators.com>
Date: Thu, 19 Mar 2020 18:20:13 +0000
Subject: [PATCH 154/631] [IMP] Add "Create FSM Equipment" option to Operation
 Types

FSM Equipment creation for serial number tracked products can be
on specific Operation Types, such as Delivery or Receipts.
---
 fieldservice_stock/__manifest__.py            |  3 ++-
 fieldservice_stock/models/__init__.py         |  1 +
 fieldservice_stock/models/stock_move.py       | 13 ++++++------
 .../models/stock_picking_type.py              | 13 ++++++++++++
 fieldservice_stock/readme/CONFIGURE.rst       | 21 +++++++++++++++++++
 fieldservice_stock/views/product_template.xml |  2 +-
 .../views/stock_picking_type.xml              | 16 ++++++++++++++
 7 files changed, 61 insertions(+), 8 deletions(-)
 create mode 100644 fieldservice_stock/models/stock_picking_type.py
 create mode 100644 fieldservice_stock/views/stock_picking_type.xml

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 3c9f806eb4..d9e559532c 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.1.4.0',
+    'version': '12.0.2.0.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
@@ -24,6 +24,7 @@
         'views/stock.xml',
         'views/fsm_equipment.xml',
         'views/product_template.xml',
+        'views/stock_picking_type.xml',
         'views/stock_production_lot.xml',
         'views/stock_request.xml',
         'views/stock_request_order.xml',
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index 53c9270de6..9eb61a602c 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -10,6 +10,7 @@
     procurement_group,
     stock_rule,
     stock_picking,
+    stock_picking_type,
     fsm_equipment,
     product_template,
     stock_production_lot,
diff --git a/fieldservice_stock/models/stock_move.py b/fieldservice_stock/models/stock_move.py
index 00ea84d474..554043edc9 100644
--- a/fieldservice_stock/models/stock_move.py
+++ b/fieldservice_stock/models/stock_move.py
@@ -20,10 +20,11 @@ def prepare_equipment_values(self, move_line):
     def _action_done(self):
         res = super()._action_done()
         for rec in self:
-            if rec.picking_code == 'outgoing' and rec.state == 'done':
-                if rec.product_tmpl_id.create_fsm_equipment:
-                    for line in rec.move_line_ids:
-                        vals = self.prepare_equipment_values(line)
-                        line.lot_id.fsm_equipment_id = \
-                            rec.env['fsm.equipment'].create(vals)
+            if (rec.state == 'done'
+                    and rec.picking_type_id.create_fsm_equipment
+                    and rec.product_tmpl_id.create_fsm_equipment):
+                for line in rec.move_line_ids:
+                    vals = self.prepare_equipment_values(line)
+                    line.lot_id.fsm_equipment_id = \
+                        rec.env['fsm.equipment'].create(vals)
         return res
diff --git a/fieldservice_stock/models/stock_picking_type.py b/fieldservice_stock/models/stock_picking_type.py
new file mode 100644
index 0000000000..5fe0671881
--- /dev/null
+++ b/fieldservice_stock/models/stock_picking_type.py
@@ -0,0 +1,13 @@
+# Copyright (C) 2020 Open Source Integrators, Daniel Reis
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class StockPickingType(models.Model):
+    _inherit = 'stock.picking.type'
+
+    create_fsm_equipment = fields.Boolean(
+        name="Create FSM Equipment",
+        help="Products with the 'Creates a FSM Equipment' flag "
+        "will automatically be converted to an FSM Equipment."
+    )
diff --git a/fieldservice_stock/readme/CONFIGURE.rst b/fieldservice_stock/readme/CONFIGURE.rst
index 8c54175260..f4ee189e04 100644
--- a/fieldservice_stock/readme/CONFIGURE.rst
+++ b/fieldservice_stock/readme/CONFIGURE.rst
@@ -24,3 +24,24 @@ If you are in a multi-warehouse situation:
 * Go to Field Service > Configuration > Territories
 * Create or select a territory
 * Set the warehouse that will serve this territory
+
+Products can be automatically converted into FSM Equipments.
+This is only available only for products tracked by serial number.
+This needs to be enabled both on Operation Types and Products.
+For example, we may want to create the FSM Equipment on Delivery,
+or on Receipts.
+
+To enable on Products:
+
+* Go to Inventory > Master Data > Products
+* Open the Product form, Inventory tab
+* On the "Traceability" section, make sure
+  "Tracking" is set to "By Unique Serial Number"
+* Enable the "Creates FSM Equipment" checkbox
+
+To enable on Operation Types:
+
+* Go to Inventory > Configuration > Operation Types
+* Select the intended Operation Type ("Receipts" for example)
+* On the "Traceability" section, enable the
+  "Create FSM Equipment" checkbox
diff --git a/fieldservice_stock/views/product_template.xml b/fieldservice_stock/views/product_template.xml
index 67c6ff5919..6b9d6f36e3 100644
--- a/fieldservice_stock/views/product_template.xml
+++ b/fieldservice_stock/views/product_template.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="product_template_extend_warranty" model="ir.ui.view">
+    <record id="product_template_form_create_fsm_equipment" model="ir.ui.view">
         <field name="model">product.template</field>
         <field name="inherit_id"
                ref="product.product_template_only_form_view"/>
diff --git a/fieldservice_stock/views/stock_picking_type.xml b/fieldservice_stock/views/stock_picking_type.xml
new file mode 100644
index 0000000000..d197e10f6a
--- /dev/null
+++ b/fieldservice_stock/views/stock_picking_type.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="stock_picking_type_form_create_fsm" model="ir.ui.view">
+        <field name="model">stock.picking.type</field>
+        <field name="inherit_id" ref="stock.view_picking_type_form"/>
+        <field name="arch" type="xml">
+
+            <field name="use_existing_lots" position="after">
+                <field name="create_fsm_equipment"/>
+            </field>
+
+        </field>
+    </record>
+
+</odoo>

From d5426782cf3cfd1632729b0f44c64e5880955812 Mon Sep 17 00:00:00 2001
From: Daniel Reis <dreis@opensourceintegrators.com>
Date: Thu, 19 Mar 2020 21:08:56 +0000
Subject: [PATCH 155/631] [IMP] Migration script to handle the otherwise
 breaking changes

---
 .../migrations/12.0.2.0.0/post-migration.py         | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 fieldservice_stock/migrations/12.0.2.0.0/post-migration.py

diff --git a/fieldservice_stock/migrations/12.0.2.0.0/post-migration.py b/fieldservice_stock/migrations/12.0.2.0.0/post-migration.py
new file mode 100644
index 0000000000..2855328b90
--- /dev/null
+++ b/fieldservice_stock/migrations/12.0.2.0.0/post-migration.py
@@ -0,0 +1,13 @@
+# Copyright (C) 2020, 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 stock_picking_type
+        SET create_fsm_equipment = 'true'
+        WHERE code = 'outgoing';
+    """)

From d9e7b18b970ef501d9eb6616cf45f1cbf46da305 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 18 Mar 2020 17:18:03 -0600
Subject: [PATCH 156/631] [IMP] fieldservice_stock: Set the FSM location when
 creating equipment

---
 fieldservice_stock/i18n/es_CL.po              | 26 ++++++++-----------
 .../i18n/fieldservice_stock.pot               |  3 +++
 fieldservice_stock/models/fsm_order.py        | 10 +++++--
 fieldservice_stock/models/stock_move.py       |  2 ++
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/fieldservice_stock/i18n/es_CL.po b/fieldservice_stock/i18n/es_CL.po
index 4fa58755d2..b9b2d25416 100644
--- a/fieldservice_stock/i18n/es_CL.po
+++ b/fieldservice_stock/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-11-18 06:35+0000\n"
+"PO-Revision-Date: 2020-03-20 01:13+0000\n"
 "Last-Translator: Nelson Ramírez Sánchez <info@konos.cl>\n"
 "Language-Team: none\n"
 "Language: es_CL\n"
@@ -14,12 +14,12 @@ 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.8\n"
+"X-Generator: Weblate 3.10\n"
 
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Allocated Quantity"
-msgstr ""
+msgstr "Cantidad Asignada"
 
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
@@ -60,7 +60,7 @@ msgstr "Hecho"
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Done Quantity"
-msgstr ""
+msgstr "Cantidad Hecha"
 
 #. module: fieldservice_stock
 #: selection:fsm.order,request_stage:0
@@ -128,12 +128,12 @@ msgstr "Lote / Serie"
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Moves"
-msgstr ""
+msgstr "Movimientos"
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
 msgid "Operations"
-msgstr ""
+msgstr "Operaciones"
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
@@ -177,7 +177,7 @@ msgstr "Productos"
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Reference"
-msgstr ""
+msgstr "Referencias"
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
@@ -186,10 +186,8 @@ msgstr "Estado de Solicitud"
 
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-#, fuzzy
-#| msgid "Request State"
 msgid "Requested Quantity"
-msgstr "Estado de Solicitud"
+msgstr "Cantidad Pedida"
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
@@ -198,10 +196,8 @@ msgstr "Órdenes de Devolución"
 
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-#, fuzzy
-#| msgid "Return Orders"
 msgid "Returns"
-msgstr "Órdenes de Devolución"
+msgstr "Devoluciones"
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
@@ -256,7 +252,7 @@ msgstr "Enviado"
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_territory
 msgid "Territory"
-msgstr ""
+msgstr "Territorio"
 
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
@@ -271,7 +267,7 @@ msgstr "Transferencias"
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidad de Medida"
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
index a7cf57132d..0305a2cadb 100644
--- a/fieldservice_stock/i18n/fieldservice_stock.pot
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -139,8 +139,11 @@ msgstr ""
 
 #. module: fieldservice_stock
 #: code:addons/fieldservice_stock/models/fsm_order.py:54
+#: code:addons/fieldservice_stock/models/fsm_order.py:60
 #: code:addons/fieldservice_stock/models/fsm_order.py:67
+#: code:addons/fieldservice_stock/models/fsm_order.py:73
 #: code:addons/fieldservice_stock/models/fsm_order.py:80
+#: code:addons/fieldservice_stock/models/fsm_order.py:86
 #, python-format
 msgid "Please create a stock request."
 msgstr ""
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index ee0a3987db..1c470ad338 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -24,6 +24,11 @@ def _default_warehouse_id(self):
             [('company_id', '=', company)], limit=1)
         return warehouse_ids and warehouse_ids.id
 
+    @api.model
+    def _get_move_domain(self):
+        return [('picking_id.picking_type_id.code', 'in',
+                 ('outgoing', 'incoming'))]
+
     stock_request_ids = fields.One2many('stock.request', 'fsm_order_id',
                                         string="Order Lines")
 
@@ -44,8 +49,9 @@ def _default_warehouse_id(self):
     request_stage = fields.Selection(REQUEST_STATES, string='Request State',
                                      default='draft', readonly=True,
                                      store=True)
-    move_ids = fields.One2many('stock.move', 'fsm_order_id',
-                               string='Operations')
+    move_ids = fields.One2many(
+        'stock.move', 'fsm_order_id', string='Operations',
+        domain=_get_move_domain)
 
     @api.multi
     def action_request_submit(self):
diff --git a/fieldservice_stock/models/stock_move.py b/fieldservice_stock/models/stock_move.py
index 554043edc9..92bbb8da84 100644
--- a/fieldservice_stock/models/stock_move.py
+++ b/fieldservice_stock/models/stock_move.py
@@ -13,6 +13,8 @@ def prepare_equipment_values(self, move_line):
             move_line.product_id.name, move_line.lot_id.name),
             'product_id': move_line.product_id.id,
             'lot_id': move_line.lot_id.id,
+            'location_id':
+            move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
             'current_location_id':
             move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
             'current_stock_location_id': move_line.location_dest_id.id}

From a4f9e5f76cb7925007feaa647db087d0b7445f44 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 13 Apr 2020 14:30:28 +0000
Subject: [PATCH 157/631] fieldservice_stock 12.0.1.5.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock/

[UPD] Update fieldservice_stock.pot

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock/

[UPD] Update fieldservice_stock.pot

[UPD] README.rst
---
 fieldservice_stock/README.rst                 | 21 +++++++++++++++++++
 fieldservice_stock/__manifest__.py            |  2 +-
 fieldservice_stock/i18n/de.po                 |  6 +++---
 fieldservice_stock/i18n/es.po                 |  6 +++---
 fieldservice_stock/i18n/es_CL.po              |  6 +++---
 .../i18n/fieldservice_stock.pot               | 18 +++++++++++++---
 .../static/description/index.html             | 20 ++++++++++++++++++
 7 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index 87b9146ec3..f5d442763b 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -71,6 +71,27 @@ If you are in a multi-warehouse situation:
 * Create or select a territory
 * Set the warehouse that will serve this territory
 
+Products can be automatically converted into FSM Equipments.
+This is only available only for products tracked by serial number.
+This needs to be enabled both on Operation Types and Products.
+For example, we may want to create the FSM Equipment on Delivery,
+or on Receipts.
+
+To enable on Products:
+
+* Go to Inventory > Master Data > Products
+* Open the Product form, Inventory tab
+* On the "Traceability" section, make sure
+  "Tracking" is set to "By Unique Serial Number"
+* Enable the "Creates FSM Equipment" checkbox
+
+To enable on Operation Types:
+
+* Go to Inventory > Configuration > Operation Types
+* Select the intended Operation Type ("Receipts" for example)
+* On the "Traceability" section, enable the
+  "Create FSM Equipment" checkbox
+
 Usage
 =====
 
diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index d9e559532c..1a70b4e826 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.2.0.0',
+    'version': '12.0.1.5.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_stock/i18n/de.po b/fieldservice_stock/i18n/de.po
index 54786115ee..ba86e778a4 100644
--- a/fieldservice_stock/i18n/de.po
+++ b/fieldservice_stock/i18n/de.po
@@ -141,9 +141,9 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:54
-#: code:addons/fieldservice_stock/models/fsm_order.py:67
-#: code:addons/fieldservice_stock/models/fsm_order.py:80
+#: code:addons/fieldservice_stock/models/fsm_order.py:60
+#: code:addons/fieldservice_stock/models/fsm_order.py:73
+#: code:addons/fieldservice_stock/models/fsm_order.py:86
 #, python-format
 msgid "Please create a stock request."
 msgstr ""
diff --git a/fieldservice_stock/i18n/es.po b/fieldservice_stock/i18n/es.po
index b1efb49689..211de7a8fa 100644
--- a/fieldservice_stock/i18n/es.po
+++ b/fieldservice_stock/i18n/es.po
@@ -141,9 +141,9 @@ msgid "Order Lines"
 msgstr "Líneas de Pedido"
 
 #. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:54
-#: code:addons/fieldservice_stock/models/fsm_order.py:67
-#: code:addons/fieldservice_stock/models/fsm_order.py:80
+#: code:addons/fieldservice_stock/models/fsm_order.py:60
+#: code:addons/fieldservice_stock/models/fsm_order.py:73
+#: code:addons/fieldservice_stock/models/fsm_order.py:86
 #, python-format
 msgid "Please create a stock request."
 msgstr "Por favor cree una solicitud de stock."
diff --git a/fieldservice_stock/i18n/es_CL.po b/fieldservice_stock/i18n/es_CL.po
index b9b2d25416..06f54a6034 100644
--- a/fieldservice_stock/i18n/es_CL.po
+++ b/fieldservice_stock/i18n/es_CL.po
@@ -141,9 +141,9 @@ msgid "Order Lines"
 msgstr "Líneas de Pedido"
 
 #. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:54
-#: code:addons/fieldservice_stock/models/fsm_order.py:67
-#: code:addons/fieldservice_stock/models/fsm_order.py:80
+#: code:addons/fieldservice_stock/models/fsm_order.py:60
+#: code:addons/fieldservice_stock/models/fsm_order.py:73
+#: code:addons/fieldservice_stock/models/fsm_order.py:86
 #, python-format
 msgid "Please create a stock request."
 msgstr "Por favor cree una solicitud de stock."
diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
index 0305a2cadb..d5ed1034c6 100644
--- a/fieldservice_stock/i18n/fieldservice_stock.pot
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -28,6 +28,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
+msgid "Create Fsm Equipment"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
 #: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
@@ -138,11 +143,13 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:54
+#: model:ir.model,name:fieldservice_stock.model_stock_picking_type
+msgid "Picking Type"
+msgstr ""
+
+#. module: fieldservice_stock
 #: code:addons/fieldservice_stock/models/fsm_order.py:60
-#: code:addons/fieldservice_stock/models/fsm_order.py:67
 #: code:addons/fieldservice_stock/models/fsm_order.py:73
-#: code:addons/fieldservice_stock/models/fsm_order.py:80
 #: code:addons/fieldservice_stock/models/fsm_order.py:86
 #, python-format
 msgid "Please create a stock request."
@@ -174,6 +181,11 @@ msgstr ""
 msgid "Products"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
+msgid "Products with the 'Creates a FSM Equipment' flag will automatically be converted to an FSM Equipment."
+msgstr ""
+
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Reference"
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index fdd70ff60d..b5d319b640 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/static/description/index.html
@@ -422,6 +422,26 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
 <li>Create or select a territory</li>
 <li>Set the warehouse that will serve this territory</li>
 </ul>
+<p>Products can be automatically converted into FSM Equipments.
+This is only available only for products tracked by serial number.
+This needs to be enabled both on Operation Types and Products.
+For example, we may want to create the FSM Equipment on Delivery,
+or on Receipts.</p>
+<p>To enable on Products:</p>
+<ul class="simple">
+<li>Go to Inventory &gt; Master Data &gt; Products</li>
+<li>Open the Product form, Inventory tab</li>
+<li>On the “Traceability” section, make sure
+“Tracking” is set to “By Unique Serial Number”</li>
+<li>Enable the “Creates FSM Equipment” checkbox</li>
+</ul>
+<p>To enable on Operation Types:</p>
+<ul class="simple">
+<li>Go to Inventory &gt; Configuration &gt; Operation Types</li>
+<li>Select the intended Operation Type (“Receipts” for example)</li>
+<li>On the “Traceability” section, enable the
+“Create FSM Equipment” checkbox</li>
+</ul>
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#id3">Usage</a></h1>

From bfbcfaf1e41d6d121920a7e8ad545b7af6c7ebd1 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 14 Apr 2020 23:18:43 +0000
Subject: [PATCH 158/631] fieldservice_stock 12.0.2.1.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock/
---
 fieldservice_stock/__manifest__.py |  2 +-
 fieldservice_stock/i18n/de.po      | 17 +++++++++++++++++
 fieldservice_stock/i18n/es.po      | 19 +++++++++++++++++++
 fieldservice_stock/i18n/es_CL.po   | 19 +++++++++++++++++++
 4 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 1a70b4e826..569b1f1787 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.1.5.0',
+    'version': '12.0.2.1.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_stock/i18n/de.po b/fieldservice_stock/i18n/de.po
index ba86e778a4..3e30e67c14 100644
--- a/fieldservice_stock/i18n/de.po
+++ b/fieldservice_stock/i18n/de.po
@@ -31,6 +31,11 @@ msgstr "Abbrechen"
 msgid "Cancelled"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
+msgid "Create Fsm Equipment"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
 #: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
@@ -140,6 +145,11 @@ msgstr ""
 msgid "Order Lines"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_picking_type
+msgid "Picking Type"
+msgstr ""
+
 #. module: fieldservice_stock
 #: code:addons/fieldservice_stock/models/fsm_order.py:60
 #: code:addons/fieldservice_stock/models/fsm_order.py:73
@@ -174,6 +184,13 @@ msgstr "Produktvorlage"
 msgid "Products"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
+msgid ""
+"Products with the 'Creates a FSM Equipment' flag will automatically be "
+"converted to an FSM Equipment."
+msgstr ""
+
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Reference"
diff --git a/fieldservice_stock/i18n/es.po b/fieldservice_stock/i18n/es.po
index 211de7a8fa..78224fc452 100644
--- a/fieldservice_stock/i18n/es.po
+++ b/fieldservice_stock/i18n/es.po
@@ -31,6 +31,13 @@ msgstr "Cancelar"
 msgid "Cancelled"
 msgstr "Cancelado"
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
+#, fuzzy
+#| msgid "Creates a FSM Equipment"
+msgid "Create Fsm Equipment"
+msgstr "Crea Equipos FSM"
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
 #: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
@@ -140,6 +147,11 @@ msgstr "Operaciones"
 msgid "Order Lines"
 msgstr "Líneas de Pedido"
 
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_picking_type
+msgid "Picking Type"
+msgstr ""
+
 #. module: fieldservice_stock
 #: code:addons/fieldservice_stock/models/fsm_order.py:60
 #: code:addons/fieldservice_stock/models/fsm_order.py:73
@@ -174,6 +186,13 @@ msgstr "Plantilla de Producto"
 msgid "Products"
 msgstr "Productos"
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
+msgid ""
+"Products with the 'Creates a FSM Equipment' flag will automatically be "
+"converted to an FSM Equipment."
+msgstr ""
+
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Reference"
diff --git a/fieldservice_stock/i18n/es_CL.po b/fieldservice_stock/i18n/es_CL.po
index 06f54a6034..26943140e6 100644
--- a/fieldservice_stock/i18n/es_CL.po
+++ b/fieldservice_stock/i18n/es_CL.po
@@ -31,6 +31,13 @@ msgstr "Cancelar"
 msgid "Cancelled"
 msgstr "Cancelado"
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
+#, fuzzy
+#| msgid "Creates a FSM Equipment"
+msgid "Create Fsm Equipment"
+msgstr "Crea Equipos FSM"
+
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
 #: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
@@ -140,6 +147,11 @@ msgstr "Operaciones"
 msgid "Order Lines"
 msgstr "Líneas de Pedido"
 
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_picking_type
+msgid "Picking Type"
+msgstr ""
+
 #. module: fieldservice_stock
 #: code:addons/fieldservice_stock/models/fsm_order.py:60
 #: code:addons/fieldservice_stock/models/fsm_order.py:73
@@ -174,6 +186,13 @@ msgstr "Plantilla de Producto"
 msgid "Products"
 msgstr "Productos"
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
+msgid ""
+"Products with the 'Creates a FSM Equipment' flag will automatically be "
+"converted to an FSM Equipment."
+msgstr ""
+
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Reference"

From a41258e5c54b3f81a58decf3980bbda0e7e3acfd Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 15 Apr 2020 16:04:57 -0700
Subject: [PATCH 159/631] [IMP] FSM Stock Request Workflow Adjustment

[DEL] Unused Imports

[IMP] Consistency with Original Method

[IMP] Fix Correction

[IMP] Call Super()

[UPD] Update fieldservice_stock.pot
---
 .../i18n/fieldservice_stock.pot               |  6 ++++
 fieldservice_stock/models/stock_request.py    | 32 ++++++++++---------
 .../models/stock_request_order.py             |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
index d5ed1034c6..ec33be8660 100644
--- a/fieldservice_stock/i18n/fieldservice_stock.pot
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -266,6 +266,12 @@ msgstr ""
 msgid "Territory"
 msgstr ""
 
+#. module: fieldservice_stock
+#: code:addons/fieldservice_stock/models/stock_request.py:58
+#, python-format
+msgid "There is already a Stock Request Order                                   with the same Field Service Order and                                   Warehouse that is in Draft state. Please                                   add this Stock Request there.                                   (%s)"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
index 882ff13ca9..3acf4440e5 100644
--- a/fieldservice_stock/models/stock_request.py
+++ b/fieldservice_stock/models/stock_request.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from datetime import datetime, timedelta
-from odoo import api, fields, models
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
 
 
 class StockRequest(models.Model):
@@ -42,28 +42,26 @@ def create(self, vals):
             fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
             fsm_order.request_stage = 'draft'
             vals['warehouse_id'] = fsm_order.warehouse_id.id
-            val_date = vals['expected_date']
-            if not isinstance(vals['expected_date'], str):
-                val_date = datetime.strftime(vals['expected_date'],
-                                             '%Y-%m-%d %H:%M:%S')
-            val_date = datetime.strptime(val_date, '%Y-%m-%d %H:%M:%S')
             picking_type_id = self.env['stock.picking.type'].search(
                 [('code', '=', 'stock_request_order'),
                  ('warehouse_id', '=', vals['warehouse_id'])],
                 limit=1)
-            date_window_after = val_date - timedelta(hours=1)
             order = self.env['stock.request.order'].search([
                 ('fsm_order_id', '=', vals['fsm_order_id']),
                 ('warehouse_id', '=', vals['warehouse_id']),
                 ('picking_type_id', '=', picking_type_id.id),
                 ('direction', '=', vals['direction']),
-                ('expected_date', '>', date_window_after),
-                ('state', '=', 'draft')
-            ])
-            if order:
-                vals['expected_date'] = order.expected_date
-                vals['order_id'] = order.id
-            else:
+                ('state', '=', 'draft')], order="id asc")
+
+            # User created a new SRO Manually
+            if len(order) > 1:
+                raise UserError(_('There is already a Stock Request Order \
+                                  with the same Field Service Order and \
+                                  Warehouse that is in Draft state. Please \
+                                  add this Stock Request there. \
+                                  (%s)') % order[0].name)
+            # Made from an FSO for the first time, create the SRO here
+            elif not order and vals.get('fsm_order_id'):
                 values = self.prepare_order_values(vals)
                 values.update({
                     'picking_type_id': picking_type_id.id,
@@ -71,6 +69,10 @@ def create(self, vals):
                     })
                 vals['order_id'] = self.env['stock.request.order'].\
                     create(values).id
+            # There is an SRO made from FSO, assign here
+            elif len(order) == 1 and vals.get('fsm_order_id'):
+                vals['expected_date'] = order.expected_date
+                vals['order_id'] = order.id
         return super().create(vals)
 
     def _prepare_procurement_values(self, group_id=False):
diff --git a/fieldservice_stock/models/stock_request_order.py b/fieldservice_stock/models/stock_request_order.py
index 21cb0707ce..e96d3687c4 100644
--- a/fieldservice_stock/models/stock_request_order.py
+++ b/fieldservice_stock/models/stock_request_order.py
@@ -11,7 +11,7 @@ class StockRequestOrder(models.Model):
         'fsm.order', string="FSM Order", ondelete='cascade',
         index=True, copy=False)
 
-    @api.onchange('direction', 'fsm_order_id')
+    @api.onchange('warehouse_id', 'direction', 'fsm_order_id')
     def _onchange_location_id(self):
         super()._onchange_location_id()
         if self.fsm_order_id:

From 1c945695fbd82d50c3d9806491eec684650e9e8e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 21 Apr 2020 13:57:43 +0000
Subject: [PATCH 160/631] fieldservice_stock 12.0.2.1.1

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock/
---
 fieldservice_stock/__manifest__.py |   2 +-
 fieldservice_stock/i18n/de.po      |  10 +
 fieldservice_stock/i18n/es.po      |  10 +
 fieldservice_stock/i18n/es_CL.po   |  10 +
 fieldservice_stock/i18n/pt_BR.po   | 307 +++++++++++++++++++++++++++++
 5 files changed, 338 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_stock/i18n/pt_BR.po

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 569b1f1787..887e0010fa 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.2.1.0',
+    'version': '12.0.2.1.1',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_stock/i18n/de.po b/fieldservice_stock/i18n/de.po
index 3e30e67c14..488f9fa190 100644
--- a/fieldservice_stock/i18n/de.po
+++ b/fieldservice_stock/i18n/de.po
@@ -271,6 +271,16 @@ msgstr ""
 msgid "Territory"
 msgstr ""
 
+#. module: fieldservice_stock
+#: code:addons/fieldservice_stock/models/stock_request.py:58
+#, python-format
+msgid ""
+"There is already a Stock Request Order                                   "
+"with the same Field Service Order and                                   "
+"Warehouse that is in Draft state. Please                                   "
+"add this Stock Request there.                                   (%s)"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
diff --git a/fieldservice_stock/i18n/es.po b/fieldservice_stock/i18n/es.po
index 78224fc452..f6c4c41b72 100644
--- a/fieldservice_stock/i18n/es.po
+++ b/fieldservice_stock/i18n/es.po
@@ -273,6 +273,16 @@ msgstr "Enviado"
 msgid "Territory"
 msgstr "Territorio"
 
+#. module: fieldservice_stock
+#: code:addons/fieldservice_stock/models/stock_request.py:58
+#, python-format
+msgid ""
+"There is already a Stock Request Order                                   "
+"with the same Field Service Order and                                   "
+"Warehouse that is in Draft state. Please                                   "
+"add this Stock Request there.                                   (%s)"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
diff --git a/fieldservice_stock/i18n/es_CL.po b/fieldservice_stock/i18n/es_CL.po
index 26943140e6..e257545b7e 100644
--- a/fieldservice_stock/i18n/es_CL.po
+++ b/fieldservice_stock/i18n/es_CL.po
@@ -273,6 +273,16 @@ msgstr "Enviado"
 msgid "Territory"
 msgstr "Territorio"
 
+#. module: fieldservice_stock
+#: code:addons/fieldservice_stock/models/stock_request.py:58
+#, python-format
+msgid ""
+"There is already a Stock Request Order                                   "
+"with the same Field Service Order and                                   "
+"Warehouse that is in Draft state. Please                                   "
+"add this Stock Request there.                                   (%s)"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
diff --git a/fieldservice_stock/i18n/pt_BR.po b/fieldservice_stock/i18n/pt_BR.po
new file mode 100644
index 0000000000..dab7400c54
--- /dev/null
+++ b/fieldservice_stock/i18n/pt_BR.po
@@ -0,0 +1,307 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-06-17 16:19+0000\n"
+"Last-Translator: Fernando Colus <fcolus1@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_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Allocated Quantity"
+msgstr "Quantidade Alocada"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
+msgid "Create Fsm Equipment"
+msgstr "Criar Equipamento FSM (Field Service Management)"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
+#: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
+msgid "Creates a FSM Equipment"
+msgstr "Cria um Equipamento FSM (Field Service Management)"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__current_stock_location_id
+msgid "Current Inventory Location"
+msgstr "Localização Atual do Inventário"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Deliveries"
+msgstr "Entregas"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__delivery_count
+msgid "Delivery Orders"
+msgstr "Pedidos de Entrega"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Done"
+msgstr "Concluído"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Done Quantity"
+msgstr "Quantidade Concluída"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_production_lot__fsm_equipment_id
+msgid "Equipment"
+msgstr "Equipamento"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request_order__fsm_order_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.stock_request_order_fsm_order_search
+msgid "FSM Order"
+msgstr "Pedido de FSM (Field Service Management)"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr "Conversão de registro FSM (Field Service Management)"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Equipamento de Serviço de Campo"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_location
+msgid "Field Service Location"
+msgstr "Localização do Serviço de Campo"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_order
+#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking__fsm_order_id
+msgid "Field Service Order"
+msgstr "Pedido de Serviço de Campo"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "In progress"
+msgstr "Em andamento"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.fsm_equipment_form_view_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Inventory"
+msgstr "Inventário"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__inventory_location_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__inventory_location_id
+msgid "Inventory Location"
+msgstr "Localização de Inventário"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr "Lote/Serial"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Moves"
+msgstr "Movimentações"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
+msgid "Operations"
+msgstr "Operações"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
+msgid "Order Lines"
+msgstr "Linhas do Pedido"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_picking_type
+msgid "Picking Type"
+msgstr "Tipo de Coleta"
+
+#. module: fieldservice_stock
+#: code:addons/fieldservice_stock/models/fsm_order.py:60
+#: code:addons/fieldservice_stock/models/fsm_order.py:73
+#: code:addons/fieldservice_stock/models/fsm_order.py:86
+#, python-format
+msgid "Please create a stock request."
+msgstr "Por gentileza, crie uma requisição de estoque."
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_procurement_group
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
+msgid "Procurement Group"
+msgstr "Grupo de Aquisições"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__product_id
+msgid "Product"
+msgstr "Produto"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move_line
+msgid "Product Moves (Stock Move Line)"
+msgstr "Movimentações de Produto (Linha de Movimentação de Estoque)"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_product_template
+msgid "Product Template"
+msgstr "Modelo de Produto"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
+msgid "Products"
+msgstr "Produtos"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
+msgid "Products with the 'Creates a FSM Equipment' flag will automatically be converted to an FSM Equipment."
+msgstr ""
+"Os produtos com o sinalizador \"Cria um equipamento FSM\" serão "
+"automaticamente convertidos em um equipamento FSM."
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Reference"
+msgstr "Referência"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
+msgid "Request State"
+msgstr "Estado da Requisição"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Requested Quantity"
+msgstr "Quantidade Requisitada"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
+msgid "Return Orders"
+msgstr "Retornar Pedidos"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Returns"
+msgstr "Retornos"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
+msgid "Serial #"
+msgstr "Serial #"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Set to Draft"
+msgstr "Marque como rascunho"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
+msgid "Shipping Location"
+msgstr "Localização do Embarque"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Movimentação de Estoque"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_request
+msgid "Stock Request"
+msgstr "Requisição de Estoque"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_request_order
+msgid "Stock Request Order"
+msgstr "Pedido de Movimentação de Estoque"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_request
+msgid "Stock Requests"
+msgstr "Requisições de Estoque"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_rule
+msgid "Stock Rule"
+msgstr "Regra de Estoque"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Submit"
+msgstr "Submeter"
+
+#. module: fieldservice_stock
+#: selection:fsm.order,request_stage:0
+msgid "Submitted"
+msgstr "Submetido"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_territory
+msgid "Territory"
+msgstr "Território"
+
+#. module: fieldservice_stock
+#: code:addons/fieldservice_stock/models/stock_request.py:58
+#, python-format
+msgid "There is already a Stock Request Order                                   with the same Field Service Order and                                   Warehouse that is in Draft state. Please                                   add this Stock Request there.                                   (%s)"
+msgstr ""
+"Já existe um Pedido de Solicitação de Estoque com o mesmo Pedido de Serviço "
+"de Campo e Armazém que está no estado Rascunho. Adicione essa solicitação de "
+"estoque lá. (%s)"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_picking
+msgid "Transfer"
+msgstr "Transferência"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__picking_ids
+msgid "Transfers"
+msgstr "Transferências"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Unit of Measure"
+msgstr "Unidade de Medida (UoM)"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_territory__warehouse_id
+msgid "Warehouse"
+msgstr "Armazém"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
+msgid "Warehouse used to ship the materials"
+msgstr "Armazém utilizado para embarque dos materiais"

From 54fabe46b982199294b20595622d8b54eb3af704 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Thu, 20 Aug 2020 18:54:21 +0530
Subject: [PATCH 161/631] [IMP] Gave Access to portal user.

---
 fieldservice_stock/security/ir.model.access.csv | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fieldservice_stock/security/ir.model.access.csv b/fieldservice_stock/security/ir.model.access.csv
index 310dd94a39..1d629dc0fd 100644
--- a/fieldservice_stock/security/ir.model.access.csv
+++ b/fieldservice_stock/security/ir.model.access.csv
@@ -1,4 +1,12 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_stock_request_allocation_fsm_user,stock.request.allocation.user,stock_request.model_stock_request_allocation,base.group_user,1,0,0,0
+access_stock_request_allocation_portal,access.stock.request.allocation.portal,stock_request.model_stock_request_allocation,base.group_portal,1,0,0,0
 access_stock_request_fsm_user,stock.request.user,stock_request.model_stock_request,fieldservice.group_fsm_user,1,0,0,0
 access_stock_request_fsm_dispatcher,stock.request.dispatcher,stock_request.model_stock_request,fieldservice.group_fsm_dispatcher,1,1,1,1
+access_stock_request_portal,access.stock.request.portal,stock_request.model_stock_request,base.group_portal,1,0,0,0
+access_stock_move_portal,access.stock.move.portal,stock.model_stock_move,base.group_portal,1,1,0,0
+access_stock_picking_type_portal,access.stock.picking.type.portal,stock.model_stock_picking_type,base.group_portal,1,0,0,0
+access_product_product_portal,access.product.product.portal,product.model_product_product,base.group_portal,1,0,0,0
+access_product_template_portal,access.product.template.portal,product.model_product_template,base.group_portal,1,0,0,0
+access_stock_move_line_portal,access.stock.move.line.portal,stock.model_stock_move_line,base.group_portal,1,0,0,0
+access_uom_uom_portal,access.uom.uom.portal,uom.model_uom_uom,base.group_portal,1,0,0,0

From 81c92382205df479581ef0bfb17ec741fedeb08f Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 29 Sep 2020 19:10:10 +0000
Subject: [PATCH 162/631] fieldservice_stock 12.0.2.2.0

---
 fieldservice_stock/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 887e0010fa..e98b166362 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.2.1.1',
+    'version': '12.0.2.2.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "

From 66f5d79f52f879da3dd3626ecb275ddc71548625 Mon Sep 17 00:00:00 2001
From: Marcel Savegnago <marcel.savegnago@gmail.com>
Date: Tue, 22 Sep 2020 04:42:23 -0300
Subject: [PATCH 163/631] [IMP] fieldservice_stock: Improve Current Inventory
 Location

---
 fieldservice_stock/models/fsm_equipment.py    |  8 +++-
 fieldservice_stock/readme/CONTRIBUTORS.rst    |  1 +
 fieldservice_stock/tests/__init__.py          |  4 ++
 .../tests/test_fsm_equipment.py               | 45 +++++++++++++++++++
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_stock/tests/__init__.py
 create mode 100644 fieldservice_stock/tests/test_fsm_equipment.py

diff --git a/fieldservice_stock/models/fsm_equipment.py b/fieldservice_stock/models/fsm_equipment.py
index b395666caf..5551372ee2 100644
--- a/fieldservice_stock/models/fsm_equipment.py
+++ b/fieldservice_stock/models/fsm_equipment.py
@@ -15,7 +15,7 @@ class FSMEquipment(models.Model):
         'stock.location', string='Current Inventory Location',
         compute='_compute_current_stock_loc_id')
 
-    @api.multi
+    @api.depends('product_id', 'lot_id')
     def _compute_current_stock_loc_id(self):
         for equipment in self:
             quants = self.env['stock.quant'].search(
@@ -27,6 +27,12 @@ def _compute_current_stock_loc_id(self):
             else:
                 equipment.current_stock_location_id = False
 
+    @api.onchange('product_id')
+    def _onchange_product(self):
+        for equipment in self:
+            # self.lot_id = False
+            self.current_stock_location_id = False
+
     @api.model
     def create(self, vals):
         res = super(FSMEquipment, self).create(vals)
diff --git a/fieldservice_stock/readme/CONTRIBUTORS.rst b/fieldservice_stock/readme/CONTRIBUTORS.rst
index 61e9fc4dc3..5db5c162c6 100644
--- a/fieldservice_stock/readme/CONTRIBUTORS.rst
+++ b/fieldservice_stock/readme/CONTRIBUTORS.rst
@@ -1,3 +1,4 @@
 * Brian McMaster <brian@mcmpest.com>
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Marcel Savegnago <marcel.savegnago@escodoo.com.br>
diff --git a/fieldservice_stock/tests/__init__.py b/fieldservice_stock/tests/__init__.py
new file mode 100644
index 0000000000..50a5826fe6
--- /dev/null
+++ b/fieldservice_stock/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2020 - TODAY, Marcel Savegnago (Escodoo)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from . import test_fsm_equipment
diff --git a/fieldservice_stock/tests/test_fsm_equipment.py b/fieldservice_stock/tests/test_fsm_equipment.py
new file mode 100644
index 0000000000..0e4c1418ea
--- /dev/null
+++ b/fieldservice_stock/tests/test_fsm_equipment.py
@@ -0,0 +1,45 @@
+# Copyright (C) 2020 - TODAY, Marcel Savegnago (Escodoo)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo.tests.common import TransactionCase
+
+
+class TestFSMEquipment(TransactionCase):
+
+    def setUp(self):
+        super(TestFSMEquipment, self).setUp()
+        self.Equipment = self.env['fsm.equipment']
+        self.stock_location = self.env.ref('stock.stock_location_customers')
+
+        product1 = self.env['product.product'].create({
+            'name': 'Product A',
+            'type': 'product',
+            'tracking': 'serial',
+        })
+        lot1 = self.env['stock.production.lot'].create({
+            'name': 'serial1',
+            'product_id': product1.id,
+        })
+        self.env['stock.quant'].create({
+            'product_id': product1.id,
+            'location_id': self.stock_location.id,
+            'quantity': 1.0,
+            'lot_id': lot1.id,
+        })
+
+        self.equipment = self.Equipment.create({
+            'name': 'Equipment 1',
+            'product_id': product1.id,
+            'lot_id': lot1.id,
+            'current_stock_location_id': self.stock_location.id,
+        })
+
+    def test_onchange_product(self):
+        equipment = self.equipment
+        equipment._onchange_product()
+        # self.assertFalse(equipment.lot_id)
+        self.assertFalse(equipment.current_stock_location_id)
+
+    def test_compute_current_stock_loc_id(self):
+        equipment = self.equipment
+        equipment._compute_current_stock_loc_id()
+        self.assertTrue(equipment.current_stock_location_id == self.stock_location)

From f849e84688fbbda7a7fe07f172b86303f7262671 Mon Sep 17 00:00:00 2001
From: Marcel Savegnago <marcel.savegnago@gmail.com>
Date: Tue, 3 Nov 2020 13:46:03 -0300
Subject: [PATCH 164/631] [FIX] remove lot_id=false

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock/

[UPD] README.rst
---
 fieldservice_stock/README.rst                    | 1 +
 fieldservice_stock/i18n/es.po                    | 1 -
 fieldservice_stock/i18n/es_CL.po                 | 1 -
 fieldservice_stock/models/fsm_equipment.py       | 1 -
 fieldservice_stock/static/description/index.html | 1 +
 fieldservice_stock/tests/test_fsm_equipment.py   | 1 -
 6 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index f5d442763b..c94a6657f5 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -134,6 +134,7 @@ Contributors
 * Brian McMaster <brian@mcmpest.com>
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Marcel Savegnago <marcel.savegnago@escodoo.com.br>
 
 Other credits
 ~~~~~~~~~~~~~
diff --git a/fieldservice_stock/i18n/es.po b/fieldservice_stock/i18n/es.po
index f6c4c41b72..52397c63c7 100644
--- a/fieldservice_stock/i18n/es.po
+++ b/fieldservice_stock/i18n/es.po
@@ -34,7 +34,6 @@ msgstr "Cancelado"
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
 #, fuzzy
-#| msgid "Creates a FSM Equipment"
 msgid "Create Fsm Equipment"
 msgstr "Crea Equipos FSM"
 
diff --git a/fieldservice_stock/i18n/es_CL.po b/fieldservice_stock/i18n/es_CL.po
index e257545b7e..1d0768f10b 100644
--- a/fieldservice_stock/i18n/es_CL.po
+++ b/fieldservice_stock/i18n/es_CL.po
@@ -34,7 +34,6 @@ msgstr "Cancelado"
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
 #, fuzzy
-#| msgid "Creates a FSM Equipment"
 msgid "Create Fsm Equipment"
 msgstr "Crea Equipos FSM"
 
diff --git a/fieldservice_stock/models/fsm_equipment.py b/fieldservice_stock/models/fsm_equipment.py
index 5551372ee2..0093df66c6 100644
--- a/fieldservice_stock/models/fsm_equipment.py
+++ b/fieldservice_stock/models/fsm_equipment.py
@@ -30,7 +30,6 @@ def _compute_current_stock_loc_id(self):
     @api.onchange('product_id')
     def _onchange_product(self):
         for equipment in self:
-            # self.lot_id = False
             self.current_stock_location_id = False
 
     @api.model
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index b5d319b640..17d3c2ccee 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/static/description/index.html
@@ -482,6 +482,7 @@ <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>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#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>Marcel Savegnago &lt;<a class="reference external" href="mailto:marcel.savegnago&#64;escodoo.com.br">marcel.savegnago&#64;escodoo.com.br</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
diff --git a/fieldservice_stock/tests/test_fsm_equipment.py b/fieldservice_stock/tests/test_fsm_equipment.py
index 0e4c1418ea..c6488b2598 100644
--- a/fieldservice_stock/tests/test_fsm_equipment.py
+++ b/fieldservice_stock/tests/test_fsm_equipment.py
@@ -36,7 +36,6 @@ def setUp(self):
     def test_onchange_product(self):
         equipment = self.equipment
         equipment._onchange_product()
-        # self.assertFalse(equipment.lot_id)
         self.assertFalse(equipment.current_stock_location_id)
 
     def test_compute_current_stock_loc_id(self):

From f8fbd6a98f0879df6b22b4b3afdd5e6eca2b3777 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 10 Dec 2020 20:14:27 +0000
Subject: [PATCH 165/631] fieldservice_stock 12.0.2.3.0

---
 fieldservice_stock/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index e98b166362..d2401c4101 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.2.2.0',
+    'version': '12.0.2.3.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "

From 2ea04c60fd3be2e9b63f6d6f0941d964db7a289f Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 21 Nov 2020 12:25:05 -0500
Subject: [PATCH 166/631] [IMP] fieldservice_stock: Split stock request

---
 fieldservice_stock/__manifest__.py            |   5 +-
 fieldservice_stock/models/__init__.py         |   3 -
 fieldservice_stock/models/fsm_order.py        |  57 +--------
 fieldservice_stock/models/stock_move_line.py  |  24 ----
 fieldservice_stock/models/stock_request.py    | 115 ------------------
 .../models/stock_request_order.py             |  54 --------
 fieldservice_stock/readme/CONFIGURE.rst       |  16 ---
 fieldservice_stock/readme/DESCRIPTION.rst     |   3 +-
 fieldservice_stock/readme/USAGE.rst           |  10 +-
 .../security/ir.model.access.csv              |   6 -
 fieldservice_stock/views/fsm_order.xml        |  40 +-----
 fieldservice_stock/views/stock.xml            |   6 -
 fieldservice_stock/views/stock_request.xml    |  24 ----
 .../views/stock_request_order.xml             |  53 --------
 14 files changed, 8 insertions(+), 408 deletions(-)
 delete mode 100644 fieldservice_stock/models/stock_move_line.py
 delete mode 100644 fieldservice_stock/models/stock_request.py
 delete mode 100644 fieldservice_stock/models/stock_request_order.py
 delete mode 100644 fieldservice_stock/views/stock_request.xml
 delete mode 100644 fieldservice_stock/views/stock_request_order.xml

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index d2401c4101..56beded5bb 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -12,8 +12,7 @@
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice',
-        'stock_request_direction',
-        'stock_request_picking_type',
+        'stock',
     ],
     'data': [
         'security/ir.model.access.csv',
@@ -26,8 +25,6 @@
         'views/product_template.xml',
         'views/stock_picking_type.xml',
         'views/stock_production_lot.xml',
-        'views/stock_request.xml',
-        'views/stock_request_order.xml',
     ],
     'license': 'AGPL-3',
     'development_status': 'Beta',
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index 9eb61a602c..26f78971aa 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -5,7 +5,6 @@
     fsm_territory,
     fsm_location,
     fsm_order,
-    stock_move_line,
     stock_move,
     procurement_group,
     stock_rule,
@@ -15,6 +14,4 @@
     product_template,
     stock_production_lot,
     fsm_wizard,
-    stock_request,
-    stock_request_order,
 )
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 1c470ad338..6c9872c14b 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -1,17 +1,7 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models, _
-
-from odoo.exceptions import UserError
-
-
-REQUEST_STATES = [
-    ('draft', 'Draft'),
-    ('submitted', 'Submitted'),
-    ('open', 'In progress'),
-    ('done', 'Done'),
-    ('cancel', 'Cancelled')]
+from odoo import api, fields, models
 
 
 class FSMOrder(models.Model):
@@ -29,9 +19,6 @@ def _get_move_domain(self):
         return [('picking_id.picking_type_id.code', 'in',
                  ('outgoing', 'incoming'))]
 
-    stock_request_ids = fields.One2many('stock.request', 'fsm_order_id',
-                                        string="Order Lines")
-
     picking_ids = fields.One2many('stock.picking', 'fsm_order_id',
                                   string='Transfers')
     delivery_count = fields.Integer(string='Delivery Orders',
@@ -46,52 +33,10 @@ def _get_move_domain(self):
                                    help="Warehouse used to ship the materials")
     return_count = fields.Integer(string='Return Orders',
                                   compute='_compute_picking_ids')
-    request_stage = fields.Selection(REQUEST_STATES, string='Request State',
-                                     default='draft', readonly=True,
-                                     store=True)
     move_ids = fields.One2many(
         'stock.move', 'fsm_order_id', string='Operations',
         domain=_get_move_domain)
 
-    @api.multi
-    def action_request_submit(self):
-        for rec in self:
-            if not rec.stock_request_ids:
-                raise UserError(_('Please create a stock request.'))
-            for line in rec.stock_request_ids:
-                if line.state == 'draft':
-                    if line.order_id:
-                        line.order_id.action_submit()
-                    else:
-                        line.action_submit()
-            rec.request_stage = 'submitted'
-
-    @api.multi
-    def action_request_cancel(self):
-        for rec in self:
-            if not rec.stock_request_ids:
-                raise UserError(_('Please create a stock request.'))
-            for line in rec.stock_request_ids:
-                if line.state in ('draft', 'submitted'):
-                    if line.order_id:
-                        line.order_id.action_cancel()
-                    else:
-                        line.action_cancel()
-            rec.request_stage = 'cancel'
-
-    @api.multi
-    def action_request_draft(self):
-        for rec in self:
-            if not rec.stock_request_ids:
-                raise UserError(_('Please create a stock request.'))
-            for line in rec.stock_request_ids:
-                if line.state == 'cancel':
-                    if line.order_id:
-                        line.order_id.action_draft()
-                    else:
-                        line.action_draft()
-            rec.request_stage = 'draft'
-
     @api.depends('picking_ids')
     def _compute_picking_ids(self):
         for order in self:
diff --git a/fieldservice_stock/models/stock_move_line.py b/fieldservice_stock/models/stock_move_line.py
deleted file mode 100644
index 92c6dbba1a..0000000000
--- a/fieldservice_stock/models/stock_move_line.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2018 Brian McMaster
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import exceptions, models
-
-
-class StockMoveLine(models.Model):
-    _inherit = "stock.move.line"
-
-    def _action_done(self):
-        res = super(StockMoveLine, self)._action_done()
-        for rec in self:
-            # cases were found where self contained deleted records
-            # example is creating a backorder for Products with lot number
-            try:
-                move_id = rec.move_id
-            except exceptions.MissingError:
-                move_id = None
-            if move_id:
-                for request in rec.move_id.allocation_ids:
-                    if (request.stock_request_id.state == 'done'
-                            and request.stock_request_id.fsm_order_id):
-                        request.stock_request_id.\
-                            fsm_order_id.request_stage = 'done'
-        return res
diff --git a/fieldservice_stock/models/stock_request.py b/fieldservice_stock/models/stock_request.py
deleted file mode 100644
index 3acf4440e5..0000000000
--- a/fieldservice_stock/models/stock_request.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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 UserError
-
-
-class StockRequest(models.Model):
-    _inherit = 'stock.request'
-
-    fsm_order_id = fields.Many2one(
-        'fsm.order', string="FSM Order", ondelete='cascade',
-        index=True, copy=False)
-
-    @api.onchange('direction', 'fsm_order_id')
-    def _onchange_location_id(self):
-        super()._onchange_location_id()
-        if self.fsm_order_id:
-            if self.direction == 'outbound':
-                # Inventory location of the FSM location of the order
-                self.location_id = \
-                    self.fsm_order_id.location_id.inventory_location_id.id
-            else:
-                # Otherwise the stock location of the warehouse
-                self.location_id = \
-                    self.fsm_order_id.warehouse_id.lot_stock_id.id
-
-    def prepare_order_values(self, vals):
-        res = {
-            'expected_date': vals['expected_date'],
-            'picking_policy': vals['picking_policy'],
-            'warehouse_id': vals['warehouse_id'],
-            'direction': vals['direction'],
-            'location_id': vals['location_id'],
-        }
-        if 'fsm_order_id' in vals and vals['fsm_order_id']:
-            res.update({'fsm_order_id': vals['fsm_order_id']})
-        return res
-
-    @api.model
-    def create(self, vals):
-        if 'fsm_order_id' in vals and vals['fsm_order_id']:
-            fsm_order = self.env['fsm.order'].browse(vals['fsm_order_id'])
-            fsm_order.request_stage = 'draft'
-            vals['warehouse_id'] = fsm_order.warehouse_id.id
-            picking_type_id = self.env['stock.picking.type'].search(
-                [('code', '=', 'stock_request_order'),
-                 ('warehouse_id', '=', vals['warehouse_id'])],
-                limit=1)
-            order = self.env['stock.request.order'].search([
-                ('fsm_order_id', '=', vals['fsm_order_id']),
-                ('warehouse_id', '=', vals['warehouse_id']),
-                ('picking_type_id', '=', picking_type_id.id),
-                ('direction', '=', vals['direction']),
-                ('state', '=', 'draft')], order="id asc")
-
-            # User created a new SRO Manually
-            if len(order) > 1:
-                raise UserError(_('There is already a Stock Request Order \
-                                  with the same Field Service Order and \
-                                  Warehouse that is in Draft state. Please \
-                                  add this Stock Request there. \
-                                  (%s)') % order[0].name)
-            # Made from an FSO for the first time, create the SRO here
-            elif not order and vals.get('fsm_order_id'):
-                values = self.prepare_order_values(vals)
-                values.update({
-                    'picking_type_id': picking_type_id.id,
-                    'warehouse_id': vals['warehouse_id'],
-                    })
-                vals['order_id'] = self.env['stock.request.order'].\
-                    create(values).id
-            # There is an SRO made from FSO, assign here
-            elif len(order) == 1 and vals.get('fsm_order_id'):
-                vals['expected_date'] = order.expected_date
-                vals['order_id'] = order.id
-        return super().create(vals)
-
-    def _prepare_procurement_values(self, group_id=False):
-        res = super()._prepare_procurement_values(group_id=group_id)
-        if self.fsm_order_id:
-            res.update({
-                'fsm_order_id': self.fsm_order_id.id,
-                'partner_id':
-                    self.fsm_order_id.location_id.shipping_address_id.id or
-                    self.fsm_order_id.location_id.partner_id.id
-            })
-        return res
-
-    def _prepare_procurement_group_values(self):
-        if self.fsm_order_id:
-            order = self.env['fsm.order'].browse(self.fsm_order_id.id)
-            return {'name': order.name,
-                    'fsm_order_id': order.id,
-                    'move_type': 'direct'}
-        else:
-            return {}
-
-    @api.multi
-    def _action_confirm(self):
-        for req in self:
-            if (not req.procurement_group_id) and req.fsm_order_id:
-                fsm_order = self.env['fsm.order'].browse(req.fsm_order_id.id)
-                group = self.env['procurement.group'].search([
-                    ('fsm_order_id', '=', fsm_order.id)])
-                if not group:
-                    values = req._prepare_procurement_group_values()
-                    group = req.env['procurement.group'].create(values)
-                if req.order_id:
-                    req.order_id.procurement_group_id = group.id
-                req.procurement_group_id = group.id
-                res = super(StockRequest, req)._action_confirm()
-                fsm_order.request_stage = 'open'
-            else:
-                res = super(StockRequest, req)._action_confirm()
-        return res
diff --git a/fieldservice_stock/models/stock_request_order.py b/fieldservice_stock/models/stock_request_order.py
deleted file mode 100644
index e96d3687c4..0000000000
--- a/fieldservice_stock/models/stock_request_order.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 StockRequestOrder(models.Model):
-    _inherit = 'stock.request.order'
-
-    fsm_order_id = fields.Many2one(
-        'fsm.order', string="FSM Order", ondelete='cascade',
-        index=True, copy=False)
-
-    @api.onchange('warehouse_id', 'direction', 'fsm_order_id')
-    def _onchange_location_id(self):
-        super()._onchange_location_id()
-        if self.fsm_order_id:
-            if self.direction == 'outbound':
-                # Inventory location of the FSM location of the order
-                self.location_id = \
-                    self.fsm_order_id.location_id.inventory_location_id.id
-            else:
-                # Otherwise the stock location of the warehouse
-                self.location_id = \
-                    self.fsm_order_id.warehouse_id.lot_stock_id.id
-        self.change_childs()
-
-    def change_childs(self):
-        super().change_childs()
-        if not self._context.get('no_change_childs', False):
-            for line in self.stock_request_ids:
-                line.fsm_order_id = self.fsm_order_id.id
-
-    def _prepare_procurement_group_values(self):
-        if self.fsm_order_id:
-            order = self.env['fsm.order'].browse(self.fsm_order_id.id)
-            return {'name': order.name,
-                    'fsm_order_id': order.id,
-                    'move_type': 'direct'}
-        else:
-            return {}
-
-    @api.multi
-    def action_confirm(self):
-        if self.fsm_order_id:
-            fsm_order = self.env['fsm.order'].browse(self.fsm_order_id.id)
-            group = self.env['procurement.group'].search([
-                ('fsm_order_id', '=', fsm_order.id)])
-            if not group:
-                values = self._prepare_procurement_group_values()
-                group = self.env['procurement.group'].create(values)
-            self.procurement_group_id = group[0].id
-            self.change_childs()
-        return super().action_confirm()
diff --git a/fieldservice_stock/readme/CONFIGURE.rst b/fieldservice_stock/readme/CONFIGURE.rst
index f4ee189e04..9b3e10b369 100644
--- a/fieldservice_stock/readme/CONFIGURE.rst
+++ b/fieldservice_stock/readme/CONFIGURE.rst
@@ -2,22 +2,6 @@ To configure this module, you need to:
 
 * Go to Field Service > Master Data > Locations
 * Create or select a location and set the inventory location
-* Go to Inventory > Configuration > Routes
-* Select the routes that you want to use from a FSM order
-* Check the box 'FSM Order Line' for outbound transfer
-* Check the box 'FSM Return Line' for inbound transfer
-
-The route 'Receipt in 1 step' has no procurement rule so if you want items to be
-returned from the service location to your warehouse, you need to create a new
-procurement rule for that route:
-
-* Name: YourCompany: Return
-* Action: Move From Another Location
-* Procurement Location:	WH/Stock
-* Served Warehouse:	YourCompany
-* Source Location: Partner Locations/Customers
-* Move Supply Method: Take From Stock
-* Operation Type: YourCompany: Receipts
 
 If you are in a multi-warehouse situation:
 
diff --git a/fieldservice_stock/readme/DESCRIPTION.rst b/fieldservice_stock/readme/DESCRIPTION.rst
index 978a9f3b33..0662a1496a 100644
--- a/fieldservice_stock/readme/DESCRIPTION.rst
+++ b/fieldservice_stock/readme/DESCRIPTION.rst
@@ -1,2 +1,3 @@
 This module is an add-on for the Field Service application in Odoo.
-It provides inventory and stock operations.
+It provides a generic framework to allow you to link inventory and
+stock operations with your field service operations.
diff --git a/fieldservice_stock/readme/USAGE.rst b/fieldservice_stock/readme/USAGE.rst
index a9332d58c5..0eca605486 100644
--- a/fieldservice_stock/readme/USAGE.rst
+++ b/fieldservice_stock/readme/USAGE.rst
@@ -1,7 +1,3 @@
-To use this module, you need to:
-
-* Create a new service order
-* Under the Inventory tab, select the warehouse and add products with quantity
-* Confirm the order to create the delivery orders
-* Validate the transfers in the Inventory app. Quantities delivered on FSM
-  Order Line will be updated.
+This module primarily establishes a connection between stock and
+field service operations so therefore has no specific usage
+instructions.
diff --git a/fieldservice_stock/security/ir.model.access.csv b/fieldservice_stock/security/ir.model.access.csv
index 1d629dc0fd..2bca56c306 100644
--- a/fieldservice_stock/security/ir.model.access.csv
+++ b/fieldservice_stock/security/ir.model.access.csv
@@ -1,12 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_stock_request_allocation_fsm_user,stock.request.allocation.user,stock_request.model_stock_request_allocation,base.group_user,1,0,0,0
-access_stock_request_allocation_portal,access.stock.request.allocation.portal,stock_request.model_stock_request_allocation,base.group_portal,1,0,0,0
-access_stock_request_fsm_user,stock.request.user,stock_request.model_stock_request,fieldservice.group_fsm_user,1,0,0,0
-access_stock_request_fsm_dispatcher,stock.request.dispatcher,stock_request.model_stock_request,fieldservice.group_fsm_dispatcher,1,1,1,1
-access_stock_request_portal,access.stock.request.portal,stock_request.model_stock_request,base.group_portal,1,0,0,0
 access_stock_move_portal,access.stock.move.portal,stock.model_stock_move,base.group_portal,1,1,0,0
 access_stock_picking_type_portal,access.stock.picking.type.portal,stock.model_stock_picking_type,base.group_portal,1,0,0,0
 access_product_product_portal,access.product.product.portal,product.model_product_product,base.group_portal,1,0,0,0
 access_product_template_portal,access.product.template.portal,product.model_product_template,base.group_portal,1,0,0,0
-access_stock_move_line_portal,access.stock.move.line.portal,stock.model_stock_move_line,base.group_portal,1,0,0,0
 access_uom_uom_portal,access.uom.uom.portal,uom.model_uom_uom,base.group_portal,1,0,0,0
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 15af98d18a..8bb19a11d4 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -23,19 +23,7 @@
                 </button>
             </div>
             <xpath expr="//notebook/page[1]" position="after">
-                <page string="Inventory">
-                    <header>
-                        <button name="action_request_submit"
-                                attrs="{'invisible': [('request_stage', 'not in', ['draft'])]}"
-                                type="object" class="oe_highlight" string="Submit"/>
-                        <button name="action_request_draft" type="object"
-                                attrs="{'invisible': [('request_stage', 'not in', ['cancel'])]}"
-                                class="oe_highlight" string="Set to Draft"/>
-                        <button name="action_request_cancel"
-                                attrs="{'invisible': [('request_stage', 'not in', ['draft','submitted','open'])]}"
-                                type="object" string="Cancel"/>
-                        <field name='request_stage' widget="statusbar"/>
-                    </header>
+                <page string="Inventory" id="stock">
                     <group groups="stock.group_stock_user">
                         <group id="stock-left">
                             <field name="warehouse_id"
@@ -43,32 +31,6 @@
                         </group>
                         <group id="stock-right"></group>
                     </group>
-                    <field name="stock_request_ids" nolabel="1">
-                        <tree editable="bottom">
-                            <field name="name" readonly="1"/>
-                            <field name="product_id"/>
-                            <field name="order_id"/>
-                            <field name="product_uom_id"
-                                   options="{'no_open': True, 'no_create': True}"
-                                   groups="uom.group_uom"/>
-                            <field name="direction" required="1"/>
-                            <field name="route_id"
-                                   options="{'no_create': True}"
-                                   groups="stock.group_stock_multi_locations"
-                                   invisible="1"/>
-                            <field name="route_ids" invisible="1"/>
-                            <field name="product_uom_qty"/>
-                            <field name="qty_in_progress"/>
-                            <field name="qty_done"/>
-                            <field name="expected_date"/>
-                            <field name="picking_policy" invisible="1"/>
-                            <field name="warehouse_id" invisible="1"/>
-                            <field name="location_id" invisible="1"/>
-                            <field name="procurement_group_id" invisible="1"/>
-                            <field name="company_id" invisible="1"/>
-                            <field name="state"/>
-                        </tree>
-                    </field>
                     <field name="move_ids" readonly="1" attrs="{'invisible': [('move_ids', '=', False)]}">
                         <tree decoration-muted="state == 'cancel'" default_order='date_expected, picking_id, sequence' string="Moves">
                             <field name="reference"/>
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index edabe5eb06..37d0963414 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -1,12 +1,6 @@
 <odoo>
 
     <!-- Menu Items -->
-    <menuitem id="menu_fsm_stock_request"
-              name="Stock Requests"
-              action="stock_request.action_stock_request_form"
-              parent="fieldservice.operations"
-              sequence="90"/>
-
     <menuitem id="menu_fsm_product"
               name="Products"
               action="stock.product_template_action_product"
diff --git a/fieldservice_stock/views/stock_request.xml b/fieldservice_stock/views/stock_request.xml
deleted file mode 100644
index c7736fbde7..0000000000
--- a/fieldservice_stock/views/stock_request.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="stock_request_fsm_order_form" model="ir.ui.view">
-        <field name="model">stock.request</field>
-        <field name="inherit_id" ref="stock_request.view_stock_request_form"/>
-        <field name="arch" type="xml">
-            <field name="picking_policy" position="after">
-                <field name="fsm_order_id"/>
-            </field>
-        </field>
-    </record>
-
-    <record id="stock_request_fsm_order_tree" model="ir.ui.view">
-        <field name="model">stock.request</field>
-        <field name="inherit_id" ref="stock_request.view_stock_request_tree"/>
-        <field name="arch" type="xml">
-            <field name="product_id" position="after">
-                <field name="fsm_order_id"/>
-            </field>
-        </field>
-    </record>
-
-</odoo>
diff --git a/fieldservice_stock/views/stock_request_order.xml b/fieldservice_stock/views/stock_request_order.xml
deleted file mode 100644
index b13d8b4b35..0000000000
--- a/fieldservice_stock/views/stock_request_order.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<odoo>
-
-    <record id="stock_request_order_fsm_order_form" model="ir.ui.view">
-        <field name="model">stock.request.order</field>
-        <field name="inherit_id" ref="stock_request.stock_request_order_form"/>
-        <field name="arch" type="xml">
-            <field name="picking_policy" position="after">
-                <field name="fsm_order_id"/>
-            </field>
-            <field name="stock_request_ids" position="attributes">
-              <attribute name="context">{
-                  'default_fsm_order_id': fsm_order_id,
-                  'default_expected_date': expected_date,
-                  'default_picking_policy': picking_policy,
-                  'default_warehouse_id': warehouse_id,
-                  'default_direction': direction,
-                  'default_location_id': location_id,
-                  'default_procurement_group_id': procurement_group_id,
-                  'default_company_id': company_id,
-                  'default_state': state}</attribute>
-            </field>
-            <xpath expr="//field[@name='stock_request_ids']/tree/field[@name='product_id']"
-                   position="after">
-                <field name="fsm_order_id" invisible="1"/>
-            </xpath>
-        </field>
-    </record>
-
-    <record id="stock_request_order_fsm_order_tree" model="ir.ui.view">
-        <field name="model">stock.request.order</field>
-        <field name="inherit_id" ref="stock_request.stock_request_order_tree"/>
-        <field name="arch" type="xml">
-            <field name="name" position="after">
-                <field name="fsm_order_id"/>
-            </field>
-        </field>
-    </record>
-
-    <record id="stock_request_order_fsm_order_search" model="ir.ui.view">
-        <field name="model">stock.request.order</field>
-        <field name="inherit_id" ref="stock_request_picking_type.view_stock_request_order_filter"/>
-        <field name="arch" type="xml">
-            <field name="name" position="after">
-                <field name="fsm_order_id"/>
-            </field>
-            <filter name="state" position="before">
-                <filter string="FSM Order" name="fsm_order_id" domain="[]"
-                        context="{'group_by': 'fsm_order_id'}"/>
-            </filter>
-        </field>
-    </record>
-
-</odoo>

From b106ce5a14e1c1085b6c04beda21e656a07430e2 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 21 Nov 2020 13:05:46 -0500
Subject: [PATCH 167/631] [IMP] fieldservice_stock: Split equipment

Remove the equipment related functionality from the fieldservice_stock module and make into separate module
---
 fieldservice_stock/__manifest__.py            |  4 --
 .../migrations/12.0.2.0.0/post-migration.py   | 13 -----
 fieldservice_stock/models/__init__.py         |  4 --
 fieldservice_stock/models/fsm_equipment.py    | 50 -------------------
 fieldservice_stock/models/product_template.py | 10 ----
 fieldservice_stock/models/stock_move.py       | 23 ---------
 .../models/stock_picking_type.py              | 13 -----
 .../models/stock_production_lot.py            | 11 ----
 fieldservice_stock/readme/CONFIGURE.rst       | 21 --------
 .../security/ir.model.access.csv              |  1 -
 fieldservice_stock/tests/__init__.py          |  4 --
 .../tests/test_fsm_equipment.py               | 44 ----------------
 fieldservice_stock/views/fsm_equipment.xml    | 33 ------------
 fieldservice_stock/views/product_template.xml | 16 ------
 .../views/stock_picking_type.xml              | 16 ------
 .../views/stock_production_lot.xml            | 24 ---------
 16 files changed, 287 deletions(-)
 delete mode 100644 fieldservice_stock/migrations/12.0.2.0.0/post-migration.py
 delete mode 100644 fieldservice_stock/models/fsm_equipment.py
 delete mode 100644 fieldservice_stock/models/product_template.py
 delete mode 100644 fieldservice_stock/models/stock_picking_type.py
 delete mode 100644 fieldservice_stock/models/stock_production_lot.py
 delete mode 100644 fieldservice_stock/tests/__init__.py
 delete mode 100644 fieldservice_stock/tests/test_fsm_equipment.py
 delete mode 100644 fieldservice_stock/views/fsm_equipment.xml
 delete mode 100644 fieldservice_stock/views/product_template.xml
 delete mode 100644 fieldservice_stock/views/stock_picking_type.xml
 delete mode 100644 fieldservice_stock/views/stock_production_lot.xml

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 56beded5bb..fd30c1df71 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -21,10 +21,6 @@
         'views/fsm_location.xml',
         'views/fsm_order.xml',
         'views/stock.xml',
-        'views/fsm_equipment.xml',
-        'views/product_template.xml',
-        'views/stock_picking_type.xml',
-        'views/stock_production_lot.xml',
     ],
     'license': 'AGPL-3',
     'development_status': 'Beta',
diff --git a/fieldservice_stock/migrations/12.0.2.0.0/post-migration.py b/fieldservice_stock/migrations/12.0.2.0.0/post-migration.py
deleted file mode 100644
index 2855328b90..0000000000
--- a/fieldservice_stock/migrations/12.0.2.0.0/post-migration.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).
-
-
-def migrate(env, version):
-    if not version:
-        return
-
-    env.execute("""
-        UPDATE stock_picking_type
-        SET create_fsm_equipment = 'true'
-        WHERE code = 'outgoing';
-    """)
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index 26f78971aa..3b9b5ad1fd 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -9,9 +9,5 @@
     procurement_group,
     stock_rule,
     stock_picking,
-    stock_picking_type,
-    fsm_equipment,
-    product_template,
-    stock_production_lot,
     fsm_wizard,
 )
diff --git a/fieldservice_stock/models/fsm_equipment.py b/fieldservice_stock/models/fsm_equipment.py
deleted file mode 100644
index 0093df66c6..0000000000
--- a/fieldservice_stock/models/fsm_equipment.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, fields, models
-
-
-class FSMEquipment(models.Model):
-    _inherit = 'fsm.equipment'
-
-    product_id = fields.Many2one(
-        'product.product', string='Product', required=True)
-    lot_id = fields.Many2one(
-        'stock.production.lot', string='Serial #', required=True)
-    current_stock_location_id = fields.Many2one(
-        'stock.location', string='Current Inventory Location',
-        compute='_compute_current_stock_loc_id')
-
-    @api.depends('product_id', 'lot_id')
-    def _compute_current_stock_loc_id(self):
-        for equipment in self:
-            quants = self.env['stock.quant'].search(
-                [('lot_id', '=', equipment.lot_id.id)], order="id desc",
-                limit=1)
-            if quants and quants.location_id:
-                equipment.current_stock_location_id = \
-                    quants.location_id.id
-            else:
-                equipment.current_stock_location_id = False
-
-    @api.onchange('product_id')
-    def _onchange_product(self):
-        for equipment in self:
-            self.current_stock_location_id = False
-
-    @api.model
-    def create(self, vals):
-        res = super(FSMEquipment, self).create(vals)
-        if 'lot_id' in vals:
-            res.lot_id.fsm_equipment_id = res.id
-        return res
-
-    @api.multi
-    def write(self, vals):
-        for equipment in self:
-            prev_lot = equipment.lot_id
-            res = super(FSMEquipment, equipment).write(vals)
-            if 'lot_id' in vals:
-                prev_lot.fsm_equipment_id = False
-                equipment.lot_id.fsm_equipment_id = equipment.id
-        return res
diff --git a/fieldservice_stock/models/product_template.py b/fieldservice_stock/models/product_template.py
deleted file mode 100644
index 54195f55d7..0000000000
--- a/fieldservice_stock/models/product_template.py
+++ /dev/null
@@ -1,10 +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, models
-
-
-class ProductTemplate(models.Model):
-    _inherit = 'product.template'
-
-    create_fsm_equipment = fields.Boolean(string='Creates a FSM Equipment')
diff --git a/fieldservice_stock/models/stock_move.py b/fieldservice_stock/models/stock_move.py
index 92bbb8da84..8c492ab972 100644
--- a/fieldservice_stock/models/stock_move.py
+++ b/fieldservice_stock/models/stock_move.py
@@ -7,26 +7,3 @@ class StockMove(models.Model):
     _inherit = "stock.move"
 
     fsm_order_id = fields.Many2one('fsm.order', string='Field Service Order')
-
-    def prepare_equipment_values(self, move_line):
-        return {'name': '%s (%s)' % (
-            move_line.product_id.name, move_line.lot_id.name),
-            'product_id': move_line.product_id.id,
-            'lot_id': move_line.lot_id.id,
-            'location_id':
-            move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
-            'current_location_id':
-            move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
-            'current_stock_location_id': move_line.location_dest_id.id}
-
-    def _action_done(self):
-        res = super()._action_done()
-        for rec in self:
-            if (rec.state == 'done'
-                    and rec.picking_type_id.create_fsm_equipment
-                    and rec.product_tmpl_id.create_fsm_equipment):
-                for line in rec.move_line_ids:
-                    vals = self.prepare_equipment_values(line)
-                    line.lot_id.fsm_equipment_id = \
-                        rec.env['fsm.equipment'].create(vals)
-        return res
diff --git a/fieldservice_stock/models/stock_picking_type.py b/fieldservice_stock/models/stock_picking_type.py
deleted file mode 100644
index 5fe0671881..0000000000
--- a/fieldservice_stock/models/stock_picking_type.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2020 Open Source Integrators, Daniel Reis
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import fields, models
-
-
-class StockPickingType(models.Model):
-    _inherit = 'stock.picking.type'
-
-    create_fsm_equipment = fields.Boolean(
-        name="Create FSM Equipment",
-        help="Products with the 'Creates a FSM Equipment' flag "
-        "will automatically be converted to an FSM Equipment."
-    )
diff --git a/fieldservice_stock/models/stock_production_lot.py b/fieldservice_stock/models/stock_production_lot.py
deleted file mode 100644
index 5e52651e3e..0000000000
--- a/fieldservice_stock/models/stock_production_lot.py
+++ /dev/null
@@ -1,11 +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, models
-
-
-class StockProductionLot(models.Model):
-    _inherit = 'stock.production.lot'
-
-    fsm_equipment_id = fields.Many2one('fsm.equipment',
-                                       string='Equipment', readonly=True)
diff --git a/fieldservice_stock/readme/CONFIGURE.rst b/fieldservice_stock/readme/CONFIGURE.rst
index 9b3e10b369..be45397600 100644
--- a/fieldservice_stock/readme/CONFIGURE.rst
+++ b/fieldservice_stock/readme/CONFIGURE.rst
@@ -8,24 +8,3 @@ If you are in a multi-warehouse situation:
 * Go to Field Service > Configuration > Territories
 * Create or select a territory
 * Set the warehouse that will serve this territory
-
-Products can be automatically converted into FSM Equipments.
-This is only available only for products tracked by serial number.
-This needs to be enabled both on Operation Types and Products.
-For example, we may want to create the FSM Equipment on Delivery,
-or on Receipts.
-
-To enable on Products:
-
-* Go to Inventory > Master Data > Products
-* Open the Product form, Inventory tab
-* On the "Traceability" section, make sure
-  "Tracking" is set to "By Unique Serial Number"
-* Enable the "Creates FSM Equipment" checkbox
-
-To enable on Operation Types:
-
-* Go to Inventory > Configuration > Operation Types
-* Select the intended Operation Type ("Receipts" for example)
-* On the "Traceability" section, enable the
-  "Create FSM Equipment" checkbox
diff --git a/fieldservice_stock/security/ir.model.access.csv b/fieldservice_stock/security/ir.model.access.csv
index 2bca56c306..b8e0ce44b5 100644
--- a/fieldservice_stock/security/ir.model.access.csv
+++ b/fieldservice_stock/security/ir.model.access.csv
@@ -1,6 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_stock_move_portal,access.stock.move.portal,stock.model_stock_move,base.group_portal,1,1,0,0
-access_stock_picking_type_portal,access.stock.picking.type.portal,stock.model_stock_picking_type,base.group_portal,1,0,0,0
 access_product_product_portal,access.product.product.portal,product.model_product_product,base.group_portal,1,0,0,0
 access_product_template_portal,access.product.template.portal,product.model_product_template,base.group_portal,1,0,0,0
 access_uom_uom_portal,access.uom.uom.portal,uom.model_uom_uom,base.group_portal,1,0,0,0
diff --git a/fieldservice_stock/tests/__init__.py b/fieldservice_stock/tests/__init__.py
deleted file mode 100644
index 50a5826fe6..0000000000
--- a/fieldservice_stock/tests/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (C) 2020 - TODAY, Marcel Savegnago (Escodoo)
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
-
-from . import test_fsm_equipment
diff --git a/fieldservice_stock/tests/test_fsm_equipment.py b/fieldservice_stock/tests/test_fsm_equipment.py
deleted file mode 100644
index c6488b2598..0000000000
--- a/fieldservice_stock/tests/test_fsm_equipment.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2020 - TODAY, Marcel Savegnago (Escodoo)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo.tests.common import TransactionCase
-
-
-class TestFSMEquipment(TransactionCase):
-
-    def setUp(self):
-        super(TestFSMEquipment, self).setUp()
-        self.Equipment = self.env['fsm.equipment']
-        self.stock_location = self.env.ref('stock.stock_location_customers')
-
-        product1 = self.env['product.product'].create({
-            'name': 'Product A',
-            'type': 'product',
-            'tracking': 'serial',
-        })
-        lot1 = self.env['stock.production.lot'].create({
-            'name': 'serial1',
-            'product_id': product1.id,
-        })
-        self.env['stock.quant'].create({
-            'product_id': product1.id,
-            'location_id': self.stock_location.id,
-            'quantity': 1.0,
-            'lot_id': lot1.id,
-        })
-
-        self.equipment = self.Equipment.create({
-            'name': 'Equipment 1',
-            'product_id': product1.id,
-            'lot_id': lot1.id,
-            'current_stock_location_id': self.stock_location.id,
-        })
-
-    def test_onchange_product(self):
-        equipment = self.equipment
-        equipment._onchange_product()
-        self.assertFalse(equipment.current_stock_location_id)
-
-    def test_compute_current_stock_loc_id(self):
-        equipment = self.equipment
-        equipment._compute_current_stock_loc_id()
-        self.assertTrue(equipment.current_stock_location_id == self.stock_location)
diff --git a/fieldservice_stock/views/fsm_equipment.xml b/fieldservice_stock/views/fsm_equipment.xml
deleted file mode 100644
index 1ce8ae287f..0000000000
--- a/fieldservice_stock/views/fsm_equipment.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="fsm_equipment_form_view_stock" model="ir.ui.view">
-        <field name="name">fsm.equipment.form.stock</field>
-        <field name="model">fsm.equipment</field>
-        <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view"/>
-        <field name="arch" type="xml">
-            <group id="secondary" position="inside">
-                <group string="Inventory"
-                       groups="stock.group_stock_user">
-                    <field name="product_id"/>
-                    <field name="lot_id"
-                           domain="[('product_id', '=', product_id)]"
-                           context="{'default_product_id': product_id}"/>
-                    <field name="current_stock_location_id"/>
-                </group>
-            </group>
-        </field>
-    </record>
-
-    <record id="fsm_equipment_tree_view_model" model="ir.ui.view">
-        <field name="name">fsm.equipment.model</field>
-        <field name="model">fsm.equipment</field>
-        <field name="inherit_id"
-               ref="fieldservice.fsm_equipment_tree_view"/>
-        <field name="arch" type="xml">
-            <field name="person_id" position="before">
-                <field name="product_id"/>
-            </field>
-        </field>
-    </record>
-</odoo>
diff --git a/fieldservice_stock/views/product_template.xml b/fieldservice_stock/views/product_template.xml
deleted file mode 100644
index 6b9d6f36e3..0000000000
--- a/fieldservice_stock/views/product_template.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="product_template_form_create_fsm_equipment" model="ir.ui.view">
-        <field name="model">product.template</field>
-        <field name="inherit_id"
-               ref="product.product_template_only_form_view"/>
-        <field name="arch" type="xml">
-            <field name="tracking" position="after">
-                <field name="create_fsm_equipment"
-                       attrs="{'invisible': [('tracking', '!=', 'serial')]}"/>
-            </field>
-        </field>
-    </record>
-
-</odoo>
diff --git a/fieldservice_stock/views/stock_picking_type.xml b/fieldservice_stock/views/stock_picking_type.xml
deleted file mode 100644
index d197e10f6a..0000000000
--- a/fieldservice_stock/views/stock_picking_type.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="stock_picking_type_form_create_fsm" model="ir.ui.view">
-        <field name="model">stock.picking.type</field>
-        <field name="inherit_id" ref="stock.view_picking_type_form"/>
-        <field name="arch" type="xml">
-
-            <field name="use_existing_lots" position="after">
-                <field name="create_fsm_equipment"/>
-            </field>
-
-        </field>
-    </record>
-
-</odoo>
diff --git a/fieldservice_stock/views/stock_production_lot.xml b/fieldservice_stock/views/stock_production_lot.xml
deleted file mode 100644
index 4f23b37cad..0000000000
--- a/fieldservice_stock/views/stock_production_lot.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="stock_production_lot_extend_equipment" model="ir.ui.view">
-        <field name="model">stock.production.lot</field>
-        <field name="inherit_id" ref="stock.view_production_lot_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//group[@name='main_group']/group[1]" position="after"
-                   sequence="0">
-                <group>
-                    <field name="fsm_equipment_id"/>
-                </group>
-            </xpath>
-        </field>
-    </record>
-
-    <record id="stock.action_production_lot_form"
-            model="ir.actions.act_window">
-        <field name="context">{'search_default_group_by_product': 1,
-            'default_product_id': context.get('product_id', False)}
-        </field>
-    </record>
-
-</odoo>

From 21d47c195108adf6bb191f54518c6eda6e0154f0 Mon Sep 17 00:00:00 2001
From: Brian McMaster <brian@mcmpest.com>
Date: Fri, 15 Jan 2021 15:32:31 -0500
Subject: [PATCH 168/631] [IMP] fieldservice_stock_request: Add tests

[UPD] Update fieldservice_stock.pot

[UPD] README.rst
---
 fieldservice_stock/README.rst                 |  50 +------
 .../i18n/fieldservice_stock.pot               | 134 ------------------
 .../static/description/index.html             |  50 +------
 fieldservice_stock/tests/__init__.py          |   4 +
 fieldservice_stock/tests/common.py            |  26 ++++
 5 files changed, 40 insertions(+), 224 deletions(-)
 create mode 100644 fieldservice_stock/tests/__init__.py
 create mode 100644 fieldservice_stock/tests/common.py

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index c94a6657f5..9a6fcdb3da 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -26,7 +26,8 @@ Field Service - Stock
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
 This module is an add-on for the Field Service application in Odoo.
-It provides inventory and stock operations.
+It provides a generic framework to allow you to link inventory and
+stock operations with your field service operations.
 
 **Table of contents**
 
@@ -48,22 +49,6 @@ To configure this module, you need to:
 
 * Go to Field Service > Master Data > Locations
 * Create or select a location and set the inventory location
-* Go to Inventory > Configuration > Routes
-* Select the routes that you want to use from a FSM order
-* Check the box 'FSM Order Line' for outbound transfer
-* Check the box 'FSM Return Line' for inbound transfer
-
-The route 'Receipt in 1 step' has no procurement rule so if you want items to be
-returned from the service location to your warehouse, you need to create a new
-procurement rule for that route:
-
-* Name: YourCompany: Return
-* Action: Move From Another Location
-* Procurement Location:	WH/Stock
-* Served Warehouse:	YourCompany
-* Source Location: Partner Locations/Customers
-* Move Supply Method: Take From Stock
-* Operation Type: YourCompany: Receipts
 
 If you are in a multi-warehouse situation:
 
@@ -71,37 +56,12 @@ If you are in a multi-warehouse situation:
 * Create or select a territory
 * Set the warehouse that will serve this territory
 
-Products can be automatically converted into FSM Equipments.
-This is only available only for products tracked by serial number.
-This needs to be enabled both on Operation Types and Products.
-For example, we may want to create the FSM Equipment on Delivery,
-or on Receipts.
-
-To enable on Products:
-
-* Go to Inventory > Master Data > Products
-* Open the Product form, Inventory tab
-* On the "Traceability" section, make sure
-  "Tracking" is set to "By Unique Serial Number"
-* Enable the "Creates FSM Equipment" checkbox
-
-To enable on Operation Types:
-
-* Go to Inventory > Configuration > Operation Types
-* Select the intended Operation Type ("Receipts" for example)
-* On the "Traceability" section, enable the
-  "Create FSM Equipment" checkbox
-
 Usage
 =====
 
-To use this module, you need to:
-
-* Create a new service order
-* Under the Inventory tab, select the warehouse and add products with quantity
-* Confirm the order to create the delivery orders
-* Validate the transfers in the Inventory app. Quantities delivered on FSM
-  Order Line will be updated.
+This module primarily establishes a connection between stock and
+field service operations so therefore has no specific usage
+instructions.
 
 Known issues / Roadmap
 ======================
diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
index ec33be8660..e23b030443 100644
--- a/fieldservice_stock/i18n/fieldservice_stock.pot
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -18,32 +18,6 @@ msgstr ""
 msgid "Allocated Quantity"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Cancel"
-msgstr ""
-
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
-msgid "Create Fsm Equipment"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
-#: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
-msgid "Creates a FSM Equipment"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__current_stock_location_id
-msgid "Current Inventory Location"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Deliveries"
@@ -54,43 +28,16 @@ msgstr ""
 msgid "Delivery Orders"
 msgstr ""
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Done"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Done Quantity"
 msgstr ""
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Draft"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_production_lot__fsm_equipment_id
-msgid "Equipment"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request__fsm_order_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request_order__fsm_order_id
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.stock_request_order_fsm_order_search
-msgid "FSM Order"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_wizard
 msgid "FSM Record Conversion"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_equipment
-msgid "Field Service Equipment"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_location
 msgid "Field Service Location"
@@ -104,14 +51,8 @@ msgstr ""
 msgid "Field Service Order"
 msgstr ""
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "In progress"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.fsm_equipment_form_view_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Inventory"
 msgstr ""
@@ -122,11 +63,6 @@ msgstr ""
 msgid "Inventory Location"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_production_lot
-msgid "Lot/Serial"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Moves"
@@ -137,16 +73,6 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
-msgid "Order Lines"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_picking_type
-msgid "Picking Type"
-msgstr ""
-
 #. module: fieldservice_stock
 #: code:addons/fieldservice_stock/models/fsm_order.py:60
 #: code:addons/fieldservice_stock/models/fsm_order.py:73
@@ -161,41 +87,16 @@ msgstr ""
 msgid "Procurement Group"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__product_id
-msgid "Product"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_move_line
-msgid "Product Moves (Stock Move Line)"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_product_template
-msgid "Product Template"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
 msgid "Products"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,help:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
-msgid "Products with the 'Creates a FSM Equipment' flag will automatically be converted to an FSM Equipment."
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Reference"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
-msgid "Request State"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Requested Quantity"
@@ -211,16 +112,6 @@ msgstr ""
 msgid "Returns"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
-msgid "Serial #"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Set to Draft"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
 msgid "Shipping Location"
@@ -231,36 +122,11 @@ msgstr ""
 msgid "Stock Move"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_request
-msgid "Stock Request"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_request_order
-msgid "Stock Request Order"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_request
-msgid "Stock Requests"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_rule
 msgid "Stock Rule"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Submit"
-msgstr ""
-
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Submitted"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_territory
 msgid "Territory"
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index 17d3c2ccee..e3f772599b 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/static/description/index.html
@@ -369,7 +369,8 @@ <h1 class="title">Field Service - Stock</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_stock"><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_stock"><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>This module is an add-on for the Field Service application in Odoo.
-It provides inventory and stock operations.</p>
+It provides a generic framework to allow you to link inventory and
+stock operations with your field service operations.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -399,22 +400,6 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
 <ul class="simple">
 <li>Go to Field Service &gt; Master Data &gt; Locations</li>
 <li>Create or select a location and set the inventory location</li>
-<li>Go to Inventory &gt; Configuration &gt; Routes</li>
-<li>Select the routes that you want to use from a FSM order</li>
-<li>Check the box ‘FSM Order Line’ for outbound transfer</li>
-<li>Check the box ‘FSM Return Line’ for inbound transfer</li>
-</ul>
-<p>The route ‘Receipt in 1 step’ has no procurement rule so if you want items to be
-returned from the service location to your warehouse, you need to create a new
-procurement rule for that route:</p>
-<ul class="simple">
-<li>Name: YourCompany: Return</li>
-<li>Action: Move From Another Location</li>
-<li>Procurement Location: WH/Stock</li>
-<li>Served Warehouse:     YourCompany</li>
-<li>Source Location: Partner Locations/Customers</li>
-<li>Move Supply Method: Take From Stock</li>
-<li>Operation Type: YourCompany: Receipts</li>
 </ul>
 <p>If you are in a multi-warehouse situation:</p>
 <ul class="simple">
@@ -422,37 +407,12 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
 <li>Create or select a territory</li>
 <li>Set the warehouse that will serve this territory</li>
 </ul>
-<p>Products can be automatically converted into FSM Equipments.
-This is only available only for products tracked by serial number.
-This needs to be enabled both on Operation Types and Products.
-For example, we may want to create the FSM Equipment on Delivery,
-or on Receipts.</p>
-<p>To enable on Products:</p>
-<ul class="simple">
-<li>Go to Inventory &gt; Master Data &gt; Products</li>
-<li>Open the Product form, Inventory tab</li>
-<li>On the “Traceability” section, make sure
-“Tracking” is set to “By Unique Serial Number”</li>
-<li>Enable the “Creates FSM Equipment” checkbox</li>
-</ul>
-<p>To enable on Operation Types:</p>
-<ul class="simple">
-<li>Go to Inventory &gt; Configuration &gt; Operation Types</li>
-<li>Select the intended Operation Type (“Receipts” for example)</li>
-<li>On the “Traceability” section, enable the
-“Create FSM Equipment” checkbox</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>Create a new service order</li>
-<li>Under the Inventory tab, select the warehouse and add products with quantity</li>
-<li>Confirm the order to create the delivery orders</li>
-<li>Validate the transfers in the Inventory app. Quantities delivered on FSM
-Order Line will be updated.</li>
-</ul>
+<p>This module primarily establishes a connection between stock and
+field service operations so therefore has no specific usage
+instructions.</p>
 </div>
 <div class="section" id="known-issues-roadmap">
 <h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
diff --git a/fieldservice_stock/tests/__init__.py b/fieldservice_stock/tests/__init__.py
new file mode 100644
index 0000000000..0d064c5691
--- /dev/null
+++ b/fieldservice_stock/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2020, Brian McMaster
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from . import common
diff --git a/fieldservice_stock/tests/common.py b/fieldservice_stock/tests/common.py
new file mode 100644
index 0000000000..f71cabc456
--- /dev/null
+++ b/fieldservice_stock/tests/common.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2020, Brian McMaster
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from odoo.tests.common import SavepointCase
+
+
+class TestFSMStockCommon(SavepointCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestFSMStockCommon, cls).setUpClass()
+
+        cls.ModelData = cls.env["ir.model.data"]
+        cls.FSMOrder = cls.env["fsm.order"]
+        cls.Product = cls.env["product.product"]
+
+        cls.stock_cust_loc = cls.ModelData.xmlid_to_res_id(
+            "stock.stock_location_customers")
+        cls.partner_1 = cls.env["res.partner"].with_context(
+            tracking_disable=True).create({"name": "Partner 1"})
+        cls.fsm_location_1 = cls.env["fsm.location"].create({
+            "name": "FSM Location 1",
+            "owner_id": cls.partner_1.id,
+            "customer_id": cls.partner_1.id,
+            "inventory_location_id": cls.stock_cust_loc,
+        })

From eeea691d7d1a0156e7d8674721f14323c4dd60e0 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 9 Mar 2021 22:53:52 +0000
Subject: [PATCH 169/631] fieldservice_stock 12.0.3.0.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock/

[UPD] Update fieldservice_stock.pot

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_stock/
---
 fieldservice_stock/__manifest__.py            |   2 +-
 fieldservice_stock/i18n/de.po                 | 163 +-----------
 fieldservice_stock/i18n/es.po                 | 231 ++++++----------
 fieldservice_stock/i18n/es_CL.po              | 231 ++++++----------
 .../i18n/fieldservice_stock.pot               |  14 -
 fieldservice_stock/i18n/pt_BR.po              | 251 +++++++-----------
 6 files changed, 259 insertions(+), 633 deletions(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index fd30c1df71..0423695fa7 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock',
     'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.2.3.0',
+    'version': '12.0.3.0.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_stock/i18n/de.po b/fieldservice_stock/i18n/de.po
index 488f9fa190..1af4456989 100644
--- a/fieldservice_stock/i18n/de.po
+++ b/fieldservice_stock/i18n/de.po
@@ -21,32 +21,6 @@ msgstr ""
 msgid "Allocated Quantity"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
-msgid "Create Fsm Equipment"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
-#: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
-msgid "Creates a FSM Equipment"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__current_stock_location_id
-msgid "Current Inventory Location"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Deliveries"
@@ -57,43 +31,16 @@ msgstr ""
 msgid "Delivery Orders"
 msgstr ""
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Done"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Done Quantity"
 msgstr ""
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Draft"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_production_lot__fsm_equipment_id
-msgid "Equipment"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request__fsm_order_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request_order__fsm_order_id
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.stock_request_order_fsm_order_search
-msgid "FSM Order"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_wizard
 msgid "FSM Record Conversion"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_equipment
-msgid "Field Service Equipment"
-msgstr "Service-Equipment"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_location
 msgid "Field Service Location"
@@ -107,14 +54,8 @@ msgstr "Field-Service-Ort"
 msgid "Field Service Order"
 msgstr "Field-Service-Auftrag"
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "In progress"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.fsm_equipment_form_view_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Inventory"
 msgstr ""
@@ -125,11 +66,6 @@ msgstr ""
 msgid "Inventory Location"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_production_lot
-msgid "Lot/Serial"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Moves"
@@ -140,67 +76,22 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
-msgid "Order Lines"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_picking_type
-msgid "Picking Type"
-msgstr ""
-
-#. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:60
-#: code:addons/fieldservice_stock/models/fsm_order.py:73
-#: code:addons/fieldservice_stock/models/fsm_order.py:86
-#, python-format
-msgid "Please create a stock request."
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_procurement_group
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
 msgid "Procurement Group"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__product_id
-msgid "Product"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_move_line
-msgid "Product Moves (Stock Move Line)"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_product_template
-msgid "Product Template"
-msgstr "Produktvorlage"
-
 #. module: fieldservice_stock
 #: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
 msgid "Products"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,help:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
-msgid ""
-"Products with the 'Creates a FSM Equipment' flag will automatically be "
-"converted to an FSM Equipment."
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Reference"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
-msgid "Request State"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Requested Quantity"
@@ -216,16 +107,6 @@ msgstr ""
 msgid "Returns"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
-msgid "Serial #"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Set to Draft"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
 msgid "Shipping Location"
@@ -236,51 +117,16 @@ msgstr ""
 msgid "Stock Move"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_request
-msgid "Stock Request"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_request_order
-msgid "Stock Request Order"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_request
-msgid "Stock Requests"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_rule
 msgid "Stock Rule"
 msgstr ""
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Submit"
-msgstr ""
-
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Submitted"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_territory
 msgid "Territory"
 msgstr ""
 
-#. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/stock_request.py:58
-#, python-format
-msgid ""
-"There is already a Stock Request Order                                   "
-"with the same Field Service Order and                                   "
-"Warehouse that is in Draft state. Please                                   "
-"add this Stock Request there.                                   (%s)"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
@@ -306,3 +152,12 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
 msgid "Warehouse used to ship the materials"
 msgstr ""
+
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
+
+#~ msgid "Field Service Equipment"
+#~ msgstr "Service-Equipment"
+
+#~ msgid "Product Template"
+#~ msgstr "Produktvorlage"
diff --git a/fieldservice_stock/i18n/es.po b/fieldservice_stock/i18n/es.po
index 52397c63c7..7bf3a80c58 100644
--- a/fieldservice_stock/i18n/es.po
+++ b/fieldservice_stock/i18n/es.po
@@ -21,33 +21,6 @@ msgstr ""
 msgid "Allocated Quantity"
 msgstr "Cantidad Asignada"
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
-#, fuzzy
-msgid "Create Fsm Equipment"
-msgstr "Crea Equipos FSM"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
-#: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
-msgid "Creates a FSM Equipment"
-msgstr "Crea Equipos FSM"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__current_stock_location_id
-msgid "Current Inventory Location"
-msgstr "Ubicación Actual de Inventario"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Deliveries"
@@ -58,43 +31,16 @@ msgstr "Entregas"
 msgid "Delivery Orders"
 msgstr "Pedidos de Entrega"
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Done"
-msgstr "Hecho"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Done Quantity"
 msgstr "Cantidad Hecha"
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_production_lot__fsm_equipment_id
-msgid "Equipment"
-msgstr "Equipo"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request__fsm_order_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request_order__fsm_order_id
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.stock_request_order_fsm_order_search
-msgid "FSM Order"
-msgstr "Orden FSM"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_wizard
 msgid "FSM Record Conversion"
 msgstr "Conversión de Registro FSM"
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_equipment
-msgid "Field Service Equipment"
-msgstr "Equipo de Servicio de Campo"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_location
 msgid "Field Service Location"
@@ -108,14 +54,8 @@ msgstr "Ubicación del Servicio de Campo"
 msgid "Field Service Order"
 msgstr "Orden de Servicio de Campo"
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "In progress"
-msgstr "En progreso"
-
 #. module: fieldservice_stock
 #: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.fsm_equipment_form_view_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Inventory"
 msgstr "Inventario"
@@ -126,11 +66,6 @@ msgstr "Inventario"
 msgid "Inventory Location"
 msgstr "Ubicación de Inventario"
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_production_lot
-msgid "Lot/Serial"
-msgstr "Lote / Serie"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Moves"
@@ -141,67 +76,22 @@ msgstr "Movimientos"
 msgid "Operations"
 msgstr "Operaciones"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
-msgid "Order Lines"
-msgstr "Líneas de Pedido"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_picking_type
-msgid "Picking Type"
-msgstr ""
-
-#. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:60
-#: code:addons/fieldservice_stock/models/fsm_order.py:73
-#: code:addons/fieldservice_stock/models/fsm_order.py:86
-#, python-format
-msgid "Please create a stock request."
-msgstr "Por favor cree una solicitud de stock."
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_procurement_group
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
 msgid "Procurement Group"
 msgstr "Grupo de Adquisiciones"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__product_id
-msgid "Product"
-msgstr "Producto"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_move_line
-msgid "Product Moves (Stock Move Line)"
-msgstr "Movimientos de Producto (Línea de Movimiento de Stock)"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_product_template
-msgid "Product Template"
-msgstr "Plantilla de Producto"
-
 #. module: fieldservice_stock
 #: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
 msgid "Products"
 msgstr "Productos"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,help:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
-msgid ""
-"Products with the 'Creates a FSM Equipment' flag will automatically be "
-"converted to an FSM Equipment."
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Reference"
 msgstr "Referencia"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
-msgid "Request State"
-msgstr "Estado de Solicitud"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Requested Quantity"
@@ -217,16 +107,6 @@ msgstr "Órdenes de Devolución"
 msgid "Returns"
 msgstr "Devoluciones"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
-msgid "Serial #"
-msgstr "# de Serial"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Set to Draft"
-msgstr "Establecer en Borrador"
-
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
 msgid "Shipping Location"
@@ -237,51 +117,16 @@ msgstr "Lugar de Envío"
 msgid "Stock Move"
 msgstr "Movimiento de Stock"
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_request
-msgid "Stock Request"
-msgstr "Solicitud de Stock"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_request_order
-msgid "Stock Request Order"
-msgstr "Pedido de Solicitud de Stock"
-
-#. module: fieldservice_stock
-#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_request
-msgid "Stock Requests"
-msgstr "Solicitudes de Stock"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_rule
 msgid "Stock Rule"
 msgstr "Regla de Stock"
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Submit"
-msgstr "Enviar"
-
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Submitted"
-msgstr "Enviado"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_territory
 msgid "Territory"
 msgstr "Territorio"
 
-#. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/stock_request.py:58
-#, python-format
-msgid ""
-"There is already a Stock Request Order                                   "
-"with the same Field Service Order and                                   "
-"Warehouse that is in Draft state. Please                                   "
-"add this Stock Request there.                                   (%s)"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
@@ -308,5 +153,81 @@ msgstr "Almacén"
 msgid "Warehouse used to ship the materials"
 msgstr "Almacén utilizado para enviar los materiales"
 
+#~ msgid "Please create a stock request."
+#~ msgstr "Por favor cree una solicitud de stock."
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Cancelled"
+#~ msgstr "Cancelado"
+
+#, fuzzy
+#~ msgid "Create Fsm Equipment"
+#~ msgstr "Crea Equipos FSM"
+
+#~ msgid "Creates a FSM Equipment"
+#~ msgstr "Crea Equipos FSM"
+
+#~ msgid "Current Inventory Location"
+#~ msgstr "Ubicación Actual de Inventario"
+
+#~ msgid "Done"
+#~ msgstr "Hecho"
+
+#~ msgid "Draft"
+#~ msgstr "Borrador"
+
+#~ msgid "Equipment"
+#~ msgstr "Equipo"
+
+#~ msgid "FSM Order"
+#~ msgstr "Orden FSM"
+
+#~ msgid "Field Service Equipment"
+#~ msgstr "Equipo de Servicio de Campo"
+
+#~ msgid "In progress"
+#~ msgstr "En progreso"
+
+#~ msgid "Lot/Serial"
+#~ msgstr "Lote / Serie"
+
+#~ msgid "Order Lines"
+#~ msgstr "Líneas de Pedido"
+
+#~ msgid "Product"
+#~ msgstr "Producto"
+
+#~ msgid "Product Moves (Stock Move Line)"
+#~ msgstr "Movimientos de Producto (Línea de Movimiento de Stock)"
+
+#~ msgid "Product Template"
+#~ msgstr "Plantilla de Producto"
+
+#~ msgid "Request State"
+#~ msgstr "Estado de Solicitud"
+
+#~ msgid "Serial #"
+#~ msgstr "# de Serial"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Establecer en Borrador"
+
+#~ msgid "Stock Request"
+#~ msgstr "Solicitud de Stock"
+
+#~ msgid "Stock Request Order"
+#~ msgstr "Pedido de Solicitud de Stock"
+
+#~ msgid "Stock Requests"
+#~ msgstr "Solicitudes de Stock"
+
+#~ msgid "Submit"
+#~ msgstr "Enviar"
+
+#~ msgid "Submitted"
+#~ msgstr "Enviado"
+
 #~ msgid "Receipts"
 #~ msgstr "Ingresos"
diff --git a/fieldservice_stock/i18n/es_CL.po b/fieldservice_stock/i18n/es_CL.po
index 1d0768f10b..e918795dcd 100644
--- a/fieldservice_stock/i18n/es_CL.po
+++ b/fieldservice_stock/i18n/es_CL.po
@@ -21,33 +21,6 @@ msgstr ""
 msgid "Allocated Quantity"
 msgstr "Cantidad Asignada"
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
-#, fuzzy
-msgid "Create Fsm Equipment"
-msgstr "Crea Equipos FSM"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
-#: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
-msgid "Creates a FSM Equipment"
-msgstr "Crea Equipos FSM"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__current_stock_location_id
-msgid "Current Inventory Location"
-msgstr "Ubicación Actual de Inventario"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Deliveries"
@@ -58,43 +31,16 @@ msgstr "Entregas"
 msgid "Delivery Orders"
 msgstr "Pedidos de Entrega"
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Done"
-msgstr "Hecho"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Done Quantity"
 msgstr "Cantidad Hecha"
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_production_lot__fsm_equipment_id
-msgid "Equipment"
-msgstr "Equipo"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request__fsm_order_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request_order__fsm_order_id
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.stock_request_order_fsm_order_search
-msgid "FSM Order"
-msgstr "Orden FSM"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_wizard
 msgid "FSM Record Conversion"
 msgstr "Conversión de Registro FSM"
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_equipment
-msgid "Field Service Equipment"
-msgstr "Equipo de Servicio de Campo"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_location
 msgid "Field Service Location"
@@ -108,14 +54,8 @@ msgstr "Ubicación del Servicio de Campo"
 msgid "Field Service Order"
 msgstr "Orden de Servicio de Campo"
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "In progress"
-msgstr "En progreso"
-
 #. module: fieldservice_stock
 #: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.fsm_equipment_form_view_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Inventory"
 msgstr "Inventario"
@@ -126,11 +66,6 @@ msgstr "Inventario"
 msgid "Inventory Location"
 msgstr "Ubicación de Inventario"
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_production_lot
-msgid "Lot/Serial"
-msgstr "Lote / Serie"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Moves"
@@ -141,67 +76,22 @@ msgstr "Movimientos"
 msgid "Operations"
 msgstr "Operaciones"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
-msgid "Order Lines"
-msgstr "Líneas de Pedido"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_picking_type
-msgid "Picking Type"
-msgstr ""
-
-#. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:60
-#: code:addons/fieldservice_stock/models/fsm_order.py:73
-#: code:addons/fieldservice_stock/models/fsm_order.py:86
-#, python-format
-msgid "Please create a stock request."
-msgstr "Por favor cree una solicitud de stock."
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_procurement_group
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
 msgid "Procurement Group"
 msgstr "Grupo de Adquisiciones"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__product_id
-msgid "Product"
-msgstr "Producto"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_move_line
-msgid "Product Moves (Stock Move Line)"
-msgstr "Movimientos de Producto (Línea de Movimiento de Stock)"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_product_template
-msgid "Product Template"
-msgstr "Plantilla de Producto"
-
 #. module: fieldservice_stock
 #: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
 msgid "Products"
 msgstr "Productos"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,help:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
-msgid ""
-"Products with the 'Creates a FSM Equipment' flag will automatically be "
-"converted to an FSM Equipment."
-msgstr ""
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Reference"
 msgstr "Referencias"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
-msgid "Request State"
-msgstr "Estado de Solicitud"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Requested Quantity"
@@ -217,16 +107,6 @@ msgstr "Órdenes de Devolución"
 msgid "Returns"
 msgstr "Devoluciones"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
-msgid "Serial #"
-msgstr "# de Serial"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Set to Draft"
-msgstr "Establecer en Borrador"
-
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
 msgid "Shipping Location"
@@ -237,51 +117,16 @@ msgstr "Lugar de Envío"
 msgid "Stock Move"
 msgstr "Movimiento de Stock"
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_request
-msgid "Stock Request"
-msgstr "Solicitud de Stock"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_request_order
-msgid "Stock Request Order"
-msgstr "Pedido de Solicitud de Stock"
-
-#. module: fieldservice_stock
-#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_request
-msgid "Stock Requests"
-msgstr "Solicitudes de Stock"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_rule
 msgid "Stock Rule"
 msgstr "Regla de Stock"
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Submit"
-msgstr "Enviar"
-
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Submitted"
-msgstr "Enviado"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_territory
 msgid "Territory"
 msgstr "Territorio"
 
-#. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/stock_request.py:58
-#, python-format
-msgid ""
-"There is already a Stock Request Order                                   "
-"with the same Field Service Order and                                   "
-"Warehouse that is in Draft state. Please                                   "
-"add this Stock Request there.                                   (%s)"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
@@ -308,5 +153,81 @@ msgstr "Almacén"
 msgid "Warehouse used to ship the materials"
 msgstr "Almacén utilizado para enviar los materiales"
 
+#~ msgid "Please create a stock request."
+#~ msgstr "Por favor cree una solicitud de stock."
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Cancelled"
+#~ msgstr "Cancelado"
+
+#, fuzzy
+#~ msgid "Create Fsm Equipment"
+#~ msgstr "Crea Equipos FSM"
+
+#~ msgid "Creates a FSM Equipment"
+#~ msgstr "Crea Equipos FSM"
+
+#~ msgid "Current Inventory Location"
+#~ msgstr "Ubicación Actual de Inventario"
+
+#~ msgid "Done"
+#~ msgstr "Hecho"
+
+#~ msgid "Draft"
+#~ msgstr "Borrador"
+
+#~ msgid "Equipment"
+#~ msgstr "Equipo"
+
+#~ msgid "FSM Order"
+#~ msgstr "Orden FSM"
+
+#~ msgid "Field Service Equipment"
+#~ msgstr "Equipo de Servicio de Campo"
+
+#~ msgid "In progress"
+#~ msgstr "En progreso"
+
+#~ msgid "Lot/Serial"
+#~ msgstr "Lote / Serie"
+
+#~ msgid "Order Lines"
+#~ msgstr "Líneas de Pedido"
+
+#~ msgid "Product"
+#~ msgstr "Producto"
+
+#~ msgid "Product Moves (Stock Move Line)"
+#~ msgstr "Movimientos de Producto (Línea de Movimiento de Stock)"
+
+#~ msgid "Product Template"
+#~ msgstr "Plantilla de Producto"
+
+#~ msgid "Request State"
+#~ msgstr "Estado de Solicitud"
+
+#~ msgid "Serial #"
+#~ msgstr "# de Serial"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Establecer en Borrador"
+
+#~ msgid "Stock Request"
+#~ msgstr "Solicitud de Stock"
+
+#~ msgid "Stock Request Order"
+#~ msgstr "Pedido de Solicitud de Stock"
+
+#~ msgid "Stock Requests"
+#~ msgstr "Solicitudes de Stock"
+
+#~ msgid "Submit"
+#~ msgstr "Enviar"
+
+#~ msgid "Submitted"
+#~ msgstr "Enviado"
+
 #~ msgid "Receipts"
 #~ msgstr "Ingresos"
diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
index e23b030443..831dfcda85 100644
--- a/fieldservice_stock/i18n/fieldservice_stock.pot
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -73,14 +73,6 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
-#. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:60
-#: code:addons/fieldservice_stock/models/fsm_order.py:73
-#: code:addons/fieldservice_stock/models/fsm_order.py:86
-#, python-format
-msgid "Please create a stock request."
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_procurement_group
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
@@ -132,12 +124,6 @@ msgstr ""
 msgid "Territory"
 msgstr ""
 
-#. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/stock_request.py:58
-#, python-format
-msgid "There is already a Stock Request Order                                   with the same Field Service Order and                                   Warehouse that is in Draft state. Please                                   add this Stock Request there.                                   (%s)"
-msgstr ""
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
diff --git a/fieldservice_stock/i18n/pt_BR.po b/fieldservice_stock/i18n/pt_BR.po
index dab7400c54..bf6b70185f 100644
--- a/fieldservice_stock/i18n/pt_BR.po
+++ b/fieldservice_stock/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_stock
+# 	* fieldservice_stock
 #
 msgid ""
 msgstr ""
@@ -21,32 +21,6 @@ msgstr ""
 msgid "Allocated Quantity"
 msgstr "Quantidade Alocada"
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
-msgid "Create Fsm Equipment"
-msgstr "Criar Equipamento FSM (Field Service Management)"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_product_product__create_fsm_equipment
-#: model:ir.model.fields,field_description:fieldservice_stock.field_product_template__create_fsm_equipment
-msgid "Creates a FSM Equipment"
-msgstr "Cria um Equipamento FSM (Field Service Management)"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__current_stock_location_id
-msgid "Current Inventory Location"
-msgstr "Localização Atual do Inventário"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Deliveries"
@@ -57,43 +31,16 @@ msgstr "Entregas"
 msgid "Delivery Orders"
 msgstr "Pedidos de Entrega"
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Done"
-msgstr "Concluído"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Done Quantity"
 msgstr "Quantidade Concluída"
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Draft"
-msgstr "Rascunho"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_production_lot__fsm_equipment_id
-msgid "Equipment"
-msgstr "Equipamento"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request__fsm_order_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_request_order__fsm_order_id
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.stock_request_order_fsm_order_search
-msgid "FSM Order"
-msgstr "Pedido de FSM (Field Service Management)"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_wizard
 msgid "FSM Record Conversion"
 msgstr "Conversão de registro FSM (Field Service Management)"
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_equipment
-msgid "Field Service Equipment"
-msgstr "Equipamento de Serviço de Campo"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_location
 msgid "Field Service Location"
@@ -107,14 +54,8 @@ msgstr "Localização do Serviço de Campo"
 msgid "Field Service Order"
 msgstr "Pedido de Serviço de Campo"
 
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "In progress"
-msgstr "Em andamento"
-
 #. module: fieldservice_stock
 #: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.fsm_equipment_form_view_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Inventory"
 msgstr "Inventário"
@@ -125,11 +66,6 @@ msgstr "Inventário"
 msgid "Inventory Location"
 msgstr "Localização de Inventário"
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_production_lot
-msgid "Lot/Serial"
-msgstr "Lote/Serial"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Moves"
@@ -140,67 +76,22 @@ msgstr "Movimentações"
 msgid "Operations"
 msgstr "Operações"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__stock_request_ids
-msgid "Order Lines"
-msgstr "Linhas do Pedido"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_picking_type
-msgid "Picking Type"
-msgstr "Tipo de Coleta"
-
-#. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/fsm_order.py:60
-#: code:addons/fieldservice_stock/models/fsm_order.py:73
-#: code:addons/fieldservice_stock/models/fsm_order.py:86
-#, python-format
-msgid "Please create a stock request."
-msgstr "Por gentileza, crie uma requisição de estoque."
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_procurement_group
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
 msgid "Procurement Group"
 msgstr "Grupo de Aquisições"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__product_id
-msgid "Product"
-msgstr "Produto"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_move_line
-msgid "Product Moves (Stock Move Line)"
-msgstr "Movimentações de Produto (Linha de Movimentação de Estoque)"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_product_template
-msgid "Product Template"
-msgstr "Modelo de Produto"
-
 #. module: fieldservice_stock
 #: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
 msgid "Products"
 msgstr "Produtos"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,help:fieldservice_stock.field_stock_picking_type__create_fsm_equipment
-msgid "Products with the 'Creates a FSM Equipment' flag will automatically be converted to an FSM Equipment."
-msgstr ""
-"Os produtos com o sinalizador \"Cria um equipamento FSM\" serão "
-"automaticamente convertidos em um equipamento FSM."
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Reference"
 msgstr "Referência"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__request_stage
-msgid "Request State"
-msgstr "Estado da Requisição"
-
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Requested Quantity"
@@ -216,16 +107,6 @@ msgstr "Retornar Pedidos"
 msgid "Returns"
 msgstr "Retornos"
 
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_equipment__lot_id
-msgid "Serial #"
-msgstr "Serial #"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Set to Draft"
-msgstr "Marque como rascunho"
-
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
 msgid "Shipping Location"
@@ -236,50 +117,16 @@ msgstr "Localização do Embarque"
 msgid "Stock Move"
 msgstr "Movimentação de Estoque"
 
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_request
-msgid "Stock Request"
-msgstr "Requisição de Estoque"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_request_order
-msgid "Stock Request Order"
-msgstr "Pedido de Movimentação de Estoque"
-
-#. module: fieldservice_stock
-#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_request
-msgid "Stock Requests"
-msgstr "Requisições de Estoque"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_rule
 msgid "Stock Rule"
 msgstr "Regra de Estoque"
 
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Submit"
-msgstr "Submeter"
-
-#. module: fieldservice_stock
-#: selection:fsm.order,request_stage:0
-msgid "Submitted"
-msgstr "Submetido"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_fsm_territory
 msgid "Territory"
 msgstr "Território"
 
-#. module: fieldservice_stock
-#: code:addons/fieldservice_stock/models/stock_request.py:58
-#, python-format
-msgid "There is already a Stock Request Order                                   with the same Field Service Order and                                   Warehouse that is in Draft state. Please                                   add this Stock Request there.                                   (%s)"
-msgstr ""
-"Já existe um Pedido de Solicitação de Estoque com o mesmo Pedido de Serviço "
-"de Campo e Armazém que está no estado Rascunho. Adicione essa solicitação de "
-"estoque lá. (%s)"
-
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_stock_picking
 msgid "Transfer"
@@ -305,3 +152,99 @@ msgstr "Armazém"
 #: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
 msgid "Warehouse used to ship the materials"
 msgstr "Armazém utilizado para embarque dos materiais"
+
+#~ msgid "Please create a stock request."
+#~ msgstr "Por gentileza, crie uma requisição de estoque."
+
+#~ msgid ""
+#~ "There is already a Stock Request Order                                   "
+#~ "with the same Field Service Order and                                   "
+#~ "Warehouse that is in Draft state. "
+#~ "Please                                   add this Stock Request "
+#~ "there.                                   (%s)"
+#~ msgstr ""
+#~ "Já existe um Pedido de Solicitação de Estoque com o mesmo Pedido de "
+#~ "Serviço de Campo e Armazém que está no estado Rascunho. Adicione essa "
+#~ "solicitação de estoque lá. (%s)"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Cancelled"
+#~ msgstr "Cancelado"
+
+#~ msgid "Create Fsm Equipment"
+#~ msgstr "Criar Equipamento FSM (Field Service Management)"
+
+#~ msgid "Creates a FSM Equipment"
+#~ msgstr "Cria um Equipamento FSM (Field Service Management)"
+
+#~ msgid "Current Inventory Location"
+#~ msgstr "Localização Atual do Inventário"
+
+#~ msgid "Done"
+#~ msgstr "Concluído"
+
+#~ msgid "Draft"
+#~ msgstr "Rascunho"
+
+#~ msgid "Equipment"
+#~ msgstr "Equipamento"
+
+#~ msgid "FSM Order"
+#~ msgstr "Pedido de FSM (Field Service Management)"
+
+#~ msgid "Field Service Equipment"
+#~ msgstr "Equipamento de Serviço de Campo"
+
+#~ msgid "In progress"
+#~ msgstr "Em andamento"
+
+#~ msgid "Lot/Serial"
+#~ msgstr "Lote/Serial"
+
+#~ msgid "Order Lines"
+#~ msgstr "Linhas do Pedido"
+
+#~ msgid "Picking Type"
+#~ msgstr "Tipo de Coleta"
+
+#~ msgid "Product"
+#~ msgstr "Produto"
+
+#~ msgid "Product Moves (Stock Move Line)"
+#~ msgstr "Movimentações de Produto (Linha de Movimentação de Estoque)"
+
+#~ msgid "Product Template"
+#~ msgstr "Modelo de Produto"
+
+#~ msgid ""
+#~ "Products with the 'Creates a FSM Equipment' flag will automatically be "
+#~ "converted to an FSM Equipment."
+#~ msgstr ""
+#~ "Os produtos com o sinalizador \"Cria um equipamento FSM\" serão "
+#~ "automaticamente convertidos em um equipamento FSM."
+
+#~ msgid "Request State"
+#~ msgstr "Estado da Requisição"
+
+#~ msgid "Serial #"
+#~ msgstr "Serial #"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Marque como rascunho"
+
+#~ msgid "Stock Request"
+#~ msgstr "Requisição de Estoque"
+
+#~ msgid "Stock Request Order"
+#~ msgstr "Pedido de Movimentação de Estoque"
+
+#~ msgid "Stock Requests"
+#~ msgstr "Requisições de Estoque"
+
+#~ msgid "Submit"
+#~ msgstr "Submeter"
+
+#~ msgid "Submitted"
+#~ msgstr "Submetido"

From 232df0390d3fd9eb10ad2f457dde6c82a740edb8 Mon Sep 17 00:00:00 2001
From: Brian McMaster <brian@mcmpest.com>
Date: Wed, 26 May 2021 11:23:36 -0400
Subject: [PATCH 170/631] [IMP] fieldservice_stock: black, isort, prettier

---
 fieldservice_stock/__manifest__.py            | 46 ++++-----
 fieldservice_stock/data/fsm_stock_data.xml    |  5 +-
 fieldservice_stock/models/fsm_location.py     | 17 ++--
 fieldservice_stock/models/fsm_order.py        | 98 +++++++++++--------
 fieldservice_stock/models/fsm_territory.py    |  4 +-
 fieldservice_stock/models/fsm_wizard.py       |  4 +-
 .../models/procurement_group.py               |  4 +-
 fieldservice_stock/models/stock_move.py       |  2 +-
 fieldservice_stock/models/stock_picking.py    | 11 ++-
 fieldservice_stock/models/stock_rule.py       | 28 ++++--
 fieldservice_stock/tests/common.py            | 25 +++--
 fieldservice_stock/views/fsm_location.xml     | 13 ++-
 fieldservice_stock/views/fsm_order.xml        | 98 ++++++++++++-------
 fieldservice_stock/views/fsm_territory.xml    | 19 ++--
 fieldservice_stock/views/stock.xml            | 27 ++---
 15 files changed, 229 insertions(+), 172 deletions(-)

diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 0423695fa7..ef693f20ea 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -2,32 +2,24 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - Stock',
-    'summary': 'Integrate the logistics operations with Field Service',
-    'version': '12.0.3.0.0',
-    'category': 'Field Service',
-    'author': "Open Source Integrators, "
-              "Brian McMaster, "
-              "Odoo Community Association (OCA)",
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice',
-        'stock',
-    ],
-    'data': [
-        'security/ir.model.access.csv',
-        'data/fsm_stock_data.xml',
-        'views/fsm_territory.xml',
-        'views/fsm_location.xml',
-        'views/fsm_order.xml',
-        'views/stock.xml',
-    ],
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'brian10048',
-        'wolfhall',
-        'max3903',
-        'smangukiya',
+    "name": "Field Service - Stock",
+    "summary": "Integrate the logistics operations with Field Service",
+    "version": "12.0.3.0.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, "
+    "Brian McMaster, "
+    "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": ["fieldservice", "stock"],
+    "data": [
+        "security/ir.model.access.csv",
+        "data/fsm_stock_data.xml",
+        "views/fsm_territory.xml",
+        "views/fsm_location.xml",
+        "views/fsm_order.xml",
+        "views/stock.xml",
     ],
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": ["brian10048", "wolfhall", "max3903", "smangukiya"],
 }
diff --git a/fieldservice_stock/data/fsm_stock_data.xml b/fieldservice_stock/data/fsm_stock_data.xml
index 290cd237e7..21fb29802d 100644
--- a/fieldservice_stock/data/fsm_stock_data.xml
+++ b/fieldservice_stock/data/fsm_stock_data.xml
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
     <!-- stock.location -->
     <record id="stock_location_field" model="stock.location">
         <field name="name">Field</field>
         <field name="usage">view</field>
-        <field name="company_id"></field>
+        <field name="company_id" />
     </record>
-
 </odoo>
diff --git a/fieldservice_stock/models/fsm_location.py b/fieldservice_stock/models/fsm_location.py
index d5b35bcd8b..e4d8f0298c 100644
--- a/fieldservice_stock/models/fsm_location.py
+++ b/fieldservice_stock/models/fsm_location.py
@@ -5,16 +5,17 @@
 
 
 class FSMLocation(models.Model):
-    _inherit = 'fsm.location'
+    _inherit = "fsm.location"
 
     inventory_location_id = fields.Many2one(
-        'stock.location', string='Inventory Location', required=True,
-        default=lambda self: self.env.ref('stock.stock_location_customers'))
-    shipping_address_id = fields.Many2one('res.partner',
-                                          string='Shipping Location')
+        "stock.location",
+        string="Inventory Location",
+        required=True,
+        default=lambda self: self.env.ref("stock.stock_location_customers"),
+    )
+    shipping_address_id = fields.Many2one("res.partner", string="Shipping Location")
 
-    @api.onchange('fsm_parent_id')
+    @api.onchange("fsm_parent_id")
     def _onchange_fsm_parent_id(self):
         super(FSMLocation, self)._onchange_fsm_parent_id()
-        self.inventory_location_id = \
-            self.fsm_parent_id.inventory_location_id.id
+        self.inventory_location_id = self.fsm_parent_id.inventory_location_id.id
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 6c9872c14b..56bf7dae1f 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -5,47 +5,61 @@
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
     @api.model
     def _default_warehouse_id(self):
         company = self.env.user.company_id.id
-        warehouse_ids = self.env['stock.warehouse'].search(
-            [('company_id', '=', company)], limit=1)
+        warehouse_ids = self.env["stock.warehouse"].search(
+            [("company_id", "=", company)], limit=1
+        )
         return warehouse_ids and warehouse_ids.id
 
     @api.model
     def _get_move_domain(self):
-        return [('picking_id.picking_type_id.code', 'in',
-                 ('outgoing', 'incoming'))]
+        return [("picking_id.picking_type_id.code", "in", ("outgoing", "incoming"))]
 
-    picking_ids = fields.One2many('stock.picking', 'fsm_order_id',
-                                  string='Transfers')
-    delivery_count = fields.Integer(string='Delivery Orders',
-                                    compute='_compute_picking_ids')
+    picking_ids = fields.One2many("stock.picking", "fsm_order_id", string="Transfers")
+    delivery_count = fields.Integer(
+        string="Delivery Orders", compute="_compute_picking_ids"
+    )
     procurement_group_id = fields.Many2one(
-        'procurement.group', 'Procurement Group', copy=False)
+        "procurement.group", "Procurement Group", copy=False
+    )
     inventory_location_id = fields.Many2one(
-        related='location_id.inventory_location_id', readonly=True)
-    warehouse_id = fields.Many2one('stock.warehouse', string='Warehouse',
-                                   required=True,
-                                   default=_default_warehouse_id,
-                                   help="Warehouse used to ship the materials")
-    return_count = fields.Integer(string='Return Orders',
-                                  compute='_compute_picking_ids')
+        related="location_id.inventory_location_id", readonly=True
+    )
+    warehouse_id = fields.Many2one(
+        "stock.warehouse",
+        string="Warehouse",
+        required=True,
+        default=_default_warehouse_id,
+        help="Warehouse used to ship the materials",
+    )
+    return_count = fields.Integer(
+        string="Return Orders", compute="_compute_picking_ids"
+    )
     move_ids = fields.One2many(
-        'stock.move', 'fsm_order_id', string='Operations',
-        domain=_get_move_domain)
+        "stock.move", "fsm_order_id", string="Operations", domain=_get_move_domain
+    )
 
-    @api.depends('picking_ids')
+    @api.depends("picking_ids")
     def _compute_picking_ids(self):
         for order in self:
             order.delivery_count = len(
-                [picking for picking in order.picking_ids if
-                 picking.picking_type_id.code == 'outgoing'])
+                [
+                    picking
+                    for picking in order.picking_ids
+                    if picking.picking_type_id.code == "outgoing"
+                ]
+            )
             order.return_count = len(
-                [picking for picking in order.picking_ids if
-                 picking.picking_type_id.code == 'incoming'])
+                [
+                    picking
+                    for picking in order.picking_ids
+                    if picking.picking_type_id.code == "incoming"
+                ]
+            )
 
     @api.multi
     def action_view_delivery(self):
@@ -54,16 +68,18 @@ def action_view_delivery(self):
         of given fsm order ids. It can either be a in a list or in a form
         view, if there is only one delivery order to show.
         """
-        action = self.env.ref('stock.action_picking_tree_all').read()[0]
-        pickings = self.mapped('picking_ids')
-        delivery_ids = [picking.id for picking in pickings if
-                        picking.picking_type_id.code == 'outgoing']
+        action = self.env.ref("stock.action_picking_tree_all").read()[0]
+        pickings = self.mapped("picking_ids")
+        delivery_ids = [
+            picking.id
+            for picking in pickings
+            if picking.picking_type_id.code == "outgoing"
+        ]
         if len(delivery_ids) > 1:
-            action['domain'] = [('id', 'in', delivery_ids)]
+            action["domain"] = [("id", "in", delivery_ids)]
         elif pickings:
-            action['views'] = [(self.env.ref('stock.view_picking_form').id,
-                                'form')]
-            action['res_id'] = delivery_ids[0]
+            action["views"] = [(self.env.ref("stock.view_picking_form").id, "form")]
+            action["res_id"] = delivery_ids[0]
         return action
 
     @api.multi
@@ -73,14 +89,16 @@ def action_view_returns(self):
         of given fsm order ids. It can either be a in a list or in a form
         view, if there is only one return order to show.
         """
-        action = self.env.ref('stock.action_picking_tree_all').read()[0]
-        pickings = self.mapped('picking_ids')
-        return_ids = [picking.id for picking in pickings if
-                      picking.picking_type_id.code == 'incoming']
+        action = self.env.ref("stock.action_picking_tree_all").read()[0]
+        pickings = self.mapped("picking_ids")
+        return_ids = [
+            picking.id
+            for picking in pickings
+            if picking.picking_type_id.code == "incoming"
+        ]
         if len(return_ids) > 1:
-            action['domain'] = [('id', 'in', return_ids)]
+            action["domain"] = [("id", "in", return_ids)]
         elif pickings:
-            action['views'] = [(self.env.ref('stock.view_picking_form').id,
-                                'form')]
-            action['res_id'] = return_ids[0]
+            action["views"] = [(self.env.ref("stock.view_picking_form").id, "form")]
+            action["res_id"] = return_ids[0]
         return action
diff --git a/fieldservice_stock/models/fsm_territory.py b/fieldservice_stock/models/fsm_territory.py
index 12959591af..bdff957024 100644
--- a/fieldservice_stock/models/fsm_territory.py
+++ b/fieldservice_stock/models/fsm_territory.py
@@ -4,6 +4,6 @@
 
 
 class FSMTerritory(models.Model):
-    _inherit = 'fsm.territory'
+    _inherit = "fsm.territory"
 
-    warehouse_id = fields.Many2one('stock.warehouse', string='Warehouse')
+    warehouse_id = fields.Many2one("stock.warehouse", string="Warehouse")
diff --git a/fieldservice_stock/models/fsm_wizard.py b/fieldservice_stock/models/fsm_wizard.py
index 7b5be78958..96a1266b3e 100644
--- a/fieldservice_stock/models/fsm_wizard.py
+++ b/fieldservice_stock/models/fsm_wizard.py
@@ -5,9 +5,9 @@
 
 
 class FSMWizard(models.TransientModel):
-    _inherit = 'fsm.wizard'
+    _inherit = "fsm.wizard"
 
     def _prepare_fsm_location(self, partner):
         res = super()._prepare_fsm_location(partner)
-        res['inventory_location_id'] = partner.property_stock_customer.id
+        res["inventory_location_id"] = partner.property_stock_customer.id
         return res
diff --git a/fieldservice_stock/models/procurement_group.py b/fieldservice_stock/models/procurement_group.py
index 39e60cda88..1c02672451 100644
--- a/fieldservice_stock/models/procurement_group.py
+++ b/fieldservice_stock/models/procurement_group.py
@@ -4,6 +4,6 @@
 
 
 class ProcurementGroup(models.Model):
-    _inherit = 'procurement.group'
+    _inherit = "procurement.group"
 
-    fsm_order_id = fields.Many2one('fsm.order', 'Field Service Order')
+    fsm_order_id = fields.Many2one("fsm.order", "Field Service Order")
diff --git a/fieldservice_stock/models/stock_move.py b/fieldservice_stock/models/stock_move.py
index 8c492ab972..9c7abe934e 100644
--- a/fieldservice_stock/models/stock_move.py
+++ b/fieldservice_stock/models/stock_move.py
@@ -6,4 +6,4 @@
 class StockMove(models.Model):
     _inherit = "stock.move"
 
-    fsm_order_id = fields.Many2one('fsm.order', string='Field Service Order')
+    fsm_order_id = fields.Many2one("fsm.order", string="Field Service Order")
diff --git a/fieldservice_stock/models/stock_picking.py b/fieldservice_stock/models/stock_picking.py
index 06abdeb450..20f94d4247 100644
--- a/fieldservice_stock/models/stock_picking.py
+++ b/fieldservice_stock/models/stock_picking.py
@@ -4,14 +4,15 @@
 
 
 class StockPicking(models.Model):
-    _inherit = 'stock.picking'
+    _inherit = "stock.picking"
 
-    fsm_order_id = fields.Many2one(related="group_id.fsm_order_id",
-                                   string="Field Service Order", store=True)
+    fsm_order_id = fields.Many2one(
+        related="group_id.fsm_order_id", string="Field Service Order", store=True
+    )
 
     @api.model
     def create(self, vals):
         res = super().create(vals)
-        if vals.get('fsm_order_id'):
-            res.fsm_order_id = vals.get('fsm_order_id')
+        if vals.get("fsm_order_id"):
+            res.fsm_order_id = vals.get("fsm_order_id")
         return res
diff --git a/fieldservice_stock/models/stock_rule.py b/fieldservice_stock/models/stock_rule.py
index 63c0ec3dff..84dde2f114 100644
--- a/fieldservice_stock/models/stock_rule.py
+++ b/fieldservice_stock/models/stock_rule.py
@@ -4,12 +4,28 @@
 
 
 class StockRule(models.Model):
-    _inherit = 'stock.rule'
+    _inherit = "stock.rule"
 
-    def _get_stock_move_values(self, product_id, product_qty, product_uom,
-                               location_id, name, origin, values, group_id):
+    def _get_stock_move_values(
+        self,
+        product_id,
+        product_qty,
+        product_uom,
+        location_id,
+        name,
+        origin,
+        values,
+        group_id,
+    ):
         vals = super()._get_stock_move_values(
-            product_id, product_qty, product_uom, location_id, name, origin,
-            values, group_id)
-        vals.update({'fsm_order_id': values.get('fsm_order_id')})
+            product_id,
+            product_qty,
+            product_uom,
+            location_id,
+            name,
+            origin,
+            values,
+            group_id,
+        )
+        vals.update({"fsm_order_id": values.get("fsm_order_id")})
         return vals
diff --git a/fieldservice_stock/tests/common.py b/fieldservice_stock/tests/common.py
index f71cabc456..c20a4a83b2 100644
--- a/fieldservice_stock/tests/common.py
+++ b/fieldservice_stock/tests/common.py
@@ -5,7 +5,6 @@
 
 
 class TestFSMStockCommon(SavepointCase):
-
     @classmethod
     def setUpClass(cls):
         super(TestFSMStockCommon, cls).setUpClass()
@@ -15,12 +14,18 @@ def setUpClass(cls):
         cls.Product = cls.env["product.product"]
 
         cls.stock_cust_loc = cls.ModelData.xmlid_to_res_id(
-            "stock.stock_location_customers")
-        cls.partner_1 = cls.env["res.partner"].with_context(
-            tracking_disable=True).create({"name": "Partner 1"})
-        cls.fsm_location_1 = cls.env["fsm.location"].create({
-            "name": "FSM Location 1",
-            "owner_id": cls.partner_1.id,
-            "customer_id": cls.partner_1.id,
-            "inventory_location_id": cls.stock_cust_loc,
-        })
+            "stock.stock_location_customers"
+        )
+        cls.partner_1 = (
+            cls.env["res.partner"]
+            .with_context(tracking_disable=True)
+            .create({"name": "Partner 1"})
+        )
+        cls.fsm_location_1 = cls.env["fsm.location"].create(
+            {
+                "name": "FSM Location 1",
+                "owner_id": cls.partner_1.id,
+                "customer_id": cls.partner_1.id,
+                "inventory_location_id": cls.stock_cust_loc,
+            }
+        )
diff --git a/fieldservice_stock/views/fsm_location.xml b/fieldservice_stock/views/fsm_location.xml
index 2de8f469b9..11a5350655 100644
--- a/fieldservice_stock/views/fsm_location.xml
+++ b/fieldservice_stock/views/fsm_location.xml
@@ -1,21 +1,20 @@
 <odoo>
-
     <!-- Copyright (C) 2018 Brian McMaster
          Copyright (C) 2019 Open Source Integrators
          License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
     <record id="fsm_location_stock_form_view" model="ir.ui.view">
         <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">
             <xpath expr="//field[@name='contact_id']" position="before">
-                <field name="shipping_address_id"/>
+                <field name="shipping_address_id" />
             </xpath>
             <xpath expr="//form/sheet/group/group[2]" position="inside">
-                <field name="inventory_location_id"
-                       domain="[('usage', 'in', ['internal', 'supplier', 'customer'])]"/>
+                <field
+                    name="inventory_location_id"
+                    domain="[('usage', 'in', ['internal', 'supplier', 'customer'])]"
+                />
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 8bb19a11d4..6c04bffdc3 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -1,58 +1,84 @@
 <odoo>
-
     <record id="view_fsm_order_form_inherit_stock" model="ir.ui.view">
         <field name="name">fsm.order.form.stock</field>
         <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">
             <div class="oe_button_box" position="inside">
-                <field name="picking_ids" invisible="1"/>
-                <button type="object"
-                        name="action_view_delivery"
-                        class="oe_stat_button"
-                        icon="fa-truck"
-                        attrs="{'invisible': [('delivery_count', '=', 0)]}" groups="base.group_user">
-                    <field name="delivery_count" widget="statinfo" string="Deliveries"/>
+                <field name="picking_ids" invisible="1" />
+                <button
+                    type="object"
+                    name="action_view_delivery"
+                    class="oe_stat_button"
+                    icon="fa-truck"
+                    attrs="{'invisible': [('delivery_count', '=', 0)]}"
+                    groups="base.group_user"
+                >
+                    <field
+                        name="delivery_count"
+                        widget="statinfo"
+                        string="Deliveries"
+                    />
                 </button>
-                <button type="object"
-                        name="action_view_returns"
-                        class="oe_stat_button"
-                        icon="fa-truck"
-                        attrs="{'invisible': [('return_count', '=', 0)]}" groups="base.group_user">
-                    <field name="return_count" widget="statinfo" string="Returns"/>
+                <button
+                    type="object"
+                    name="action_view_returns"
+                    class="oe_stat_button"
+                    icon="fa-truck"
+                    attrs="{'invisible': [('return_count', '=', 0)]}"
+                    groups="base.group_user"
+                >
+                    <field name="return_count" widget="statinfo" string="Returns" />
                 </button>
             </div>
             <xpath expr="//notebook/page[1]" position="after">
                 <page string="Inventory" id="stock">
                     <group groups="stock.group_stock_user">
                         <group id="stock-left">
-                            <field name="warehouse_id"
-                                   groups="stock.group_stock_multi_warehouses"/>
+                            <field
+                                name="warehouse_id"
+                                groups="stock.group_stock_multi_warehouses"
+                            />
                         </group>
-                        <group id="stock-right"></group>
+                        <group id="stock-right" />
                     </group>
-                    <field name="move_ids" readonly="1" attrs="{'invisible': [('move_ids', '=', False)]}">
-                        <tree decoration-muted="state == 'cancel'" default_order='date_expected, picking_id, sequence' string="Moves">
-                            <field name="reference"/>
-                            <field name="date_expected" widget='date'/>
-                            <field name="date" widget="date"/>
-                            <field name="picking_id" string="Reference" invisible="1"/>
-                            <field name="sequence" invisible="1"/>
-                            <field name="origin"/>
-                            <field name="product_id"/>
-                            <field name="product_uom_qty" string="Requested Quantity"/>
-                            <field name="reserved_availability" string="Allocated Quantity"/>
-                            <field name="quantity_done" string="Done Quantity"/>
-                            <field name="product_uom" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="uom.group_uom"/>
-                            <field name="location_id" invisible="1"/>
-                            <field name="location_dest_id" invisible="1"/>
-                            <field name="create_date" invisible="1"/>
-                            <field name="state"/>
+                    <field
+                        name="move_ids"
+                        readonly="1"
+                        attrs="{'invisible': [('move_ids', '=', False)]}"
+                    >
+                        <tree
+                            decoration-muted="state == 'cancel'"
+                            default_order='date_expected, picking_id, sequence'
+                            string="Moves"
+                        >
+                            <field name="reference" />
+                            <field name="date_expected" widget='date' />
+                            <field name="date" widget="date" />
+                            <field name="picking_id" string="Reference" invisible="1" />
+                            <field name="sequence" invisible="1" />
+                            <field name="origin" />
+                            <field name="product_id" />
+                            <field name="product_uom_qty" string="Requested Quantity" />
+                            <field
+                                name="reserved_availability"
+                                string="Allocated Quantity"
+                            />
+                            <field name="quantity_done" string="Done Quantity" />
+                            <field
+                                name="product_uom"
+                                options="{'no_open': True, 'no_create': True}"
+                                string="Unit of Measure"
+                                groups="uom.group_uom"
+                            />
+                            <field name="location_id" invisible="1" />
+                            <field name="location_dest_id" invisible="1" />
+                            <field name="create_date" invisible="1" />
+                            <field name="state" />
                         </tree>
                     </field>
                 </page>
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_stock/views/fsm_territory.xml b/fieldservice_stock/views/fsm_territory.xml
index bc6698c152..810c48c970 100644
--- a/fieldservice_stock/views/fsm_territory.xml
+++ b/fieldservice_stock/views/fsm_territory.xml
@@ -1,29 +1,30 @@
 <odoo>
-
     <!-- Territory Tree View -->
     <record id="fsm_territory_wh_tree_view" model="ir.ui.view">
         <field name="name">fsm.territory.warehouse.tree</field>
         <field name="model">fsm.territory</field>
-        <field name="inherit_id" ref="fieldservice.fsm_territory_tree_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_territory_tree_view" />
         <field name="arch" type="xml">
             <field name="branch_id" position="after">
-                <field name="warehouse_id"
-                       groups="stock.group_stock_multi_warehouses"/>
+                <field
+                    name="warehouse_id"
+                    groups="stock.group_stock_multi_warehouses"
+                />
             </field>
         </field>
     </record>
-
     <!-- Territory Form View -->
     <record id="fsm_territory_wh_form_view" model="ir.ui.view">
         <field name="name">fsm.territory.warehouse.form</field>
         <field name="model">fsm.territory</field>
-        <field name="inherit_id" ref="fieldservice.fsm_territory_form_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_territory_form_view" />
         <field name="arch" type="xml">
             <field name="person_id" position="after">
-                <field name="warehouse_id"
-                       groups="stock.group_stock_multi_warehouses"/>
+                <field
+                    name="warehouse_id"
+                    groups="stock.group_stock_multi_warehouses"
+                />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 37d0963414..110cf14e6b 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -1,16 +1,17 @@
 <odoo>
-
     <!-- Menu Items -->
-    <menuitem id="menu_fsm_product"
-              name="Products"
-              action="stock.product_template_action_product"
-              parent="fieldservice.data"
-              sequence="90"/>
-
-    <menuitem id="menu_fsm_stock_inventory"
-              name="Inventory"
-              action="stock.quantsact"
-              parent="fieldservice.reporting"
-              sequence="30"/>
-
+    <menuitem
+        id="menu_fsm_product"
+        name="Products"
+        action="stock.product_template_action_product"
+        parent="fieldservice.data"
+        sequence="90"
+    />
+    <menuitem
+        id="menu_fsm_stock_inventory"
+        name="Inventory"
+        action="stock.quantsact"
+        parent="fieldservice.reporting"
+        sequence="30"
+    />
 </odoo>

From 6451e71188d1f863c8ed833c2eb29ac6b758babc Mon Sep 17 00:00:00 2001
From: Brian McMaster <brian@mcmpest.com>
Date: Wed, 26 May 2021 13:28:49 -0400
Subject: [PATCH 171/631] [MIG] fieldservice_stock: Migration to 13.0

---
 fieldservice_stock/README.rst                 |  12 +-
 fieldservice_stock/__manifest__.py            |   6 +-
 fieldservice_stock/i18n/es_AR.po              | 154 ++++++++++++++++++
 .../i18n/fieldservice_stock.pot               |  11 +-
 fieldservice_stock/i18n/fr_FR.po              | 154 ++++++++++++++++++
 .../migrations/13.0.1.0.0/pre-migration.py    |  12 ++
 fieldservice_stock/models/__init__.py         |   2 +-
 fieldservice_stock/models/fsm_order.py        |   2 -
 .../{fsm_territory.py => res_territory.py}    |   4 +-
 fieldservice_stock/readme/INSTALL.rst         |   2 +-
 .../static/description/index.html             |   8 +-
 .../{fsm_territory.xml => res_territory.xml}  |  16 +-
 fieldservice_stock/views/stock.xml            |   2 +-
 13 files changed, 351 insertions(+), 34 deletions(-)
 create mode 100644 fieldservice_stock/i18n/es_AR.po
 create mode 100644 fieldservice_stock/i18n/fr_FR.po
 create mode 100644 fieldservice_stock/migrations/13.0.1.0.0/pre-migration.py
 rename fieldservice_stock/models/{fsm_territory.py => res_territory.py} (77%)
 rename fieldservice_stock/views/{fsm_territory.xml => res_territory.xml} (56%)

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index 9a6fcdb3da..231c92d3ac 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -14,13 +14,13 @@ Field Service - Stock
     :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_stock
+    :target: https://github.com/OCA/field-service/tree/13.0/fieldservice_stock
     :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_stock
+    :target: https://translation.odoo-community.org/projects/field-service-13-0/field-service-13-0-fieldservice_stock
     :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/13.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -40,7 +40,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/13.0/base_geoengine
 
 Configuration
 =============
@@ -75,7 +75,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_stock%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_stock%0Aversion:%2013.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.
 
@@ -133,6 +133,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-brian10048| |maintainer-wolfhall| |maintainer-max3903| |maintainer-smangukiya| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_stock>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/13.0/fieldservice_stock>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index ef693f20ea..3d609dd3de 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -1,10 +1,10 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
+# Copyright (C) 2018 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     "name": "Field Service - Stock",
     "summary": "Integrate the logistics operations with Field Service",
-    "version": "12.0.3.0.0",
+    "version": "13.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, "
     "Brian McMaster, "
@@ -14,7 +14,7 @@
     "data": [
         "security/ir.model.access.csv",
         "data/fsm_stock_data.xml",
-        "views/fsm_territory.xml",
+        "views/res_territory.xml",
         "views/fsm_location.xml",
         "views/fsm_order.xml",
         "views/stock.xml",
diff --git a/fieldservice_stock/i18n/es_AR.po b/fieldservice_stock/i18n/es_AR.po
new file mode 100644
index 0000000000..4fb6ffd27d
--- /dev/null
+++ b/fieldservice_stock/i18n/es_AR.po
@@ -0,0 +1,154 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2021-05-30 20:48+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_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Allocated Quantity"
+msgstr "Cantidad Asignada"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Deliveries"
+msgstr "Entregas"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__delivery_count
+msgid "Delivery Orders"
+msgstr "Pedidos de Entrega"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Done Quantity"
+msgstr "Cantidad Realizada"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr "Conversión de Registro FSM"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación del Servicio de Campo"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_order
+#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking__fsm_order_id
+msgid "Field Service Order"
+msgstr "Pedido de Servicio de Campo"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Inventory"
+msgstr "Inventario"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__inventory_location_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__inventory_location_id
+msgid "Inventory Location"
+msgstr "Ubicación de Inventario"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Moves"
+msgstr "Movimientos"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
+msgid "Operations"
+msgstr "Operaciones"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_procurement_group
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
+msgid "Procurement Group"
+msgstr "Grupo de Adquicisiones"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
+msgid "Products"
+msgstr "Productos"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Requested Quantity"
+msgstr "Cantidad Requerida"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
+msgid "Return Orders"
+msgstr "Pedidos de Devolución"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Returns"
+msgstr "Devoluciones"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
+msgid "Shipping Location"
+msgstr "Ubicación de Envío"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de Inventario"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_rule
+msgid "Stock Rule"
+msgstr "Regla de Inventario"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_res_territory
+msgid "Territory"
+msgstr "Territorio"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_picking
+msgid "Transfer"
+msgstr "Transferencia"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__picking_ids
+msgid "Transfers"
+msgstr "Transferencias"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Unit of Measure"
+msgstr "Unidad de Medida"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_res_territory__warehouse_id
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
+msgid "Warehouse used to ship the materials"
+msgstr "Almacén utilizada para envío de materiales"
diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
index 831dfcda85..8e5a953614 100644
--- a/fieldservice_stock/i18n/fieldservice_stock.pot
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_stock
+# 	* fieldservice_stock
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.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"
@@ -120,7 +120,7 @@ msgid "Stock Rule"
 msgstr ""
 
 #. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_territory
+#: model:ir.model,name:fieldservice_stock.model_res_territory
 msgid "Territory"
 msgstr ""
 
@@ -141,7 +141,7 @@ msgstr ""
 
 #. module: fieldservice_stock
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_territory__warehouse_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_res_territory__warehouse_id
 msgid "Warehouse"
 msgstr ""
 
@@ -149,4 +149,3 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
 msgid "Warehouse used to ship the materials"
 msgstr ""
-
diff --git a/fieldservice_stock/i18n/fr_FR.po b/fieldservice_stock/i18n/fr_FR.po
new file mode 100644
index 0000000000..b96b9bc440
--- /dev/null
+++ b/fieldservice_stock/i18n/fr_FR.po
@@ -0,0 +1,154 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2021-06-02 11:48+0000\n"
+"Last-Translator: Sandrine (ACSONE) <sandrine.ravet@acsone.eu>\n"
+"Language-Team: none\n"
+"Language: fr_FR\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_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Allocated Quantity"
+msgstr "Quantité allouée"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Deliveries"
+msgstr "Livraisons"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__delivery_count
+msgid "Delivery Orders"
+msgstr "Ordres de livraison"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Done Quantity"
+msgstr "Quantité faite"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr ""
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_location
+msgid "Field Service Location"
+msgstr "Lieu de prestation"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_fsm_order
+#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move__fsm_order_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking__fsm_order_id
+msgid "Field Service Order"
+msgstr "Service sur site"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Inventory"
+msgstr "Inventaire"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__inventory_location_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__inventory_location_id
+msgid "Inventory Location"
+msgstr "Lieu d'inventaire"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Moves"
+msgstr "Mouvements"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
+msgid "Operations"
+msgstr "Opérations"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_procurement_group
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
+msgid "Procurement Group"
+msgstr "Groupe d'approvisionnement"
+
+#. module: fieldservice_stock
+#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
+msgid "Products"
+msgstr "Produits"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Reference"
+msgstr "Référence"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Requested Quantity"
+msgstr "Quantité demandée"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
+msgid "Return Orders"
+msgstr "Ordres de retour"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Returns"
+msgstr "Retours"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
+msgid "Shipping Location"
+msgstr "Lieu de livraison"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Mouvement de stock"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_rule
+msgid "Stock Rule"
+msgstr "Règle de stock"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_res_territory
+msgid "Territory"
+msgstr "Territoire"
+
+#. module: fieldservice_stock
+#: model:ir.model,name:fieldservice_stock.model_stock_picking
+msgid "Transfer"
+msgstr "Transfert"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__picking_ids
+msgid "Transfers"
+msgstr "Transferts"
+
+#. module: fieldservice_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
+msgid "Unit of Measure"
+msgstr "Unité de mesure"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_res_territory__warehouse_id
+msgid "Warehouse"
+msgstr "Entrepôt"
+
+#. module: fieldservice_stock
+#: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
+msgid "Warehouse used to ship the materials"
+msgstr "Entrepôt utilisé pour livrer les produits"
diff --git a/fieldservice_stock/migrations/13.0.1.0.0/pre-migration.py b/fieldservice_stock/migrations/13.0.1.0.0/pre-migration.py
new file mode 100644
index 0000000000..45666c371e
--- /dev/null
+++ b/fieldservice_stock/migrations/13.0.1.0.0/pre-migration.py
@@ -0,0 +1,12 @@
+# Copyright 2021 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    cr = env.cr
+    if openupgrade.table_exists(cr, "fsm_territory"):
+        openupgrade.rename_models(cr, [("fsm.territory", "res.territory")])
+        openupgrade.rename_tables(cr, [("fsm_territory", "res_territory")])
diff --git a/fieldservice_stock/models/__init__.py b/fieldservice_stock/models/__init__.py
index 3b9b5ad1fd..f8f62f5645 100644
--- a/fieldservice_stock/models/__init__.py
+++ b/fieldservice_stock/models/__init__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
-    fsm_territory,
+    res_territory,
     fsm_location,
     fsm_order,
     stock_move,
diff --git a/fieldservice_stock/models/fsm_order.py b/fieldservice_stock/models/fsm_order.py
index 56bf7dae1f..106a51eff3 100644
--- a/fieldservice_stock/models/fsm_order.py
+++ b/fieldservice_stock/models/fsm_order.py
@@ -61,7 +61,6 @@ def _compute_picking_ids(self):
                 ]
             )
 
-    @api.multi
     def action_view_delivery(self):
         """
         This function returns an action that display existing delivery orders
@@ -82,7 +81,6 @@ def action_view_delivery(self):
             action["res_id"] = delivery_ids[0]
         return action
 
-    @api.multi
     def action_view_returns(self):
         """
         This function returns an action that display existing return orders
diff --git a/fieldservice_stock/models/fsm_territory.py b/fieldservice_stock/models/res_territory.py
similarity index 77%
rename from fieldservice_stock/models/fsm_territory.py
rename to fieldservice_stock/models/res_territory.py
index bdff957024..e231fca4e9 100644
--- a/fieldservice_stock/models/fsm_territory.py
+++ b/fieldservice_stock/models/res_territory.py
@@ -3,7 +3,7 @@
 from odoo import fields, models
 
 
-class FSMTerritory(models.Model):
-    _inherit = "fsm.territory"
+class ResTerritory(models.Model):
+    _inherit = "res.territory"
 
     warehouse_id = fields.Many2one("stock.warehouse", string="Warehouse")
diff --git a/fieldservice_stock/readme/INSTALL.rst b/fieldservice_stock/readme/INSTALL.rst
index c010f8f6a2..e5355c4b0f 100644
--- a/fieldservice_stock/readme/INSTALL.rst
+++ b/fieldservice_stock/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/13.0/base_geoengine
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index e3f772599b..28f9414271 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Stock</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_stock"><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_stock"><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><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/13.0/fieldservice_stock"><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-13-0/field-service-13-0-fieldservice_stock"><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/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module is an add-on for the Field Service application in Odoo.
 It provides a generic framework to allow you to link inventory and
 stock operations with your field service operations.</p>
@@ -392,7 +392,7 @@ <h1 class="title">Field Service - Stock</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/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>
@@ -424,7 +424,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_stock%0Aversion:%2012.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_stock%0Aversion:%2013.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">
@@ -461,7 +461,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/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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_stock">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/13.0/fieldservice_stock">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_stock/views/fsm_territory.xml b/fieldservice_stock/views/res_territory.xml
similarity index 56%
rename from fieldservice_stock/views/fsm_territory.xml
rename to fieldservice_stock/views/res_territory.xml
index 810c48c970..62d19ef241 100644
--- a/fieldservice_stock/views/fsm_territory.xml
+++ b/fieldservice_stock/views/res_territory.xml
@@ -1,9 +1,9 @@
 <odoo>
     <!-- Territory Tree View -->
-    <record id="fsm_territory_wh_tree_view" model="ir.ui.view">
-        <field name="name">fsm.territory.warehouse.tree</field>
-        <field name="model">fsm.territory</field>
-        <field name="inherit_id" ref="fieldservice.fsm_territory_tree_view" />
+    <record id="res_territory_wh_tree_view" model="ir.ui.view">
+        <field name="name">res.territory.warehouse.tree</field>
+        <field name="model">res.territory</field>
+        <field name="inherit_id" ref="base_territory.res_territory_tree_view" />
         <field name="arch" type="xml">
             <field name="branch_id" position="after">
                 <field
@@ -14,10 +14,10 @@
         </field>
     </record>
     <!-- Territory Form View -->
-    <record id="fsm_territory_wh_form_view" model="ir.ui.view">
-        <field name="name">fsm.territory.warehouse.form</field>
-        <field name="model">fsm.territory</field>
-        <field name="inherit_id" ref="fieldservice.fsm_territory_form_view" />
+    <record id="res_territory_wh_form_view" model="ir.ui.view">
+        <field name="name">res.territory.warehouse.form</field>
+        <field name="model">res.territory</field>
+        <field name="inherit_id" ref="base_territory.res_territory_form_view" />
         <field name="arch" type="xml">
             <field name="person_id" position="after">
                 <field
diff --git a/fieldservice_stock/views/stock.xml b/fieldservice_stock/views/stock.xml
index 110cf14e6b..6fd0fe5c0f 100644
--- a/fieldservice_stock/views/stock.xml
+++ b/fieldservice_stock/views/stock.xml
@@ -10,7 +10,7 @@
     <menuitem
         id="menu_fsm_stock_inventory"
         name="Inventory"
-        action="stock.quantsact"
+        action="stock.action_view_quants"
         parent="fieldservice.reporting"
         sequence="30"
     />

From a6a5c8a1771648e2102b11c036c416bc30fc237a Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Mon, 5 Jul 2021 17:10:05 +0530
Subject: [PATCH 172/631] [14.0][MIG] fieldservice_stock

---
 fieldservice_stock/README.rst                 |  11 +-
 fieldservice_stock/__manifest__.py            |   2 +-
 fieldservice_stock/i18n/es_AR.po              | 154 ------------------
 fieldservice_stock/i18n/fr_FR.po              | 154 ------------------
 .../migrations/13.0.1.0.0/pre-migration.py    |  12 --
 fieldservice_stock/models/stock_rule.py       |   4 +-
 fieldservice_stock/readme/CONTRIBUTORS.rst    |   1 +
 .../static/description/index.html             |   9 +-
 fieldservice_stock/tests/__init__.py          |   3 +-
 fieldservice_stock/tests/common.py            |  31 ----
 fieldservice_stock/tests/test_fsm_stock.py    |  65 ++++++++
 fieldservice_stock/tests/test_fsm_wizard.py   |  18 ++
 fieldservice_stock/views/fsm_order.xml        |   1 -
 .../odoo/addons/fieldservice_stock            |   1 +
 setup/fieldservice_stock/setup.py             |   6 +
 15 files changed, 107 insertions(+), 365 deletions(-)
 delete mode 100644 fieldservice_stock/i18n/es_AR.po
 delete mode 100644 fieldservice_stock/i18n/fr_FR.po
 delete mode 100644 fieldservice_stock/migrations/13.0.1.0.0/pre-migration.py
 delete mode 100644 fieldservice_stock/tests/common.py
 create mode 100644 fieldservice_stock/tests/test_fsm_stock.py
 create mode 100644 fieldservice_stock/tests/test_fsm_wizard.py
 create mode 120000 setup/fieldservice_stock/odoo/addons/fieldservice_stock
 create mode 100644 setup/fieldservice_stock/setup.py

diff --git a/fieldservice_stock/README.rst b/fieldservice_stock/README.rst
index 231c92d3ac..a5ae65c03f 100644
--- a/fieldservice_stock/README.rst
+++ b/fieldservice_stock/README.rst
@@ -14,13 +14,13 @@ Field Service - Stock
     :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/13.0/fieldservice_stock
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_stock
     :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-13-0/field-service-13-0-fieldservice_stock
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_stock
     :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/13.0
+    :target: https://runbot.odoo-community.org/runbot/264/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -75,7 +75,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_stock%0Aversion:%2013.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_stock%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.
 
@@ -95,6 +95,7 @@ Contributors
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Marcel Savegnago <marcel.savegnago@escodoo.com.br>
+* Freni Patel <fpatel@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -133,6 +134,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-brian10048| |maintainer-wolfhall| |maintainer-max3903| |maintainer-smangukiya| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/13.0/fieldservice_stock>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_stock>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_stock/__manifest__.py b/fieldservice_stock/__manifest__.py
index 3d609dd3de..1f5683ce8e 100644
--- a/fieldservice_stock/__manifest__.py
+++ b/fieldservice_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Field Service - Stock",
     "summary": "Integrate the logistics operations with Field Service",
-    "version": "13.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, "
     "Brian McMaster, "
diff --git a/fieldservice_stock/i18n/es_AR.po b/fieldservice_stock/i18n/es_AR.po
deleted file mode 100644
index 4fb6ffd27d..0000000000
--- a/fieldservice_stock/i18n/es_AR.po
+++ /dev/null
@@ -1,154 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* fieldservice_stock
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 13.0\n"
-"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-05-30 20:48+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_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Allocated Quantity"
-msgstr "Cantidad Asignada"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Deliveries"
-msgstr "Entregas"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__delivery_count
-msgid "Delivery Orders"
-msgstr "Pedidos de Entrega"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Done Quantity"
-msgstr "Cantidad Realizada"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_wizard
-msgid "FSM Record Conversion"
-msgstr "Conversión de Registro FSM"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_location
-msgid "Field Service Location"
-msgstr "Ubicación del Servicio de Campo"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_order
-#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group__fsm_order_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move__fsm_order_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking__fsm_order_id
-msgid "Field Service Order"
-msgstr "Pedido de Servicio de Campo"
-
-#. module: fieldservice_stock
-#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Inventory"
-msgstr "Inventario"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__inventory_location_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__inventory_location_id
-msgid "Inventory Location"
-msgstr "Ubicación de Inventario"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Moves"
-msgstr "Movimientos"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
-msgid "Operations"
-msgstr "Operaciones"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_procurement_group
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
-msgid "Procurement Group"
-msgstr "Grupo de Adquicisiones"
-
-#. module: fieldservice_stock
-#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
-msgid "Products"
-msgstr "Productos"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Reference"
-msgstr "Referencia"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Requested Quantity"
-msgstr "Cantidad Requerida"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
-msgid "Return Orders"
-msgstr "Pedidos de Devolución"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Returns"
-msgstr "Devoluciones"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
-msgid "Shipping Location"
-msgstr "Ubicación de Envío"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento de Inventario"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_rule
-msgid "Stock Rule"
-msgstr "Regla de Inventario"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_res_territory
-msgid "Territory"
-msgstr "Territorio"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_picking
-msgid "Transfer"
-msgstr "Transferencia"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__picking_ids
-msgid "Transfers"
-msgstr "Transferencias"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Unit of Measure"
-msgstr "Unidad de Medida"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_res_territory__warehouse_id
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
-msgid "Warehouse used to ship the materials"
-msgstr "Almacén utilizada para envío de materiales"
diff --git a/fieldservice_stock/i18n/fr_FR.po b/fieldservice_stock/i18n/fr_FR.po
deleted file mode 100644
index b96b9bc440..0000000000
--- a/fieldservice_stock/i18n/fr_FR.po
+++ /dev/null
@@ -1,154 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* fieldservice_stock
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 13.0\n"
-"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-06-02 11:48+0000\n"
-"Last-Translator: Sandrine (ACSONE) <sandrine.ravet@acsone.eu>\n"
-"Language-Team: none\n"
-"Language: fr_FR\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_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Allocated Quantity"
-msgstr "Quantité allouée"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Deliveries"
-msgstr "Livraisons"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__delivery_count
-msgid "Delivery Orders"
-msgstr "Ordres de livraison"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Done Quantity"
-msgstr "Quantité faite"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_wizard
-msgid "FSM Record Conversion"
-msgstr ""
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_location
-msgid "Field Service Location"
-msgstr "Lieu de prestation"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_fsm_order
-#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group__fsm_order_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move__fsm_order_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking__fsm_order_id
-msgid "Field Service Order"
-msgstr "Service sur site"
-
-#. module: fieldservice_stock
-#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Inventory"
-msgstr "Inventaire"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__inventory_location_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__inventory_location_id
-msgid "Inventory Location"
-msgstr "Lieu d'inventaire"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Moves"
-msgstr "Mouvements"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__move_ids
-msgid "Operations"
-msgstr "Opérations"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_procurement_group
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id
-msgid "Procurement Group"
-msgstr "Groupe d'approvisionnement"
-
-#. module: fieldservice_stock
-#: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_product
-msgid "Products"
-msgstr "Produits"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Reference"
-msgstr "Référence"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Requested Quantity"
-msgstr "Quantité demandée"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__return_count
-msgid "Return Orders"
-msgstr "Ordres de retour"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Returns"
-msgstr "Retours"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__shipping_address_id
-msgid "Shipping Location"
-msgstr "Lieu de livraison"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_move
-msgid "Stock Move"
-msgstr "Mouvement de stock"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_rule
-msgid "Stock Rule"
-msgstr "Règle de stock"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_res_territory
-msgid "Territory"
-msgstr "Territoire"
-
-#. module: fieldservice_stock
-#: model:ir.model,name:fieldservice_stock.model_stock_picking
-msgid "Transfer"
-msgstr "Transfert"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__picking_ids
-msgid "Transfers"
-msgstr "Transferts"
-
-#. module: fieldservice_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
-msgid "Unit of Measure"
-msgstr "Unité de mesure"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__warehouse_id
-#: model:ir.model.fields,field_description:fieldservice_stock.field_res_territory__warehouse_id
-msgid "Warehouse"
-msgstr "Entrepôt"
-
-#. module: fieldservice_stock
-#: model:ir.model.fields,help:fieldservice_stock.field_fsm_order__warehouse_id
-msgid "Warehouse used to ship the materials"
-msgstr "Entrepôt utilisé pour livrer les produits"
diff --git a/fieldservice_stock/migrations/13.0.1.0.0/pre-migration.py b/fieldservice_stock/migrations/13.0.1.0.0/pre-migration.py
deleted file mode 100644
index 45666c371e..0000000000
--- a/fieldservice_stock/migrations/13.0.1.0.0/pre-migration.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 Brian McMaster
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from openupgradelib import openupgrade
-
-
-@openupgrade.migrate()
-def migrate(env, version):
-    cr = env.cr
-    if openupgrade.table_exists(cr, "fsm_territory"):
-        openupgrade.rename_models(cr, [("fsm.territory", "res.territory")])
-        openupgrade.rename_tables(cr, [("fsm_territory", "res_territory")])
diff --git a/fieldservice_stock/models/stock_rule.py b/fieldservice_stock/models/stock_rule.py
index 84dde2f114..3ae73200cf 100644
--- a/fieldservice_stock/models/stock_rule.py
+++ b/fieldservice_stock/models/stock_rule.py
@@ -14,8 +14,8 @@ def _get_stock_move_values(
         location_id,
         name,
         origin,
+        company_id,
         values,
-        group_id,
     ):
         vals = super()._get_stock_move_values(
             product_id,
@@ -24,8 +24,8 @@ def _get_stock_move_values(
             location_id,
             name,
             origin,
+            company_id,
             values,
-            group_id,
         )
         vals.update({"fsm_order_id": values.get("fsm_order_id")})
         return vals
diff --git a/fieldservice_stock/readme/CONTRIBUTORS.rst b/fieldservice_stock/readme/CONTRIBUTORS.rst
index 5db5c162c6..c8f79f911e 100644
--- a/fieldservice_stock/readme/CONTRIBUTORS.rst
+++ b/fieldservice_stock/readme/CONTRIBUTORS.rst
@@ -2,3 +2,4 @@
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Marcel Savegnago <marcel.savegnago@escodoo.com.br>
+* Freni Patel <fpatel@opensourceintegrators.com>
diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index 28f9414271..02b650895c 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/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 - Stock</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Stock</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/13.0/fieldservice_stock"><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-13-0/field-service-13-0-fieldservice_stock"><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/13.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/14.0/fieldservice_stock"><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_stock"><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>This module is an add-on for the Field Service application in Odoo.
 It provides a generic framework to allow you to link inventory and
 stock operations with your field service operations.</p>
@@ -424,7 +424,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_stock%0Aversion:%2013.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_stock%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">
@@ -443,6 +443,7 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#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>Marcel Savegnago &lt;<a class="reference external" href="mailto:marcel.savegnago&#64;escodoo.com.br">marcel.savegnago&#64;escodoo.com.br</a>&gt;</li>
+<li>Freni Patel &lt;<a class="reference external" href="mailto:fpatel&#64;opensourceintegrators.com">fpatel&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -461,7 +462,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/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/13.0/fieldservice_stock">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/14.0/fieldservice_stock">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_stock/tests/__init__.py b/fieldservice_stock/tests/__init__.py
index 0d064c5691..f2e2076220 100644
--- a/fieldservice_stock/tests/__init__.py
+++ b/fieldservice_stock/tests/__init__.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2020, Brian McMaster
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 
-from . import common
+from . import test_fsm_stock
+from . import test_fsm_wizard
diff --git a/fieldservice_stock/tests/common.py b/fieldservice_stock/tests/common.py
deleted file mode 100644
index c20a4a83b2..0000000000
--- a/fieldservice_stock/tests/common.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2020, Brian McMaster
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
-
-from odoo.tests.common import SavepointCase
-
-
-class TestFSMStockCommon(SavepointCase):
-    @classmethod
-    def setUpClass(cls):
-        super(TestFSMStockCommon, cls).setUpClass()
-
-        cls.ModelData = cls.env["ir.model.data"]
-        cls.FSMOrder = cls.env["fsm.order"]
-        cls.Product = cls.env["product.product"]
-
-        cls.stock_cust_loc = cls.ModelData.xmlid_to_res_id(
-            "stock.stock_location_customers"
-        )
-        cls.partner_1 = (
-            cls.env["res.partner"]
-            .with_context(tracking_disable=True)
-            .create({"name": "Partner 1"})
-        )
-        cls.fsm_location_1 = cls.env["fsm.location"].create(
-            {
-                "name": "FSM Location 1",
-                "owner_id": cls.partner_1.id,
-                "customer_id": cls.partner_1.id,
-                "inventory_location_id": cls.stock_cust_loc,
-            }
-        )
diff --git a/fieldservice_stock/tests/test_fsm_stock.py b/fieldservice_stock/tests/test_fsm_stock.py
new file mode 100644
index 0000000000..dfa751ddd0
--- /dev/null
+++ b/fieldservice_stock/tests/test_fsm_stock.py
@@ -0,0 +1,65 @@
+# Copyright (C) 2020, Brian McMaster
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from datetime import timedelta
+
+from odoo import fields
+from odoo.tests.common import TransactionCase
+
+
+class TestFSMStockCommon(TransactionCase):
+    def setUp(self):
+        super(TestFSMStockCommon, self).setUp()
+        self.location = self.env["fsm.location"]
+        self.FSMOrder = self.env["fsm.order"]
+        self.Product = self.env["product.product"]
+
+        self.stock_cust_loc = self.env.ref("stock.stock_location_customers")
+        self.stock_location = self.env.ref("stock.stock_location_stock")
+        self.customer_location = self.env.ref("stock.stock_location_customers")
+        self.test_location = self.env.ref("fieldservice.test_location")
+        self.partner_1 = (
+            self.env["res.partner"]
+            .with_context(tracking_disable=True)
+            .create({"name": "Partner 1"})
+        )
+        self.customer = self.env["res.partner"].create({"name": "SuperPartner"})
+
+    def test_fsm_orders(self):
+        """Test creating new workorders, and test following functions."""
+        # Create an Orders
+        hours_diff = 100
+        date_start = fields.Datetime.today()
+
+        order = self.FSMOrder.create(
+            {
+                "location_id": self.test_location.id,
+                "date_start": date_start,
+                "date_end": date_start + timedelta(hours=hours_diff),
+                "request_early": fields.Datetime.today(),
+            }
+        )
+        self.picking = self.env["stock.picking"].create(
+            {
+                "location_dest_id": self.stock_location.id,
+                "location_id": self.customer_location.id,
+                "partner_id": self.customer.id,
+                "picking_type_id": self.env.ref("stock.picking_type_in").id,
+                "fsm_order_id": order.id,
+            }
+        )
+        self.out_picking = self.env["stock.picking"].create(
+            {
+                "location_id": self.stock_location.id,
+                "location_dest_id": self.customer_location.id,
+                "partner_id": self.customer.id,
+                "picking_type_id": self.env.ref("stock.picking_type_out").id,
+                "fsm_order_id": order.id,
+            }
+        )
+        order._compute_picking_ids()
+        order.location_id._onchange_fsm_parent_id()
+        order._default_warehouse_id()
+        order.action_view_delivery()
+        order.action_view_returns()
diff --git a/fieldservice_stock/tests/test_fsm_wizard.py b/fieldservice_stock/tests/test_fsm_wizard.py
new file mode 100644
index 0000000000..aede1705b7
--- /dev/null
+++ b/fieldservice_stock/tests/test_fsm_wizard.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests.common import TransactionCase
+
+
+class FSMWizard(TransactionCase):
+    """
+    Test used to check that the base functionalities of Field Service Stock.
+    """
+
+    def setUp(self):
+        super(FSMWizard, self).setUp()
+        self.Wizard = self.env["fsm.wizard"]
+        self.test_partner = self.env.ref("fieldservice.test_partner")
+
+    def test_prepare_location(self):
+        self.Wizard._prepare_fsm_location(self.test_partner)
diff --git a/fieldservice_stock/views/fsm_order.xml b/fieldservice_stock/views/fsm_order.xml
index 6c04bffdc3..ab068ce5c2 100644
--- a/fieldservice_stock/views/fsm_order.xml
+++ b/fieldservice_stock/views/fsm_order.xml
@@ -53,7 +53,6 @@
                             string="Moves"
                         >
                             <field name="reference" />
-                            <field name="date_expected" widget='date' />
                             <field name="date" widget="date" />
                             <field name="picking_id" string="Reference" invisible="1" />
                             <field name="sequence" invisible="1" />
diff --git a/setup/fieldservice_stock/odoo/addons/fieldservice_stock b/setup/fieldservice_stock/odoo/addons/fieldservice_stock
new file mode 120000
index 0000000000..6bb1c1f529
--- /dev/null
+++ b/setup/fieldservice_stock/odoo/addons/fieldservice_stock
@@ -0,0 +1 @@
+../../../../fieldservice_stock
\ No newline at end of file
diff --git a/setup/fieldservice_stock/setup.py b/setup/fieldservice_stock/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_stock/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 14ca17fb68d1fe374e1bb915eb4f4d6c59065f1c Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 19 Feb 2020 00:55:17 +0000
Subject: [PATCH 173/631] fieldservice_account_analytic 12.0.3.3.0

---
 fieldservice_account_analytic/__manifest__.py |   2 +-
 fieldservice_account_analytic/i18n/es.po      |  22 +++
 fieldservice_account_analytic/i18n/es_AR.po   | 127 ++++++++++++++++++
 fieldservice_account_analytic/i18n/es_CL.po   |  22 +++
 fieldservice_account_analytic/i18n/pt_BR.po   |  29 +++-
 fieldservice_account_analytic/i18n/pt_PT.po   | 127 ++++++++++++++++++
 6 files changed, 325 insertions(+), 4 deletions(-)
 create mode 100644 fieldservice_account_analytic/i18n/es_AR.po
 create mode 100644 fieldservice_account_analytic/i18n/pt_PT.po

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index c9aae9b2d8..bca30ae460 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - Analytic Accounting',
     'summary': """Track analytic accounts on Field Service locations
                   and orders""",
-    'version': '12.0.3.2.0',
+    'version': '12.0.3.3.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_account_analytic/i18n/es.po b/fieldservice_account_analytic/i18n/es.po
index 017a539d4e..77f10545fe 100644
--- a/fieldservice_account_analytic/i18n/es.po
+++ b/fieldservice_account_analytic/i18n/es.po
@@ -52,6 +52,16 @@ msgstr "Facturar a"
 msgid "Billed Customer"
 msgstr "Facturado a Cliente"
 
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
@@ -82,6 +92,18 @@ msgstr "Ubicación del Servicio de Campo"
 msgid "Field Service Order"
 msgstr "Orden de  Servicio de Campo"
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__fsm_filter_location_by_contact
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__fsm_filter_location_by_contact
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter Contacts with Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter the Location on an FSM Order by the Contact"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
 msgid "Invoice Line"
diff --git a/fieldservice_account_analytic/i18n/es_AR.po b/fieldservice_account_analytic/i18n/es_AR.po
new file mode 100644
index 0000000000..965e516fe5
--- /dev/null
+++ b/fieldservice_account_analytic/i18n/es_AR.po
@@ -0,0 +1,127 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_account_analytic
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-09-10 08:00+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 3.10\n"
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_order_form_analytic
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__analytic_account_id
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea Analítica"
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Contact"
+msgstr "Factura de Contacto"
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Location"
+msgstr "Ubicación de Factura"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
+msgid "Bill to"
+msgstr "Facturar a"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
+msgid "Billed Customer"
+msgstr "Cliente Facturado"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_config_settings
+msgid "Config Settings"
+msgstr "Configurar Ajustes"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_search_view_analytic
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
+msgid "FSM Order"
+msgstr "Pedido FSM"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr "Conversión a Registro FSM"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación del Servicio de Campo"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
+msgid "Field Service Order"
+msgstr "Pedido de Servicio de Campo"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__fsm_filter_location_by_contact
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__fsm_filter_location_by_contact
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter Contacts with Location"
+msgstr "Filtrar Contactos con Ubicación"
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter the Location on an FSM Order by the Contact"
+msgstr "Filtrar la Ubicación por Contacto en un Pedido FSM"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de Factura"
+
+#. module: fieldservice_account_analytic
+#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#, python-format
+msgid "No analytic account set on the order's Location."
+msgstr "No hay una cuenta analítica establecida en la Ubicación del pedido."
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
+msgid "Time Type"
+msgstr "Tipo de Tiempo"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
+msgid "Total Cost"
+msgstr "Costo Total"
diff --git a/fieldservice_account_analytic/i18n/es_CL.po b/fieldservice_account_analytic/i18n/es_CL.po
index 1ac61bd739..cfe0014f8f 100644
--- a/fieldservice_account_analytic/i18n/es_CL.po
+++ b/fieldservice_account_analytic/i18n/es_CL.po
@@ -52,6 +52,16 @@ msgstr ""
 msgid "Billed Customer"
 msgstr ""
 
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
@@ -82,6 +92,18 @@ msgstr ""
 msgid "Field Service Order"
 msgstr ""
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__fsm_filter_location_by_contact
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__fsm_filter_location_by_contact
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter Contacts with Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter the Location on an FSM Order by the Contact"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
 msgid "Invoice Line"
diff --git a/fieldservice_account_analytic/i18n/pt_BR.po b/fieldservice_account_analytic/i18n/pt_BR.po
index 5c3dc5dd7d..e44e795ee0 100644
--- a/fieldservice_account_analytic/i18n/pt_BR.po
+++ b/fieldservice_account_analytic/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-05 22:13+0000\n"
-"Last-Translator: Marcel Savegnago <marcel.savegnago@gmail.com>\n"
+"PO-Revision-Date: 2020-06-17 16:19+0000\n"
+"Last-Translator: Fernando Colus <fcolus1@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -52,6 +52,16 @@ msgstr "Conta para"
 msgid "Billed Customer"
 msgstr "Cliente Faturado"
 
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_config_settings
+msgid "Config Settings"
+msgstr "Definições de configuração"
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
@@ -65,7 +75,7 @@ msgstr "Cliente"
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
-msgstr "Ordem FSM"
+msgstr "Ordem FSM (Field Service Management)"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
@@ -82,6 +92,19 @@ msgstr "Localização do Serviço de Campo"
 msgid "Field Service Order"
 msgstr "Ordem de Serviço de Campo"
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__fsm_filter_location_by_contact
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__fsm_filter_location_by_contact
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter Contacts with Location"
+msgstr "Filtrar contatos de acordo com o Local"
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter the Location on an FSM Order by the Contact"
+msgstr ""
+"Filtrar por contato o local em um pedido do FSM (Field Services Management)"
+
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
 msgid "Invoice Line"
diff --git a/fieldservice_account_analytic/i18n/pt_PT.po b/fieldservice_account_analytic/i18n/pt_PT.po
new file mode 100644
index 0000000000..bf9ae769dc
--- /dev/null
+++ b/fieldservice_account_analytic/i18n/pt_PT.po
@@ -0,0 +1,127 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_account_analytic
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-07-21 10:19+0000\n"
+"Last-Translator: Daniel Reis <dgreis@sapo.pt>\n"
+"Language-Team: none\n"
+"Language: pt_PT\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_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_order_form_analytic
+msgid "Accounting"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__analytic_account_id
+msgid "Analytic Account"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: selection:fsm.order,bill_to:0
+msgid "Bill Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
+msgid "Bill to"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
+msgid "Billed Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
+msgid "Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_search_view_analytic
+msgid "Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location
+msgid "Field Service Location"
+msgstr "Local do Serviço de Campo"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
+msgid "Field Service Order"
+msgstr "Ordem de Serviço"
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__fsm_filter_location_by_contact
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__fsm_filter_location_by_contact
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter Contacts with Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter the Location on an FSM Order by the Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#, python-format
+msgid "No analytic account set on the order's Location."
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
+msgid "Time Type"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
+msgid "Total Cost"
+msgstr ""

From f93674641cd8d30a2333dc03ef51f36ebb837a06 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Wed, 7 Oct 2020 00:06:36 +0530
Subject: [PATCH 174/631] [WIP][13.0][MIG] Fix Travis

---
 fieldservice_account_analytic/__manifest__.py | 48 ++++++---------
 .../data/ir_rule.xml                          | 33 +++++------
 .../demo/fsm_location.xml                     | 12 ++--
 fieldservice_account_analytic/init_hook.py    |  6 +-
 .../migrations/12.0.2.0.0/post-migration.py   |  3 +-
 .../models/__init__.py                        |  2 +-
 .../models/account_invoice_line.py            | 12 ++--
 .../models/analytic_account.py                | 19 +++---
 .../models/fsm_location.py                    | 23 +++++---
 .../models/fsm_order.py                       | 59 +++++++++++--------
 .../models/res_company.py                     |  8 +--
 .../models/res_config_settings.py             |  8 +--
 .../readme/USAGE.rst                          |  1 -
 .../report/fsm_order_report_template.xml      | 13 ++--
 .../tests/test_fsm_account_wizard.py          | 16 ++---
 .../views/fsm_location.xml                    | 26 ++++----
 .../views/fsm_order.xml                       | 27 ++++-----
 .../views/res_config_settings.xml             | 12 ++--
 .../wizard/fsm_wizard.py                      |  6 +-
 19 files changed, 166 insertions(+), 168 deletions(-)

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index bca30ae460..02a768abd2 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -2,35 +2,25 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - Analytic Accounting',
-    'summary': """Track analytic accounts on Field Service locations
+    "name": "Field Service - Analytic Accounting",
+    "summary": """Track analytic accounts on Field Service locations
                   and orders""",
-    'version': '12.0.3.3.0',
-    'category': 'Field Service',
-    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice_account',
-        'analytic',
-        'product',
-    ],
-    'data': [
-        'data/ir_rule.xml',
-        'security/ir.model.access.csv',
-        'report/fsm_order_report_template.xml',
-        'views/fsm_location.xml',
-        'views/fsm_order.xml',
-        'views/res_config_settings.xml'
-    ],
-    'demo': [
-        'demo/fsm_location.xml',
-    ],
-    'pre_init_hook': 'pre_init_hook',
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'osimallen',
-        'brian10048',
-        'bodedra',
+    "version": "13.0.1.0.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": ["fieldservice_account", "analytic", "product"],
+    "data": [
+        "data/ir_rule.xml",
+        "security/ir.model.access.csv",
+        "report/fsm_order_report_template.xml",
+        "views/fsm_location.xml",
+        "views/fsm_order.xml",
+        "views/res_config_settings.xml",
     ],
+    "demo": ["demo/fsm_location.xml"],
+    "pre_init_hook": "pre_init_hook",
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": ["osimallen", "brian10048", "bodedra"],
 }
diff --git a/fieldservice_account_analytic/data/ir_rule.xml b/fieldservice_account_analytic/data/ir_rule.xml
index 622bca4ee7..279666bf91 100644
--- a/fieldservice_account_analytic/data/ir_rule.xml
+++ b/fieldservice_account_analytic/data/ir_rule.xml
@@ -1,28 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="analytic_account_fsm_manager" model="ir.rule">
         <field name="name">account.analytic.line.fsm.manager</field>
-        <field name="model_id" ref="model_account_analytic_line"/>
-        <field name="global" eval="False"/>
+        <field name="model_id" ref="model_account_analytic_line" />
+        <field name="global" eval="False" />
         <field name="domain_force">[(1, '=', 1)]</field>
-        <field name="groups" eval="[(4, ref('fieldservice.group_fsm_manager'))]"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+        <field name="groups" eval="[(4, ref('fieldservice.group_fsm_manager'))]" />
+        <field name="perm_read" eval="True" />
+        <field name="perm_write" eval="True" />
+        <field name="perm_create" eval="True" />
+        <field name="perm_unlink" eval="True" />
     </record>
-
     <record id="analytic_account_fsm_dispatcher" model="ir.rule">
         <field name="name">account.analytic.line.fsm.dispatcher</field>
-        <field name="model_id" ref="model_account_analytic_line"/>
-        <field name="global" eval="False"/>
+        <field name="model_id" ref="model_account_analytic_line" />
+        <field name="global" eval="False" />
         <field name="domain_force">[(1, '=', 1)]</field>
-        <field name="groups" eval="[(4, ref('fieldservice.group_fsm_dispatcher'))]"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+        <field name="groups" eval="[(4, ref('fieldservice.group_fsm_dispatcher'))]" />
+        <field name="perm_read" eval="True" />
+        <field name="perm_write" eval="True" />
+        <field name="perm_create" eval="True" />
+        <field name="perm_unlink" eval="True" />
     </record>
-
 </odoo>
diff --git a/fieldservice_account_analytic/demo/fsm_location.xml b/fieldservice_account_analytic/demo/fsm_location.xml
index fc3a0e6201..713b1d2a7c 100644
--- a/fieldservice_account_analytic/demo/fsm_location.xml
+++ b/fieldservice_account_analytic/demo/fsm_location.xml
@@ -1,20 +1,16 @@
 <odoo>
-
     <!-- fsm.location -->
     <record id="fieldservice.test_location" model="fsm.location">
-        <field name="customer_id" eval="ref('fieldservice.test_loc_partner')"/>
+        <field name="customer_id" eval="ref('fieldservice.test_loc_partner')" />
     </record>
-
     <!-- Other locations -->
     <record id="fieldservice.location_1" model="fsm.location">
-        <field name="customer_id" eval="ref('fieldservice.location_partner_1')"/>
+        <field name="customer_id" eval="ref('fieldservice.location_partner_1')" />
     </record>
-
     <record id="fieldservice.location_2" model="fsm.location">
-        <field name="customer_id" eval="ref('fieldservice.location_partner_2')"/>
+        <field name="customer_id" eval="ref('fieldservice.location_partner_2')" />
     </record>
-
     <record id="fieldservice.location_3" model="fsm.location">
-        <field name="customer_id" eval="ref('fieldservice.location_partner_3')"/>
+        <field name="customer_id" eval="ref('fieldservice.location_partner_3')" />
     </record>
 </odoo>
diff --git a/fieldservice_account_analytic/init_hook.py b/fieldservice_account_analytic/init_hook.py
index 730d91faac..49ef6b0ab8 100644
--- a/fieldservice_account_analytic/init_hook.py
+++ b/fieldservice_account_analytic/init_hook.py
@@ -4,5 +4,7 @@
 
 def pre_init_hook(cr):
     cr.execute("""ALTER TABLE "fsm_location" ADD "customer_id" INT;""")
-    cr.execute("""UPDATE "fsm_location" SET customer_id = owner_id
-    WHERE customer_id IS NULL;""")
+    cr.execute(
+        """UPDATE "fsm_location" SET customer_id = owner_id
+    WHERE customer_id IS NULL;"""
+    )
diff --git a/fieldservice_account_analytic/migrations/12.0.2.0.0/post-migration.py b/fieldservice_account_analytic/migrations/12.0.2.0.0/post-migration.py
index 7218f7ce5e..1f7de1b3b7 100644
--- a/fieldservice_account_analytic/migrations/12.0.2.0.0/post-migration.py
+++ b/fieldservice_account_analytic/migrations/12.0.2.0.0/post-migration.py
@@ -6,5 +6,4 @@ def migrate(env, version):
     if not version:
         return
 
-    env.execute("UPDATE fsm_order SET bill_to = 'location' "
-                "WHERE bill_to IS NULL;")
+    env.execute("UPDATE fsm_order SET bill_to = 'location' " "WHERE bill_to IS NULL;")
diff --git a/fieldservice_account_analytic/models/__init__.py b/fieldservice_account_analytic/models/__init__.py
index a08d9949b4..f42338c138 100644
--- a/fieldservice_account_analytic/models/__init__.py
+++ b/fieldservice_account_analytic/models/__init__.py
@@ -6,5 +6,5 @@
     fsm_location,
     fsm_order,
     res_company,
-    res_config_settings
+    res_config_settings,
 )
diff --git a/fieldservice_account_analytic/models/account_invoice_line.py b/fieldservice_account_analytic/models/account_invoice_line.py
index ca90dab2b1..21bb9c93a3 100644
--- a/fieldservice_account_analytic/models/account_invoice_line.py
+++ b/fieldservice_account_analytic/models/account_invoice_line.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, models, _
+from odoo import _, api, models
 from odoo.exceptions import ValidationError
 
 
@@ -10,12 +10,12 @@ class AccountInvoiceLine(models.Model):
 
     @api.model
     def create(self, vals):
-        order = self.env['fsm.order'].browse(vals.get('fsm_order_id'))
+        order = self.env["fsm.order"].browse(vals.get("fsm_order_id"))
         if order:
             if order.location_id.analytic_account_id:
-                vals['account_analytic_id'] = order.location_id.\
-                    analytic_account_id.id
+                vals["account_analytic_id"] = order.location_id.analytic_account_id.id
             else:
-                raise ValidationError(_("No analytic account "
-                                        "set on the order's Location."))
+                raise ValidationError(
+                    _("No analytic account " "set on the order's Location.")
+                )
         return super(AccountInvoiceLine, self).create(vals)
diff --git a/fieldservice_account_analytic/models/analytic_account.py b/fieldservice_account_analytic/models/analytic_account.py
index 62bb9c12a7..149b82fe81 100644
--- a/fieldservice_account_analytic/models/analytic_account.py
+++ b/fieldservice_account_analytic/models/analytic_account.py
@@ -1,28 +1,29 @@
 # Copyright (C) 2018 - TODAY, 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
 
 
 class AccountAnalyticLine(models.Model):
-    _inherit = 'account.analytic.line'
+    _inherit = "account.analytic.line"
 
-    fsm_order_id = fields.Many2one('fsm.order', string='FSM Order')
-    product_id = fields.Many2one('product.product', string='Time Type')
+    fsm_order_id = fields.Many2one("fsm.order", string="FSM Order")
+    product_id = fields.Many2one("product.product", string="Time Type")
 
     @api.model
     def create(self, vals):
-        order = self.env['fsm.order'].browse(vals.get('fsm_order_id'))
+        order = self.env["fsm.order"].browse(vals.get("fsm_order_id"))
         if order:
             if order.location_id.analytic_account_id:
-                vals['account_id'] = order.location_id.analytic_account_id.id
+                vals["account_id"] = order.location_id.analytic_account_id.id
             else:
-                raise ValidationError(_("No analytic account set "
-                                        "on the order's Location."))
+                raise ValidationError(
+                    _("No analytic account set " "on the order's Location.")
+                )
         return super(AccountAnalyticLine, self).create(vals)
 
-    @api.onchange('product_id')
+    @api.onchange("product_id")
     def onchange_product_id(self):
         if self.product_id:
             self.name = self.product_id.name
diff --git a/fieldservice_account_analytic/models/fsm_location.py b/fieldservice_account_analytic/models/fsm_location.py
index 6885f1b1c1..d1fa677f92 100644
--- a/fieldservice_account_analytic/models/fsm_location.py
+++ b/fieldservice_account_analytic/models/fsm_location.py
@@ -1,15 +1,15 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models, api
+from odoo import api, fields, models
 
 
 class FSMLocation(models.Model):
-    _inherit = 'fsm.location'
+    _inherit = "fsm.location"
 
-    analytic_account_id = fields.Many2one('account.analytic.account',
-                                          string='Analytic Account',
-                                          company_dependent=True)
+    analytic_account_id = fields.Many2one(
+        "account.analytic.account", string="Analytic Account", company_dependent=True
+    )
 
     @api.model
     def get_default_customer(self):
@@ -18,10 +18,15 @@ def get_default_customer(self):
         return self.owner_id.id
 
     customer_id = fields.Many2one(
-        'res.partner', string='Billed Customer', required=True,
-        ondelete='restrict', auto_join=True, track_visibility='onchange',
-        default=get_default_customer)
+        "res.partner",
+        string="Billed Customer",
+        required=True,
+        ondelete="restrict",
+        auto_join=True,
+        track_visibility="onchange",
+        default=get_default_customer,
+    )
 
-    @api.onchange('fsm_parent_id')
+    @api.onchange("fsm_parent_id")
     def _onchange_fsm_parent_id_account(self):
         self.customer_id = self.fsm_parent_id.customer_id or False
diff --git a/fieldservice_account_analytic/models/fsm_order.py b/fieldservice_account_analytic/models/fsm_order.py
index c2e5da8402..77ab3e6264 100644
--- a/fieldservice_account_analytic/models/fsm_order.py
+++ b/fieldservice_account_analytic/models/fsm_order.py
@@ -5,44 +5,53 @@
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
-
-    total_cost = fields.Float(compute='_compute_total_cost',
-                              string='Total Cost')
-    bill_to = fields.Selection([('location', 'Bill Location'),
-                                ('contact', 'Bill Contact')],
-                               string="Bill to",
-                               required=True,
-                               default="location")
-    customer_id = fields.Many2one('res.partner', string='Contact',
-                                  domain=[('customer', '=', True)],
-                                  change_default=True,
-                                  index=True,
-                                  track_visibility='always')
+    _inherit = "fsm.order"
+
+    total_cost = fields.Float(compute="_compute_total_cost", string="Total Cost")
+    bill_to = fields.Selection(
+        [("location", "Bill Location"), ("contact", "Bill Contact")],
+        string="Bill to",
+        required=True,
+        default="location",
+    )
+    customer_id = fields.Many2one(
+        "res.partner",
+        string="Contact",
+        domain=[("customer", "=", True)],
+        change_default=True,
+        index=True,
+        track_visibility="always",
+    )
 
     def _compute_total_cost(self):
         """ To be overridden as needed from other modules """
         for order in self:
             order.total_cost = 0.0
 
-    @api.onchange('location_id', 'customer_id')
+    @api.onchange("location_id", "customer_id")
     def _onchange_location_id_customer_account(self):
         if self.env.user.company_id.fsm_filter_location_by_contact:
             if self.location_id:
-                return {'domain': {'customer_id': [('service_location_id', '=',
-                                                    self.location_id.id)]}}
+                return {
+                    "domain": {
+                        "customer_id": [
+                            ("service_location_id", "=", self.location_id.id)
+                        ]
+                    }
+                }
             else:
-                return {'domain': {'customer_id': [],
-                                   'location_id': []}}
+                return {"domain": {"customer_id": [], "location_id": []}}
         else:
             if self.customer_id:
-                return {'domain': {'location_id': [('partner_id', '=',
-                                                    self.customer_id.id)]}}
+                return {
+                    "domain": {
+                        "location_id": [("partner_id", "=", self.customer_id.id)]
+                    }
+                }
             else:
-                return {'domain': {'location_id': [],
-                                   'customer_id': []}}
+                return {"domain": {"location_id": [], "customer_id": []}}
 
-    @api.onchange('customer_id')
+    @api.onchange("customer_id")
     def _onchange_customer_id_location(self):
         if self.customer_id:
             self.location_id = self.customer_id.service_location_id
@@ -51,6 +60,6 @@ def _onchange_customer_id_location(self):
     def write(self, vals):
         res = super(FSMOrder, self).write(vals)
         for order in self:
-            if 'customer_id' not in vals and order.customer_id is False:
+            if "customer_id" not in vals and order.customer_id is False:
                 order.customer_id = order.location_id.customer_id.id
         return res
diff --git a/fieldservice_account_analytic/models/res_company.py b/fieldservice_account_analytic/models/res_company.py
index ed087f6ed9..4d6dd0e399 100644
--- a/fieldservice_account_analytic/models/res_company.py
+++ b/fieldservice_account_analytic/models/res_company.py
@@ -5,14 +5,14 @@
 
 
 class ResCompany(models.Model):
-    _inherit = 'res.company'
+    _inherit = "res.company"
 
     fsm_filter_location_by_contact = fields.Boolean(
-        string='Filter Contacts with Location'
+        string="Filter Contacts with Location"
     )
 
-    @api.onchange('fsm_filter_location_by_contact')
+    @api.onchange("fsm_filter_location_by_contact")
     def onchange_fsm_filter_location_by_contact(self):
-        fso_ids = self.env['fsm.order'].search([])
+        fso_ids = self.env["fsm.order"].search([])
         for fso_id in fso_ids:
             fso_id._onchange_location_id_customer_account()
diff --git a/fieldservice_account_analytic/models/res_config_settings.py b/fieldservice_account_analytic/models/res_config_settings.py
index e8ea540845..8d37084ce9 100644
--- a/fieldservice_account_analytic/models/res_config_settings.py
+++ b/fieldservice_account_analytic/models/res_config_settings.py
@@ -5,10 +5,10 @@
 
 
 class ResConfigSettings(models.TransientModel):
-    _inherit = 'res.config.settings'
+    _inherit = "res.config.settings"
 
     fsm_filter_location_by_contact = fields.Boolean(
-        string='Filter Contacts with Location',
-        related='company_id.fsm_filter_location_by_contact',
-        readonly=False
+        string="Filter Contacts with Location",
+        related="company_id.fsm_filter_location_by_contact",
+        readonly=False,
     )
diff --git a/fieldservice_account_analytic/readme/USAGE.rst b/fieldservice_account_analytic/readme/USAGE.rst
index 8b13789179..e69de29bb2 100644
--- a/fieldservice_account_analytic/readme/USAGE.rst
+++ b/fieldservice_account_analytic/readme/USAGE.rst
@@ -1 +0,0 @@
-
diff --git a/fieldservice_account_analytic/report/fsm_order_report_template.xml b/fieldservice_account_analytic/report/fsm_order_report_template.xml
index e00d75f2c7..701c934f27 100644
--- a/fieldservice_account_analytic/report/fsm_order_report_template.xml
+++ b/fieldservice_account_analytic/report/fsm_order_report_template.xml
@@ -1,16 +1,19 @@
 <odoo>
-
-    <template id="report_fsm_order_document_account" inherit_id="fieldservice.report_fsm_order_document">
+    <template
+        id="report_fsm_order_document_account"
+        inherit_id="fieldservice.report_fsm_order_document"
+    >
         <xpath expr="//div[hasclass('page')]" position="before">
             <t t-if="doc.customer_id">
                 <t t-set="information_block">
                     <t t-if="doc.customer_id">
-                        <div t-field="doc.customer_id"
-                             t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;, &quot;phone&quot;, &quot;email&quot;]}"/>
+                        <div
+                            t-field="doc.customer_id"
+                            t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;, &quot;phone&quot;, &quot;email&quot;]}"
+                        />
                     </t>
                 </t>
             </t>
         </xpath>
     </template>
-
 </odoo>
diff --git a/fieldservice_account_analytic/tests/test_fsm_account_wizard.py b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
index 5a3eaf84ae..b1c9e08423 100644
--- a/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
+++ b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
@@ -1,13 +1,10 @@
 # Copyright 2019 Ecosoft Co., Ltd (http://ecosoft.co.th/)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 
-from odoo.addons.fieldservice_account.tests.test_fsm_account import (
-    FSMAccountCase
-)
+from odoo.addons.fieldservice_account.tests.test_fsm_account import FSMAccountCase
 
 
 class FSMAccountCase(FSMAccountCase):
-
     def setUp(self):
         super(FSMAccountCase, self).setUp()
 
@@ -20,11 +17,10 @@ def test_convert_contact_to_fsm_location(self):
         self.Wizard.action_convert_location(self.test_loc_partner2)
 
         # check if there is a new FSM Location with the same name
-        self.wiz_location = self.env['fsm.location']. \
-            search([('name', '=', self.test_loc_partner2.name)])
+        self.wiz_location = self.env["fsm.location"].search(
+            [("name", "=", self.test_loc_partner2.name)]
+        )
 
         # check if location is created successfully and fields copied over
-        self.assertEqual(self.test_loc_partner2,
-                         self.wiz_location.customer_id)
-        self.assertEqual(self.test_loc_partner2,
-                         self.wiz_location.owner_id)
+        self.assertEqual(self.test_loc_partner2, self.wiz_location.customer_id)
+        self.assertEqual(self.test_loc_partner2, self.wiz_location.owner_id)
diff --git a/fieldservice_account_analytic/views/fsm_location.xml b/fieldservice_account_analytic/views/fsm_location.xml
index 3a5e23cdcf..35c10b28ce 100644
--- a/fieldservice_account_analytic/views/fsm_location.xml
+++ b/fieldservice_account_analytic/views/fsm_location.xml
@@ -1,52 +1,52 @@
 <odoo>
-
     <!-- Field Service Location Tree View-->
     <record id="fsm_location_tree_view_analytic" model="ir.ui.view">
         <field name="name">fsm.location.tree.accounting</field>
         <field name="model">fsm.location</field>
-        <field name="inherit_id" ref="fieldservice.fsm_location_tree_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_location_tree_view" />
         <field name="arch" type="xml">
             <field name="owner_id" position="after">
-                <field name="customer_id"/>
+                <field name="customer_id" />
             </field>
         </field>
     </record>
-
-
     <!-- Field Service Location Form View-->
     <record id="fsm_location_form_view_analytic" model="ir.ui.view">
         <field name="name">fsm.location.form.accounting</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 name="accounting" string="Accounting">
                     <group>
                         <group>
-                            <field name="analytic_account_id"/>
+                            <field name="analytic_account_id" />
                         </group>
                     </group>
                 </page>
             </page>
             <field name="owner_id" position="after">
-                <field name="customer_id"/>
+                <field name="customer_id" />
             </field>
         </field>
     </record>
-    
     <!-- Field Service Location Search View-->
     <record id="fsm_location_search_view_analytic" model="ir.ui.view">
         <field name="name">fsm.location.search</field>
         <field name="model">fsm.location</field>
-        <field name="inherit_id" ref="fieldservice.fsm_location_search_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_location_search_view" />
         <field name="arch" type="xml">
             <field name="owner_id" position="after">
-                <field name="customer_id"/>
+                <field name="customer_id" />
             </field>
             <filter name="owner_id" position="after">
-                <filter name="customer_id" string="Customer" domain="[]" context="{'group_by':'customer_id'}"/>
+                <filter
+                    name="customer_id"
+                    string="Customer"
+                    domain="[]"
+                    context="{'group_by':'customer_id'}"
+                />
             </filter>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_account_analytic/views/fsm_order.xml b/fieldservice_account_analytic/views/fsm_order.xml
index db0ccee063..1688cbbdbf 100644
--- a/fieldservice_account_analytic/views/fsm_order.xml
+++ b/fieldservice_account_analytic/views/fsm_order.xml
@@ -1,14 +1,17 @@
 <odoo>
-
     <record id="fsm_order_form_analytic" model="ir.ui.view">
         <field name="name">fsm.order.form.account</field>
         <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">
             <notebook position="inside">
                 <page name="accounting" string="Accounting">
                     <group name="bill_to">
-                        <field name="bill_to" widget="radio" options="{'horizontal': true}"/>
+                        <field
+                            name="bill_to"
+                            widget="radio"
+                            options="{'horizontal': true}"
+                        />
                     </group>
                 </page>
             </notebook>
@@ -17,46 +20,42 @@
             </field>
         </field>
     </record>
-
     <record id="fsm_order_tree_view" model="ir.ui.view">
         <field name="name">fsm.order.tree</field>
         <field name="model">fsm.order</field>
-        <field name="inherit_id" ref="fieldservice.fsm_order_tree_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_order_tree_view" />
         <field name="arch" type="xml">
             <field name="name" position="after">
-                <field name="customer_id"/>
+                <field name="customer_id" />
             </field>
         </field>
     </record>
-
     <!-- Dashboard -->
     <record id="fsm_order_kanban_view" model="ir.ui.view">
         <field name="name">fsm.order.kanban</field>
         <field name="model">fsm.order</field>
-        <field name="inherit_id" ref="fieldservice.fsm_order_kanban_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_order_kanban_view" />
         <field name="arch" type="xml">
             <field name="priority" position="after">
-                <field name="customer_id"/>
+                <field name="customer_id" />
             </field>
             <xpath expr="//div[hasclass('oe_kanban_content')]/div[2]" position="after">
                 <div class="text-muted o_kanban_record_subtitle">
                     <span t-if="record.customer_id.value">
-                        <t t-esc="record.customer_id.value"/>
+                        <t t-esc="record.customer_id.value" />
                     </span>
                 </div>
             </xpath>
         </field>
     </record>
-
     <record id="fsm_order_calendar_view" model="ir.ui.view">
         <field name="name">Orders</field>
         <field name="model">fsm.order</field>
-        <field name="inherit_id" ref="fieldservice.fsm_order_calendar_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_order_calendar_view" />
         <field name="arch" type="xml">
             <field name="phone" position="after">
-                <field name="customer_id"/>
+                <field name="customer_id" />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_account_analytic/views/res_config_settings.xml b/fieldservice_account_analytic/views/res_config_settings.xml
index b7bb82f2f6..a8f77daefb 100644
--- a/fieldservice_account_analytic/views/res_config_settings.xml
+++ b/fieldservice_account_analytic/views/res_config_settings.xml
@@ -2,17 +2,19 @@
     <record id="res_config_settings_view_form_filter" model="ir.ui.view">
         <field name="name">res.config.settings.view.form.fsm.filter</field>
         <field name="model">res.config.settings</field>
-        <field name="priority" eval="40"/>
-        <field name="inherit_id" ref="fieldservice.res_config_settings_view_form"/>
+        <field name="priority" eval="40" />
+        <field name="inherit_id" ref="fieldservice.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <div id="orders" position="inside">
                 <div class="col-xs-12 col-md-6 o_setting_box">
                     <div class="o_setting_left_pane">
-                        <field name="fsm_filter_location_by_contact"/>
+                        <field name="fsm_filter_location_by_contact" />
                     </div>
                     <div class="o_setting_right_pane">
-                        <label for="fsm_filter_location_by_contact"
-                                string="Filter Contacts with Location"/>
+                        <label
+                            for="fsm_filter_location_by_contact"
+                            string="Filter Contacts with Location"
+                        />
                         <div class="text-muted">
                             Filter the Location on an FSM Order by the Contact
                         </div>
diff --git a/fieldservice_account_analytic/wizard/fsm_wizard.py b/fieldservice_account_analytic/wizard/fsm_wizard.py
index a3050f737d..3b69d1c6af 100644
--- a/fieldservice_account_analytic/wizard/fsm_wizard.py
+++ b/fieldservice_account_analytic/wizard/fsm_wizard.py
@@ -4,10 +4,10 @@
 
 
 class FSMWizard(models.TransientModel):
-    _inherit = 'fsm.wizard'
+    _inherit = "fsm.wizard"
 
     def _prepare_fsm_location(self, partner):
         res = super()._prepare_fsm_location(partner)
-        res['customer_id'] = partner.id
-        res['owner_id'] = partner.id
+        res["customer_id"] = partner.id
+        res["owner_id"] = partner.id
         return res

From 36256be23b31e5855cdd5d1e87e5dedf70deb287 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Wed, 7 Oct 2020 00:17:24 +0530
Subject: [PATCH 175/631] [IMP] Improved code.

---
 .../data/ir_rule.xml                          |  1 -
 .../migrations/12.0.2.0.0/post-migration.py   |  9 -------
 .../models/__init__.py                        |  2 +-
 .../models/account_invoice_line.py            | 21 ----------------
 .../models/account_move.py                    | 24 +++++++++++++++++++
 .../models/fsm_location.py                    |  2 +-
 .../models/fsm_order.py                       |  8 +------
 7 files changed, 27 insertions(+), 40 deletions(-)
 delete mode 100644 fieldservice_account_analytic/migrations/12.0.2.0.0/post-migration.py
 delete mode 100644 fieldservice_account_analytic/models/account_invoice_line.py
 create mode 100644 fieldservice_account_analytic/models/account_move.py

diff --git a/fieldservice_account_analytic/data/ir_rule.xml b/fieldservice_account_analytic/data/ir_rule.xml
index 279666bf91..cebe54e330 100644
--- a/fieldservice_account_analytic/data/ir_rule.xml
+++ b/fieldservice_account_analytic/data/ir_rule.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="analytic_account_fsm_manager" model="ir.rule">
         <field name="name">account.analytic.line.fsm.manager</field>
diff --git a/fieldservice_account_analytic/migrations/12.0.2.0.0/post-migration.py b/fieldservice_account_analytic/migrations/12.0.2.0.0/post-migration.py
deleted file mode 100644
index 1f7de1b3b7..0000000000
--- a/fieldservice_account_analytic/migrations/12.0.2.0.0/post-migration.py
+++ /dev/null
@@ -1,9 +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 fsm_order SET bill_to = 'location' " "WHERE bill_to IS NULL;")
diff --git a/fieldservice_account_analytic/models/__init__.py b/fieldservice_account_analytic/models/__init__.py
index f42338c138..b1e4a7d50d 100644
--- a/fieldservice_account_analytic/models/__init__.py
+++ b/fieldservice_account_analytic/models/__init__.py
@@ -1,7 +1,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
-    account_invoice_line,
+    account_move,
     analytic_account,
     fsm_location,
     fsm_order,
diff --git a/fieldservice_account_analytic/models/account_invoice_line.py b/fieldservice_account_analytic/models/account_invoice_line.py
deleted file mode 100644
index 21bb9c93a3..0000000000
--- a/fieldservice_account_analytic/models/account_invoice_line.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import _, api, models
-from odoo.exceptions import ValidationError
-
-
-class AccountInvoiceLine(models.Model):
-    _inherit = "account.invoice.line"
-
-    @api.model
-    def create(self, vals):
-        order = self.env["fsm.order"].browse(vals.get("fsm_order_id"))
-        if order:
-            if order.location_id.analytic_account_id:
-                vals["account_analytic_id"] = order.location_id.analytic_account_id.id
-            else:
-                raise ValidationError(
-                    _("No analytic account " "set on the order's Location.")
-                )
-        return super(AccountInvoiceLine, self).create(vals)
diff --git a/fieldservice_account_analytic/models/account_move.py b/fieldservice_account_analytic/models/account_move.py
new file mode 100644
index 0000000000..a9a2c29247
--- /dev/null
+++ b/fieldservice_account_analytic/models/account_move.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, models
+from odoo.exceptions import ValidationError
+
+
+class AccountMoveLine(models.Model):
+    _inherit = "account.move.line"
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            order = self.env["fsm.order"].browse(vals.get("fsm_order_id"))
+            if order:
+                if order.location_id.analytic_account_id:
+                    vals[
+                        "analytic_account_id"
+                    ] = order.location_id.analytic_account_id.id
+                else:
+                    raise ValidationError(
+                        _("No analytic account " "set on the order's Location.")
+                    )
+        return super(AccountMoveLine, self).create(vals_list)
diff --git a/fieldservice_account_analytic/models/fsm_location.py b/fieldservice_account_analytic/models/fsm_location.py
index d1fa677f92..40dbba9199 100644
--- a/fieldservice_account_analytic/models/fsm_location.py
+++ b/fieldservice_account_analytic/models/fsm_location.py
@@ -23,7 +23,7 @@ def get_default_customer(self):
         required=True,
         ondelete="restrict",
         auto_join=True,
-        track_visibility="onchange",
+        tracking=True,
         default=get_default_customer,
     )
 
diff --git a/fieldservice_account_analytic/models/fsm_order.py b/fieldservice_account_analytic/models/fsm_order.py
index 77ab3e6264..c171a32ec8 100644
--- a/fieldservice_account_analytic/models/fsm_order.py
+++ b/fieldservice_account_analytic/models/fsm_order.py
@@ -15,12 +15,7 @@ class FSMOrder(models.Model):
         default="location",
     )
     customer_id = fields.Many2one(
-        "res.partner",
-        string="Contact",
-        domain=[("customer", "=", True)],
-        change_default=True,
-        index=True,
-        track_visibility="always",
+        "res.partner", string="Contact", change_default=True, index=True, tracking=True,
     )
 
     def _compute_total_cost(self):
@@ -56,7 +51,6 @@ def _onchange_customer_id_location(self):
         if self.customer_id:
             self.location_id = self.customer_id.service_location_id
 
-    @api.multi
     def write(self, vals):
         res = super(FSMOrder, self).write(vals)
         for order in self:

From bcd7a02f40793ba1d9627cecc046063dac896fb4 Mon Sep 17 00:00:00 2001
From: osi-scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 17 Jan 2019 09:27:00 -0700
Subject: [PATCH 176/631] [IMP] Fix Readme

---
 .../README.rst                                | 117 +++++
 .../__init__.py                               |   4 +
 .../__manifest__.py                           |  20 +
 .../data/demo.xml                             | 163 ++++++
 .../models/__init__.py                        |   6 +
 .../models/res_partner.py                     |  24 +
 .../models/res_partner_relation_type.py       |  50 ++
 .../readme/CONFIGURE.rst                      |   5 +
 .../readme/CONTRIBUTORS.rst                   |   1 +
 .../readme/CREDITS.rst                        |   3 +
 .../readme/DESCRIPTION.rst                    |   5 +
 .../readme/INSTALL.rst                        |   6 +
 .../readme/ROADMAP.rst                        |   2 +
 .../readme/USAGE.rst                          |   4 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 464 ++++++++++++++++++
 16 files changed, 874 insertions(+)
 create mode 100644 fieldservice_partner_multi_relation/README.rst
 create mode 100644 fieldservice_partner_multi_relation/__init__.py
 create mode 100644 fieldservice_partner_multi_relation/__manifest__.py
 create mode 100644 fieldservice_partner_multi_relation/data/demo.xml
 create mode 100644 fieldservice_partner_multi_relation/models/__init__.py
 create mode 100644 fieldservice_partner_multi_relation/models/res_partner.py
 create mode 100644 fieldservice_partner_multi_relation/models/res_partner_relation_type.py
 create mode 100644 fieldservice_partner_multi_relation/readme/CONFIGURE.rst
 create mode 100644 fieldservice_partner_multi_relation/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_partner_multi_relation/readme/CREDITS.rst
 create mode 100644 fieldservice_partner_multi_relation/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_partner_multi_relation/readme/INSTALL.rst
 create mode 100644 fieldservice_partner_multi_relation/readme/ROADMAP.rst
 create mode 100644 fieldservice_partner_multi_relation/readme/USAGE.rst
 create mode 100644 fieldservice_partner_multi_relation/static/description/icon.png
 create mode 100644 fieldservice_partner_multi_relation/static/description/index.html

diff --git a/fieldservice_partner_multi_relation/README.rst b/fieldservice_partner_multi_relation/README.rst
new file mode 100644
index 0000000000..6f55c109b5
--- /dev/null
+++ b/fieldservice_partner_multi_relation/README.rst
@@ -0,0 +1,117 @@
+===============================
+Field Service Partner Relations
+===============================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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_partner_multi_relation
+    :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_partner_multi_relation
+    :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| 
+
+Partner Multi Relations does not support FSM Locations as a left or right
+partner_id, only Organisation and Person
+
+This module allows you to connect partner_multi_relations with FSM Locations and
+comes with a predifined list of relation types for the user to use.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Installation
+============
+
+First install partner_multi_relation from OCA/partner-contact and then
+install the fieldservice module. After these are installed you can install
+this module.
+
+Please refer to the installation instructions available at:
+https://github.com/OCA/field-service/tree/11.0/fieldservice_partner_multi_relation
+
+Configuration
+=============
+
+To use this module, you need to:
+
+* Go to Contacts > Relation Types
+* Create or select a relation type with FSM location
+* Choose wether or not make it a unique relation
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go to Contacts > Relations
+* Set a relation of your choosing using your new type
+
+Known issues / Roadmap
+======================
+
+The roadmap of the Field Service application is documented on
+`Github <https://github.com/OCA/field-service/issues/66>`_.
+
+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_partner_multi_relation%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
+~~~~~~~~~~~~
+
+* Steven Campbell <scampbell@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.
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_partner_multi_relation>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_partner_multi_relation/__init__.py b/fieldservice_partner_multi_relation/__init__.py
new file mode 100644
index 0000000000..da2feecfe9
--- /dev/null
+++ b/fieldservice_partner_multi_relation/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_partner_multi_relation/__manifest__.py b/fieldservice_partner_multi_relation/__manifest__.py
new file mode 100644
index 0000000000..2f85787adc
--- /dev/null
+++ b/fieldservice_partner_multi_relation/__manifest__.py
@@ -0,0 +1,20 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    "name": "Field Service Partner Relations",
+    "version": "11.0.1.0.0",
+    'category': 'Field Service',
+    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
+    "website": "https://github.com/OCA/partner-contact",
+    "complexity": "normal",
+    "license": "AGPL-3",
+    "depends": [
+        'contacts',
+        'sales_team',
+        'partner_multi_relation'
+    ],
+    "demo": [
+        "data/demo.xml",
+    ]
+
+}
diff --git a/fieldservice_partner_multi_relation/data/demo.xml b/fieldservice_partner_multi_relation/data/demo.xml
new file mode 100644
index 0000000000..dccce47168
--- /dev/null
+++ b/fieldservice_partner_multi_relation/data/demo.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- owns  -->
+    <record id="rel_type_owns_loc" model="res.partner.relation.type">
+        <field name="name">owns</field>
+        <field name="name_inverse">is owned by</field>
+        <field name="contact_type_left">fsm-location</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_owns_per" model="res.partner.relation.type">
+        <field name="name">owns</field>
+        <field name="name_inverse">is owned by</field>
+        <field name="contact_type_left">p</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_owns_org" model="res.partner.relation.type">
+        <field name="name">owns</field>
+        <field name="name_inverse">is owned by</field>
+        <field name="contact_type_left">c</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+
+    <!-- manages  -->
+    <record id="rel_type_manages_loc" model="res.partner.relation.type">
+        <field name="name">manges</field>
+        <field name="name_inverse">is managed by</field>
+        <field name="contact_type_left">fsm-location</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_manages_org" model="res.partner.relation.type">
+        <field name="name">manges</field>
+        <field name="name_inverse">is managed by</field>
+        <field name="contact_type_left">c</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_manages_per" model="res.partner.relation.type">
+        <field name="name">manges</field>
+        <field name="name_inverse">is managed by</field>
+        <field name="contact_type_left">p</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+
+    <!-- pays the invoices for  -->
+    <record id="rel_type_pays_invoices_loc" model="res.partner.relation.type">
+        <field name="name">pays the invoices for</field>
+        <field name="name_inverse">gets the invoices paid by</field>
+        <field name="contact_type_left">fsm-location</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_pays_invoices_org" model="res.partner.relation.type">
+        <field name="name">pays the invoices for</field>
+        <field name="name_inverse">gets the invoices paid by</field>
+        <field name="contact_type_left">c</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_pays_invoices_per" model="res.partner.relation.type">
+        <field name="name">pays the invoices for</field>
+        <field name="name_inverse">gets the invoices paid by</field>
+        <field name="contact_type_left">p</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+
+    <!-- is the primary contact of  -->
+    <record id="rel_type_primary_contact_loc" model="res.partner.relation.type">
+        <field name="name">is the primary contact of</field>
+        <field name="name_inverse">whose primary contact</field>
+        <field name="contact_type_left">fsm-location</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_primary_contact_org" model="res.partner.relation.type">
+        <field name="name">is the primary contact of</field>
+        <field name="name_inverse">whose primary contact</field>
+        <field name="contact_type_left">c</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_primary_contact_per" model="res.partner.relation.type">
+        <field name="name">is the primary contact of</field>
+        <field name="name_inverse">whose primary contact</field>
+        <field name="contact_type_left">p</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+
+    <!-- is the secondary contact of  -->
+    <record id="rel_type_secondary_contact_loc" model="res.partner.relation.type">
+        <field name="name">is the secondary contact of</field>
+        <field name="name_inverse">whose secondary contact</field>
+        <field name="contact_type_left">fsm-location</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_secondary_contact_org" model="res.partner.relation.type">
+        <field name="name">is the secondary contact of</field>
+        <field name="name_inverse">whose secondary contact</field>
+        <field name="contact_type_left">c</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_secondary_contact_per" model="res.partner.relation.type">
+        <field name="name">is the secondary contact of</field>
+        <field name="name_inverse">whose secondary contact</field>
+        <field name="contact_type_left">p</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+
+    <!-- is a tenant of  -->
+    <record id="rel_type_tenant_loc" model="res.partner.relation.type">
+        <field name="name">is a tenant of</field>
+        <field name="name_inverse">is occupied by</field>
+        <field name="contact_type_left">fsm-location</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_tenant_org" model="res.partner.relation.type">
+        <field name="name">is a tenant of</field>
+        <field name="name_inverse">is occupied by</field>
+        <field name="contact_type_left">c</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_tenant_per" model="res.partner.relation.type">
+        <field name="name">is a tenant of</field>
+        <field name="name_inverse">is occupied by</field>
+        <field name="contact_type_left">p</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+
+    <!-- is an employee at  -->
+    <record id="rel_type_employee_loc" model="res.partner.relation.type">
+        <field name="name">is an employee at</field>
+        <field name="name_inverse">employs</field>
+        <field name="contact_type_left">fsm-location</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_employee_org" model="res.partner.relation.type">
+        <field name="name">is an employee at</field>
+        <field name="name_inverse">employs</field>
+        <field name="contact_type_left">c</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+    <record id="rel_type_employee_per" model="res.partner.relation.type">
+        <field name="name">is an employee at</field>
+        <field name="name_inverse">employs</field>
+        <field name="contact_type_left">p</field>
+        <field name="contact_type_right">fsm-location</field>
+        <field name="is_unique" eval="True" />
+    </record>
+</odoo>
diff --git a/fieldservice_partner_multi_relation/models/__init__.py b/fieldservice_partner_multi_relation/models/__init__.py
new file mode 100644
index 0000000000..17fa5f3c11
--- /dev/null
+++ b/fieldservice_partner_multi_relation/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import res_partner_relation_type
+from . import res_partner
+
diff --git a/fieldservice_partner_multi_relation/models/res_partner.py b/fieldservice_partner_multi_relation/models/res_partner.py
new file mode 100644
index 0000000000..9a16eccada
--- /dev/null
+++ b/fieldservice_partner_multi_relation/models/res_partner.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    @api.multi
+    def get_partner_type(self):
+        super(ResPartner, self)
+        """Get partner type for relation.
+        :return: 'c' for company or 'p' for person or
+        'fsm-location' for FSM Location
+        :rtype: str
+        """
+        self.ensure_one()
+        if self.fsm_location:
+            return 'fsm-location'
+        elif self.is_company:
+            return 'c'
+        else:
+            return 'p'
diff --git a/fieldservice_partner_multi_relation/models/res_partner_relation_type.py b/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
new file mode 100644
index 0000000000..8e6f5cbd10
--- /dev/null
+++ b/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
@@ -0,0 +1,50 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, models
+
+HANDLE_INVALID_ONCHANGE = [
+    ('restrict',
+     _('Do not allow change that will result in invalid relations')),
+    ('ignore',
+     _('Allow existing relations that do not fit changed conditions')),
+    ('end',
+     _('End relations per today, if they do not fit changed conditions')),
+    ('delete',
+     _('Delete relations that do not fit changed conditions')),
+]
+
+
+class ResPartnerRelationType(models.Model):
+    _inherit = 'res.partner.relation.type'
+
+    @api.multi
+    def get_partner_types(self):
+        super(ResPartnerRelationType, self)
+        return [
+            ('c', _('Organisation')),
+            ('p', _('Person')),
+            ('fsm-location', _('FSM Location'))
+        ]
+    
+    @api.multi
+    def _check_partner(self, side):
+        super(ResPartnerRelationType, self)
+        for record in self:
+            assert side in ['left', 'right']
+            ptype = getattr(record.type_id, "contact_type_%s" % side)
+            partner = getattr(record, '%s_partner_id' % side)
+            if ((ptype == 'c' and not partner.is_company) or
+                    (ptype == 'p' and partner.is_company) or 
+                        (ptype == 'fsm-location' and 
+                         not partner.fsm_location)):
+                raise ValidationError(
+                    _('The %s partner is not applicable for this '
+                      'relation type.') % side
+                )
+            category = getattr(record.type_id, "partner_category_%s" % side)
+            if category and category.id not in partner.category_id.ids:
+                raise ValidationError(
+                    _('The %s partner does not have category %s.') %
+                    (side, category.name)
+                )
diff --git a/fieldservice_partner_multi_relation/readme/CONFIGURE.rst b/fieldservice_partner_multi_relation/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..ee87c4cb82
--- /dev/null
+++ b/fieldservice_partner_multi_relation/readme/CONFIGURE.rst
@@ -0,0 +1,5 @@
+To use this module, you need to:
+
+* Go to Contacts > Relation Types
+* Create or select a relation type with FSM location
+* Choose wether or not make it a unique relation
diff --git a/fieldservice_partner_multi_relation/readme/CONTRIBUTORS.rst b/fieldservice_partner_multi_relation/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..8fa8bb9784
--- /dev/null
+++ b/fieldservice_partner_multi_relation/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Steven Campbell <scampbell@opensourceintegrators.com>
diff --git a/fieldservice_partner_multi_relation/readme/CREDITS.rst b/fieldservice_partner_multi_relation/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_partner_multi_relation/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_partner_multi_relation/readme/DESCRIPTION.rst b/fieldservice_partner_multi_relation/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..2ca979b08e
--- /dev/null
+++ b/fieldservice_partner_multi_relation/readme/DESCRIPTION.rst
@@ -0,0 +1,5 @@
+Partner Multi Relations does not support FSM Locations as a left or right
+partner_id, only Organisation and Person
+
+This module allows you to connect partner_multi_relations with FSM Locations and
+comes with a predifined list of relation types for the user to use.
diff --git a/fieldservice_partner_multi_relation/readme/INSTALL.rst b/fieldservice_partner_multi_relation/readme/INSTALL.rst
new file mode 100644
index 0000000000..188baec870
--- /dev/null
+++ b/fieldservice_partner_multi_relation/readme/INSTALL.rst
@@ -0,0 +1,6 @@
+First install partner_multi_relation from OCA/partner-contact and then
+install the fieldservice module. After these are installed you can install
+this module.
+
+Please refer to the installation instructions available at:
+https://github.com/OCA/field-service/tree/11.0/fieldservice_partner_multi_relation
diff --git a/fieldservice_partner_multi_relation/readme/ROADMAP.rst b/fieldservice_partner_multi_relation/readme/ROADMAP.rst
new file mode 100644
index 0000000000..b0ff1e4854
--- /dev/null
+++ b/fieldservice_partner_multi_relation/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/66>`_.
diff --git a/fieldservice_partner_multi_relation/readme/USAGE.rst b/fieldservice_partner_multi_relation/readme/USAGE.rst
new file mode 100644
index 0000000000..2e3806d9cb
--- /dev/null
+++ b/fieldservice_partner_multi_relation/readme/USAGE.rst
@@ -0,0 +1,4 @@
+To use this module, you need to:
+
+* Go to Contacts > Relations
+* Set a relation of your choosing using your new type
diff --git a/fieldservice_partner_multi_relation/static/description/icon.png b/fieldservice_partner_multi_relation/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_partner_multi_relation/static/description/index.html b/fieldservice_partner_multi_relation/static/description/index.html
new file mode 100644
index 0000000000..917c496e33
--- /dev/null
+++ b/fieldservice_partner_multi_relation/static/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 Partner Relations</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-partner-relations">
+<h1 class="title">Field Service Partner Relations</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_partner_multi_relation"><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_partner_multi_relation"><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>Partner Multi Relations does not support FSM Locations as a left or right
+partner_id, only Organisation and Person</p>
+<p>This module allows you to connect partner_multi_relations with FSM Locations and
+comes with a predifined list of relation types for the user to use.</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>First install partner_multi_relation from OCA/partner-contact and then
+install the fieldservice module. After these are installed you can install
+this module.</p>
+<p>Please refer to the installation instructions available at:
+<a class="reference external" href="https://github.com/OCA/field-service/tree/11.0/fieldservice_partner_multi_relation">https://github.com/OCA/field-service/tree/11.0/fieldservice_partner_multi_relation</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 Contacts &gt; Relation Types</li>
+<li>Create or select a relation type with FSM location</li>
+<li>Choose wether or not make it a unique relation</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 Contacts &gt; Relations</li>
+<li>Set a relation of your choosing using your new type</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/66">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_partner_multi_relation%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>Steven Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#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>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/11.0/fieldservice_partner_multi_relation">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 b8b20530e88cbf67514ff6f9cebb828503bf1c5e Mon Sep 17 00:00:00 2001
From: osi-scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 17 Jan 2019 12:56:35 -0700
Subject: [PATCH 177/631] [IMP] flake8

---
 .../models/res_partner_relation_type.py                  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fieldservice_partner_multi_relation/models/res_partner_relation_type.py b/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
index 8e6f5cbd10..ec6c081923 100644
--- a/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
+++ b/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, models
+from odoo.exceptions import ValidationError
 
 HANDLE_INVALID_ONCHANGE = [
     ('restrict',
@@ -26,7 +27,7 @@ def get_partner_types(self):
             ('p', _('Person')),
             ('fsm-location', _('FSM Location'))
         ]
-    
+
     @api.multi
     def _check_partner(self, side):
         super(ResPartnerRelationType, self)
@@ -35,9 +36,9 @@ def _check_partner(self, side):
             ptype = getattr(record.type_id, "contact_type_%s" % side)
             partner = getattr(record, '%s_partner_id' % side)
             if ((ptype == 'c' and not partner.is_company) or
-                    (ptype == 'p' and partner.is_company) or 
-                        (ptype == 'fsm-location' and 
-                         not partner.fsm_location)):
+                    (ptype == 'p' and partner.is_company) or
+                    (ptype == 'fsm-location' and
+                     not partner.fsm_location)):
                 raise ValidationError(
                     _('The %s partner is not applicable for this '
                       'relation type.') % side

From 53f245dd2450790da8c3d3bf249ffe4512f7763e Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 23 Jan 2019 13:27:51 -0600
Subject: [PATCH 178/631] [FIX] fieldservice_partner_multi_relation

---
 fieldservice_partner_multi_relation/models/__init__.py    | 1 -
 fieldservice_partner_multi_relation/models/res_partner.py | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fieldservice_partner_multi_relation/models/__init__.py b/fieldservice_partner_multi_relation/models/__init__.py
index 17fa5f3c11..1f68c26cd0 100644
--- a/fieldservice_partner_multi_relation/models/__init__.py
+++ b/fieldservice_partner_multi_relation/models/__init__.py
@@ -3,4 +3,3 @@
 
 from . import res_partner_relation_type
 from . import res_partner
-
diff --git a/fieldservice_partner_multi_relation/models/res_partner.py b/fieldservice_partner_multi_relation/models/res_partner.py
index 9a16eccada..c5f1d1093a 100644
--- a/fieldservice_partner_multi_relation/models/res_partner.py
+++ b/fieldservice_partner_multi_relation/models/res_partner.py
@@ -9,12 +9,13 @@ class ResPartner(models.Model):
 
     @api.multi
     def get_partner_type(self):
-        super(ResPartner, self)
-        """Get partner type for relation.
+        """
+        Get partner type for relation.
         :return: 'c' for company or 'p' for person or
-        'fsm-location' for FSM Location
+                 'fsm-location' for FSM Location
         :rtype: str
         """
+        super(ResPartner, self)
         self.ensure_one()
         if self.fsm_location:
             return 'fsm-location'

From 6a83da9a94fceda26d2b7759a63ce435c99cfcfd Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Mon, 22 Apr 2019 17:06:48 +0530
Subject: [PATCH 179/631] [MIG][12.0] fieldservice_partner_multi_relation

---
 .../README.rst                                | 19 +++++++---
 .../__init__.py                               |  1 -
 .../__manifest__.py                           | 12 +++----
 .../data/demo.xml                             | 21 -----------
 .../models/__init__.py                        |  1 -
 .../models/res_partner.py                     |  6 +---
 .../models/res_partner_relation_type.py       | 36 +------------------
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../static/description/index.html             |  9 +++--
 9 files changed, 29 insertions(+), 77 deletions(-)

diff --git a/fieldservice_partner_multi_relation/README.rst b/fieldservice_partner_multi_relation/README.rst
index 6f55c109b5..febb21a839 100644
--- a/fieldservice_partner_multi_relation/README.rst
+++ b/fieldservice_partner_multi_relation/README.rst
@@ -14,13 +14,13 @@ Field Service Partner Relations
     :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_partner_multi_relation
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_partner_multi_relation
     :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_partner_multi_relation
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_partner_multi_relation
     :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| 
@@ -75,7 +75,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_partner_multi_relation%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_partner_multi_relation%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.
 
@@ -91,6 +91,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Steven Campbell <scampbell@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -112,6 +113,14 @@ 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.
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_partner_multi_relation>`_ project on GitHub.
+.. |maintainer-max3903| image:: https://github.com/max3903.png?size=40px
+    :target: https://github.com/max3903
+    :alt: max3903
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-max3903| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_partner_multi_relation>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_partner_multi_relation/__init__.py b/fieldservice_partner_multi_relation/__init__.py
index da2feecfe9..69f7babdfb 100644
--- a/fieldservice_partner_multi_relation/__init__.py
+++ b/fieldservice_partner_multi_relation/__init__.py
@@ -1,4 +1,3 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
diff --git a/fieldservice_partner_multi_relation/__manifest__.py b/fieldservice_partner_multi_relation/__manifest__.py
index 2f85787adc..8eb9c4bb6a 100644
--- a/fieldservice_partner_multi_relation/__manifest__.py
+++ b/fieldservice_partner_multi_relation/__manifest__.py
@@ -2,19 +2,19 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service Partner Relations",
-    "version": "11.0.1.0.0",
+    "version": "12.0.1.0.0",
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     "website": "https://github.com/OCA/partner-contact",
     "complexity": "normal",
     "license": "AGPL-3",
     "depends": [
-        'contacts',
-        'sales_team',
-        'partner_multi_relation'
+        'partner_multi_relation',
+        'fieldservice'
     ],
     "demo": [
         "data/demo.xml",
-    ]
-
+    ],
+    'development_status': 'Beta',
+    'maintainers': ['max3903'],
 }
diff --git a/fieldservice_partner_multi_relation/data/demo.xml b/fieldservice_partner_multi_relation/data/demo.xml
index dccce47168..70a4c7e5d2 100644
--- a/fieldservice_partner_multi_relation/data/demo.xml
+++ b/fieldservice_partner_multi_relation/data/demo.xml
@@ -6,21 +6,18 @@
         <field name="name_inverse">is owned by</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_owns_per" model="res.partner.relation.type">
         <field name="name">owns</field>
         <field name="name_inverse">is owned by</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_owns_org" model="res.partner.relation.type">
         <field name="name">owns</field>
         <field name="name_inverse">is owned by</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
 
     <!-- manages  -->
@@ -29,21 +26,18 @@
         <field name="name_inverse">is managed by</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_manages_org" model="res.partner.relation.type">
         <field name="name">manges</field>
         <field name="name_inverse">is managed by</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_manages_per" model="res.partner.relation.type">
         <field name="name">manges</field>
         <field name="name_inverse">is managed by</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
 
     <!-- pays the invoices for  -->
@@ -52,21 +46,18 @@
         <field name="name_inverse">gets the invoices paid by</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_pays_invoices_org" model="res.partner.relation.type">
         <field name="name">pays the invoices for</field>
         <field name="name_inverse">gets the invoices paid by</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_pays_invoices_per" model="res.partner.relation.type">
         <field name="name">pays the invoices for</field>
         <field name="name_inverse">gets the invoices paid by</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
 
     <!-- is the primary contact of  -->
@@ -75,21 +66,18 @@
         <field name="name_inverse">whose primary contact</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_primary_contact_org" model="res.partner.relation.type">
         <field name="name">is the primary contact of</field>
         <field name="name_inverse">whose primary contact</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_primary_contact_per" model="res.partner.relation.type">
         <field name="name">is the primary contact of</field>
         <field name="name_inverse">whose primary contact</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
 
     <!-- is the secondary contact of  -->
@@ -98,21 +86,18 @@
         <field name="name_inverse">whose secondary contact</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_secondary_contact_org" model="res.partner.relation.type">
         <field name="name">is the secondary contact of</field>
         <field name="name_inverse">whose secondary contact</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_secondary_contact_per" model="res.partner.relation.type">
         <field name="name">is the secondary contact of</field>
         <field name="name_inverse">whose secondary contact</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
 
     <!-- is a tenant of  -->
@@ -121,21 +106,18 @@
         <field name="name_inverse">is occupied by</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_tenant_org" model="res.partner.relation.type">
         <field name="name">is a tenant of</field>
         <field name="name_inverse">is occupied by</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_tenant_per" model="res.partner.relation.type">
         <field name="name">is a tenant of</field>
         <field name="name_inverse">is occupied by</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
 
     <!-- is an employee at  -->
@@ -144,20 +126,17 @@
         <field name="name_inverse">employs</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_employee_org" model="res.partner.relation.type">
         <field name="name">is an employee at</field>
         <field name="name_inverse">employs</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
     <record id="rel_type_employee_per" model="res.partner.relation.type">
         <field name="name">is an employee at</field>
         <field name="name_inverse">employs</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
-        <field name="is_unique" eval="True" />
     </record>
 </odoo>
diff --git a/fieldservice_partner_multi_relation/models/__init__.py b/fieldservice_partner_multi_relation/models/__init__.py
index 1f68c26cd0..afae7c673f 100644
--- a/fieldservice_partner_multi_relation/models/__init__.py
+++ b/fieldservice_partner_multi_relation/models/__init__.py
@@ -1,4 +1,3 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import res_partner_relation_type
diff --git a/fieldservice_partner_multi_relation/models/res_partner.py b/fieldservice_partner_multi_relation/models/res_partner.py
index c5f1d1093a..144b3151f5 100644
--- a/fieldservice_partner_multi_relation/models/res_partner.py
+++ b/fieldservice_partner_multi_relation/models/res_partner.py
@@ -15,11 +15,7 @@ def get_partner_type(self):
                  'fsm-location' for FSM Location
         :rtype: str
         """
-        super(ResPartner, self)
         self.ensure_one()
         if self.fsm_location:
             return 'fsm-location'
-        elif self.is_company:
-            return 'c'
-        else:
-            return 'p'
+        return super(ResPartner, self).get_partner_type()
diff --git a/fieldservice_partner_multi_relation/models/res_partner_relation_type.py b/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
index ec6c081923..6a7bb3aa96 100644
--- a/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
+++ b/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
@@ -2,18 +2,6 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, models
-from odoo.exceptions import ValidationError
-
-HANDLE_INVALID_ONCHANGE = [
-    ('restrict',
-     _('Do not allow change that will result in invalid relations')),
-    ('ignore',
-     _('Allow existing relations that do not fit changed conditions')),
-    ('end',
-     _('End relations per today, if they do not fit changed conditions')),
-    ('delete',
-     _('Delete relations that do not fit changed conditions')),
-]
 
 
 class ResPartnerRelationType(models.Model):
@@ -21,31 +9,9 @@ class ResPartnerRelationType(models.Model):
 
     @api.multi
     def get_partner_types(self):
-        super(ResPartnerRelationType, self)
+        super(ResPartnerRelationType, self).get_partner_types()
         return [
             ('c', _('Organisation')),
             ('p', _('Person')),
             ('fsm-location', _('FSM Location'))
         ]
-
-    @api.multi
-    def _check_partner(self, side):
-        super(ResPartnerRelationType, self)
-        for record in self:
-            assert side in ['left', 'right']
-            ptype = getattr(record.type_id, "contact_type_%s" % side)
-            partner = getattr(record, '%s_partner_id' % side)
-            if ((ptype == 'c' and not partner.is_company) or
-                    (ptype == 'p' and partner.is_company) or
-                    (ptype == 'fsm-location' and
-                     not partner.fsm_location)):
-                raise ValidationError(
-                    _('The %s partner is not applicable for this '
-                      'relation type.') % side
-                )
-            category = getattr(record.type_id, "partner_category_%s" % side)
-            if category and category.id not in partner.category_id.ids:
-                raise ValidationError(
-                    _('The %s partner does not have category %s.') %
-                    (side, category.name)
-                )
diff --git a/fieldservice_partner_multi_relation/readme/CONTRIBUTORS.rst b/fieldservice_partner_multi_relation/readme/CONTRIBUTORS.rst
index 8fa8bb9784..f40f65a097 100644
--- a/fieldservice_partner_multi_relation/readme/CONTRIBUTORS.rst
+++ b/fieldservice_partner_multi_relation/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Steven Campbell <scampbell@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_partner_multi_relation/static/description/index.html b/fieldservice_partner_multi_relation/static/description/index.html
index 917c496e33..ff33fc87a3 100644
--- a/fieldservice_partner_multi_relation/static/description/index.html
+++ b/fieldservice_partner_multi_relation/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service Partner Relations</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_partner_multi_relation"><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_partner_multi_relation"><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_partner_multi_relation"><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_partner_multi_relation"><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>Partner Multi Relations does not support FSM Locations as a left or right
 partner_id, only Organisation and Person</p>
 <p>This module allows you to connect partner_multi_relations with FSM Locations and
@@ -424,7 +424,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_partner_multi_relation%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_partner_multi_relation%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">
@@ -439,6 +439,7 @@ <h2><a class="toc-backref" href="#id7">Authors</a></h2>
 <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
 <li>Steven Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#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">
@@ -455,7 +456,9 @@ <h2><a class="toc-backref" href="#id10">Maintainers</a></h2>
 <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>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/11.0/fieldservice_partner_multi_relation">OCA/field-service</a> project on GitHub.</p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
+<p><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_partner_multi_relation">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 2e39784d5e7d860d1aaa7e9aa1756fc3d8fd9fa3 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 7 Jun 2019 10:28:03 -0700
Subject: [PATCH 180/631] [IMP][ADD] Smart Button FSM Location to Relations

---
 .../__manifest__.py                           |  4 +++
 .../models/__init__.py                        |  1 +
 .../models/fsm_location.py                    | 35 +++++++++++++++++++
 .../views/fsm_location.xml                    | 22 ++++++++++++
 .../views/menu.xml                            |  9 +++++
 5 files changed, 71 insertions(+)
 create mode 100644 fieldservice_partner_multi_relation/models/fsm_location.py
 create mode 100644 fieldservice_partner_multi_relation/views/fsm_location.xml
 create mode 100644 fieldservice_partner_multi_relation/views/menu.xml

diff --git a/fieldservice_partner_multi_relation/__manifest__.py b/fieldservice_partner_multi_relation/__manifest__.py
index 8eb9c4bb6a..f3d43d2ca9 100644
--- a/fieldservice_partner_multi_relation/__manifest__.py
+++ b/fieldservice_partner_multi_relation/__manifest__.py
@@ -12,6 +12,10 @@
         'partner_multi_relation',
         'fieldservice'
     ],
+    "data": [
+        'views/fsm_location.xml',
+        'views/menu.xml'
+    ],
     "demo": [
         "data/demo.xml",
     ],
diff --git a/fieldservice_partner_multi_relation/models/__init__.py b/fieldservice_partner_multi_relation/models/__init__.py
index afae7c673f..708edadd81 100644
--- a/fieldservice_partner_multi_relation/models/__init__.py
+++ b/fieldservice_partner_multi_relation/models/__init__.py
@@ -2,3 +2,4 @@
 
 from . import res_partner_relation_type
 from . import res_partner
+from . import fsm_location
diff --git a/fieldservice_partner_multi_relation/models/fsm_location.py b/fieldservice_partner_multi_relation/models/fsm_location.py
new file mode 100644
index 0000000000..747d281bc2
--- /dev/null
+++ b/fieldservice_partner_multi_relation/models/fsm_location.py
@@ -0,0 +1,35 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMLocation(models.Model):
+    _inherit = 'fsm.location'
+
+    rel_count = fields.Integer(string='Relations',
+                               compute='_compute_relation_count')
+
+    @api.multi
+    def _compute_relation_count(self):
+        for location in self:
+            location.rel_count = self.env['res.partner.relation.all'].\
+                search_count([('this_partner_id', '=', location.name)])
+
+    @api.multi
+    def action_view_relations(self):
+        """
+        This function returns an action that display existing
+        partner relations of a given fsm location id.
+        """
+        for location in self:
+            action = self.env.\
+                ref('partner_multi_relation.tree_res_partner_relation_all').\
+                read()[0]
+            relations = self.env['res.partner.relation.all'].\
+                search([('this_partner_id', '=', location.name)])
+            action = self.env.\
+                ref('partner_multi_relation.action_res_partner_relation_all')\
+                .read()[0]
+            action['domain'] = [('id', 'in', relations.ids)]
+            return action
diff --git a/fieldservice_partner_multi_relation/views/fsm_location.xml b/fieldservice_partner_multi_relation/views/fsm_location.xml
new file mode 100644
index 0000000000..5503590922
--- /dev/null
+++ b/fieldservice_partner_multi_relation/views/fsm_location.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Field Service Location Form View-->
+    <record id="fsm_location_relations_form_view" model="ir.ui.view">
+        <field name="name">fsm.location.relations.form.view</field>
+        <field name="model">fsm.location</field>
+        <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
+        <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <button name="action_view_relations"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-thumbs-up">
+                    <field name="rel_count"
+                           widget="statinfo"
+                           string="Relations"/>
+                </button>
+            </div>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_partner_multi_relation/views/menu.xml b/fieldservice_partner_multi_relation/views/menu.xml
new file mode 100644
index 0000000000..ee241e56d6
--- /dev/null
+++ b/fieldservice_partner_multi_relation/views/menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <menuitem id="reporting"
+                name="Relations"
+                sequence="40"
+                parent="fieldservice.config"
+                action="partner_multi_relation.action_res_partner_relation_all"
+                groups="fieldservice.group_fsm_dispatcher"/>
+</odoo>

From 14dab2da3338ea6567c75b26db4872169c7245cb Mon Sep 17 00:00:00 2001
From: Steve Campbell <scampbell@opensourceintegrators.com>
Date: Tue, 25 Jun 2019 09:56:01 -0700
Subject: [PATCH 181/631] [IMP] fieldservice_partner_multi_relation: Integrate
 FSM in Partner Multi Relation (#240)

---
 .../data/demo.xml                             |  84 +++----
 .../models/__init__.py                        |   1 +
 .../models/res_partner_relation_all.py        | 220 ++++++++++++++++++
 .../static/description/index.html             |   2 +-
 4 files changed, 264 insertions(+), 43 deletions(-)
 create mode 100644 fieldservice_partner_multi_relation/models/res_partner_relation_all.py

diff --git a/fieldservice_partner_multi_relation/data/demo.xml b/fieldservice_partner_multi_relation/data/demo.xml
index 70a4c7e5d2..b9a95a1724 100644
--- a/fieldservice_partner_multi_relation/data/demo.xml
+++ b/fieldservice_partner_multi_relation/data/demo.xml
@@ -2,140 +2,140 @@
 <odoo>
     <!-- owns  -->
     <record id="rel_type_owns_loc" model="res.partner.relation.type">
-        <field name="name">owns</field>
-        <field name="name_inverse">is owned by</field>
+        <field name="name">[L+L] owns</field>
+        <field name="name_inverse">[L+L] is owned by</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_owns_per" model="res.partner.relation.type">
-        <field name="name">owns</field>
-        <field name="name_inverse">is owned by</field>
+        <field name="name">[P+L] owns</field>
+        <field name="name_inverse">[L+P] is owned by</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_owns_org" model="res.partner.relation.type">
-        <field name="name">owns</field>
-        <field name="name_inverse">is owned by</field>
+        <field name="name">[C+L] owns</field>
+        <field name="name_inverse">[L+C] is owned by</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
 
     <!-- manages  -->
     <record id="rel_type_manages_loc" model="res.partner.relation.type">
-        <field name="name">manges</field>
-        <field name="name_inverse">is managed by</field>
+        <field name="name">[L+L] manages</field>
+        <field name="name_inverse">[L+L] is managed by</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_manages_org" model="res.partner.relation.type">
-        <field name="name">manges</field>
-        <field name="name_inverse">is managed by</field>
+        <field name="name">[C+L] manages</field>
+        <field name="name_inverse">[L+C] is managed by</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_manages_per" model="res.partner.relation.type">
-        <field name="name">manges</field>
-        <field name="name_inverse">is managed by</field>
+        <field name="name">[P+L] manages</field>
+        <field name="name_inverse">[L+P] is managed by</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
 
     <!-- pays the invoices for  -->
     <record id="rel_type_pays_invoices_loc" model="res.partner.relation.type">
-        <field name="name">pays the invoices for</field>
-        <field name="name_inverse">gets the invoices paid by</field>
+        <field name="name">[L+L] pays the invoices for</field>
+        <field name="name_inverse">[L+L] gets the invoices paid by</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_pays_invoices_org" model="res.partner.relation.type">
-        <field name="name">pays the invoices for</field>
-        <field name="name_inverse">gets the invoices paid by</field>
+        <field name="name">[C+L] pays the invoices for</field>
+        <field name="name_inverse">[L+C] gets the invoices paid by</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_pays_invoices_per" model="res.partner.relation.type">
-        <field name="name">pays the invoices for</field>
-        <field name="name_inverse">gets the invoices paid by</field>
+        <field name="name">[P+L] pays the invoices for</field>
+        <field name="name_inverse">[L+P] gets the invoices paid by</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
 
     <!-- is the primary contact of  -->
     <record id="rel_type_primary_contact_loc" model="res.partner.relation.type">
-        <field name="name">is the primary contact of</field>
-        <field name="name_inverse">whose primary contact</field>
+        <field name="name">[L+L] is the primary contact of</field>
+        <field name="name_inverse">[L+L] whose primary contact</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_primary_contact_org" model="res.partner.relation.type">
-        <field name="name">is the primary contact of</field>
-        <field name="name_inverse">whose primary contact</field>
+        <field name="name">[C+L] is the primary contact of</field>
+        <field name="name_inverse">[L+C] whose primary contact</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_primary_contact_per" model="res.partner.relation.type">
-        <field name="name">is the primary contact of</field>
-        <field name="name_inverse">whose primary contact</field>
+        <field name="name">[P+L] is the primary contact of</field>
+        <field name="name_inverse">[L+P] whose primary contact</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
 
     <!-- is the secondary contact of  -->
     <record id="rel_type_secondary_contact_loc" model="res.partner.relation.type">
-        <field name="name">is the secondary contact of</field>
-        <field name="name_inverse">whose secondary contact</field>
+        <field name="name">[L+L] is the secondary contact of</field>
+        <field name="name_inverse">[L+L] whose secondary contact</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_secondary_contact_org" model="res.partner.relation.type">
-        <field name="name">is the secondary contact of</field>
-        <field name="name_inverse">whose secondary contact</field>
+        <field name="name">[C+L] is the secondary contact of</field>
+        <field name="name_inverse">[L+C] whose secondary contact</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_secondary_contact_per" model="res.partner.relation.type">
-        <field name="name">is the secondary contact of</field>
-        <field name="name_inverse">whose secondary contact</field>
+        <field name="name">[P+L] is the secondary contact of</field>
+        <field name="name_inverse">[L+P] whose secondary contact</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
 
     <!-- is a tenant of  -->
     <record id="rel_type_tenant_loc" model="res.partner.relation.type">
-        <field name="name">is a tenant of</field>
-        <field name="name_inverse">is occupied by</field>
+        <field name="name">[L+L] is a tenant of</field>
+        <field name="name_inverse">[L+L] is occupied by</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_tenant_org" model="res.partner.relation.type">
-        <field name="name">is a tenant of</field>
-        <field name="name_inverse">is occupied by</field>
+        <field name="name">[C+L] is a tenant of</field>
+        <field name="name_inverse">[L+C] is occupied by</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_tenant_per" model="res.partner.relation.type">
-        <field name="name">is a tenant of</field>
-        <field name="name_inverse">is occupied by</field>
+        <field name="name">[P+L] is a tenant of</field>
+        <field name="name_inverse">[L+P] is occupied by</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
 
     <!-- is an employee at  -->
     <record id="rel_type_employee_loc" model="res.partner.relation.type">
-        <field name="name">is an employee at</field>
-        <field name="name_inverse">employs</field>
+        <field name="name">[L+L] is an employee at</field>
+        <field name="name_inverse">[L+L] employs</field>
         <field name="contact_type_left">fsm-location</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_employee_org" model="res.partner.relation.type">
-        <field name="name">is an employee at</field>
-        <field name="name_inverse">employs</field>
+        <field name="name">[C+L] is an employee at</field>
+        <field name="name_inverse">[L+C] employs</field>
         <field name="contact_type_left">c</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
     <record id="rel_type_employee_per" model="res.partner.relation.type">
-        <field name="name">is an employee at</field>
-        <field name="name_inverse">employs</field>
+        <field name="name">[P+L] is an employee at</field>
+        <field name="name_inverse">[L+P] employs</field>
         <field name="contact_type_left">p</field>
         <field name="contact_type_right">fsm-location</field>
     </record>
diff --git a/fieldservice_partner_multi_relation/models/__init__.py b/fieldservice_partner_multi_relation/models/__init__.py
index 708edadd81..5be357425d 100644
--- a/fieldservice_partner_multi_relation/models/__init__.py
+++ b/fieldservice_partner_multi_relation/models/__init__.py
@@ -3,3 +3,4 @@
 from . import res_partner_relation_type
 from . import res_partner
 from . import fsm_location
+from . import res_partner_relation_all
diff --git a/fieldservice_partner_multi_relation/models/res_partner_relation_all.py b/fieldservice_partner_multi_relation/models/res_partner_relation_all.py
new file mode 100644
index 0000000000..914151eca4
--- /dev/null
+++ b/fieldservice_partner_multi_relation/models/res_partner_relation_all.py
@@ -0,0 +1,220 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models, _
+from odoo.exceptions import ValidationError
+
+
+class ResPartnerRelationAll(models.AbstractModel):
+    _inherit = 'res.partner.relation.all'
+
+    @api.onchange('this_partner_id')
+    def onchange_this_partner_id(self):
+        if self.this_partner_id:
+            type_id = self.env['res.partner.relation.type'].\
+                search([('name', '=', self.type_selection_id.name)])
+            if (type_id.contact_type_left == 'fsm-location'
+                    or type_id.contact_type_right == 'fsm-location'
+                    or self.this_partner_id.fsm_location
+                    or self.other_partner_id.fsm_location):
+                if not self.type_selection_id:
+                    return self.set_domain_type()
+            elif not self.this_partner_id:
+                if not self.other_partner_id:
+                    return {'domain': {'type_selection_id': ''}}
+
+            else:
+                super(ResPartnerRelationAll, self).onchange_partner_id()
+        else:
+            # Remove left_cat domain on type
+            return self.set_domain_type()
+
+    @api.onchange('other_partner_id')
+    def onchange_other_partner_id(self):
+        if self.other_partner_id:
+            type_id = self.env['res.partner.relation.type'].\
+                search([('name', '=', self.type_selection_id.name)])
+            if (type_id.contact_type_left == 'fsm-location'
+                    or type_id.contact_type_right == 'fsm-location'
+                    or self.this_partner_id.fsm_location
+                    or self.other_partner_id.fsm_location):
+                if not type_id:
+                    return self.set_domain_type()
+                elif not self.other_partner_id:
+                    if not self.this_partner_id:
+                        return {'domain': {'type_selection_id': ''}}
+
+            else:
+                super(ResPartnerRelationAll, self).onchange_partner_id()
+        else:
+            # Remove right_cat domain on type
+            self.set_domain_type()
+
+    @api.onchange('type_selection_id')
+    def onchange_type_selection_id(self):
+        # Clear any prexisting domains
+        if not self.type_selection_id:
+            return {'domain':
+                    {'this_partner_id': [('id', '!=', None)],
+                     'other_partner_id': [('id', '!=', None)]}}
+        type_id = self.env['res.partner.relation.type'].\
+            search([('name', '=', self.type_selection_id.name)])
+        if (type_id.contact_type_left == 'fsm-location'
+                or type_id.contact_type_right == 'fsm-location'
+                or self.this_partner_id.fsm_location
+                or self.other_partner_id.fsm_location):
+            if self.this_partner_id and self.other_partner_id:
+                # Check
+                self.try_type()
+            elif self.this_partner_id:
+                # Set domain Right
+                res = self.set_domain_right()
+                return res
+            elif self.other_partner_id:
+                # Set domain Left
+                res = self.set_domain_left()
+                return res
+            else:
+                res = self.set_domain_left()
+                res2 = self.set_domain_right()
+                res.update(res2['domain'])
+                return res
+        else:
+            super(ResPartnerRelationAll, self).onchange_type_selection_id()
+
+    def try_type(self):
+        type_id = self.env['res.partner.relation.type'].\
+            search([('name', '=', self.type_selection_id.name)])
+        # From Type
+        left_cat = type_id.contact_type_left
+        right_cat = type_id.contact_type_right
+        # Left Partner
+        left_to_test = self.this_partner_id
+        # Right Partner
+        right_to_test = self.other_partner_id
+
+        # Compare
+        if left_cat == 'p':
+            if left_to_test.company_type != 'person':
+                raise ValidationError(_('Left Partner not type Person'))
+        if left_cat == 'c':
+            if left_to_test.company_type != 'compnay':
+                raise ValidationError(_('Left Partner not type Company'))
+        if left_cat == 'fsm-location':
+            if not left_to_test.fsm_location:
+                raise ValidationError(_('Left Partner not type FSM Location'))
+
+        if right_cat == 'p':
+            if right_to_test.company_type != 'person':
+                raise ValidationError(_('Right Partner not type Person'))
+        if right_cat == 'c':
+            if right_to_test.company_type != 'compnay':
+                raise ValidationError(_('Right Partner not type Company'))
+        if right_cat == 'fsm-location':
+            if not right_to_test.fsm_location:
+                raise ValidationError(
+                    _('Right Partner not type FSM Location'))
+
+    def set_domain_left(self):
+        type_id = self.env['res.partner.relation.type'].\
+            search([('name', '=', self.type_selection_id.name)])
+        # From Type
+        res = {}
+        # With a Relation Type
+        if type_id:
+            left_cat = type_id.contact_type_left
+            # Create domain for Left based on Type Left Category
+            res = self.build_domain(1, left_cat)
+            return res
+        # Without a Relation Type
+        else:
+            res = {'domain': {'this_partner_id': ''}}
+
+    def set_domain_right(self):
+        type_id = self.env['res.partner.relation.type'].\
+            search([('name', '=', self.type_selection_id.name)])
+        # From Type
+        res = {}
+        # With a Relation Type
+        if type_id:
+            right_cat = type_id.contact_type_right
+            # Create domain for Right based on Type Right Category
+            res = self.build_domain(0, right_cat)
+            return res
+        # Wtihout a Relation Type
+        else:
+            res = {'domain': {'other_partner_id': ''}}
+
+    def set_domain_type(self):
+        res = {}
+        # If Left & Right then Type must match both
+        if self.this_partner_id and self.other_partner_id:
+            left_cat = self.get_cat(self.this_partner_id)
+            right_cat = self.get_cat(self.other_partner_id)
+            type_ids = self.env['res.partner.relation.type'].\
+                search([('contact_type_left', '=', left_cat),
+                        ('contact_type_right', '=', right_cat)])
+            type_names = []
+            for type_id in type_ids:
+                type_names.append(type_id.name)
+            # From Type
+            res = {'domain':
+                   {'type_selection_id': [('name', 'in', type_names)]}}
+        # If Left Type must match Left
+        elif self.this_partner_id:
+            left_cat = self.get_cat(self.this_partner_id)
+            type_ids = self.env['res.partner.relation.type'].\
+                search([('contact_type_left', '=', left_cat)])
+            type_names = []
+            for type_id in type_ids:
+                type_names.append(type_id.name)
+            res = {'domain':
+                   {'type_selection_id': [('name', 'in', type_names)]}}
+        # If Right Type must match Right
+        elif self.other_partner_id:
+            right_cat = self.get_cat(self.other_partner_id)
+            type_ids = self.env['res.partner.relation.type'].\
+                search([('contact_type_right', '=', right_cat)])
+            type_names = []
+            for type_id in type_ids:
+                type_names.append(type_id.name)
+            res = {'domain':
+                   {'type_selection_id': [('name', 'in', type_names)]}}
+        return res
+
+    def build_domain(self, side, cat):
+        build = {}
+        if cat == 'p':
+            if side:
+                build = {'domain':
+                         {'this_partner_id':
+                          [('company_type', '=', 'person')]}}
+            else:
+                build = {'domain':
+                         {'other_partner_id':
+                          [('company_type', '=', 'person')]}}
+        if cat == 'c':
+            if side:
+                build = {'domain':
+                         {'this_partner_id':
+                          [('company_type', '=', 'company')]}}
+            else:
+                build = {'domain':
+                         {'other_partner_id':
+                          [('company_type', '=', 'company')]}}
+        if cat == 'fsm-location':
+            if side:
+                build = {'domain':
+                         {'this_partner_id': [('fsm_location', '=', True)]}}
+            else:
+                build = {'domain':
+                         {'other_partner_id': [('fsm_location', '=', True)]}}
+        return build
+
+    def get_cat(self, partner):
+        if partner.fsm_location:
+            return 'fsm-location'
+        elif partner.company_type == 'person':
+            return 'p'
+        else:
+            return 'c'
diff --git a/fieldservice_partner_multi_relation/static/description/index.html b/fieldservice_partner_multi_relation/static/description/index.html
index ff33fc87a3..0dee5b6d8b 100644
--- a/fieldservice_partner_multi_relation/static/description/index.html
+++ b/fieldservice_partner_multi_relation/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 Partner Relations</title>
 <style type="text/css">
 

From a7eb27cf9b0e41c3b1488f9fbfb21caeb91d1be7 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 11 Oct 2019 12:32:38 -0500
Subject: [PATCH 182/631] [IMP] fieldservice_partner_multi_relation

---
 .../__manifest__.py                           |  17 +-
 .../i18n/de.po                                | 308 +++++++++++++++++
 .../i18n/es.po                                | 308 +++++++++++++++++
 .../i18n/es_CL.po                             | 308 +++++++++++++++++
 .../fieldservice_partner_multi_relation.pot   | 306 +++++++++++++++++
 .../i18n/pt_BR.po                             | 310 ++++++++++++++++++
 6 files changed, 1549 insertions(+), 8 deletions(-)
 create mode 100644 fieldservice_partner_multi_relation/i18n/de.po
 create mode 100644 fieldservice_partner_multi_relation/i18n/es.po
 create mode 100644 fieldservice_partner_multi_relation/i18n/es_CL.po
 create mode 100644 fieldservice_partner_multi_relation/i18n/fieldservice_partner_multi_relation.pot
 create mode 100644 fieldservice_partner_multi_relation/i18n/pt_BR.po

diff --git a/fieldservice_partner_multi_relation/__manifest__.py b/fieldservice_partner_multi_relation/__manifest__.py
index f3d43d2ca9..64f163f50d 100644
--- a/fieldservice_partner_multi_relation/__manifest__.py
+++ b/fieldservice_partner_multi_relation/__manifest__.py
@@ -2,23 +2,24 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Field Service Partner Relations",
+    "summary": "Manage relations between contacts, companies and locations",
     "version": "12.0.1.0.0",
-    'category': 'Field Service',
-    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
+    "category": "Field Service",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/partner-contact",
     "complexity": "normal",
     "license": "AGPL-3",
     "depends": [
-        'partner_multi_relation',
-        'fieldservice'
+        "partner_multi_relation",
+        "fieldservice"
     ],
     "data": [
-        'views/fsm_location.xml',
-        'views/menu.xml'
+        "views/fsm_location.xml",
+        "views/menu.xml"
     ],
     "demo": [
         "data/demo.xml",
     ],
-    'development_status': 'Beta',
-    'maintainers': ['max3903'],
+    "development_status": "Beta",
+    "maintainers": ["max3903"],
 }
diff --git a/fieldservice_partner_multi_relation/i18n/de.po b/fieldservice_partner_multi_relation/i18n/de.po
new file mode 100644
index 0000000000..c33421c90e
--- /dev/null
+++ b/fieldservice_partner_multi_relation/i18n/de.po
@@ -0,0 +1,308 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_partner_multi_relation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-26 17:58+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_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner_relation_all
+msgid "All (non-inverse + inverse) relations between partners"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:16
+#, python-format
+msgid "FSM Location"
+msgstr "Field-Service-Ort"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_fsm_location
+msgid "Field Service Location"
+msgstr "Field-Service-Ort"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:102
+#, python-format
+msgid "Left Partner not type Company"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:105
+#, python-format
+msgid "Left Partner not type FSM Location"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:99
+#, python-format
+msgid "Left Partner not type Person"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:14
+#, python-format
+msgid "Organisation"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner_relation_type
+msgid "Partner Relation Type"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:15
+#, python-format
+msgid "Person"
+msgstr "Person"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_fsm_location__rel_count
+#: model:ir.ui.menu,name:fieldservice_partner_multi_relation.reporting
+#: model_terms:ir.ui.view,arch_db:fieldservice_partner_multi_relation.fsm_location_relations_form_view
+msgid "Relations"
+msgstr "Beziehungen"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:112
+#, python-format
+msgid "Right Partner not type Company"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:116
+#, python-format
+msgid "Right Partner not type FSM Location"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:109
+#, python-format
+msgid "Right Partner not type Person"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_org
+msgid "[C+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_org
+msgid "[C+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_org
+msgid "[C+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_org
+msgid "[C+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_org
+msgid "[C+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_org
+msgid "[C+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_org
+msgid "[C+L] pays the invoices for"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_org
+msgid "[L+C] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_org
+msgid "[L+C] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_org
+msgid "[L+C] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_org
+msgid "[L+C] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_org
+msgid "[L+C] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_org
+msgid "[L+C] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_org
+msgid "[L+C] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_loc
+msgid "[L+L] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_loc
+msgid "[L+L] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_loc
+msgid "[L+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_loc
+msgid "[L+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_loc
+msgid "[L+L] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_loc
+msgid "[L+L] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_loc
+msgid "[L+L] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_loc
+msgid "[L+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_loc
+msgid "[L+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_loc
+msgid "[L+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_loc
+msgid "[L+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_loc
+msgid "[L+L] pays the invoices for"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_loc
+msgid "[L+L] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_loc
+msgid "[L+L] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_per
+msgid "[L+P] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_per
+msgid "[L+P] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_per
+msgid "[L+P] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_per
+msgid "[L+P] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_per
+msgid "[L+P] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_per
+msgid "[L+P] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_per
+msgid "[L+P] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_per
+msgid "[P+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_per
+msgid "[P+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_per
+msgid "[P+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_per
+msgid "[P+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_per
+msgid "[P+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_per
+msgid "[P+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_per
+msgid "[P+L] pays the invoices for"
+msgstr ""
diff --git a/fieldservice_partner_multi_relation/i18n/es.po b/fieldservice_partner_multi_relation/i18n/es.po
new file mode 100644
index 0000000000..629ea1c21a
--- /dev/null
+++ b/fieldservice_partner_multi_relation/i18n/es.po
@@ -0,0 +1,308 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_partner_multi_relation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-03-04 00:14+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.10\n"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner_relation_all
+msgid "All (non-inverse + inverse) relations between partners"
+msgstr "Todas las relaciones (no inversas + inversas) entre socios"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:16
+#, python-format
+msgid "FSM Location"
+msgstr "Ubicación FSM"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación de Servicio de Campo"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:102
+#, python-format
+msgid "Left Partner not type Company"
+msgstr "Contacto abandonado no es tipoEmpresa"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:105
+#, python-format
+msgid "Left Partner not type FSM Location"
+msgstr "El contacto izquierdo no es tipo ubicación FSM"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:99
+#, python-format
+msgid "Left Partner not type Person"
+msgstr "El contacto izquierdo no es tipo persona"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:14
+#, python-format
+msgid "Organisation"
+msgstr "Organización"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner_relation_type
+msgid "Partner Relation Type"
+msgstr "Tipo de Relación Contacto"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:15
+#, python-format
+msgid "Person"
+msgstr "Persona"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_fsm_location__rel_count
+#: model:ir.ui.menu,name:fieldservice_partner_multi_relation.reporting
+#: model_terms:ir.ui.view,arch_db:fieldservice_partner_multi_relation.fsm_location_relations_form_view
+msgid "Relations"
+msgstr "Relaciones"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:112
+#, python-format
+msgid "Right Partner not type Company"
+msgstr "El contacto derecho no es tipo empresa"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:116
+#, python-format
+msgid "Right Partner not type FSM Location"
+msgstr "El contacto derecho no es tipo ubicación FSM"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:109
+#, python-format
+msgid "Right Partner not type Person"
+msgstr "El contacto derecho no es tipo Persona"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_org
+msgid "[C+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_org
+msgid "[C+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_org
+msgid "[C+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_org
+msgid "[C+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_org
+msgid "[C+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_org
+msgid "[C+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_org
+msgid "[C+L] pays the invoices for"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_org
+msgid "[L+C] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_org
+msgid "[L+C] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_org
+msgid "[L+C] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_org
+msgid "[L+C] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_org
+msgid "[L+C] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_org
+msgid "[L+C] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_org
+msgid "[L+C] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_loc
+msgid "[L+L] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_loc
+msgid "[L+L] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_loc
+msgid "[L+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_loc
+msgid "[L+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_loc
+msgid "[L+L] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_loc
+msgid "[L+L] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_loc
+msgid "[L+L] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_loc
+msgid "[L+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_loc
+msgid "[L+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_loc
+msgid "[L+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_loc
+msgid "[L+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_loc
+msgid "[L+L] pays the invoices for"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_loc
+msgid "[L+L] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_loc
+msgid "[L+L] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_per
+msgid "[L+P] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_per
+msgid "[L+P] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_per
+msgid "[L+P] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_per
+msgid "[L+P] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_per
+msgid "[L+P] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_per
+msgid "[L+P] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_per
+msgid "[L+P] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_per
+msgid "[P+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_per
+msgid "[P+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_per
+msgid "[P+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_per
+msgid "[P+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_per
+msgid "[P+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_per
+msgid "[P+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_per
+msgid "[P+L] pays the invoices for"
+msgstr ""
diff --git a/fieldservice_partner_multi_relation/i18n/es_CL.po b/fieldservice_partner_multi_relation/i18n/es_CL.po
new file mode 100644
index 0000000000..a62fd1d551
--- /dev/null
+++ b/fieldservice_partner_multi_relation/i18n/es_CL.po
@@ -0,0 +1,308 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_partner_multi_relation
+#
+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_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner_relation_all
+msgid "All (non-inverse + inverse) relations between partners"
+msgstr "Todas las relaciones (no inversas + inversas) entre socios"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:16
+#, python-format
+msgid "FSM Location"
+msgstr "Ubicación FSM"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación de Servicio de Campo"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:102
+#, python-format
+msgid "Left Partner not type Company"
+msgstr "Contacto abandonado no es tipoEmpresa"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:105
+#, python-format
+msgid "Left Partner not type FSM Location"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:99
+#, python-format
+msgid "Left Partner not type Person"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:14
+#, python-format
+msgid "Organisation"
+msgstr "Organización"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner_relation_type
+msgid "Partner Relation Type"
+msgstr "Tipo de Relación Contacto"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:15
+#, python-format
+msgid "Person"
+msgstr "Persona"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_fsm_location__rel_count
+#: model:ir.ui.menu,name:fieldservice_partner_multi_relation.reporting
+#: model_terms:ir.ui.view,arch_db:fieldservice_partner_multi_relation.fsm_location_relations_form_view
+msgid "Relations"
+msgstr "Relaciones"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:112
+#, python-format
+msgid "Right Partner not type Company"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:116
+#, python-format
+msgid "Right Partner not type FSM Location"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:109
+#, python-format
+msgid "Right Partner not type Person"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_org
+msgid "[C+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_org
+msgid "[C+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_org
+msgid "[C+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_org
+msgid "[C+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_org
+msgid "[C+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_org
+msgid "[C+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_org
+msgid "[C+L] pays the invoices for"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_org
+msgid "[L+C] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_org
+msgid "[L+C] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_org
+msgid "[L+C] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_org
+msgid "[L+C] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_org
+msgid "[L+C] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_org
+msgid "[L+C] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_org
+msgid "[L+C] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_loc
+msgid "[L+L] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_loc
+msgid "[L+L] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_loc
+msgid "[L+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_loc
+msgid "[L+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_loc
+msgid "[L+L] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_loc
+msgid "[L+L] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_loc
+msgid "[L+L] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_loc
+msgid "[L+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_loc
+msgid "[L+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_loc
+msgid "[L+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_loc
+msgid "[L+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_loc
+msgid "[L+L] pays the invoices for"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_loc
+msgid "[L+L] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_loc
+msgid "[L+L] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_per
+msgid "[L+P] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_per
+msgid "[L+P] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_per
+msgid "[L+P] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_per
+msgid "[L+P] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_per
+msgid "[L+P] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_per
+msgid "[L+P] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_per
+msgid "[L+P] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_per
+msgid "[P+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_per
+msgid "[P+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_per
+msgid "[P+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_per
+msgid "[P+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_per
+msgid "[P+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_per
+msgid "[P+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_per
+msgid "[P+L] pays the invoices for"
+msgstr ""
diff --git a/fieldservice_partner_multi_relation/i18n/fieldservice_partner_multi_relation.pot b/fieldservice_partner_multi_relation/i18n/fieldservice_partner_multi_relation.pot
new file mode 100644
index 0000000000..fb907a2e08
--- /dev/null
+++ b/fieldservice_partner_multi_relation/i18n/fieldservice_partner_multi_relation.pot
@@ -0,0 +1,306 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_partner_multi_relation
+#
+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_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner_relation_all
+msgid "All (non-inverse + inverse) relations between partners"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:16
+#, python-format
+msgid "FSM Location"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:102
+#, python-format
+msgid "Left Partner not type Company"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:105
+#, python-format
+msgid "Left Partner not type FSM Location"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:99
+#, python-format
+msgid "Left Partner not type Person"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:14
+#, python-format
+msgid "Organisation"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner_relation_type
+msgid "Partner Relation Type"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:15
+#, python-format
+msgid "Person"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_fsm_location__rel_count
+#: model:ir.ui.menu,name:fieldservice_partner_multi_relation.reporting
+#: model_terms:ir.ui.view,arch_db:fieldservice_partner_multi_relation.fsm_location_relations_form_view
+msgid "Relations"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:112
+#, python-format
+msgid "Right Partner not type Company"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:116
+#, python-format
+msgid "Right Partner not type FSM Location"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:109
+#, python-format
+msgid "Right Partner not type Person"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_org
+msgid "[C+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_org
+msgid "[C+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_org
+msgid "[C+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_org
+msgid "[C+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_org
+msgid "[C+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_org
+msgid "[C+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_org
+msgid "[C+L] pays the invoices for"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_org
+msgid "[L+C] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_org
+msgid "[L+C] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_org
+msgid "[L+C] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_org
+msgid "[L+C] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_org
+msgid "[L+C] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_org
+msgid "[L+C] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_org
+msgid "[L+C] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_loc
+msgid "[L+L] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_loc
+msgid "[L+L] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_loc
+msgid "[L+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_loc
+msgid "[L+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_loc
+msgid "[L+L] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_loc
+msgid "[L+L] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_loc
+msgid "[L+L] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_loc
+msgid "[L+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_loc
+msgid "[L+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_loc
+msgid "[L+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_loc
+msgid "[L+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_loc
+msgid "[L+L] pays the invoices for"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_loc
+msgid "[L+L] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_loc
+msgid "[L+L] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_per
+msgid "[L+P] employs"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_per
+msgid "[L+P] gets the invoices paid by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_per
+msgid "[L+P] is managed by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_per
+msgid "[L+P] is occupied by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_per
+msgid "[L+P] is owned by"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_per
+msgid "[L+P] whose primary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_per
+msgid "[L+P] whose secondary contact"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_per
+msgid "[P+L] is a tenant of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_per
+msgid "[P+L] is an employee at"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_per
+msgid "[P+L] is the primary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_per
+msgid "[P+L] is the secondary contact of"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_per
+msgid "[P+L] manages"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_per
+msgid "[P+L] owns"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_per
+msgid "[P+L] pays the invoices for"
+msgstr ""
+
diff --git a/fieldservice_partner_multi_relation/i18n/pt_BR.po b/fieldservice_partner_multi_relation/i18n/pt_BR.po
new file mode 100644
index 0000000000..51f5339151
--- /dev/null
+++ b/fieldservice_partner_multi_relation/i18n/pt_BR.po
@@ -0,0 +1,310 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_partner_multi_relation
+#
+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"
+"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_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner_relation_all
+msgid "All (non-inverse + inverse) relations between partners"
+msgstr "Todas as relações (não inversas + inversas) entre parceiros"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner
+msgid "Contact"
+msgstr "Contato"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:16
+#, python-format
+msgid "FSM Location"
+msgstr "Localização do FSM (Field Service Management)"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_fsm_location
+msgid "Field Service Location"
+msgstr "Local do Serviço de Campo"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:102
+#, python-format
+msgid "Left Partner not type Company"
+msgstr "Parceiro à Esquerda, não Tipo Empresa"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:105
+#, python-format
+msgid "Left Partner not type FSM Location"
+msgstr ""
+"Parceiro à Esquerda, não Tipo Localização no FSM (Field Service Management)"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:99
+#, python-format
+msgid "Left Partner not type Person"
+msgstr "Parceiro à Esquerda, não Tipo Pessoa"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:14
+#, python-format
+msgid "Organisation"
+msgstr "Organização"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model,name:fieldservice_partner_multi_relation.model_res_partner_relation_type
+msgid "Partner Relation Type"
+msgstr "Tipo de Relação do Parceiro"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:15
+#, python-format
+msgid "Person"
+msgstr "Pessoa"
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_fsm_location__rel_count
+#: model:ir.ui.menu,name:fieldservice_partner_multi_relation.reporting
+#: model_terms:ir.ui.view,arch_db:fieldservice_partner_multi_relation.fsm_location_relations_form_view
+msgid "Relations"
+msgstr "Relações"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:112
+#, python-format
+msgid "Right Partner not type Company"
+msgstr "Parceiro à Direita, não Tipo Empresa"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:116
+#, python-format
+msgid "Right Partner not type FSM Location"
+msgstr ""
+"Parceiro à Direita, não Tipo Localização no FSM (Field Service Management)"
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:109
+#, python-format
+msgid "Right Partner not type Person"
+msgstr "Parceiro à Direita, não Tipo Pessoa"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_org
+msgid "[C+L] is a tenant of"
+msgstr "[C+L] é um inquilino de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_org
+msgid "[C+L] is an employee at"
+msgstr "[C+L] é um funcionário da"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_org
+msgid "[C+L] is the primary contact of"
+msgstr "[C+L] é o contato primário de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_org
+msgid "[C+L] is the secondary contact of"
+msgstr "[C+L] é o contato secundário de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_org
+msgid "[C+L] manages"
+msgstr "[C+L] gerencias"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_org
+msgid "[C+L] owns"
+msgstr "[C+L] donos"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_org
+msgid "[C+L] pays the invoices for"
+msgstr "[C+L] paga as faturas para"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_org
+msgid "[L+C] employs"
+msgstr "[L + C] emprega"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_org
+msgid "[L+C] gets the invoices paid by"
+msgstr "[L+C] recebe as faturas pagas por"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_org
+msgid "[L+C] is managed by"
+msgstr "[L+C] é gerenciado por"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_org
+msgid "[L+C] is occupied by"
+msgstr "[L+C] é ocupado por"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_org
+msgid "[L+C] is owned by"
+msgstr "[L+C] é propriedade de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_org
+msgid "[L+C] whose primary contact"
+msgstr "[L + C] cujo contato principal"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_org
+msgid "[L+C] whose secondary contact"
+msgstr "[L + C] cujo contato secundário"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_loc
+msgid "[L+L] employs"
+msgstr "[L + L] emprega"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_loc
+msgid "[L+L] gets the invoices paid by"
+msgstr "[L+L] recebe as faturas pagas por"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_loc
+msgid "[L+L] is a tenant of"
+msgstr "[L+L] é um inquilino de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_loc
+msgid "[L+L] is an employee at"
+msgstr "[L+L] é um funcionário da"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_loc
+msgid "[L+L] is managed by"
+msgstr "[L+L] é gerenciado por"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_loc
+msgid "[L+L] is occupied by"
+msgstr "[L+L] é ocupado por"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_loc
+msgid "[L+L] is owned by"
+msgstr "[L+L] é propriedade de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_loc
+msgid "[L+L] is the primary contact of"
+msgstr "[L+L] é o contato primário de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_loc
+msgid "[L+L] is the secondary contact of"
+msgstr "[L+L] é o contato secundário de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_loc
+msgid "[L+L] manages"
+msgstr "[L+L] gerencias"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_loc
+msgid "[L+L] owns"
+msgstr "[L+L] donos"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_loc
+msgid "[L+L] pays the invoices for"
+msgstr "[L+L] paga as faturas para"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_loc
+msgid "[L+L] whose primary contact"
+msgstr "[L + L] cujo contato principal"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_loc
+msgid "[L+L] whose secondary contact"
+msgstr "[L + L] cujo contato secundário"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_employee_per
+msgid "[L+P] employs"
+msgstr "[L + P] emprega"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_pays_invoices_per
+msgid "[L+P] gets the invoices paid by"
+msgstr "[L+P] recebe as faturas pagas por"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_manages_per
+msgid "[L+P] is managed by"
+msgstr "[L+P] é gerenciado por"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_tenant_per
+msgid "[L+P] is occupied by"
+msgstr "[L+P] é ocupado por"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_owns_per
+msgid "[L+P] is owned by"
+msgstr "[L+P] é propriedade de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_primary_contact_per
+msgid "[L+P] whose primary contact"
+msgstr "[L + P] cujo contato principal"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name_inverse:fieldservice_partner_multi_relation.rel_type_secondary_contact_per
+msgid "[L+P] whose secondary contact"
+msgstr "[L + P] cujo contato secundário"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_tenant_per
+msgid "[P+L] is a tenant of"
+msgstr "[P+L] é um inquilino de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_employee_per
+msgid "[P+L] is an employee at"
+msgstr "[P+L] é um funcionário da"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_primary_contact_per
+msgid "[P+L] is the primary contact of"
+msgstr "[P+L] é o contato primário de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_secondary_contact_per
+msgid "[P+L] is the secondary contact of"
+msgstr "[P+L] é o contato secundário de"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_manages_per
+msgid "[P+L] manages"
+msgstr "[P+L] gerencias"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_owns_per
+msgid "[P+L] owns"
+msgstr "[P+L] donos"
+
+#. module: fieldservice_partner_multi_relation
+#: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_per
+msgid "[P+L] pays the invoices for"
+msgstr "[P+L] paga as faturas para"

From 7d91351db240d487e558761a9b12bf5c63cb7c8e Mon Sep 17 00:00:00 2001
From: Vimal Patel <vimal.patel.serpentcs@gmail.com>
Date: Mon, 5 Jul 2021 12:13:49 +0530
Subject: [PATCH 183/631] [14.0][MIG]fieldservice_partner_multi_relation:
 Travis

---
 .../__manifest__.py                           |  12 +-
 .../data/demo.xml                             |   2 +-
 .../models/fsm_location.py                    |  29 +--
 .../models/res_partner.py                     |   4 +-
 .../models/res_partner_relation_all.py        | 196 ++++++++++--------
 .../models/res_partner_relation_type.py       |   8 +-
 .../views/fsm_location.xml                    |  18 +-
 .../views/menu.xml                            |  16 +-
 .../fieldservice_partner_multi_relation       |   1 +
 .../setup.py                                  |   6 +
 10 files changed, 155 insertions(+), 137 deletions(-)
 create mode 120000 setup/fieldservice_partner_multi_relation/odoo/addons/fieldservice_partner_multi_relation
 create mode 100644 setup/fieldservice_partner_multi_relation/setup.py

diff --git a/fieldservice_partner_multi_relation/__manifest__.py b/fieldservice_partner_multi_relation/__manifest__.py
index 64f163f50d..1379d5477f 100644
--- a/fieldservice_partner_multi_relation/__manifest__.py
+++ b/fieldservice_partner_multi_relation/__manifest__.py
@@ -3,20 +3,14 @@
 {
     "name": "Field Service Partner Relations",
     "summary": "Manage relations between contacts, companies and locations",
-    "version": "12.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/partner-contact",
     "complexity": "normal",
     "license": "AGPL-3",
-    "depends": [
-        "partner_multi_relation",
-        "fieldservice"
-    ],
-    "data": [
-        "views/fsm_location.xml",
-        "views/menu.xml"
-    ],
+    "depends": ["partner_multi_relation", "fieldservice"],
+    "data": ["views/fsm_location.xml", "views/menu.xml"],
     "demo": [
         "data/demo.xml",
     ],
diff --git a/fieldservice_partner_multi_relation/data/demo.xml b/fieldservice_partner_multi_relation/data/demo.xml
index b9a95a1724..971a24f6be 100644
--- a/fieldservice_partner_multi_relation/data/demo.xml
+++ b/fieldservice_partner_multi_relation/data/demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <!-- owns  -->
     <record id="rel_type_owns_loc" model="res.partner.relation.type">
diff --git a/fieldservice_partner_multi_relation/models/fsm_location.py b/fieldservice_partner_multi_relation/models/fsm_location.py
index 747d281bc2..14c3320dae 100644
--- a/fieldservice_partner_multi_relation/models/fsm_location.py
+++ b/fieldservice_partner_multi_relation/models/fsm_location.py
@@ -5,16 +5,16 @@
 
 
 class FSMLocation(models.Model):
-    _inherit = 'fsm.location'
+    _inherit = "fsm.location"
 
-    rel_count = fields.Integer(string='Relations',
-                               compute='_compute_relation_count')
+    rel_count = fields.Integer(string="Relations", compute="_compute_relation_count")
 
     @api.multi
     def _compute_relation_count(self):
         for location in self:
-            location.rel_count = self.env['res.partner.relation.all'].\
-                search_count([('this_partner_id', '=', location.name)])
+            location.rel_count = self.env["res.partner.relation.all"].search_count(
+                [("this_partner_id", "=", location.name)]
+            )
 
     @api.multi
     def action_view_relations(self):
@@ -23,13 +23,14 @@ def action_view_relations(self):
         partner relations of a given fsm location id.
         """
         for location in self:
-            action = self.env.\
-                ref('partner_multi_relation.tree_res_partner_relation_all').\
-                read()[0]
-            relations = self.env['res.partner.relation.all'].\
-                search([('this_partner_id', '=', location.name)])
-            action = self.env.\
-                ref('partner_multi_relation.action_res_partner_relation_all')\
-                .read()[0]
-            action['domain'] = [('id', 'in', relations.ids)]
+            action = self.env.ref(
+                "partner_multi_relation.tree_res_partner_relation_all"
+            ).read()[0]
+            relations = self.env["res.partner.relation.all"].search(
+                [("this_partner_id", "=", location.name)]
+            )
+            action = self.env.ref(
+                "partner_multi_relation.action_res_partner_relation_all"
+            ).read()[0]
+            action["domain"] = [("id", "in", relations.ids)]
             return action
diff --git a/fieldservice_partner_multi_relation/models/res_partner.py b/fieldservice_partner_multi_relation/models/res_partner.py
index 144b3151f5..2da7ecb1ae 100644
--- a/fieldservice_partner_multi_relation/models/res_partner.py
+++ b/fieldservice_partner_multi_relation/models/res_partner.py
@@ -5,7 +5,7 @@
 
 
 class ResPartner(models.Model):
-    _inherit = 'res.partner'
+    _inherit = "res.partner"
 
     @api.multi
     def get_partner_type(self):
@@ -17,5 +17,5 @@ def get_partner_type(self):
         """
         self.ensure_one()
         if self.fsm_location:
-            return 'fsm-location'
+            return "fsm-location"
         return super(ResPartner, self).get_partner_type()
diff --git a/fieldservice_partner_multi_relation/models/res_partner_relation_all.py b/fieldservice_partner_multi_relation/models/res_partner_relation_all.py
index 914151eca4..6484aa2a0d 100644
--- a/fieldservice_partner_multi_relation/models/res_partner_relation_all.py
+++ b/fieldservice_partner_multi_relation/models/res_partner_relation_all.py
@@ -1,27 +1,30 @@
 # Copyright (C) 2019 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, models, _
+from odoo import _, api, models
 from odoo.exceptions import ValidationError
 
 
 class ResPartnerRelationAll(models.AbstractModel):
-    _inherit = 'res.partner.relation.all'
+    _inherit = "res.partner.relation.all"
 
-    @api.onchange('this_partner_id')
+    @api.onchange("this_partner_id")
     def onchange_this_partner_id(self):
         if self.this_partner_id:
-            type_id = self.env['res.partner.relation.type'].\
-                search([('name', '=', self.type_selection_id.name)])
-            if (type_id.contact_type_left == 'fsm-location'
-                    or type_id.contact_type_right == 'fsm-location'
-                    or self.this_partner_id.fsm_location
-                    or self.other_partner_id.fsm_location):
+            type_id = self.env["res.partner.relation.type"].search(
+                [("name", "=", self.type_selection_id.name)]
+            )
+            if (
+                type_id.contact_type_left == "fsm-location"
+                or type_id.contact_type_right == "fsm-location"
+                or self.this_partner_id.fsm_location
+                or self.other_partner_id.fsm_location
+            ):
                 if not self.type_selection_id:
                     return self.set_domain_type()
             elif not self.this_partner_id:
                 if not self.other_partner_id:
-                    return {'domain': {'type_selection_id': ''}}
+                    return {"domain": {"type_selection_id": ""}}
 
             else:
                 super(ResPartnerRelationAll, self).onchange_partner_id()
@@ -29,20 +32,23 @@ def onchange_this_partner_id(self):
             # Remove left_cat domain on type
             return self.set_domain_type()
 
-    @api.onchange('other_partner_id')
+    @api.onchange("other_partner_id")
     def onchange_other_partner_id(self):
         if self.other_partner_id:
-            type_id = self.env['res.partner.relation.type'].\
-                search([('name', '=', self.type_selection_id.name)])
-            if (type_id.contact_type_left == 'fsm-location'
-                    or type_id.contact_type_right == 'fsm-location'
-                    or self.this_partner_id.fsm_location
-                    or self.other_partner_id.fsm_location):
+            type_id = self.env["res.partner.relation.type"].search(
+                [("name", "=", self.type_selection_id.name)]
+            )
+            if (
+                type_id.contact_type_left == "fsm-location"
+                or type_id.contact_type_right == "fsm-location"
+                or self.this_partner_id.fsm_location
+                or self.other_partner_id.fsm_location
+            ):
                 if not type_id:
                     return self.set_domain_type()
                 elif not self.other_partner_id:
                     if not self.this_partner_id:
-                        return {'domain': {'type_selection_id': ''}}
+                        return {"domain": {"type_selection_id": ""}}
 
             else:
                 super(ResPartnerRelationAll, self).onchange_partner_id()
@@ -50,19 +56,25 @@ def onchange_other_partner_id(self):
             # Remove right_cat domain on type
             self.set_domain_type()
 
-    @api.onchange('type_selection_id')
+    @api.onchange("type_selection_id")
     def onchange_type_selection_id(self):
         # Clear any prexisting domains
         if not self.type_selection_id:
-            return {'domain':
-                    {'this_partner_id': [('id', '!=', None)],
-                     'other_partner_id': [('id', '!=', None)]}}
-        type_id = self.env['res.partner.relation.type'].\
-            search([('name', '=', self.type_selection_id.name)])
-        if (type_id.contact_type_left == 'fsm-location'
-                or type_id.contact_type_right == 'fsm-location'
-                or self.this_partner_id.fsm_location
-                or self.other_partner_id.fsm_location):
+            return {
+                "domain": {
+                    "this_partner_id": [("id", "!=", None)],
+                    "other_partner_id": [("id", "!=", None)],
+                }
+            }
+        type_id = self.env["res.partner.relation.type"].search(
+            [("name", "=", self.type_selection_id.name)]
+        )
+        if (
+            type_id.contact_type_left == "fsm-location"
+            or type_id.contact_type_right == "fsm-location"
+            or self.this_partner_id.fsm_location
+            or self.other_partner_id.fsm_location
+        ):
             if self.this_partner_id and self.other_partner_id:
                 # Check
                 self.try_type()
@@ -77,14 +89,15 @@ def onchange_type_selection_id(self):
             else:
                 res = self.set_domain_left()
                 res2 = self.set_domain_right()
-                res.update(res2['domain'])
+                res.update(res2["domain"])
                 return res
         else:
             super(ResPartnerRelationAll, self).onchange_type_selection_id()
 
     def try_type(self):
-        type_id = self.env['res.partner.relation.type'].\
-            search([('name', '=', self.type_selection_id.name)])
+        type_id = self.env["res.partner.relation.type"].search(
+            [("name", "=", self.type_selection_id.name)]
+        )
         # From Type
         left_cat = type_id.contact_type_left
         right_cat = type_id.contact_type_right
@@ -94,30 +107,30 @@ def try_type(self):
         right_to_test = self.other_partner_id
 
         # Compare
-        if left_cat == 'p':
-            if left_to_test.company_type != 'person':
-                raise ValidationError(_('Left Partner not type Person'))
-        if left_cat == 'c':
-            if left_to_test.company_type != 'compnay':
-                raise ValidationError(_('Left Partner not type Company'))
-        if left_cat == 'fsm-location':
+        if left_cat == "p":
+            if left_to_test.company_type != "person":
+                raise ValidationError(_("Left Partner not type Person"))
+        if left_cat == "c":
+            if left_to_test.company_type != "compnay":
+                raise ValidationError(_("Left Partner not type Company"))
+        if left_cat == "fsm-location":
             if not left_to_test.fsm_location:
-                raise ValidationError(_('Left Partner not type FSM Location'))
-
-        if right_cat == 'p':
-            if right_to_test.company_type != 'person':
-                raise ValidationError(_('Right Partner not type Person'))
-        if right_cat == 'c':
-            if right_to_test.company_type != 'compnay':
-                raise ValidationError(_('Right Partner not type Company'))
-        if right_cat == 'fsm-location':
+                raise ValidationError(_("Left Partner not type FSM Location"))
+
+        if right_cat == "p":
+            if right_to_test.company_type != "person":
+                raise ValidationError(_("Right Partner not type Person"))
+        if right_cat == "c":
+            if right_to_test.company_type != "compnay":
+                raise ValidationError(_("Right Partner not type Company"))
+        if right_cat == "fsm-location":
             if not right_to_test.fsm_location:
-                raise ValidationError(
-                    _('Right Partner not type FSM Location'))
+                raise ValidationError(_("Right Partner not type FSM Location"))
 
     def set_domain_left(self):
-        type_id = self.env['res.partner.relation.type'].\
-            search([('name', '=', self.type_selection_id.name)])
+        type_id = self.env["res.partner.relation.type"].search(
+            [("name", "=", self.type_selection_id.name)]
+        )
         # From Type
         res = {}
         # With a Relation Type
@@ -128,11 +141,12 @@ def set_domain_left(self):
             return res
         # Without a Relation Type
         else:
-            res = {'domain': {'this_partner_id': ''}}
+            res = {"domain": {"this_partner_id": ""}}
 
     def set_domain_right(self):
-        type_id = self.env['res.partner.relation.type'].\
-            search([('name', '=', self.type_selection_id.name)])
+        type_id = self.env["res.partner.relation.type"].search(
+            [("name", "=", self.type_selection_id.name)]
+        )
         # From Type
         res = {}
         # With a Relation Type
@@ -143,7 +157,7 @@ def set_domain_right(self):
             return res
         # Wtihout a Relation Type
         else:
-            res = {'domain': {'other_partner_id': ''}}
+            res = {"domain": {"other_partner_id": ""}}
 
     def set_domain_type(self):
         res = {}
@@ -151,70 +165,70 @@ def set_domain_type(self):
         if self.this_partner_id and self.other_partner_id:
             left_cat = self.get_cat(self.this_partner_id)
             right_cat = self.get_cat(self.other_partner_id)
-            type_ids = self.env['res.partner.relation.type'].\
-                search([('contact_type_left', '=', left_cat),
-                        ('contact_type_right', '=', right_cat)])
+            type_ids = self.env["res.partner.relation.type"].search(
+                [
+                    ("contact_type_left", "=", left_cat),
+                    ("contact_type_right", "=", right_cat),
+                ]
+            )
             type_names = []
             for type_id in type_ids:
                 type_names.append(type_id.name)
             # From Type
-            res = {'domain':
-                   {'type_selection_id': [('name', 'in', type_names)]}}
+            res = {"domain": {"type_selection_id": [("name", "in", type_names)]}}
         # If Left Type must match Left
         elif self.this_partner_id:
             left_cat = self.get_cat(self.this_partner_id)
-            type_ids = self.env['res.partner.relation.type'].\
-                search([('contact_type_left', '=', left_cat)])
+            type_ids = self.env["res.partner.relation.type"].search(
+                [("contact_type_left", "=", left_cat)]
+            )
             type_names = []
             for type_id in type_ids:
                 type_names.append(type_id.name)
-            res = {'domain':
-                   {'type_selection_id': [('name', 'in', type_names)]}}
+            res = {"domain": {"type_selection_id": [("name", "in", type_names)]}}
         # If Right Type must match Right
         elif self.other_partner_id:
             right_cat = self.get_cat(self.other_partner_id)
-            type_ids = self.env['res.partner.relation.type'].\
-                search([('contact_type_right', '=', right_cat)])
+            type_ids = self.env["res.partner.relation.type"].search(
+                [("contact_type_right", "=", right_cat)]
+            )
             type_names = []
             for type_id in type_ids:
                 type_names.append(type_id.name)
-            res = {'domain':
-                   {'type_selection_id': [('name', 'in', type_names)]}}
+            res = {"domain": {"type_selection_id": [("name", "in", type_names)]}}
         return res
 
     def build_domain(self, side, cat):
         build = {}
-        if cat == 'p':
+        if cat == "p":
             if side:
-                build = {'domain':
-                         {'this_partner_id':
-                          [('company_type', '=', 'person')]}}
+                build = {
+                    "domain": {"this_partner_id": [("company_type", "=", "person")]}
+                }
             else:
-                build = {'domain':
-                         {'other_partner_id':
-                          [('company_type', '=', 'person')]}}
-        if cat == 'c':
+                build = {
+                    "domain": {"other_partner_id": [("company_type", "=", "person")]}
+                }
+        if cat == "c":
             if side:
-                build = {'domain':
-                         {'this_partner_id':
-                          [('company_type', '=', 'company')]}}
+                build = {
+                    "domain": {"this_partner_id": [("company_type", "=", "company")]}
+                }
             else:
-                build = {'domain':
-                         {'other_partner_id':
-                          [('company_type', '=', 'company')]}}
-        if cat == 'fsm-location':
+                build = {
+                    "domain": {"other_partner_id": [("company_type", "=", "company")]}
+                }
+        if cat == "fsm-location":
             if side:
-                build = {'domain':
-                         {'this_partner_id': [('fsm_location', '=', True)]}}
+                build = {"domain": {"this_partner_id": [("fsm_location", "=", True)]}}
             else:
-                build = {'domain':
-                         {'other_partner_id': [('fsm_location', '=', True)]}}
+                build = {"domain": {"other_partner_id": [("fsm_location", "=", True)]}}
         return build
 
     def get_cat(self, partner):
         if partner.fsm_location:
-            return 'fsm-location'
-        elif partner.company_type == 'person':
-            return 'p'
+            return "fsm-location"
+        elif partner.company_type == "person":
+            return "p"
         else:
-            return 'c'
+            return "c"
diff --git a/fieldservice_partner_multi_relation/models/res_partner_relation_type.py b/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
index 6a7bb3aa96..ebc9ef9778 100644
--- a/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
+++ b/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
@@ -5,13 +5,13 @@
 
 
 class ResPartnerRelationType(models.Model):
-    _inherit = 'res.partner.relation.type'
+    _inherit = "res.partner.relation.type"
 
     @api.multi
     def get_partner_types(self):
         super(ResPartnerRelationType, self).get_partner_types()
         return [
-            ('c', _('Organisation')),
-            ('p', _('Person')),
-            ('fsm-location', _('FSM Location'))
+            ("c", _("Organisation")),
+            ("p", _("Person")),
+            ("fsm-location", _("FSM Location")),
         ]
diff --git a/fieldservice_partner_multi_relation/views/fsm_location.xml b/fieldservice_partner_multi_relation/views/fsm_location.xml
index 5503590922..d0284bf7c5 100644
--- a/fieldservice_partner_multi_relation/views/fsm_location.xml
+++ b/fieldservice_partner_multi_relation/views/fsm_location.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <!-- Field Service Location Form View-->
     <record id="fsm_location_relations_form_view" model="ir.ui.view">
         <field name="name">fsm.location.relations.form.view</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">
             <div class="oe_button_box" position="inside">
-                <button name="action_view_relations"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-thumbs-up">
-                    <field name="rel_count"
-                           widget="statinfo"
-                           string="Relations"/>
+                <button
+                    name="action_view_relations"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-thumbs-up"
+                >
+                    <field name="rel_count" widget="statinfo" string="Relations" />
                 </button>
             </div>
         </field>
diff --git a/fieldservice_partner_multi_relation/views/menu.xml b/fieldservice_partner_multi_relation/views/menu.xml
index ee241e56d6..cddc17e899 100644
--- a/fieldservice_partner_multi_relation/views/menu.xml
+++ b/fieldservice_partner_multi_relation/views/menu.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <menuitem id="reporting"
-                name="Relations"
-                sequence="40"
-                parent="fieldservice.config"
-                action="partner_multi_relation.action_res_partner_relation_all"
-                groups="fieldservice.group_fsm_dispatcher"/>
+    <menuitem
+        id="reporting"
+        name="Relations"
+        sequence="40"
+        parent="fieldservice.config"
+        action="partner_multi_relation.action_res_partner_relation_all"
+        groups="fieldservice.group_fsm_dispatcher"
+    />
 </odoo>
diff --git a/setup/fieldservice_partner_multi_relation/odoo/addons/fieldservice_partner_multi_relation b/setup/fieldservice_partner_multi_relation/odoo/addons/fieldservice_partner_multi_relation
new file mode 120000
index 0000000000..d43166ceaf
--- /dev/null
+++ b/setup/fieldservice_partner_multi_relation/odoo/addons/fieldservice_partner_multi_relation
@@ -0,0 +1 @@
+../../../../fieldservice_partner_multi_relation
\ No newline at end of file
diff --git a/setup/fieldservice_partner_multi_relation/setup.py b/setup/fieldservice_partner_multi_relation/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_partner_multi_relation/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From c5b611ac08952b2401d13aa2b5eff1b3ce8c5e46 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 15 Apr 2021 17:59:44 +0530
Subject: [PATCH 184/631] [14.0][MIG] fieldservice_account_analytic

---
 fieldservice_account_analytic/__manifest__.py |  18 ++-
 .../migrations/14.0.1.0.0/post-migration.py   |   9 ++
 .../models/fsm_order.py                       |   6 +-
 .../tests/test_fsm_account_wizard.py          | 114 +++++++++++++++++-
 .../odoo/addons/fieldservice_account_analytic |   1 +
 setup/fieldservice_account_analytic/setup.py  |   6 +
 6 files changed, 143 insertions(+), 11 deletions(-)
 create mode 100644 fieldservice_account_analytic/migrations/14.0.1.0.0/post-migration.py
 create mode 120000 setup/fieldservice_account_analytic/odoo/addons/fieldservice_account_analytic
 create mode 100644 setup/fieldservice_account_analytic/setup.py

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index 02a768abd2..95133c0ccd 100644
--- a/fieldservice_account_analytic/__manifest__.py
+++ b/fieldservice_account_analytic/__manifest__.py
@@ -5,11 +5,15 @@
     "name": "Field Service - Analytic Accounting",
     "summary": """Track analytic accounts on Field Service locations
                   and orders""",
-    "version": "13.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",
-    "depends": ["fieldservice_account", "analytic", "product"],
+    "depends": [
+        "fieldservice_account",
+        "analytic",
+        "product",
+    ],
     "data": [
         "data/ir_rule.xml",
         "security/ir.model.access.csv",
@@ -18,9 +22,15 @@
         "views/fsm_order.xml",
         "views/res_config_settings.xml",
     ],
-    "demo": ["demo/fsm_location.xml"],
+    "demo": [
+        "demo/fsm_location.xml",
+    ],
     "pre_init_hook": "pre_init_hook",
     "license": "AGPL-3",
     "development_status": "Beta",
-    "maintainers": ["osimallen", "brian10048", "bodedra"],
+    "maintainers": [
+        "osimallen",
+        "brian10048",
+        "bodedra",
+    ],
 }
diff --git a/fieldservice_account_analytic/migrations/14.0.1.0.0/post-migration.py b/fieldservice_account_analytic/migrations/14.0.1.0.0/post-migration.py
new file mode 100644
index 0000000000..25f67de025
--- /dev/null
+++ b/fieldservice_account_analytic/migrations/14.0.1.0.0/post-migration.py
@@ -0,0 +1,9 @@
+# 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 fsm_order SET bill_to = 'location' " "WHERE bill_to IS NULL;")
diff --git a/fieldservice_account_analytic/models/fsm_order.py b/fieldservice_account_analytic/models/fsm_order.py
index c171a32ec8..7bc208986f 100644
--- a/fieldservice_account_analytic/models/fsm_order.py
+++ b/fieldservice_account_analytic/models/fsm_order.py
@@ -15,7 +15,11 @@ class FSMOrder(models.Model):
         default="location",
     )
     customer_id = fields.Many2one(
-        "res.partner", string="Contact", change_default=True, index=True, tracking=True,
+        "res.partner",
+        string="Contact",
+        change_default=True,
+        index=True,
+        tracking=True,
     )
 
     def _compute_total_cost(self):
diff --git a/fieldservice_account_analytic/tests/test_fsm_account_wizard.py b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
index b1c9e08423..f05ce7d688 100644
--- a/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
+++ b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
@@ -1,21 +1,77 @@
 # Copyright 2019 Ecosoft Co., Ltd (http://ecosoft.co.th/)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 
-from odoo.addons.fieldservice_account.tests.test_fsm_account import FSMAccountCase
+from datetime import timedelta
 
+from odoo import fields
+from odoo.exceptions import ValidationError
+from odoo.tests.common import TransactionCase
 
-class FSMAccountCase(FSMAccountCase):
+
+class FSMAccountAnalyticCase(TransactionCase):
     def setUp(self):
-        super(FSMAccountCase, self).setUp()
+        super(FSMAccountAnalyticCase, self).setUp()
+        self.Wizard = self.env["fsm.wizard"]
+        self.WorkOrder = self.env["fsm.order"]
+        self.AccountInvoice = self.env["account.move"]
+        self.AccountInvoiceLine = self.env["account.move.line"]
+        # create a Res Partner
+        self.test_partner = self.env["res.partner"].create(
+            {"name": "Test Partner", "phone": "123", "email": "tp@email.com"}
+        )
+        # create a Res Partner to be converted to FSM Location/Person
+        self.test_loc_partner = self.env["res.partner"].create(
+            {"name": "Test Loc Partner", "phone": "ABC", "email": "tlp@email.com"}
+        )
+        self.test_loc_partner2 = self.env["res.partner"].create(
+            {"name": "Test Loc Partner 2", "phone": "123", "email": "tlp@example.com"}
+        )
+        # create expected FSM Location to compare to converted FSM Location
+        self.test_location = self.env["fsm.location"].create(
+            {
+                "name": "Test Location",
+                "phone": "123",
+                "email": "tp@email.com",
+                "partner_id": self.test_loc_partner.id,
+                "owner_id": self.test_loc_partner.id,
+                "customer_id": self.test_loc_partner.id,
+            }
+        )
+        self.test_location2 = self.env["fsm.location"].create(
+            {
+                "name": "Test Location 2",
+                "phone": "123",
+                "email": "tp@email.com",
+                "partner_id": self.test_loc_partner2.id,
+                "owner_id": self.test_loc_partner2.id,
+                "customer_id": self.test_loc_partner2.id,
+                "fsm_parent_id": self.test_location.id,
+            }
+        )
+        self.default_account_revenue = self.env["account.account"].search(
+            [
+                ("company_id", "=", self.env.user.company_id.id),
+                (
+                    "user_type_id",
+                    "=",
+                    self.env.ref("account.data_account_type_revenue").id,
+                ),
+            ],
+            limit=1,
+        )
+        self.move_line = self.env["account.move.line"]
+        self.analytic_line = self.env["account.analytic.line"]
+        self.test_analytic_account = self.env["account.analytic.account"].create(
+            {"name": "test_analytic_account"}
+        )
 
-    def test_convert_contact_to_fsm_location(self):
+    def test_convert_contact_to_fsm_loc(self):
         """
         Test converting a contact to a location to make sure the customer_id
         and owner_id get set correctly
         :return:
         """
-        self.Wizard.action_convert_location(self.test_loc_partner2)
-
+        self.Wizard._prepare_fsm_location(self.test_partner)
         # check if there is a new FSM Location with the same name
         self.wiz_location = self.env["fsm.location"].search(
             [("name", "=", self.test_loc_partner2.name)]
@@ -24,3 +80,49 @@ def test_convert_contact_to_fsm_location(self):
         # check if location is created successfully and fields copied over
         self.assertEqual(self.test_loc_partner2, self.wiz_location.customer_id)
         self.assertEqual(self.test_loc_partner2, self.wiz_location.owner_id)
+
+    def test_fsm_orders(self):
+        """Test creating new workorders, and test following functions."""
+        # Create an Orders
+        hours_diff = 100
+        date_start = fields.Datetime.today()
+
+        order = self.WorkOrder.create(
+            {
+                "location_id": self.test_location.id,
+                "date_start": date_start,
+                "customer_id": self.test_partner.id,
+                "date_end": date_start + timedelta(hours=hours_diff),
+                "request_early": fields.Datetime.today(),
+            }
+        )
+        order2 = self.WorkOrder.create(
+            {
+                "location_id": self.test_location2.id,
+                "date_start": date_start,
+                "customer_id": self.test_partner.id,
+                "date_end": date_start + timedelta(hours=hours_diff),
+                "request_early": fields.Datetime.today(),
+            }
+        )
+        order._compute_total_cost()
+        order._onchange_customer_id_location()
+        self.env.user.company_id.fsm_filter_location_by_contact = True
+        self.env.user.company_id.onchange_fsm_filter_location_by_contact()
+        order._onchange_location_id_customer_account()
+        self.test_location2.get_default_customer()
+        with self.assertRaises(ValidationError):
+            self.move_line.create(
+                {
+                    "account_id": self.default_account_revenue.id,
+                    "analytic_account_id": self.test_analytic_account.id,
+                    "fsm_order_id": order2.id,
+                }
+            )
+        with self.assertRaises(ValidationError):
+            self.analytic_line.create(
+                {
+                    "analytic_account_id": self.test_analytic_account.id,
+                    "fsm_order_id": order2.id,
+                }
+            )
diff --git a/setup/fieldservice_account_analytic/odoo/addons/fieldservice_account_analytic b/setup/fieldservice_account_analytic/odoo/addons/fieldservice_account_analytic
new file mode 120000
index 0000000000..ea72b8f778
--- /dev/null
+++ b/setup/fieldservice_account_analytic/odoo/addons/fieldservice_account_analytic
@@ -0,0 +1 @@
+../../../../fieldservice_account_analytic
\ No newline at end of file
diff --git a/setup/fieldservice_account_analytic/setup.py b/setup/fieldservice_account_analytic/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_account_analytic/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 1c6dc09b744d9870a0482d2a551fa09a347a0b46 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 6 Dec 2018 16:35:43 -0600
Subject: [PATCH 185/631] [ADD] fieldservice_distribution

---
 fieldservice_distribution/README.rst          | 109 +++++
 fieldservice_distribution/__init__.py         |   4 +
 fieldservice_distribution/__manifest__.py     |  23 +
 fieldservice_distribution/models/__init__.py  |   4 +
 .../models/fsm_location.py                    |  12 +
 .../readme/CONTRIBUTORS.rst                   |   3 +
 fieldservice_distribution/readme/CREDITS.rst  |   3 +
 .../readme/DESCRIPTION.rst                    |   3 +
 fieldservice_distribution/readme/ROADMAP.rst  |   2 +
 fieldservice_distribution/readme/USAGE.rst    |   7 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 451 ++++++++++++++++++
 .../views/fsm_location.xml                    |  21 +
 13 files changed, 642 insertions(+)
 create mode 100644 fieldservice_distribution/README.rst
 create mode 100644 fieldservice_distribution/__init__.py
 create mode 100644 fieldservice_distribution/__manifest__.py
 create mode 100644 fieldservice_distribution/models/__init__.py
 create mode 100644 fieldservice_distribution/models/fsm_location.py
 create mode 100644 fieldservice_distribution/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_distribution/readme/CREDITS.rst
 create mode 100644 fieldservice_distribution/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_distribution/readme/ROADMAP.rst
 create mode 100644 fieldservice_distribution/readme/USAGE.rst
 create mode 100644 fieldservice_distribution/static/description/icon.png
 create mode 100644 fieldservice_distribution/static/description/index.html
 create mode 100644 fieldservice_distribution/views/fsm_location.xml

diff --git a/fieldservice_distribution/README.rst b/fieldservice_distribution/README.rst
new file mode 100644
index 0000000000..810e76a083
--- /dev/null
+++ b/fieldservice_distribution/README.rst
@@ -0,0 +1,109 @@
+============================
+Field Service - Distribution
+============================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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_distribution
+    :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_distribution
+    :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| 
+
+This module allows you to manage your distribution network (of water,
+electricity, gaz, telephone, bandwidth) by setting the distribution parent on a
+field service location.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go to Field Service > Master Data > Locations
+* Create or select a location
+* In the "Others" tab, you can set a location as a distribution location
+* On another location, below the Parent location, you can set the parent
+  distribution location that distributes to the current location
+
+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_distribution%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
+~~~~~~~~~~~~
+
+* Wolfgang Hall <whall@opensourceintegrators.com>
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Steve Campbell <scampbell@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-max3903| image:: https://github.com/max3903.png?size=40px
+    :target: https://github.com/max3903
+    :alt: max3903
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-max3903| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_distribution>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_distribution/__init__.py b/fieldservice_distribution/__init__.py
new file mode 100644
index 0000000000..631bd4893a
--- /dev/null
+++ b/fieldservice_distribution/__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_distribution/__manifest__.py b/fieldservice_distribution/__manifest__.py
new file mode 100644
index 0000000000..4e1c00bed7
--- /dev/null
+++ b/fieldservice_distribution/__manifest__.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - Distribution',
+    'summary': 'Manage your distribution structure',
+    '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',
+    ],
+    'data': [
+        'views/fsm_location.xml',
+    ],
+    'application': False,
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'max3903',
+    ],
+}
diff --git a/fieldservice_distribution/models/__init__.py b/fieldservice_distribution/models/__init__.py
new file mode 100644
index 0000000000..61d98a615d
--- /dev/null
+++ b/fieldservice_distribution/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_distribution/models/fsm_location.py b/fieldservice_distribution/models/fsm_location.py
new file mode 100644
index 0000000000..4ecbb75645
--- /dev/null
+++ b/fieldservice_distribution/models/fsm_location.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2018 - TODAY, 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'
+
+    is_a_distribution = fields.Boolean(string='Is a Distribution')
+    dist_parent_id = fields.Many2one('fsm.location',
+                                     string='Distribution Parent')
diff --git a/fieldservice_distribution/readme/CONTRIBUTORS.rst b/fieldservice_distribution/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..db6ccc051b
--- /dev/null
+++ b/fieldservice_distribution/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* Wolfgang Hall <whall@opensourceintegrators.com>
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Steve Campbell <scampbell@opensourceintegrators.com>
diff --git a/fieldservice_distribution/readme/CREDITS.rst b/fieldservice_distribution/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_distribution/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_distribution/readme/DESCRIPTION.rst b/fieldservice_distribution/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..1b76c38dbb
--- /dev/null
+++ b/fieldservice_distribution/readme/DESCRIPTION.rst
@@ -0,0 +1,3 @@
+This module allows you to manage your distribution network (of water,
+electricity, gaz, telephone, bandwidth) by setting the distribution parent on a
+field service location.
diff --git a/fieldservice_distribution/readme/ROADMAP.rst b/fieldservice_distribution/readme/ROADMAP.rst
new file mode 100644
index 0000000000..f607015959
--- /dev/null
+++ b/fieldservice_distribution/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_distribution/readme/USAGE.rst b/fieldservice_distribution/readme/USAGE.rst
new file mode 100644
index 0000000000..d69bb5c877
--- /dev/null
+++ b/fieldservice_distribution/readme/USAGE.rst
@@ -0,0 +1,7 @@
+To use this module, you need to:
+
+* Go to Field Service > Master Data > Locations
+* Create or select a location
+* In the "Others" tab, you can set a location as a distribution location
+* On another location, below the Parent location, you can set the parent
+  distribution location that distributes to the current location
diff --git a/fieldservice_distribution/static/description/icon.png b/fieldservice_distribution/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_distribution/static/description/index.html b/fieldservice_distribution/static/description/index.html
new file mode 100644
index 0000000000..64c643d0e7
--- /dev/null
+++ b/fieldservice_distribution/static/description/index.html
@@ -0,0 +1,451 @@
+<?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 - Distribution</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-distribution">
+<h1 class="title">Field Service - Distribution</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_distribution"><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_distribution"><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 allows you to manage your distribution network (of water,
+electricity, gaz, telephone, bandwidth) by setting the distribution parent on a
+field service location.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id2">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id7">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id1">Usage</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>In the “Others” tab, you can set a location as a distribution location</li>
+<li>On another location, below the Parent location, you can set the parent
+distribution location that distributes to the current location</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id2">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="#id3">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_distribution%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="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">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>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id7">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="#id8">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">maintainer</a>:</p>
+<p><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_distribution">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_distribution/views/fsm_location.xml b/fieldservice_distribution/views/fsm_location.xml
new file mode 100644
index 0000000000..5ba5ab4698
--- /dev/null
+++ b/fieldservice_distribution/views/fsm_location.xml
@@ -0,0 +1,21 @@
+<?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">
+            <xpath expr="//page/group/group[@id='others-left']"
+                   position="inside">
+                <field name="is_a_distribution"/>
+            </xpath>
+            <field name="parent_id" position="after">
+                <field name="dist_parent_id"
+                       domain="[('is_a_distribution', '=', 'True')]"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>

From 6bc8966e5b2600ddd4264ebc2024d985c79376d7 Mon Sep 17 00:00:00 2001
From: Michael Allen <mallen@opensourceintegrators.com>
Date: Thu, 13 Dec 2018 10:34:23 -0700
Subject: [PATCH 186/631] [IMP] Enable geometry on location

---
 fieldservice_distribution/models/fsm_location.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fieldservice_distribution/models/fsm_location.py b/fieldservice_distribution/models/fsm_location.py
index 4ecbb75645..d685b67574 100644
--- a/fieldservice_distribution/models/fsm_location.py
+++ b/fieldservice_distribution/models/fsm_location.py
@@ -1,10 +1,11 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import fields
+from odoo.addons.base_geoengine import geo_model
 
 
-class FSMLocation(models.Model):
+class FSMLocation(geo_model.GeoModel):
     _inherit = 'fsm.location'
 
     is_a_distribution = fields.Boolean(string='Is a Distribution')

From 468959ab89c7e910f5ccba816bd31599060756c8 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 31 Jan 2019 17:17:26 -0600
Subject: [PATCH 187/631] [IMP] fieldservice_distribution

---
 fieldservice_distribution/__manifest__.py     |  2 +-
 .../models/fsm_location.py                    | 43 ++++++++++++++++++-
 .../views/fsm_location.xml                    | 13 +++++-
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/fieldservice_distribution/__manifest__.py b/fieldservice_distribution/__manifest__.py
index 4e1c00bed7..72abb56b38 100644
--- a/fieldservice_distribution/__manifest__.py
+++ b/fieldservice_distribution/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Distribution',
     'summary': 'Manage your distribution structure',
-    'version': '11.0.0.0.1',
+    'version': '11.0.0.1.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_distribution/models/fsm_location.py b/fieldservice_distribution/models/fsm_location.py
index d685b67574..1cf447d6fd 100644
--- a/fieldservice_distribution/models/fsm_location.py
+++ b/fieldservice_distribution/models/fsm_location.py
@@ -1,7 +1,7 @@
 # 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 api, fields
 from odoo.addons.base_geoengine import geo_model
 
 
@@ -11,3 +11,44 @@ class FSMLocation(geo_model.GeoModel):
     is_a_distribution = fields.Boolean(string='Is a Distribution')
     dist_parent_id = fields.Many2one('fsm.location',
                                      string='Distribution Parent')
+
+    distrib_count = fields.Integer(
+        compute='_compute_distrib_sublocation_ids',
+        string='# of distributed sub-locations')
+
+    @api.multi
+    def _compute_distrib_sublocation_ids(self):
+        for location in self:
+            for child in location:
+                child_locs = self.env['fsm.location'].search(
+                    [('parent_id', '=', child.id)])
+                count = self.env['fsm.location'].search_count(
+                    [('parent_id', '=', child.id),
+                     ('is_a_distribution', '=', True)])
+            if child_locs:
+                for loc in child_locs:
+                    count += loc.distrib_count
+            location.distrib_count = count
+
+    @api.multi
+    def action_view_distrib_sublocation(self):
+        '''
+        This function returns an action that display existing
+        distribution sub-locations of a given fsm location id.
+        It can either be a in a list or in a form view, if there is only one
+        sub-location to show.
+        '''
+        for location in self:
+            action = self.env.ref('fieldservice.action_fsm_location').read()[0]
+            sublocation = self.get_action_views(0, 0, location)
+            sublocation.filtered(lambda r: r.is_a_distribution)
+            if len(sublocation) > 1 or len(sublocation) == 0:
+                action['domain'] = [('id', 'in', sublocation.ids),
+                                    ('is_a_distribution', '=', True)]
+            elif sublocation:
+                action['views'] = [(self.env.
+                                    ref('fieldservice.' +
+                                        'fsm_location_form_view').id,
+                                    'form')]
+                action['res_id'] = sublocation.id
+            return action
diff --git a/fieldservice_distribution/views/fsm_location.xml b/fieldservice_distribution/views/fsm_location.xml
index 5ba5ab4698..ef6a1468a8 100644
--- a/fieldservice_distribution/views/fsm_location.xml
+++ b/fieldservice_distribution/views/fsm_location.xml
@@ -7,13 +7,24 @@
         <field name="model">fsm.location</field>
         <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
         <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <button name="action_view_distrib_sublocation"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-sitemap"
+                        attrs="{'invisible': [('is_a_distribution', '!=', True)]}">
+                    <field name="distrib_count"
+                           widget="statinfo"
+                           string="Distributed To"/>
+                </button>
+            </div>
             <xpath expr="//page/group/group[@id='others-left']"
                    position="inside">
                 <field name="is_a_distribution"/>
             </xpath>
             <field name="parent_id" position="after">
                 <field name="dist_parent_id"
-                       domain="[('is_a_distribution', '=', 'True')]"/>
+                       domain="[('is_a_distribution', '=', True)]"/>
             </field>
         </field>
     </record>

From 1fe3f6a72122c7774939351e2e03d0cf8f499e98 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 1 Feb 2019 19:04:57 -0600
Subject: [PATCH 188/631] [FIX] fieldservice_distribution

---
 fieldservice_distribution/__manifest__.py        |  2 +-
 fieldservice_distribution/views/fsm_location.xml | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/fieldservice_distribution/__manifest__.py b/fieldservice_distribution/__manifest__.py
index 72abb56b38..ab0f46ed06 100644
--- a/fieldservice_distribution/__manifest__.py
+++ b/fieldservice_distribution/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Distribution',
     'summary': 'Manage your distribution structure',
-    'version': '11.0.0.1.0',
+    'version': '11.0.0.2.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_distribution/views/fsm_location.xml b/fieldservice_distribution/views/fsm_location.xml
index ef6a1468a8..81d85bf385 100644
--- a/fieldservice_distribution/views/fsm_location.xml
+++ b/fieldservice_distribution/views/fsm_location.xml
@@ -12,7 +12,8 @@
                         type="object"
                         class="oe_stat_button"
                         icon="fa-sitemap"
-                        attrs="{'invisible': [('is_a_distribution', '!=', True)]}">
+                        attrs="{'invisible': [('is_a_distribution', '!=', True)]}"
+                        context="{'parent_id': active_id, 'dist_parent_id': active_id, 'is_a_distribution': True}">
                     <field name="distrib_count"
                            widget="statinfo"
                            string="Distributed To"/>
@@ -22,11 +23,17 @@
                    position="inside">
                 <field name="is_a_distribution"/>
             </xpath>
-            <field name="parent_id" position="after">
+            <field name="ref" position="after">
                 <field name="dist_parent_id"
                        domain="[('is_a_distribution', '=', True)]"/>
             </field>
         </field>
     </record>
 
+    <record id="fieldservice.action_fsm_location" model="ir.actions.act_window">
+        <field name="context">{'default_parent_id': context.get('parent_id', False),
+                               'default_dist_parent_id': context.get('dist_parent_id', False),
+                               'default_is_a_distribution': context.get('is_a_distribution', False)}</field>
+    </record>
+
 </odoo>

From 9e0036e2f13c11e0d8a2503ebea14272fbedbcee Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 21 Feb 2019 09:58:07 -0600
Subject: [PATCH 189/631] [FIX] Conflict with parent_id field of res.partner

---
 fieldservice_distribution/models/fsm_location.py | 4 ++--
 fieldservice_distribution/views/fsm_location.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fieldservice_distribution/models/fsm_location.py b/fieldservice_distribution/models/fsm_location.py
index 1cf447d6fd..f7def5f4a7 100644
--- a/fieldservice_distribution/models/fsm_location.py
+++ b/fieldservice_distribution/models/fsm_location.py
@@ -21,9 +21,9 @@ def _compute_distrib_sublocation_ids(self):
         for location in self:
             for child in location:
                 child_locs = self.env['fsm.location'].search(
-                    [('parent_id', '=', child.id)])
+                    [('fsm_parent_id', '=', child.id)])
                 count = self.env['fsm.location'].search_count(
-                    [('parent_id', '=', child.id),
+                    [('fsm_parent_id', '=', child.id),
                      ('is_a_distribution', '=', True)])
             if child_locs:
                 for loc in child_locs:
diff --git a/fieldservice_distribution/views/fsm_location.xml b/fieldservice_distribution/views/fsm_location.xml
index 81d85bf385..4000fd830e 100644
--- a/fieldservice_distribution/views/fsm_location.xml
+++ b/fieldservice_distribution/views/fsm_location.xml
@@ -13,7 +13,7 @@
                         class="oe_stat_button"
                         icon="fa-sitemap"
                         attrs="{'invisible': [('is_a_distribution', '!=', True)]}"
-                        context="{'parent_id': active_id, 'dist_parent_id': active_id, 'is_a_distribution': True}">
+                        context="{'fsm_parent_id': active_id, 'dist_parent_id': active_id, 'is_a_distribution': True}">
                     <field name="distrib_count"
                            widget="statinfo"
                            string="Distributed To"/>
@@ -31,7 +31,7 @@
     </record>
 
     <record id="fieldservice.action_fsm_location" model="ir.actions.act_window">
-        <field name="context">{'default_parent_id': context.get('parent_id', False),
+        <field name="context">{'default_fsm_parent_id': context.get('fsm_parent_id', False),
                                'default_dist_parent_id': context.get('dist_parent_id', False),
                                'default_is_a_distribution': context.get('is_a_distribution', False)}</field>
     </record>

From 4b81c2299c63dbb5fc8ae2a8d3de89c9c8c0c269 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Wed, 3 Apr 2019 21:15:44 +0530
Subject: [PATCH 190/631] [MIG][WIP][12.0] fieldservice_distribution

---
 fieldservice_distribution/README.rst          | 11 ++++---
 fieldservice_distribution/__manifest__.py     |  2 +-
 .../models/fsm_location.py                    | 31 +++++++------------
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../static/description/index.html             |  7 +++--
 5 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/fieldservice_distribution/README.rst b/fieldservice_distribution/README.rst
index 810e76a083..d070352a5c 100644
--- a/fieldservice_distribution/README.rst
+++ b/fieldservice_distribution/README.rst
@@ -14,13 +14,13 @@ Field Service - Distribution
     :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_distribution
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_distribution
     :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_distribution
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_distribution
     :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| 
@@ -57,7 +57,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_distribution%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_distribution%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.
 
@@ -75,6 +75,7 @@ Contributors
 * Wolfgang Hall <whall@opensourceintegrators.com>
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbell@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -104,6 +105,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_distribution>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_distribution>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_distribution/__manifest__.py b/fieldservice_distribution/__manifest__.py
index ab0f46ed06..3ef7292b12 100644
--- a/fieldservice_distribution/__manifest__.py
+++ b/fieldservice_distribution/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Distribution',
     'summary': 'Manage your distribution structure',
-    'version': '11.0.0.2.0',
+    'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_distribution/models/fsm_location.py b/fieldservice_distribution/models/fsm_location.py
index f7def5f4a7..d98f6f0797 100644
--- a/fieldservice_distribution/models/fsm_location.py
+++ b/fieldservice_distribution/models/fsm_location.py
@@ -1,11 +1,10 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields
-from odoo.addons.base_geoengine import geo_model
+from odoo import api, fields, models
 
 
-class FSMLocation(geo_model.GeoModel):
+class FSMLocation(models.Model):
     _inherit = 'fsm.location'
 
     is_a_distribution = fields.Boolean(string='Is a Distribution')
@@ -19,36 +18,30 @@ class FSMLocation(geo_model.GeoModel):
     @api.multi
     def _compute_distrib_sublocation_ids(self):
         for location in self:
-            for child in location:
-                child_locs = self.env['fsm.location'].search(
-                    [('fsm_parent_id', '=', child.id)])
-                count = self.env['fsm.location'].search_count(
-                    [('fsm_parent_id', '=', child.id),
-                     ('is_a_distribution', '=', True)])
-            if child_locs:
-                for loc in child_locs:
-                    count += loc.distrib_count
-            location.distrib_count = count
+            location.distrib_count = self.env['fsm.location'].search_count(
+                [('fsm_parent_id', 'child_of', location.id), (
+                    'id', '!=', location.id), (
+                    'is_a_distribution', '=', True)])
 
     @api.multi
     def action_view_distrib_sublocation(self):
-        '''
+        """
         This function returns an action that display existing
         distribution sub-locations of a given fsm location id.
         It can either be a in a list or in a form view, if there is only one
         sub-location to show.
-        '''
+        """
         for location in self:
             action = self.env.ref('fieldservice.action_fsm_location').read()[0]
             sublocation = self.get_action_views(0, 0, location)
             sublocation.filtered(lambda r: r.is_a_distribution)
-            if len(sublocation) > 1 or len(sublocation) == 0:
-                action['domain'] = [('id', 'in', sublocation.ids),
-                                    ('is_a_distribution', '=', True)]
-            elif sublocation:
+            if len(sublocation) == 1:
                 action['views'] = [(self.env.
                                     ref('fieldservice.' +
                                         'fsm_location_form_view').id,
                                     'form')]
                 action['res_id'] = sublocation.id
+            else:
+                action['domain'] = [('id', 'in', sublocation.ids),
+                                    ('is_a_distribution', '=', True)]
             return action
diff --git a/fieldservice_distribution/readme/CONTRIBUTORS.rst b/fieldservice_distribution/readme/CONTRIBUTORS.rst
index db6ccc051b..c72bec9f3b 100644
--- a/fieldservice_distribution/readme/CONTRIBUTORS.rst
+++ b/fieldservice_distribution/readme/CONTRIBUTORS.rst
@@ -1,3 +1,4 @@
 * Wolfgang Hall <whall@opensourceintegrators.com>
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbell@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_distribution/static/description/index.html b/fieldservice_distribution/static/description/index.html
index 64c643d0e7..acd4a69adf 100644
--- a/fieldservice_distribution/static/description/index.html
+++ b/fieldservice_distribution/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Distribution</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_distribution"><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_distribution"><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_distribution"><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_distribution"><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>This module allows you to manage your distribution network (of water,
 electricity, gaz, telephone, bandwidth) by setting the distribution parent on a
 field service location.</p>
@@ -407,7 +407,7 @@ <h1><a class="toc-backref" href="#id3">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_distribution%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_distribution%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">
@@ -424,6 +424,7 @@ <h2><a class="toc-backref" href="#id6">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>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>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">
@@ -442,7 +443,7 @@ <h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" 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_distribution">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_distribution">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 2f6a137cf3aa9e32dd699aa80efee02aed987df2 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 24 May 2019 17:52:52 -0500
Subject: [PATCH 191/631] [IMP] fieldservice_account: #135 Contractor Cost
 Check

---
 fieldservice_distribution/i18n/de.po          | 42 +++++++++++++++++++
 fieldservice_distribution/i18n/es.po          | 42 +++++++++++++++++++
 fieldservice_distribution/i18n/es_AR.po       | 42 +++++++++++++++++++
 fieldservice_distribution/i18n/es_CL.po       | 42 +++++++++++++++++++
 .../i18n/fieldservice_distribution.pot        | 40 ++++++++++++++++++
 fieldservice_distribution/i18n/pt_BR.po       | 42 +++++++++++++++++++
 .../static/description/index.html             |  2 +-
 .../views/fsm_location.xml                    | 10 ++---
 8 files changed, 254 insertions(+), 8 deletions(-)
 create mode 100644 fieldservice_distribution/i18n/de.po
 create mode 100644 fieldservice_distribution/i18n/es.po
 create mode 100644 fieldservice_distribution/i18n/es_AR.po
 create mode 100644 fieldservice_distribution/i18n/es_CL.po
 create mode 100644 fieldservice_distribution/i18n/fieldservice_distribution.pot
 create mode 100644 fieldservice_distribution/i18n/pt_BR.po

diff --git a/fieldservice_distribution/i18n/de.po b/fieldservice_distribution/i18n/de.po
new file mode 100644
index 0000000000..bfb39b5403
--- /dev/null
+++ b/fieldservice_distribution/i18n/de.po
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_distribution
+#
+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"
+"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_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__distrib_count
+msgid "# of distributed sub-locations"
+msgstr ""
+
+#. module: fieldservice_distribution
+#: model_terms:ir.ui.view,arch_db:fieldservice_distribution.fsm_location_form_view
+msgid "Distributed To"
+msgstr ""
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__dist_parent_id
+msgid "Distribution Parent"
+msgstr ""
+
+#. module: fieldservice_distribution
+#: model:ir.model,name:fieldservice_distribution.model_fsm_location
+msgid "Field Service Location"
+msgstr "Field-Service-Ort"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__is_a_distribution
+msgid "Is a Distribution"
+msgstr ""
diff --git a/fieldservice_distribution/i18n/es.po b/fieldservice_distribution/i18n/es.po
new file mode 100644
index 0000000000..1a2a31f22b
--- /dev/null
+++ b/fieldservice_distribution/i18n/es.po
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_distribution
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-22 04:35+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.8\n"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__distrib_count
+msgid "# of distributed sub-locations"
+msgstr "# de sububicaciones distribuidas"
+
+#. module: fieldservice_distribution
+#: model_terms:ir.ui.view,arch_db:fieldservice_distribution.fsm_location_form_view
+msgid "Distributed To"
+msgstr "Distribuido a"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__dist_parent_id
+msgid "Distribution Parent"
+msgstr "Padre de Distribución"
+
+#. module: fieldservice_distribution
+#: model:ir.model,name:fieldservice_distribution.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación del Servicio de Campo"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__is_a_distribution
+msgid "Is a Distribution"
+msgstr "Es una Distribución"
diff --git a/fieldservice_distribution/i18n/es_AR.po b/fieldservice_distribution/i18n/es_AR.po
new file mode 100644
index 0000000000..4398fc718c
--- /dev/null
+++ b/fieldservice_distribution/i18n/es_AR.po
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_distribution
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-07-21 05:19+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 3.10\n"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__distrib_count
+msgid "# of distributed sub-locations"
+msgstr "# de sub-ubicaciones distribuidas"
+
+#. module: fieldservice_distribution
+#: model_terms:ir.ui.view,arch_db:fieldservice_distribution.fsm_location_form_view
+msgid "Distributed To"
+msgstr "Distribuido a"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__dist_parent_id
+msgid "Distribution Parent"
+msgstr "Distribución Principal"
+
+#. module: fieldservice_distribution
+#: model:ir.model,name:fieldservice_distribution.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación de Servicio de Campo"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__is_a_distribution
+msgid "Is a Distribution"
+msgstr "Es una Distribución"
diff --git a/fieldservice_distribution/i18n/es_CL.po b/fieldservice_distribution/i18n/es_CL.po
new file mode 100644
index 0000000000..07110e8f38
--- /dev/null
+++ b/fieldservice_distribution/i18n/es_CL.po
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_distribution
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-22 04:35+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.8\n"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__distrib_count
+msgid "# of distributed sub-locations"
+msgstr "# de sububicaciones distribuidas"
+
+#. module: fieldservice_distribution
+#: model_terms:ir.ui.view,arch_db:fieldservice_distribution.fsm_location_form_view
+msgid "Distributed To"
+msgstr "Distribuido a"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__dist_parent_id
+msgid "Distribution Parent"
+msgstr "Padre de Distribución"
+
+#. module: fieldservice_distribution
+#: model:ir.model,name:fieldservice_distribution.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación del Servicio de Campo"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__is_a_distribution
+msgid "Is a Distribution"
+msgstr "Es una Distribución"
diff --git a/fieldservice_distribution/i18n/fieldservice_distribution.pot b/fieldservice_distribution/i18n/fieldservice_distribution.pot
new file mode 100644
index 0000000000..7253d9283a
--- /dev/null
+++ b/fieldservice_distribution/i18n/fieldservice_distribution.pot
@@ -0,0 +1,40 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_distribution
+#
+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_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__distrib_count
+msgid "# of distributed sub-locations"
+msgstr ""
+
+#. module: fieldservice_distribution
+#: model_terms:ir.ui.view,arch_db:fieldservice_distribution.fsm_location_form_view
+msgid "Distributed To"
+msgstr ""
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__dist_parent_id
+msgid "Distribution Parent"
+msgstr ""
+
+#. module: fieldservice_distribution
+#: model:ir.model,name:fieldservice_distribution.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__is_a_distribution
+msgid "Is a Distribution"
+msgstr ""
+
diff --git a/fieldservice_distribution/i18n/pt_BR.po b/fieldservice_distribution/i18n/pt_BR.po
new file mode 100644
index 0000000000..fcdc298bcc
--- /dev/null
+++ b/fieldservice_distribution/i18n/pt_BR.po
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_distribution
+#
+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"
+"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_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__distrib_count
+msgid "# of distributed sub-locations"
+msgstr "Número de sub-locais distribuídos"
+
+#. module: fieldservice_distribution
+#: model_terms:ir.ui.view,arch_db:fieldservice_distribution.fsm_location_form_view
+msgid "Distributed To"
+msgstr "Distribuído Para"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__dist_parent_id
+msgid "Distribution Parent"
+msgstr "Pai da Distribuição"
+
+#. module: fieldservice_distribution
+#: model:ir.model,name:fieldservice_distribution.model_fsm_location
+msgid "Field Service Location"
+msgstr "Localização do Serviço de Campo"
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__is_a_distribution
+msgid "Is a Distribution"
+msgstr "É uma Distribuição"
diff --git a/fieldservice_distribution/static/description/index.html b/fieldservice_distribution/static/description/index.html
index acd4a69adf..7e2e356d84 100644
--- a/fieldservice_distribution/static/description/index.html
+++ b/fieldservice_distribution/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 - Distribution</title>
 <style type="text/css">
 
diff --git a/fieldservice_distribution/views/fsm_location.xml b/fieldservice_distribution/views/fsm_location.xml
index 4000fd830e..a32984eb50 100644
--- a/fieldservice_distribution/views/fsm_location.xml
+++ b/fieldservice_distribution/views/fsm_location.xml
@@ -13,7 +13,9 @@
                         class="oe_stat_button"
                         icon="fa-sitemap"
                         attrs="{'invisible': [('is_a_distribution', '!=', True)]}"
-                        context="{'fsm_parent_id': active_id, 'dist_parent_id': active_id, 'is_a_distribution': True}">
+                        context="{'default_fsm_parent_id': active_id,
+                                  'default_dist_parent_id': active_id,
+                                  'default_is_a_distribution': True}">
                     <field name="distrib_count"
                            widget="statinfo"
                            string="Distributed To"/>
@@ -30,10 +32,4 @@
         </field>
     </record>
 
-    <record id="fieldservice.action_fsm_location" model="ir.actions.act_window">
-        <field name="context">{'default_fsm_parent_id': context.get('fsm_parent_id', False),
-                               'default_dist_parent_id': context.get('dist_parent_id', False),
-                               'default_is_a_distribution': context.get('is_a_distribution', False)}</field>
-    </record>
-
 </odoo>

From 9eb0c71d5691b64408a769b7675e601040e94c63 Mon Sep 17 00:00:00 2001
From: Patrick Wilson <36892066+patrickrwilson@users.noreply.github.com>
Date: Mon, 17 Aug 2020 11:39:49 -0500
Subject: [PATCH 192/631] [FIX] Distribution To Smart Button

---
 fieldservice_distribution/models/fsm_location.py | 9 ++++++---
 fieldservice_distribution/views/fsm_location.xml | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/fieldservice_distribution/models/fsm_location.py b/fieldservice_distribution/models/fsm_location.py
index d98f6f0797..efe83e4750 100644
--- a/fieldservice_distribution/models/fsm_location.py
+++ b/fieldservice_distribution/models/fsm_location.py
@@ -19,7 +19,7 @@ class FSMLocation(models.Model):
     def _compute_distrib_sublocation_ids(self):
         for location in self:
             location.distrib_count = self.env['fsm.location'].search_count(
-                [('fsm_parent_id', 'child_of', location.id), (
+                [('dist_parent_id', '=', location.id), (
                     'id', '!=', location.id), (
                     'is_a_distribution', '=', True)])
 
@@ -33,8 +33,11 @@ def action_view_distrib_sublocation(self):
         """
         for location in self:
             action = self.env.ref('fieldservice.action_fsm_location').read()[0]
-            sublocation = self.get_action_views(0, 0, location)
-            sublocation.filtered(lambda r: r.is_a_distribution)
+            sublocation = self.env["fsm.location"].search(
+                [('dist_parent_id', '=', location.id),
+                 ('id', '!=', location.id),
+                 ('is_a_distribution', '=', True)]
+            )
             if len(sublocation) == 1:
                 action['views'] = [(self.env.
                                     ref('fieldservice.' +
diff --git a/fieldservice_distribution/views/fsm_location.xml b/fieldservice_distribution/views/fsm_location.xml
index a32984eb50..23dc03875d 100644
--- a/fieldservice_distribution/views/fsm_location.xml
+++ b/fieldservice_distribution/views/fsm_location.xml
@@ -13,7 +13,7 @@
                         class="oe_stat_button"
                         icon="fa-sitemap"
                         attrs="{'invisible': [('is_a_distribution', '!=', True)]}"
-                        context="{'default_fsm_parent_id': active_id,
+                        context="{'default_fsm_parent_id': fsm_parent_id,
                                   'default_dist_parent_id': active_id,
                                   'default_is_a_distribution': True}">
                     <field name="distrib_count"

From 3ab48dd2ccb7872bc7386c98102f958fb148f317 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 27 Aug 2020 13:12:58 +0000
Subject: [PATCH 193/631] fieldservice_distribution 12.0.1.1.0

---
 fieldservice_distribution/__manifest__.py | 2 +-
 fieldservice_distribution/i18n/es_AR.po   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fieldservice_distribution/__manifest__.py b/fieldservice_distribution/__manifest__.py
index 3ef7292b12..0b7017c21c 100644
--- a/fieldservice_distribution/__manifest__.py
+++ b/fieldservice_distribution/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Distribution',
     'summary': 'Manage your distribution structure',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.1.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_distribution/i18n/es_AR.po b/fieldservice_distribution/i18n/es_AR.po
index 4398fc718c..103d0185f8 100644
--- a/fieldservice_distribution/i18n/es_AR.po
+++ b/fieldservice_distribution/i18n/es_AR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-07-21 05:19+0000\n"
+"PO-Revision-Date: 2020-10-05 18:58+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_AR\n"
@@ -34,7 +34,7 @@ msgstr "Distribución Principal"
 #. module: fieldservice_distribution
 #: model:ir.model,name:fieldservice_distribution.model_fsm_location
 msgid "Field Service Location"
-msgstr "Ubicación de Servicio de Campo"
+msgstr "Ubicación del Servicio de Campo"
 
 #. module: fieldservice_distribution
 #: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__is_a_distribution

From f29259fa01b3bb9479e7b5a4a5ede3f6b2252d69 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 15 Apr 2021 11:35:42 +0530
Subject: [PATCH 194/631] [FIX] Travis

---
 fieldservice_distribution/__manifest__.py     | 30 +++++------
 .../models/fsm_location.py                    | 51 +++++++++++--------
 .../views/fsm_location.xml                    | 39 +++++++-------
 .../odoo/addons/fieldservice_distribution     |  1 +
 setup/fieldservice_distribution/setup.py      |  6 +++
 5 files changed, 74 insertions(+), 53 deletions(-)
 create mode 120000 setup/fieldservice_distribution/odoo/addons/fieldservice_distribution
 create mode 100644 setup/fieldservice_distribution/setup.py

diff --git a/fieldservice_distribution/__manifest__.py b/fieldservice_distribution/__manifest__.py
index 0b7017c21c..af5fe6f76c 100644
--- a/fieldservice_distribution/__manifest__.py
+++ b/fieldservice_distribution/__manifest__.py
@@ -2,22 +2,22 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - Distribution',
-    'summary': 'Manage your distribution structure',
-    'version': '12.0.1.1.0',
-    'category': 'Field Service',
-    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice',
+    "name": "Field Service - Distribution",
+    "summary": "Manage your distribution structure",
+    "version": "14.0.1.0.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": [
+        "fieldservice",
     ],
-    'data': [
-        'views/fsm_location.xml',
+    "data": [
+        "views/fsm_location.xml",
     ],
-    'application': False,
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'max3903',
+    "application": False,
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": [
+        "max3903",
     ],
 }
diff --git a/fieldservice_distribution/models/fsm_location.py b/fieldservice_distribution/models/fsm_location.py
index efe83e4750..0706210bb4 100644
--- a/fieldservice_distribution/models/fsm_location.py
+++ b/fieldservice_distribution/models/fsm_location.py
@@ -5,23 +5,26 @@
 
 
 class FSMLocation(models.Model):
-    _inherit = 'fsm.location'
+    _inherit = "fsm.location"
 
-    is_a_distribution = fields.Boolean(string='Is a Distribution')
-    dist_parent_id = fields.Many2one('fsm.location',
-                                     string='Distribution Parent')
+    is_a_distribution = fields.Boolean(string="Is a Distribution")
+    dist_parent_id = fields.Many2one("fsm.location", string="Distribution Parent")
 
     distrib_count = fields.Integer(
-        compute='_compute_distrib_sublocation_ids',
-        string='# of distributed sub-locations')
+        compute="_compute_distrib_sublocation_ids",
+        string="# of distributed sub-locations",
+    )
 
     @api.multi
     def _compute_distrib_sublocation_ids(self):
         for location in self:
-            location.distrib_count = self.env['fsm.location'].search_count(
-                [('dist_parent_id', '=', location.id), (
-                    'id', '!=', location.id), (
-                    'is_a_distribution', '=', True)])
+            location.distrib_count = self.env["fsm.location"].search_count(
+                [
+                    ("dist_parent_id", "=", location.id),
+                    ("id", "!=", location.id),
+                    ("is_a_distribution", "=", True),
+                ]
+            )
 
     @api.multi
     def action_view_distrib_sublocation(self):
@@ -32,19 +35,25 @@ def action_view_distrib_sublocation(self):
         sub-location to show.
         """
         for location in self:
-            action = self.env.ref('fieldservice.action_fsm_location').read()[0]
+            action = self.env.ref("fieldservice.action_fsm_location").read()[0]
             sublocation = self.env["fsm.location"].search(
-                [('dist_parent_id', '=', location.id),
-                 ('id', '!=', location.id),
-                 ('is_a_distribution', '=', True)]
+                [
+                    ("dist_parent_id", "=", location.id),
+                    ("id", "!=", location.id),
+                    ("is_a_distribution", "=", True),
+                ]
             )
             if len(sublocation) == 1:
-                action['views'] = [(self.env.
-                                    ref('fieldservice.' +
-                                        'fsm_location_form_view').id,
-                                    'form')]
-                action['res_id'] = sublocation.id
+                action["views"] = [
+                    (
+                        self.env.ref("fieldservice." + "fsm_location_form_view").id,
+                        "form",
+                    )
+                ]
+                action["res_id"] = sublocation.id
             else:
-                action['domain'] = [('id', 'in', sublocation.ids),
-                                    ('is_a_distribution', '=', True)]
+                action["domain"] = [
+                    ("id", "in", sublocation.ids),
+                    ("is_a_distribution", "=", True),
+                ]
             return action
diff --git a/fieldservice_distribution/views/fsm_location.xml b/fieldservice_distribution/views/fsm_location.xml
index 23dc03875d..957590ec0d 100644
--- a/fieldservice_distribution/views/fsm_location.xml
+++ b/fieldservice_distribution/views/fsm_location.xml
@@ -1,33 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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="inherit_id" ref="fieldservice.fsm_location_form_view" />
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
-                <button name="action_view_distrib_sublocation"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-sitemap"
-                        attrs="{'invisible': [('is_a_distribution', '!=', True)]}"
-                        context="{'default_fsm_parent_id': fsm_parent_id,
+                <button
+                    name="action_view_distrib_sublocation"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-sitemap"
+                    attrs="{'invisible': [('is_a_distribution', '!=', True)]}"
+                    context="{'default_fsm_parent_id': fsm_parent_id,
                                   'default_dist_parent_id': active_id,
-                                  'default_is_a_distribution': True}">
-                    <field name="distrib_count"
-                           widget="statinfo"
-                           string="Distributed To"/>
+                                  'default_is_a_distribution': True}"
+                >
+                    <field
+                        name="distrib_count"
+                        widget="statinfo"
+                        string="Distributed To"
+                    />
                 </button>
             </div>
-            <xpath expr="//page/group/group[@id='others-left']"
-                   position="inside">
-                <field name="is_a_distribution"/>
+            <xpath expr="//page/group/group[@id='others-left']" position="inside">
+                <field name="is_a_distribution" />
             </xpath>
             <field name="ref" position="after">
-                <field name="dist_parent_id"
-                       domain="[('is_a_distribution', '=', True)]"/>
+                <field
+                    name="dist_parent_id"
+                    domain="[('is_a_distribution', '=', True)]"
+                />
             </field>
         </field>
     </record>
diff --git a/setup/fieldservice_distribution/odoo/addons/fieldservice_distribution b/setup/fieldservice_distribution/odoo/addons/fieldservice_distribution
new file mode 120000
index 0000000000..d243d11708
--- /dev/null
+++ b/setup/fieldservice_distribution/odoo/addons/fieldservice_distribution
@@ -0,0 +1 @@
+../../../../fieldservice_distribution
\ No newline at end of file
diff --git a/setup/fieldservice_distribution/setup.py b/setup/fieldservice_distribution/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_distribution/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From ca15b239543aaf213a9118162b9ab634321153a5 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 15 Apr 2021 11:48:25 +0530
Subject: [PATCH 195/631] [14.0][MIG] fieldservice_distribution

---
 fieldservice_distribution/README.rst          | 11 ++++---
 .../models/fsm_location.py                    |  4 +--
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../static/description/index.html             |  9 +++---
 fieldservice_distribution/tests/__init__.py   |  4 +++
 .../tests/test_fsm_distribution.py            | 31 +++++++++++++++++++
 6 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 fieldservice_distribution/tests/__init__.py
 create mode 100644 fieldservice_distribution/tests/test_fsm_distribution.py

diff --git a/fieldservice_distribution/README.rst b/fieldservice_distribution/README.rst
index d070352a5c..c78aabe1b6 100644
--- a/fieldservice_distribution/README.rst
+++ b/fieldservice_distribution/README.rst
@@ -14,13 +14,13 @@ Field Service - Distribution
     :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_distribution
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_distribution
     :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_distribution
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_distribution
     :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| 
@@ -57,7 +57,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_distribution%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_distribution%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.
 
@@ -76,6 +76,7 @@ Contributors
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbell@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Freni Patel <fpatel@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -105,6 +106,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_distribution>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_distribution>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_distribution/models/fsm_location.py b/fieldservice_distribution/models/fsm_location.py
index 0706210bb4..96f47075ed 100644
--- a/fieldservice_distribution/models/fsm_location.py
+++ b/fieldservice_distribution/models/fsm_location.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, 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 FSMLocation(models.Model):
@@ -15,7 +15,6 @@ class FSMLocation(models.Model):
         string="# of distributed sub-locations",
     )
 
-    @api.multi
     def _compute_distrib_sublocation_ids(self):
         for location in self:
             location.distrib_count = self.env["fsm.location"].search_count(
@@ -26,7 +25,6 @@ def _compute_distrib_sublocation_ids(self):
                 ]
             )
 
-    @api.multi
     def action_view_distrib_sublocation(self):
         """
         This function returns an action that display existing
diff --git a/fieldservice_distribution/readme/CONTRIBUTORS.rst b/fieldservice_distribution/readme/CONTRIBUTORS.rst
index c72bec9f3b..42bba4e260 100644
--- a/fieldservice_distribution/readme/CONTRIBUTORS.rst
+++ b/fieldservice_distribution/readme/CONTRIBUTORS.rst
@@ -2,3 +2,4 @@
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbell@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Freni Patel <fpatel@opensourceintegrators.com>
diff --git a/fieldservice_distribution/static/description/index.html b/fieldservice_distribution/static/description/index.html
index 7e2e356d84..7899cd9f39 100644
--- a/fieldservice_distribution/static/description/index.html
+++ b/fieldservice_distribution/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 - Distribution</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Distribution</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_distribution"><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_distribution"><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><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_distribution"><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_distribution"><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>This module allows you to manage your distribution network (of water,
 electricity, gaz, telephone, bandwidth) by setting the distribution parent on a
 field service location.</p>
@@ -407,7 +407,7 @@ <h1><a class="toc-backref" href="#id3">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_distribution%0Aversion:%2012.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_distribution%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">
@@ -425,6 +425,7 @@ <h2><a class="toc-backref" href="#id6">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>Steve Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#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>Freni Patel &lt;<a class="reference external" href="mailto:fpatel&#64;opensourceintegrators.com">fpatel&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -443,7 +444,7 @@ <h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" 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_distribution">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/14.0/fieldservice_distribution">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_distribution/tests/__init__.py b/fieldservice_distribution/tests/__init__.py
new file mode 100644
index 0000000000..9634010568
--- /dev/null
+++ b/fieldservice_distribution/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2020, Brian McMaster
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from . import test_fsm_distribution
diff --git a/fieldservice_distribution/tests/test_fsm_distribution.py b/fieldservice_distribution/tests/test_fsm_distribution.py
new file mode 100644
index 0000000000..30abdb0b71
--- /dev/null
+++ b/fieldservice_distribution/tests/test_fsm_distribution.py
@@ -0,0 +1,31 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from odoo.tests.common import TransactionCase
+
+
+class TestFSMSDistribution(TransactionCase):
+    def setUp(self):
+        super(TestFSMSDistribution, self).setUp()
+        self.location = self.env["fsm.location"]
+        self.FSMOrder = self.env["fsm.order"]
+        self.test_loc_partner = self.env["res.partner"].create(
+            {"name": "Test Loc Partner 2", "phone": "123", "email": "tlp@example.com"}
+        )
+        self.test_location = self.env.ref("fieldservice.test_location")
+        self.test_location2 = self.location.create(
+            {
+                "name": "Test Location 2",
+                "phone": "123",
+                "email": "tp@email.com",
+                "partner_id": self.test_loc_partner.id,
+                "owner_id": self.test_loc_partner.id,
+                "dist_parent_id": self.test_location.id,
+                "is_a_distribution": True,
+            }
+        )
+
+    def test_fsm_location(self):
+        """Test creating new location, and test following functions."""
+        self.test_location._compute_distrib_sublocation_ids()
+        self.test_location.action_view_distrib_sublocation()

From 776f0ce443a9867d6fbc7949b28adf1a6c26b40b Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 7 Jul 2021 23:06:23 +0000
Subject: [PATCH 196/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6051d5a65a..40296026b6 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ addon | version | summary
 [base_territory](base_territory/) | 14.0.1.0.0 | This module allows you to define territories, branches, districts and regions to be used for Field Service operations or Sales.
 [fieldservice](fieldservice/) | 14.0.1.1.1 | Manage Field Service Locations, Workers and Orders
 [fieldservice_account](fieldservice_account/) | 14.0.1.0.0 | Track invoices linked to Field Service orders
+[fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills

From bea8f6c1009094825a0c7134d2f856d920e67f1d Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 7 Jul 2021 23:06:25 +0000
Subject: [PATCH 197/631] [UPD] README.rst

---
 fieldservice_account_analytic/README.rst      | 15 +++-----
 .../static/description/index.html             | 34 ++++++++-----------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/fieldservice_account_analytic/README.rst b/fieldservice_account_analytic/README.rst
index aeb2336ff6..2fcd8a1ad6 100644
--- a/fieldservice_account_analytic/README.rst
+++ b/fieldservice_account_analytic/README.rst
@@ -14,13 +14,13 @@ Field Service - Analytic Accounting
     :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_account_analytic
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_account_analytic
     :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_account_analytic
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_account_analytic
     :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| 
@@ -48,18 +48,13 @@ To configure this module, you need to:
 * Go to Field Service > Master Data > Locations
 * Create or select a location and set their analytic account
 
-Usage
-=====
-
-
-
 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_account_analytic%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_account_analytic%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.
 
@@ -112,6 +107,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-osimallen| |maintainer-brian10048| |maintainer-bodedra| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_account_analytic>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_account_analytic>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_account_analytic/static/description/index.html b/fieldservice_account_analytic/static/description/index.html
index ac71aa178f..4956497980 100644
--- a/fieldservice_account_analytic/static/description/index.html
+++ b/fieldservice_account_analytic/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Analytic Accounting</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_account_analytic"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_account_analytic"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" 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><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_account_analytic"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_account_analytic"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" 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>This module adds the ability to track your analytic accounts on field
 service orders.
 It also adds the option to track the billing partner for field service
@@ -377,13 +377,12 @@ <h1 class="title">Field Service - Analytic Accounting</h1>
 <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="#bug-tracker" id="id4">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
-<li><a class="reference internal" href="#other-credits" id="id8">Other credits</a></li>
-<li><a class="reference internal" href="#maintainers" id="id9">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id7">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -400,27 +399,24 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
 <li>Create or select a location and set their analytic account</li>
 </ul>
 </div>
-<div class="section" id="usage">
-<h1><a class="toc-backref" href="#id3">Usage</a></h1>
-</div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id4">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id3">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_account_analytic%0Aversion:%2012.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_account_analytic%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="#id5">Credits</a></h1>
+<h1><a class="toc-backref" href="#id4">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id6">Authors</a></h2>
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
 <ul class="simple">
 <li>Open Source Integrators</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
 <li>Michael Allen &lt;<a class="reference external" href="mailto:mallen&#64;opensourceintegrators.com">mallen&#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>
@@ -428,14 +424,14 @@ <h2><a class="toc-backref" href="#id7">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="other-credits">
-<h2><a class="toc-backref" href="#id8">Other credits</a></h2>
+<h2><a class="toc-backref" href="#id7">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="#id9">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id8">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
@@ -443,7 +439,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/osimallen"><img alt="osimallen" src="https://github.com/osimallen.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> <a class="reference external" href="https://github.com/bodedra"><img alt="bodedra" src="https://github.com/bodedra.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_account_analytic">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/14.0/fieldservice_account_analytic">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 739411cc8db0f6c9598bb500e6d3d0b7a525501e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 7 Jul 2021 23:06:26 +0000
Subject: [PATCH 198/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 309aa65ffa..d32771e585 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210608.0
\ No newline at end of file
+14.0.20210707.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 9d1da0c70f..97a4f85f9a 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -11,6 +11,7 @@
         'odoo14-addon-base_territory',
         'odoo14-addon-fieldservice',
         'odoo14-addon-fieldservice_account',
+        'odoo14-addon-fieldservice_account_analytic',
         'odoo14-addon-fieldservice_crm',
         'odoo14-addon-fieldservice_project',
         'odoo14-addon-fieldservice_skill',

From 0cd359d7e8e4c3152cb5f1c1343f349826693105 Mon Sep 17 00:00:00 2001
From: Vimal Patel <vimal.patel.serpentcs@gmail.com>
Date: Mon, 5 Jul 2021 14:38:38 +0530
Subject: [PATCH 199/631] [14.0][MIG]fieldservice_partner_multi_relation:
 migrated to v14

---
 .../__manifest__.py                           |   2 +-
 .../models/fsm_location.py                    |   7 +-
 .../models/res_partner.py                     |   3 +-
 .../models/res_partner_relation_all.py        |  14 +-
 .../models/res_partner_relation_type.py       |   3 +-
 .../tests/__init__.py                         |   4 +
 ...est_fieldservice_partner_multi_relation.py | 239 ++++++++++++++++++
 7 files changed, 249 insertions(+), 23 deletions(-)
 create mode 100644 fieldservice_partner_multi_relation/tests/__init__.py
 create mode 100644 fieldservice_partner_multi_relation/tests/test_fieldservice_partner_multi_relation.py

diff --git a/fieldservice_partner_multi_relation/__manifest__.py b/fieldservice_partner_multi_relation/__manifest__.py
index 1379d5477f..6bb9167b78 100644
--- a/fieldservice_partner_multi_relation/__manifest__.py
+++ b/fieldservice_partner_multi_relation/__manifest__.py
@@ -6,7 +6,7 @@
     "version": "14.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
-    "website": "https://github.com/OCA/partner-contact",
+    "website": "https://github.com/OCA/field-service",
     "complexity": "normal",
     "license": "AGPL-3",
     "depends": ["partner_multi_relation", "fieldservice"],
diff --git a/fieldservice_partner_multi_relation/models/fsm_location.py b/fieldservice_partner_multi_relation/models/fsm_location.py
index 14c3320dae..844e359ef2 100644
--- a/fieldservice_partner_multi_relation/models/fsm_location.py
+++ b/fieldservice_partner_multi_relation/models/fsm_location.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, 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 FSMLocation(models.Model):
@@ -9,23 +9,18 @@ class FSMLocation(models.Model):
 
     rel_count = fields.Integer(string="Relations", compute="_compute_relation_count")
 
-    @api.multi
     def _compute_relation_count(self):
         for location in self:
             location.rel_count = self.env["res.partner.relation.all"].search_count(
                 [("this_partner_id", "=", location.name)]
             )
 
-    @api.multi
     def action_view_relations(self):
         """
         This function returns an action that display existing
         partner relations of a given fsm location id.
         """
         for location in self:
-            action = self.env.ref(
-                "partner_multi_relation.tree_res_partner_relation_all"
-            ).read()[0]
             relations = self.env["res.partner.relation.all"].search(
                 [("this_partner_id", "=", location.name)]
             )
diff --git a/fieldservice_partner_multi_relation/models/res_partner.py b/fieldservice_partner_multi_relation/models/res_partner.py
index 2da7ecb1ae..37d38f860d 100644
--- a/fieldservice_partner_multi_relation/models/res_partner.py
+++ b/fieldservice_partner_multi_relation/models/res_partner.py
@@ -1,13 +1,12 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, models
+from odoo import models
 
 
 class ResPartner(models.Model):
     _inherit = "res.partner"
 
-    @api.multi
     def get_partner_type(self):
         """
         Get partner type for relation.
diff --git a/fieldservice_partner_multi_relation/models/res_partner_relation_all.py b/fieldservice_partner_multi_relation/models/res_partner_relation_all.py
index 6484aa2a0d..16b210af8d 100644
--- a/fieldservice_partner_multi_relation/models/res_partner_relation_all.py
+++ b/fieldservice_partner_multi_relation/models/res_partner_relation_all.py
@@ -22,10 +22,6 @@ def onchange_this_partner_id(self):
             ):
                 if not self.type_selection_id:
                     return self.set_domain_type()
-            elif not self.this_partner_id:
-                if not self.other_partner_id:
-                    return {"domain": {"type_selection_id": ""}}
-
             else:
                 super(ResPartnerRelationAll, self).onchange_partner_id()
         else:
@@ -46,10 +42,6 @@ def onchange_other_partner_id(self):
             ):
                 if not type_id:
                     return self.set_domain_type()
-                elif not self.other_partner_id:
-                    if not self.this_partner_id:
-                        return {"domain": {"type_selection_id": ""}}
-
             else:
                 super(ResPartnerRelationAll, self).onchange_partner_id()
         else:
@@ -80,12 +72,10 @@ def onchange_type_selection_id(self):
                 self.try_type()
             elif self.this_partner_id:
                 # Set domain Right
-                res = self.set_domain_right()
-                return res
+                return self.set_domain_right()
             elif self.other_partner_id:
                 # Set domain Left
-                res = self.set_domain_left()
-                return res
+                return self.set_domain_left()
             else:
                 res = self.set_domain_left()
                 res2 = self.set_domain_right()
diff --git a/fieldservice_partner_multi_relation/models/res_partner_relation_type.py b/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
index ebc9ef9778..e3cb8b7507 100644
--- a/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
+++ b/fieldservice_partner_multi_relation/models/res_partner_relation_type.py
@@ -1,13 +1,12 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, models
+from odoo import _, models
 
 
 class ResPartnerRelationType(models.Model):
     _inherit = "res.partner.relation.type"
 
-    @api.multi
     def get_partner_types(self):
         super(ResPartnerRelationType, self).get_partner_types()
         return [
diff --git a/fieldservice_partner_multi_relation/tests/__init__.py b/fieldservice_partner_multi_relation/tests/__init__.py
new file mode 100644
index 0000000000..9857c26d55
--- /dev/null
+++ b/fieldservice_partner_multi_relation/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_fieldservice_partner_multi_relation
diff --git a/fieldservice_partner_multi_relation/tests/test_fieldservice_partner_multi_relation.py b/fieldservice_partner_multi_relation/tests/test_fieldservice_partner_multi_relation.py
new file mode 100644
index 0000000000..4b5eb5a858
--- /dev/null
+++ b/fieldservice_partner_multi_relation/tests/test_fieldservice_partner_multi_relation.py
@@ -0,0 +1,239 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields
+from odoo.exceptions import ValidationError
+
+from odoo.addons.partner_multi_relation.tests.test_partner_relation_common import (
+    TestPartnerRelationCommon,
+)
+
+
+class TestPartnerRelation(TestPartnerRelationCommon):
+    def setUp(self):
+        super(TestPartnerRelation, self).setUp()
+
+        self.fsm_location_01 = self.partner_model.create(
+            {"name": "Test FSM Location - 1", "fsm_location": True, "ref": "FSM01"}
+        )
+        self.fsm_location_02 = self.partner_model.create(
+            {"name": "Test FSM Location - 2", "fsm_location": True, "ref": "FSM02"}
+        )
+        self.fsm_company_03 = self.partner_model.create(
+            {"name": "Test FSM Company - 2", "company_type": "", "ref": "FSM03"}
+        )
+        self.fsm_person_03 = self.partner_model.create(
+            {"name": "Test FSM Person", "company_type": "person", "ref": "FSM04"}
+        )
+        self.fsm_location_obj = self.env["fsm.location"]
+        # Create a new FSM > FSM relation type:
+        (
+            self.type_fsm_loc2fsm_loc,
+            self.fsm_location2fsm_location,
+            self.selection_fsm_loc3fsm_loc,
+        ) = self._create_relation_type_selection(
+            {
+                "name": "FSM -> FSM",
+                "name_inverse": "FSM <- FSM",
+                "contact_type_left": "fsm-location",
+                "contact_type_right": "fsm-location",
+            }
+        )
+
+        # Create a new FSM > Person relation type:
+        (
+            self.type_fsm_loc2person,
+            self.selection_fsm_loc2person,
+            self.selection_person4fsm_loc,
+        ) = self._create_relation_type_selection(
+            {
+                "name": "FSM -> Person",
+                "name_inverse": "Person <- FSM",
+                "contact_type_left": "fsm-location",
+                "contact_type_right": "p",
+            }
+        )
+
+        # Create a new FSM > Person relation type:
+        (
+            self.type_person2company,
+            self.selection_person2company,
+            self.selection_comapany2person,
+        ) = self._create_relation_type_selection(
+            {
+                "name": "Person -> Company",
+                "name_inverse": "Company <- Person",
+                "contact_type_left": "c",
+                "contact_type_right": "p",
+            }
+        )
+
+    def test_validate_fsm_get_cat(self):
+        relation = self.relation_all_model.new(
+            {
+                "this_partner_id": self.fsm_person_03.id,
+                "type_selection_id": self.selection_person2company.id,
+                "other_partner_id": self.fsm_company_03.id,
+            }
+        )
+        relation.get_cat(self.fsm_person_03)
+        relation.get_cat(self.fsm_company_03)
+
+    def test_validate_fsm_location_01(self):
+        self.fsm_location = self.fsm_location_obj.create(
+            {
+                "name": "Test FSM Location - 1",
+                "owner_id": self.fsm_location_01.id,
+            }
+        )
+        self.fsm_location._compute_relation_count()
+        self.fsm_location.action_view_relations()
+
+    def test_validate_fsm_location_02(self):
+        """Test create overlapping with start / end dates."""
+        self.fsm_location_01.get_partner_type()
+        relation = self.relation_all_model.create(
+            {
+                "this_partner_id": self.fsm_location_01.id,
+                "type_selection_id": self.fsm_location2fsm_location.id,
+                "other_partner_id": self.fsm_location_02.id,
+                "date_start": fields.Date.today(),
+                "date_end": fields.Date.today(),
+            }
+        )
+        relation.onchange_this_partner_id()
+        relation.onchange_other_partner_id()
+        relation.onchange_type_selection_id()
+        # New relation with overlapping start / end should give error
+        with self.assertRaises(ValidationError):
+            self.relation_all_model.create(
+                {
+                    "this_partner_id": relation.this_partner_id.id,
+                    "type_selection_id": relation.type_selection_id.id,
+                    "other_partner_id": relation.other_partner_id.id,
+                    "date_start": fields.Date.today(),
+                    "date_end": fields.Date.today(),
+                }
+            )
+
+    def test_validate_fsm_location_03(self):
+        relation = self.relation_all_model.create(
+            {
+                "this_partner_id": self.partner_01_person.id,
+                "type_selection_id": self.fsm_location2fsm_location.id,
+                "other_partner_id": self.fsm_location_02.id,
+            }
+        )
+        with self.assertRaises(ValidationError):
+            relation.onchange_type_selection_id()
+
+    def test_validate_fsm_location_04(self):
+        relation = self.relation_all_model.create(
+            {
+                "this_partner_id": self.partner_02_company.id,
+                "type_selection_id": self.selection_fsm_loc2person.id,
+                "other_partner_id": self.fsm_location_02.id,
+            }
+        )
+        with self.assertRaises(ValidationError):
+            relation.onchange_type_selection_id()
+
+    def test_validate_fsm_location_05(self):
+        relation = self.relation_all_model.new(
+            {
+                "this_partner_id": self.partner_02_company.id,
+                "type_selection_id": self.selection_fsm_loc2person.id,
+                "other_partner_id": self.partner_01_person.id,
+            }
+        )
+        with self.assertRaises(ValidationError):
+            relation.onchange_type_selection_id()
+
+    def test_validate_fsm_location_06(self):
+        relation = self.relation_all_model.new(
+            {
+                "this_partner_id": self.fsm_location_01.id,
+                "type_selection_id": self.fsm_location2fsm_location.id,
+            }
+        )
+        relation.onchange_type_selection_id()
+        relation.onchange_this_partner_id()
+
+    def test_validate_fsm_location_07(self):
+        relation = self.relation_all_model.new(
+            {
+                "other_partner_id": self.fsm_location_02.id,
+                "type_selection_id": self.fsm_location2fsm_location.id,
+            }
+        )
+        relation.onchange_type_selection_id()
+        relation.onchange_other_partner_id()
+
+    def test_validate_fsm_location_08(self):
+        relation = self.relation_all_model.new(
+            {
+                "type_selection_id": self.fsm_location2fsm_location.id,
+            }
+        )
+        relation.onchange_type_selection_id()
+
+    def test_validate_fsm_location_09(self):
+        relation = self.relation_all_model.new(
+            {
+                "this_partner_id": self.fsm_location_02.id,
+            }
+        )
+        relation.onchange_this_partner_id()
+        relation.onchange_type_selection_id()
+
+    def test_validate_fsm_location_10(self):
+        relation = self.relation_all_model.new(
+            {
+                "other_partner_id": self.fsm_location_01.id,
+            }
+        )
+        relation.onchange_other_partner_id()
+        relation.onchange_type_selection_id()
+
+    def test_validate_fsm_location_11(self):
+        relation = self.relation_all_model.new(
+            {
+                "this_partner_id": self.fsm_location_01.id,
+                "other_partner_id": self.fsm_location_02.id,
+            }
+        )
+        relation.onchange_this_partner_id()
+        relation.onchange_other_partner_id()
+
+    def test_validate_fsm_location_12(self):
+        relation = self.relation_all_model.new(
+            {
+                "this_partner_id": self.fsm_person_03.id,
+                "type_selection_id": self.selection_person2company.id,
+            }
+        )
+        with self.assertRaises(ValidationError):
+            relation.try_type()
+            relation.onchange_this_partner_id()
+            relation.onchange_other_partner_id()
+
+    def test_validate_fsm_location_13(self):
+        relation = self.relation_all_model.new(
+            {
+                "this_partner_id": self.fsm_person_03.id,
+                "type_selection_id": self.selection_person2company.id,
+                "other_partner_id": self.partner_02_company.id,
+            }
+        )
+        relation.set_domain_left()
+        relation.set_domain_right()
+
+    def test_validate_fsm_location_14(self):
+        relation = self.relation_all_model.new(
+            {
+                "this_partner_id": self.partner_02_company.id,
+                "type_selection_id": self.selection_person2company.id,
+                "other_partner_id": self.partner_02_company.id,
+            }
+        )
+        relation.set_domain_left()
+        relation.set_domain_right()

From 27b859c5d6a22e23251898ecaff5e2f7e279973b Mon Sep 17 00:00:00 2001
From: osi-scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 19 Dec 2018 15:50:26 -0700
Subject: [PATCH 200/631] [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 13f039a2ab09ad3c031a8091273c6c379a51827d Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 20 Dec 2018 11:27:24 -0600
Subject: [PATCH 201/631] [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 d8e30c68bd74c318c974e20d17dba5bd421f8403 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 20 Dec 2018 17:40:55 -0600
Subject: [PATCH 202/631] [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 5efe8f9b57c378e3d0b9da82ec4bc77b424a4098 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 203/631] [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 0865cbc89e47dc3659a18beb8cb35c661181f060 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 26 Jun 2019 09:43:27 -0700
Subject: [PATCH 204/631] [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 3869634923c15ced5dcc6297e5f8a7e71e414738 Mon Sep 17 00:00:00 2001
From: osi-scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 19 Dec 2018 15:50:26 -0700
Subject: [PATCH 205/631] [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 c6d38513c66670249317d295ff856353badc8b0d Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 20 Dec 2018 17:40:55 -0600
Subject: [PATCH 206/631] [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 0f02a8ba4c49cb9c220c1cf711396211b800f725 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 11 May 2019 17:54:52 -0400
Subject: [PATCH 207/631] [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 7576826c8eeea30c7b97f771f31048ae8e69acd9 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 13 May 2019 19:19:11 -0400
Subject: [PATCH 208/631] [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 3080c72817afadcd526a080454cd03ba71a6f54c Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Wed, 22 May 2019 18:35:48 -0400
Subject: [PATCH 209/631] [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 8d90016fc0804795cd19cfcf3760713e48dfef41 Mon Sep 17 00:00:00 2001
From: hparfr <raph@hpar.fr>
Date: Mon, 15 Jul 2019 16:38:28 +0200
Subject: [PATCH 210/631] 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 c46f367183592ef2bdf878857f959b4a1ba91380 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 9 Oct 2019 21:31:58 -0500
Subject: [PATCH 211/631] [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 c366ade90504babe554d246202642dee03596856 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 16 Oct 2019 08:48:31 -0500
Subject: [PATCH 212/631] [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 bd0c950147a97e62cb28ca7a2c0acc66526ade94 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sun, 10 Nov 2019 10:49:26 -0500
Subject: [PATCH 213/631] [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 323734acf6f029e6a01bef0881a29e6377dada2a Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 18 Nov 2019 20:12:56 -0500
Subject: [PATCH 214/631] [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 164b38f863e37850b078865151bc41a40798cfec 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 215/631] 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 5f9344f587b6790cca653358c1c984581e0e6cdf 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 216/631] 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 1ba60ac9de8b499ef8ae1aa7e1324c67a2146696 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Thu, 14 Nov 2019 12:01:05 -0500
Subject: [PATCH 217/631] [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 0eb4efa24f0a7bcd9fcfa395170e98c271bb599b Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Fri, 22 Nov 2019 11:45:26 -0500
Subject: [PATCH 218/631] [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 f371ac7b485d3b045e27f0493ea54118fc7d03d5 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 25 Nov 2019 11:29:53 -0600
Subject: [PATCH 219/631] [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 54b12407a3e307537556e541aeb17d7bb3553d95 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 26 Nov 2019 08:53:11 -0500
Subject: [PATCH 220/631] [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 8431085b0a8d84bdc8b1d4467854ede754d909c9 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Fri, 6 Dec 2019 09:59:24 -0500
Subject: [PATCH 221/631] [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 ca7e47cbea0fdf7fc1b8304b1466fb4c39765574 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 10 Dec 2019 09:09:20 -0600
Subject: [PATCH 222/631] [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 8b158e74108f3ee3fb6978f9a3c74b1e9a39523d Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 10 Dec 2019 09:26:39 -0600
Subject: [PATCH 223/631] [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 677096418074c773c4af4f607ecfcd3b2d9be98c Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 10 Dec 2019 09:39:20 -0600
Subject: [PATCH 224/631] [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 9a17e7df0b126d4ee78124a5fc48cf1693393211 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 10 Dec 2019 17:19:11 -0500
Subject: [PATCH 225/631] [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 7339fbd176351308aed53398cdb3fd0a52b72201 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 22 Dec 2019 10:54:54 -0600
Subject: [PATCH 226/631] [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 e9fa1b6a781932ae8ff0af19da56f2bb23da8336 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 22 Dec 2019 14:15:50 -0600
Subject: [PATCH 227/631] [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 895c703c35ff4bcc5f94b18cdd48b7bd4af08628 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 22 Dec 2019 14:29:51 -0600
Subject: [PATCH 228/631] [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 b26079a87174d3ae963269c930a94ef6f89b27db Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 19 Dec 2019 17:02:49 -0600
Subject: [PATCH 229/631] [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 92db669b4d337465e9c102c501f40f4fd535c387 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 31 Dec 2019 07:23:09 -0500
Subject: [PATCH 230/631] [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 0b4e01ac64e82d5c685c4c601523b2290ee2be1f Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 31 Dec 2019 07:25:33 -0500
Subject: [PATCH 231/631] [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 9b98c6433e887951a7d3ece77b7a3112821f28e3 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 232/631] [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 234fd48f906a3877f704fd54190fe1ce83a46b87 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 6 Jan 2020 13:18:57 -0500
Subject: [PATCH 233/631] [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 e515077ecc5aab10f869d3cd5475ef9dabde59e4 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 6 Jan 2020 17:33:52 -0600
Subject: [PATCH 234/631] [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 e4d8a6de3285a54e530e4b83fe2124d08ec8e42e Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 9 Jan 2020 13:40:34 -0800
Subject: [PATCH 235/631] [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 306c3da51f21c11dce002c0bc2e3259288b99c8a Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@ursainfosystems.com>
Date: Thu, 9 Jan 2020 17:01:02 -0800
Subject: [PATCH 236/631] 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 78f3dc0db743e5ad5bc97bd2c1c219ec147fc1b3 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Thu, 16 Jan 2020 17:40:44 -0500
Subject: [PATCH 237/631] [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 fb73dcaa312131a622f44e90b122d4fbf95c0e7e Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 20 Jan 2020 15:31:47 -0500
Subject: [PATCH 238/631] [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 7bafa5e45e51461ac927a10bbc1c846bee1ec031 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 20 Jan 2020 15:43:21 -0500
Subject: [PATCH 239/631] [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 86a832ed11ea3f8c3c6e14d92a2eca2e58258c95 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 24 Feb 2020 10:35:49 -0500
Subject: [PATCH 240/631] [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 78ee8c10ffbc0c539aff3172b0f559002e7a32be Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 3 Apr 2020 17:40:32 -0600
Subject: [PATCH 241/631] [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 0efc49ba64080aba55316a2422a48940e2c1ca24 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 12 May 2020 18:08:38 -0500
Subject: [PATCH 242/631] [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 3eef68151c8e0aedcf89f3ea5a81020ec25cd9e1 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 13 May 2020 19:09:20 -0500
Subject: [PATCH 243/631] [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 7f170529ba9d62f625500723d0cb1be77dc97793 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sat, 16 May 2020 18:56:45 -0500
Subject: [PATCH 244/631] [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 217311e63a7e0de3b42d57494d5154bba53744e6 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Fri, 17 Jul 2020 23:57:01 -0400
Subject: [PATCH 245/631] [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 8498d4af2fd3688ba9c41dc8f5208d1d98e19ab3 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 18 Jul 2020 00:08:36 -0400
Subject: [PATCH 246/631] [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 98a1128237f8043960ffb7c5f67f8705a724b34c Mon Sep 17 00:00:00 2001
From: Raphael <rlee@opensourceintegrators.com>
Date: Mon, 5 Oct 2020 16:31:29 -0700
Subject: [PATCH 247/631] [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 62b167c6bb6d3ba86e23b609b975e1da85b7ee76 Mon Sep 17 00:00:00 2001
From: Raphael <rlee@opensourceintegrators.com>
Date: Wed, 7 Oct 2020 15:08:23 -0700
Subject: [PATCH 248/631] [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 dd9747c95253ee62064e7a3ec015dcf4957af2a9 Mon Sep 17 00:00:00 2001
From: Brian McMaster <brian@mcmpest.com>
Date: Thu, 22 Oct 2020 16:22:50 -0400
Subject: [PATCH 249/631] [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 1b5cf425776aac2618660ae4b72763e1ba3b9391 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 15 Apr 2021 13:45:46 +0530
Subject: [PATCH 250/631] [FIX] Travis

---
 fieldservice_sale/__manifest__.py              |  2 +-
 fieldservice_sale/models/sale_order_line.py    | 18 +++++++++---------
 .../tests/test_fsm_sale_onchange_partner.py    |  6 +++---
 .../odoo/addons/fieldservice_sale              |  1 +
 setup/fieldservice_sale/setup.py               |  6 ++++++
 5 files changed, 20 insertions(+), 13 deletions(-)
 create mode 120000 setup/fieldservice_sale/odoo/addons/fieldservice_sale
 create mode 100644 setup/fieldservice_sale/setup.py

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
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 75e318539a87e3bdaada4c63452ce1ba1e4fda86 Mon Sep 17 00:00:00 2001
From: Nikul Chaudhary <nikul.chaudhary.serpentcs@gmail.com>
Date: Fri, 13 Dec 2019 17:27:11 +0530
Subject: [PATCH 251/631] [ADD] Added a fieldservice_route v12

---
 fieldservice_route/README.rst                 | 114 +++++
 fieldservice_route/__init__.py                |   3 +
 fieldservice_route/__manifest__.py            |  34 ++
 .../data/fsm_route_day_data.xml               |  31 ++
 fieldservice_route/data/fsm_stage_data.xml    |  19 +
 fieldservice_route/data/ir_sequence.xml       |  12 +
 .../i18n/fieldservice_route.pot               | 323 +++++++++++++
 fieldservice_route/models/__init__.py         |   8 +
 fieldservice_route/models/fsm_location.py     |  11 +
 fieldservice_route/models/fsm_order.py        |  55 +++
 fieldservice_route/models/fsm_route.py        |  15 +
 fieldservice_route/models/fsm_route_day.py    |  21 +
 .../models/fsm_route_dayroute.py              |  63 +++
 fieldservice_route/models/fsm_stage.py        |  11 +
 fieldservice_route/readme/CONFIGURE.rst       |   6 +
 fieldservice_route/readme/CONTRIBUTORS.rst    |   2 +
 fieldservice_route/readme/CREDITS.rst         |   4 +
 fieldservice_route/readme/DESCRIPTION.rst     |   4 +
 fieldservice_route/readme/USAGE.rst           |   7 +
 .../security/ir.model.access.csv              |   7 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 454 ++++++++++++++++++
 fieldservice_route/tests/__init__.py          |   3 +
 fieldservice_route/tests/test_fsm_order.py    |  36 ++
 fieldservice_route/views/fsm_location.xml     |  14 +
 fieldservice_route/views/fsm_order.xml        |  17 +
 fieldservice_route/views/fsm_route.xml        |  48 ++
 fieldservice_route/views/fsm_route_day.xml    |  39 ++
 .../views/fsm_route_dayroute.xml              | 122 +++++
 fieldservice_route/views/menu.xml             |  28 ++
 30 files changed, 1511 insertions(+)
 create mode 100644 fieldservice_route/README.rst
 create mode 100644 fieldservice_route/__init__.py
 create mode 100644 fieldservice_route/__manifest__.py
 create mode 100644 fieldservice_route/data/fsm_route_day_data.xml
 create mode 100644 fieldservice_route/data/fsm_stage_data.xml
 create mode 100644 fieldservice_route/data/ir_sequence.xml
 create mode 100644 fieldservice_route/i18n/fieldservice_route.pot
 create mode 100644 fieldservice_route/models/__init__.py
 create mode 100644 fieldservice_route/models/fsm_location.py
 create mode 100644 fieldservice_route/models/fsm_order.py
 create mode 100644 fieldservice_route/models/fsm_route.py
 create mode 100644 fieldservice_route/models/fsm_route_day.py
 create mode 100644 fieldservice_route/models/fsm_route_dayroute.py
 create mode 100644 fieldservice_route/models/fsm_stage.py
 create mode 100644 fieldservice_route/readme/CONFIGURE.rst
 create mode 100644 fieldservice_route/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_route/readme/CREDITS.rst
 create mode 100644 fieldservice_route/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_route/readme/USAGE.rst
 create mode 100644 fieldservice_route/security/ir.model.access.csv
 create mode 100644 fieldservice_route/static/description/icon.png
 create mode 100644 fieldservice_route/static/description/index.html
 create mode 100644 fieldservice_route/tests/__init__.py
 create mode 100644 fieldservice_route/tests/test_fsm_order.py
 create mode 100644 fieldservice_route/views/fsm_location.xml
 create mode 100644 fieldservice_route/views/fsm_order.xml
 create mode 100644 fieldservice_route/views/fsm_route.xml
 create mode 100644 fieldservice_route/views/fsm_route_day.xml
 create mode 100644 fieldservice_route/views/fsm_route_dayroute.xml
 create mode 100644 fieldservice_route/views/menu.xml

diff --git a/fieldservice_route/README.rst b/fieldservice_route/README.rst
new file mode 100644
index 0000000000..d6e6a25790
--- /dev/null
+++ b/fieldservice_route/README.rst
@@ -0,0 +1,114 @@
+===================
+Field Service Route
+===================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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/12.0/fieldservice_route
+    :alt: OCA/field-service
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_route
+    :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
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+A Field Service route is the sorted list of orders that one worker/vehicle will perform during a day.
+
+This module allows you to manage your Field Service routes: when assigning an order to a worker and scheduling it, a route is automatically created for that worker and day.
+
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+To use this module, you need to:
+
+* Go to Field Service > Configuration > Stages
+* Define the workflow of your routes by creating new stages whose type is "Route"
+* Go to Field Service > Configuration > Routes
+* Create your routes by setting their name and selecting their territory
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go to Field Service
+* Create or select an order
+* Assign it to a worker and schedule it
+* Go to Field Service > Dashboard > Day Routes. A new record has been created.
+
+
+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_route%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+
+Contributors
+~~~~~~~~~~~~
+
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Nikul Chaudhary <nikul.chaudhary.serpentcs@gmail.com>
+
+Other credits
+~~~~~~~~~~~~~
+
+The development of this module has been financially supported by:
+
+* Open Source Integrators <https://opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.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-max3903| image:: https://github.com/max3903.png?size=40px
+    :target: https://github.com/max3903
+    :alt: max3903
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-max3903| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_route>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_route/__init__.py b/fieldservice_route/__init__.py
new file mode 100644
index 0000000000..69f7babdfb
--- /dev/null
+++ b/fieldservice_route/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_route/__manifest__.py b/fieldservice_route/__manifest__.py
new file mode 100644
index 0000000000..7d574e6503
--- /dev/null
+++ b/fieldservice_route/__manifest__.py
@@ -0,0 +1,34 @@
+# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent consulting Services
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    'name': 'Field Service Route',
+    'summary': '''A Field Service route is the sorted list of orders that one
+    worker/vehicle will perform during a day.''',
+    'version': '12.0.1.0.0',
+    'category': 'Field Service',
+    'license': 'AGPL-3',
+    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice'
+    ],
+    'data': [
+        'data/ir_sequence.xml',
+        'data/fsm_route_day_data.xml',
+        'data/fsm_stage_data.xml',
+        'security/ir.model.access.csv',
+        'views/fsm_route_day.xml',
+        'views/fsm_route.xml',
+        'views/fsm_location.xml',
+        'views/fsm_route_dayroute.xml',
+        'views/fsm_order.xml',
+        'views/menu.xml',
+    ],
+    'application': True,
+    'development_status': 'Beta',
+    'maintainers': [
+        'max3903'
+    ],
+}
diff --git a/fieldservice_route/data/fsm_route_day_data.xml b/fieldservice_route/data/fsm_route_day_data.xml
new file mode 100644
index 0000000000..c9d4a499a0
--- /dev/null
+++ b/fieldservice_route/data/fsm_route_day_data.xml
@@ -0,0 +1,31 @@
+<odoo noupdate="1">
+
+    <record id="fsm_route_day_monday" model="fsm.route.day">
+        <field name="name">Monday</field>
+    </record>
+
+    <record id="fsm_route_day_tuesday" model="fsm.route.day">
+        <field name="name">Tuesday</field>
+    </record>
+
+    <record id="fsm_route_day_wednesday" model="fsm.route.day">
+        <field name="name">Wednesday</field>
+    </record>
+
+    <record id="fsm_route_day_thursday" model="fsm.route.day">
+        <field name="name">Thursday</field>
+    </record>
+
+    <record id="fsm_route_day_friday" model="fsm.route.day">
+        <field name="name">Friday</field>
+    </record>
+
+    <record id="fsm_route_day_saturday" model="fsm.route.day">
+        <field name="name">Saturday</field>
+    </record>
+
+    <record id="fsm_route_day_sunday" model="fsm.route.day">
+        <field name="name">Sunday</field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_route/data/fsm_stage_data.xml b/fieldservice_route/data/fsm_stage_data.xml
new file mode 100644
index 0000000000..3634662647
--- /dev/null
+++ b/fieldservice_route/data/fsm_stage_data.xml
@@ -0,0 +1,19 @@
+<odoo noupdate="1">
+
+    <record id="fsm_stage_route_new" model="fsm.stage">
+        <field name="name">New</field>
+        <field name="sequence">10</field>
+        <field name="is_default">True</field>
+        <field name="stage_type">route</field>
+        <field name="custom_color">#ECF0F1</field>
+    </record>
+
+    <record id="fsm_stage_route_close" model="fsm.stage">
+        <field name="name">Closed</field>
+        <field name="sequence">20</field>
+        <field name="is_closed">True</field>
+        <field name="stage_type">route</field>
+        <field name="custom_color">#7F8C8D</field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_route/data/ir_sequence.xml b/fieldservice_route/data/ir_sequence.xml
new file mode 100644
index 0000000000..1f3c2525b2
--- /dev/null
+++ b/fieldservice_route/data/ir_sequence.xml
@@ -0,0 +1,12 @@
+<odoo noupdate="1">
+
+    <!-- Sequence for fsm.route -->
+    <record id="seq_fsm_route" model="ir.sequence">
+        <field name="name">FSM Day Route</field>
+        <field name="code">fsm.route.dayroute</field>
+        <field name="prefix">SR</field>
+        <field name="padding">3</field>
+        <field name="company_id" eval="False"/>
+    </record>
+
+</odoo>
diff --git a/fieldservice_route/i18n/fieldservice_route.pot b/fieldservice_route/i18n/fieldservice_route.pot
new file mode 100644
index 0000000000..64127504cd
--- /dev/null
+++ b/fieldservice_route/i18n/fieldservice_route.pot
@@ -0,0 +1,323 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_route
+#
+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_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute
+msgid "Add Day Routes here."
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route
+msgid "Add Routes here."
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
+msgid "Create a Route Day."
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date
+msgid "Date"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__dayroute_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Day Route"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_report
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute_report
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_tree
+msgid "Day Routes"
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute_report
+msgid "Day Routes Report"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__day_ids
+msgid "Days"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__end_location_id
+msgid "End Location"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Equipment"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_route
+msgid "Field Service Route"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_route_dayroute
+msgid "Field Service Route Dayroute"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_stage
+msgid "Field Service Stage"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Friday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__last_location_id
+msgid "Last Location"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__latitude
+msgid "Latitude"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Location"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__longitude
+msgid "Longitude"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_allow_time
+msgid "Maximal Allowable Time (in hours)"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Monday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:20
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:60
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:62
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_count
+msgid "Number of Orders"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Orders"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__fsm_person_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__person_id
+msgid "Person"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date_start_planned
+msgid "Planned Start Time"
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Planning"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__fsm_route_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__fsm_route_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__route_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Route"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_day
+#: model:ir.model,name:fieldservice_route.model_fsm_route_day
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_tree_view
+msgid "Route Day"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_day
+msgid "Route Days"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_tree
+msgid "Routes"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Saturday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__stage_id
+msgid "Stage"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__start_location_id
+msgid "Start Location"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Sunday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__team_id
+msgid "Team"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__territory_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__territory_id
+msgid "Territory"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Thursday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__work_time
+msgid "Time before overtime (in hours)"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__stage_type
+msgid "Type"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Worker"
+msgstr ""
+
+#. module: fieldservice_route
+#: sql_constraint:fsm.route.dayroute:0
+msgid "You cannot create 2 day routes for the same worker on the same day!"
+msgstr ""
+
diff --git a/fieldservice_route/models/__init__.py b/fieldservice_route/models/__init__.py
new file mode 100644
index 0000000000..de911b39ca
--- /dev/null
+++ b/fieldservice_route/models/__init__.py
@@ -0,0 +1,8 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import fsm_stage
+from . import fsm_route_day
+from . import fsm_route
+from . import fsm_location
+from . import fsm_route_dayroute
+from . import fsm_order
diff --git a/fieldservice_route/models/fsm_location.py b/fieldservice_route/models/fsm_location.py
new file mode 100644
index 0000000000..db787c4f68
--- /dev/null
+++ b/fieldservice_route/models/fsm_location.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent consulting Services
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class FSMLocation(models.Model):
+    _inherit = 'fsm.location'
+
+    fsm_route_id = fields.Many2one('fsm.route', string='Route')
diff --git a/fieldservice_route/models/fsm_order.py b/fieldservice_route/models/fsm_order.py
new file mode 100644
index 0000000000..359974ee85
--- /dev/null
+++ b/fieldservice_route/models/fsm_order.py
@@ -0,0 +1,55 @@
+# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent consulting Services
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class FSMOrder(models.Model):
+    _inherit = 'fsm.order'
+
+    dayroute_id = fields.Many2one('fsm.route.dayroute',
+                                  string='Day Route',
+                                  index=True)
+    fsm_route_id = fields.Many2one(related="location_id.fsm_route_id",
+                                   string='Route')
+
+    def _manage_fsm_route(self, vals):
+        fsm_route_obj = self.env['fsm.route.dayroute']
+        for rec in self:
+            old_route_id = False
+            person_id = vals.get('person_id') or rec.person_id.id
+            scheduled_date_start = vals.get('scheduled_date_start') or \
+                rec.scheduled_date_start
+            fsm_route = fsm_route_obj.search([
+                ('person_id', '=', person_id),
+                ('date', '=', scheduled_date_start)],
+                limit=1)
+            old_route_id = rec.dayroute_id
+            if fsm_route:
+                rec.dayroute_id = fsm_route.id
+                if old_route_id and not old_route_id.order_ids:
+                    old_route_id.unlink()
+            elif not fsm_route and person_id or scheduled_date_start:
+                fsm_route_obj.create({
+                    'person_id': person_id,
+                    'date': scheduled_date_start,
+                    'route_id': rec.fsm_route_id.id,
+                    'order_ids': [(4, rec.id)]
+                })
+                if old_route_id and not old_route_id.order_ids:
+                    old_route_id.unlink()
+
+    @api.model
+    def create(self, vals):
+        res = super(FSMOrder, self).create(vals)
+        if res.person_id and res.scheduled_date_start:
+            res._manage_fsm_route(vals)
+        return res
+
+    @api.multi
+    def write(self, vals):
+        for rec in self:
+            if vals.get('person_id') or vals.get('scheduled_date_start'):
+                rec._manage_fsm_route(vals)
+        return super(FSMOrder, self).write(vals)
diff --git a/fieldservice_route/models/fsm_route.py b/fieldservice_route/models/fsm_route.py
new file mode 100644
index 0000000000..56ae757c63
--- /dev/null
+++ b/fieldservice_route/models/fsm_route.py
@@ -0,0 +1,15 @@
+# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent consulting Services
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class FSMRoute(models.Model):
+    _name = 'fsm.route'
+    _description = 'Field Service Route'
+
+    name = fields.Char('Name', required=True)
+    territory_id = fields.Many2one('fsm.territory', string='Territory')
+    fsm_person_id = fields.Many2one('fsm.person', string='Person')
+    day_ids = fields.Many2many('fsm.route.day', string='Days')
diff --git a/fieldservice_route/models/fsm_route_day.py b/fieldservice_route/models/fsm_route_day.py
new file mode 100644
index 0000000000..683a8214af
--- /dev/null
+++ b/fieldservice_route/models/fsm_route_day.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent consulting Services
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class FSMRouteDay(models.Model):
+    _name = 'fsm.route.day'
+    _description = 'Route Day'
+
+    name = fields.Selection([
+        ('Monday', 'Monday'),
+        ('Tuesday', 'Tuesday'),
+        ('Wednesday', 'Wednesday'),
+        ('Thursday', 'Thursday'),
+        ('Friday', 'Friday'),
+        ('Saturday', 'Saturday'),
+        ('Sunday', 'Sunday')],
+        string='Name'
+    )
diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
new file mode 100644
index 0000000000..a18b6cb5e9
--- /dev/null
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -0,0 +1,63 @@
+# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent consulting Services
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models, _
+
+
+class FSMRouteDayRoute(models.Model):
+    _name = 'fsm.route.dayroute'
+    _description = 'Field Service Route Dayroute'
+
+    @api.depends('route_id')
+    def _compute_order_count(self):
+        for rec in self:
+            rec.order_count = 0
+            if rec.order_ids:
+                rec.order_count = len(rec.order_ids)
+
+    name = fields.Char(string='Name', required=True,
+                       default=lambda self: _('New'))
+    person_id = fields.Many2one('fsm.person', string='Person')
+    route_id = fields.Many2one('fsm.route', string='Route')
+    date = fields.Date(string='Date')
+    team_id = fields.Many2one('fsm.team', string='Team')
+    stage_id = fields.Many2one('fsm.stage', string='Stage',
+                               domain="[('stage_type', '=', 'route')]",
+                               index=True, copy=False,
+                               default=lambda self: self._default_stage_id())
+    territory_id = fields.Many2one('fsm.territory', string='Territory')
+    longitude = fields.Float("Longitude")
+    latitude = fields.Float("Latitude")
+    last_location_id = fields.Many2one('fsm.location', string='Last Location')
+    date_start_planned = fields.Datetime(string='Planned Start Time')
+    start_location_id = fields.Many2one(
+        'fsm.location', string='Start Location')
+    end_location_id = fields.Many2one('fsm.location', string='End Location')
+    work_time = fields.Float(string='Time before overtime (in hours)',
+                             default=8.0)
+    max_allow_time = fields.Float(string="Maximal Allowable Time (in hours)",
+                                  default=10.0)
+    order_ids = fields.One2many('fsm.order', 'dayroute_id',
+                                string='Orders')
+    order_count = fields.Integer(string='Number of Orders',
+                                 compute=_compute_order_count)
+
+    _sql_constraints = [
+        ('fsm_route_dayroute_person_date_uniq',
+         'unique (person_id, date)',
+         "You cannot create 2 day routes for the same"
+         " worker on the same day!"),
+    ]
+
+    def _default_stage_id(self):
+        return self.env['fsm.stage'].search([('stage_type', '=', 'route'),
+                                             ('is_default', '=', True)],
+                                            limit=1)
+
+    @api.model
+    def create(self, vals):
+        if vals.get('name', _('New')) == _('New'):
+            vals['name'] = self.env['ir.sequence'].next_by_code(
+                'fsm.route.dayroute') or _('New')
+        return super(FSMRouteDayRoute, self).create(vals)
diff --git a/fieldservice_route/models/fsm_stage.py b/fieldservice_route/models/fsm_stage.py
new file mode 100644
index 0000000000..7a3773dab3
--- /dev/null
+++ b/fieldservice_route/models/fsm_stage.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent consulting Services
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class FSMStage(models.Model):
+    _inherit = 'fsm.stage'
+
+    stage_type = fields.Selection(selection_add=[('route', 'Route')])
diff --git a/fieldservice_route/readme/CONFIGURE.rst b/fieldservice_route/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..4cd722a155
--- /dev/null
+++ b/fieldservice_route/readme/CONFIGURE.rst
@@ -0,0 +1,6 @@
+To use this module, you need to:
+
+* Go to Field Service > Configuration > Stages
+* Define the workflow of your routes by creating new stages whose type is "Route"
+* Go to Field Service > Configuration > Routes
+* Create your routes by setting their name and selecting their territory
diff --git a/fieldservice_route/readme/CONTRIBUTORS.rst b/fieldservice_route/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..f4dcda0602
--- /dev/null
+++ b/fieldservice_route/readme/CONTRIBUTORS.rst
@@ -0,0 +1,2 @@
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Nikul Chaudhary <nikul.chaudhary.serpentcs@gmail.com>
diff --git a/fieldservice_route/readme/CREDITS.rst b/fieldservice_route/readme/CREDITS.rst
new file mode 100644
index 0000000000..d2eaed7d81
--- /dev/null
+++ b/fieldservice_route/readme/CREDITS.rst
@@ -0,0 +1,4 @@
+The development of this module has been financially supported by:
+
+* Open Source Integrators <https://opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_route/readme/DESCRIPTION.rst b/fieldservice_route/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..94f9854196
--- /dev/null
+++ b/fieldservice_route/readme/DESCRIPTION.rst
@@ -0,0 +1,4 @@
+A Field Service route is the sorted list of orders that one worker/vehicle will perform during a day.
+
+This module allows you to manage your Field Service routes: when assigning an order to a worker and scheduling it, a route is automatically created for that worker and day.
+
diff --git a/fieldservice_route/readme/USAGE.rst b/fieldservice_route/readme/USAGE.rst
new file mode 100644
index 0000000000..ee41b9c759
--- /dev/null
+++ b/fieldservice_route/readme/USAGE.rst
@@ -0,0 +1,7 @@
+To use this module, you need to:
+
+* Go to Field Service
+* Create or select an order
+* Assign it to a worker and schedule it
+* Go to Field Service > Dashboard > Day Routes. A new record has been created.
+
diff --git a/fieldservice_route/security/ir.model.access.csv b/fieldservice_route/security/ir.model.access.csv
new file mode 100644
index 0000000000..163c5a29f6
--- /dev/null
+++ b/fieldservice_route/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_fsm_route_user,fsm.route.user,model_fsm_route,fieldservice.group_fsm_user,1,1,0,0
+access_fsm_route_dispatcher,fsm.route.dispatcher,model_fsm_route,fieldservice.group_fsm_dispatcher,1,1,1,1
+access_fsm_route_day_user,fsm.route.day.user,model_fsm_route_day,fieldservice.group_fsm_user,1,1,0,0
+access_fsm_route_day_dispatcher,fsm.route.day.dispatcher,model_fsm_route_day,fieldservice.group_fsm_dispatcher,1,1,1,1
+access_fsm_route_dayroute_user,fsm.route.dayroute.user,model_fsm_route_dayroute,fieldservice.group_fsm_user,1,1,0,0
+access_fsm_route_dayroute_dispatcher,fsm.route.dayroute.dispatcher,model_fsm_route_dayroute,fieldservice.group_fsm_dispatcher,1,1,1,1
diff --git a/fieldservice_route/static/description/icon.png b/fieldservice_route/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_route/static/description/index.html b/fieldservice_route/static/description/index.html
new file mode 100644
index 0000000000..fa256530f0
--- /dev/null
+++ b/fieldservice_route/static/description/index.html
@@ -0,0 +1,454 @@
+<?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 Route</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-route">
+<h1 class="title">Field Service Route</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_route"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_route"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" 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>A Field Service route is the sorted list of orders that one worker/vehicle will perform during a day.</p>
+<p>This module allows you to manage your Field Service routes: when assigning an order to a worker and scheduling it, a route is automatically created for that worker and day.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id7">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<p>To use this module, you need to:</p>
+<ul class="simple">
+<li>Go to Field Service &gt; Configuration &gt; Stages</li>
+<li>Define the workflow of your routes by creating new stages whose type is “Route”</li>
+<li>Go to Field Service &gt; Configuration &gt; Routes</li>
+<li>Create your routes by setting their name and selecting their territory</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">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>Assign it to a worker and schedule it</li>
+<li>Go to Field Service &gt; Dashboard &gt; Day Routes. A new record has been created.</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id3">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_route%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="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<ul class="simple">
+<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Nikul Chaudhary &lt;<a class="reference external" href="mailto:nikul.chaudhary.serpentcs&#64;gmail.com">nikul.chaudhary.serpentcs&#64;gmail.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id7">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>
+<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="maintainers">
+<h2><a class="toc-backref" href="#id8">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">maintainer</a>:</p>
+<p><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_route">OCA/field-service</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/fieldservice_route/tests/__init__.py b/fieldservice_route/tests/__init__.py
new file mode 100644
index 0000000000..71d63056f0
--- /dev/null
+++ b/fieldservice_route/tests/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_fsm_order
diff --git a/fieldservice_route/tests/test_fsm_order.py b/fieldservice_route/tests/test_fsm_order.py
new file mode 100644
index 0000000000..5e306437ec
--- /dev/null
+++ b/fieldservice_route/tests/test_fsm_order.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent consulting Services
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo.tests.common import TransactionCase
+from datetime import datetime
+
+
+class FSMOrderRouteCase(TransactionCase):
+
+    def setUp(self):
+        super(FSMOrderRouteCase, self).setUp()
+        self.fsm_stage_obj = self.env['fsm.stage']
+        self.fsm_order_obj = self.env['fsm.order']
+        self.fsm_route_obj = self.env['fsm.route']
+        self.test_person = self.env.ref("fieldservice.test_person")
+        self.test_location = self.env.ref("fieldservice.test_location")
+        self.fsm_route_id = self.fsm_route_obj.create(
+            {
+                'name': 'Demo Route',
+                'fsm_person_id': self.test_person.id,
+            })
+        self.test_location.fsm_route_id = self.fsm_route_id.id
+        self.date = datetime.now()
+
+    def test_create_day_route(self):
+        order = self.fsm_order_obj.create({'location_id':
+                                           self.test_location.id,
+                                           'person_id': self.test_person.id,
+                                           'scheduled_date_start': self.date,
+                                           })
+        self.assertEqual(order.fsm_route_id, self.test_location.fsm_route_id)
+        self.assertEqual(order.dayroute_id.person_id, order.person_id)
+        self.assertEqual(order.dayroute_id.date,
+                         order.scheduled_date_start.date())
+        self.assertEqual(order.dayroute_id.route_id, order.fsm_route_id)
diff --git a/fieldservice_route/views/fsm_location.xml b/fieldservice_route/views/fsm_location.xml
new file mode 100644
index 0000000000..8cd4bd0d50
--- /dev/null
+++ b/fieldservice_route/views/fsm_location.xml
@@ -0,0 +1,14 @@
+<odoo>
+
+    <record id="fsm_location_form_view_route_inherit" model="ir.ui.view">
+        <field name="name">fsm.location.form</field>
+        <field name="model">fsm.location</field>
+        <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
+        <field name="arch" type="xml">
+            <field name="category_id" position="after">
+                <field name="fsm_route_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_route/views/fsm_order.xml b/fieldservice_route/views/fsm_order.xml
new file mode 100644
index 0000000000..af0579ae41
--- /dev/null
+++ b/fieldservice_route/views/fsm_order.xml
@@ -0,0 +1,17 @@
+<odoo>
+
+    <record id="fsm_order_form_inherit_route" model="ir.ui.view">
+        <field name="name">fsm.order.form</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
+        <field name="arch" type="xml">
+            <field name="location_id" position="after">
+                <field name="fsm_route_id"/>
+            </field>
+            <field name="scheduled_date_end" position="after">
+                <field name="dayroute_id" readonly="1"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_route/views/fsm_route.xml b/fieldservice_route/views/fsm_route.xml
new file mode 100644
index 0000000000..7dc4de5c3d
--- /dev/null
+++ b/fieldservice_route/views/fsm_route.xml
@@ -0,0 +1,48 @@
+<odoo>
+
+    <record id="fsm_route_tree" model="ir.ui.view">
+        <field name="name">fsm.route.tree</field>
+        <field name="model">fsm.route</field>
+        <field name="arch" type="xml">
+            <tree string="Routes">
+                <field name="name"/>
+                <field name="territory_id"/>
+                <field name="fsm_person_id"/>
+                <field name="day_ids"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="fsm_route_form" model="ir.ui.view">
+        <field name="name">fsm.route.form</field>
+        <field name="model">fsm.route</field>
+        <field name="arch" type="xml">
+            <form string="Route">
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                    </div>
+                    <group col="4">
+                        <field name="fsm_person_id"/>
+                        <field name="day_ids" widget="many2many_tags"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_fsm_route" model="ir.actions.act_window">
+        <field name="name">Routes</field>
+        <field name="res_model">fsm.route</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Add Routes here.
+            </p>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_route/views/fsm_route_day.xml b/fieldservice_route/views/fsm_route_day.xml
new file mode 100644
index 0000000000..509be21162
--- /dev/null
+++ b/fieldservice_route/views/fsm_route_day.xml
@@ -0,0 +1,39 @@
+<odoo>
+
+    <record id="fsm_route_day_tree_view" model="ir.ui.view">
+        <field name="name">Route Day</field>
+        <field name="model">fsm.route.day</field>
+        <field name="arch" type="xml">
+            <tree string="Route Day">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="fsm_route_day_form_view" model="ir.ui.view">
+        <field name="name">Route Day</field>
+        <field name="model">fsm.route.day</field>
+        <field name="arch" type="xml">
+            <form string="Route Day">
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_fsm_route_day" model="ir.actions.act_window">
+        <field name="name">Route Day</field>
+        <field name="res_model">fsm.route.day</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a Route Day.
+            </p>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_route/views/fsm_route_dayroute.xml b/fieldservice_route/views/fsm_route_dayroute.xml
new file mode 100644
index 0000000000..09c72660da
--- /dev/null
+++ b/fieldservice_route/views/fsm_route_dayroute.xml
@@ -0,0 +1,122 @@
+<odoo> 
+
+    <record id="fsm_route_dayroute_tree" model="ir.ui.view">
+        <field name="name">fsm.route.dayroute.tree</field>
+        <field name="model">fsm.route.dayroute</field>
+        <field name="arch" type="xml">
+            <tree string="Day Routes">
+                <field name="name"/>
+                <field name="person_id"/>
+                <field name="date"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="fsm_route_dayroute_form" model="ir.ui.view">
+        <field name="name">fsm.route.dayroute.form</field>
+        <field name="model">fsm.route.dayroute</field>
+        <field name="arch" type="xml">
+            <form string="Day Route">
+                <header>
+                    <field name="stage_id"
+                           widget="statusbar"
+                           options="{'fold_field': 'fold'}"
+                           clickable="True"
+                           domain="[('stage_type', '=', 'route')]"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" readonly="1"/>
+                        </h1>
+                    </div>
+                    <group col="4">
+                        <field name="person_id" required="1"/>
+                        <field name="date" required="1"/>
+                    </group>
+                    <group>
+                        <field name="route_id"/>
+                    </group>
+                    <notebook>
+                        <page string="Orders">
+                            <group>
+                                <field name="order_count"/>
+                            </group>
+                            <field name="order_ids" nolabel="1"
+                                   widget="many2many"
+                                   domain="[('route_id', '=', False)]">
+                                <tree>
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="name"/>
+                                    <field name="location_id"/>
+                                    <field name="scheduled_date_start"/>
+                                    <field name="stage_id"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Planning">
+                            <group col="4">
+                                <field name="team_id"/>
+                                <field name="territory_id"/>
+                                <field name="date_start_planned"/>
+                                <field name="longitude"/>
+                                <field name="latitude"/>
+                                <field name="start_location_id"/>
+                                <field name="end_location_id"/>
+                                <field name="last_location_id"/>
+                                <field name="work_time"/>
+                                <field name="max_allow_time"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_fsm_route_dayroute" model="ir.actions.act_window">
+        <field name="name">Day Routes</field>
+        <field name="res_model">fsm.route.dayroute</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Add Day Routes here.
+            </p>
+        </field>
+    </record>
+
+    <!-- Reporting -->
+    <record id="fsm_route_dayroute_graph_view" model="ir.ui.view">
+        <field name="name">fsm.route.graph</field>
+        <field name="model">fsm.route.dayroute</field>
+        <field name="arch" type="xml">
+            <graph string="Day Routes" type="bar">
+                <field name="date" type="row"/>
+            </graph>
+        </field>
+    </record>
+
+    <record id="fsm_route_dayroute_pivot_view" model="ir.ui.view">
+        <field name="name">fsm.route.pivot</field>
+        <field name="model">fsm.route.dayroute</field>
+        <field name="arch" type="xml">
+            <pivot string="Day Routes" display_quantity="true">
+                <field name="date" type="row"/>
+            </pivot>
+        </field>
+    </record>
+
+    <record id="action_fsm_route_dayroute_report" model="ir.actions.act_window">
+        <field name="name">Day Routes</field>
+        <field name="res_model">fsm.route.dayroute</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,pivot</field>
+        <field name="help" type="html">
+            <p>
+                Day Routes Report
+            </p>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_route/views/menu.xml b/fieldservice_route/views/menu.xml
new file mode 100644
index 0000000000..11171fbb3b
--- /dev/null
+++ b/fieldservice_route/views/menu.xml
@@ -0,0 +1,28 @@
+<odoo>
+
+    <!-- Routes -->
+    <menuitem id="menu_fsm_route_dayroute"
+              name="Day Routes"
+              action="action_fsm_route_dayroute"
+              parent="fieldservice.operations"
+              sequence="10"/>
+
+    <menuitem id="menu_fsm_route"
+              name="Routes"
+              action="action_fsm_route"
+              parent="fieldservice.data"
+              sequence="20"/>
+
+    <menuitem id="menu_fsm_route_day"
+              name="Route Days"
+              action="action_fsm_route_day"
+              parent="fieldservice.config"
+              sequence="30"/>
+
+    <!-- Reporting -->
+    <menuitem id="menu_fsm_route_dayroute_report"
+              name="Day Routes"
+              action="action_fsm_route_dayroute_report"
+              parent="fieldservice.reporting"/>
+
+</odoo>

From e3ed0ebb6b1f64dd07091ac6d886c0ec35ad393a Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 30 Dec 2019 16:34:46 -0600
Subject: [PATCH 252/631] [IMP] fieldservice_route

---
 .../views/fsm_route_dayroute.xml              | 51 +++++++++++--------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/fieldservice_route/views/fsm_route_dayroute.xml b/fieldservice_route/views/fsm_route_dayroute.xml
index 09c72660da..2f26ba3770 100644
--- a/fieldservice_route/views/fsm_route_dayroute.xml
+++ b/fieldservice_route/views/fsm_route_dayroute.xml
@@ -1,4 +1,4 @@
-<odoo> 
+<odoo>
 
     <record id="fsm_route_dayroute_tree" model="ir.ui.view">
         <field name="name">fsm.route.dayroute.tree</field>
@@ -8,6 +8,7 @@
                 <field name="name"/>
                 <field name="person_id"/>
                 <field name="date"/>
+                <field name="stage_id"/>
             </tree>
         </field>
     </record>
@@ -25,22 +26,30 @@
                            domain="[('stage_type', '=', 'route')]"/>
                 </header>
                 <sheet>
+                    <div class="oe_button_box" name="button_box"/>
                     <div class="oe_title">
                         <h1>
                             <field name="name" readonly="1"/>
                         </h1>
                     </div>
-                    <group col="4">
-                        <field name="person_id" required="1"/>
-                        <field name="date" required="1"/>
-                    </group>
-                    <group>
-                        <field name="route_id"/>
+                    <group id="main">
+                        <group id="left">
+                            <field name="person_id" required="1"/>
+                            <field name="team_id"/>
+                        </group>
+                        <group id="right">
+                            <field name="date" required="1"/>
+                            <field name="route_id"/>
+                            <field name="territory_id"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Orders">
-                            <group>
-                                <field name="order_count"/>
+                            <group id="orders">
+                                <group id="orders-left">
+                                    <field name="order_count"/>
+                                </group>
+                                <group id="orders-right"/>
                             </group>
                             <field name="order_ids" nolabel="1"
                                    widget="many2many"
@@ -55,17 +64,19 @@
                             </field>
                         </page>
                         <page string="Planning">
-                            <group col="4">
-                                <field name="team_id"/>
-                                <field name="territory_id"/>
-                                <field name="date_start_planned"/>
-                                <field name="longitude"/>
-                                <field name="latitude"/>
-                                <field name="start_location_id"/>
-                                <field name="end_location_id"/>
-                                <field name="last_location_id"/>
-                                <field name="work_time"/>
-                                <field name="max_allow_time"/>
+                            <group id="planning">
+                                <group id="planning-left" string="Timing">
+                                    <field name="date_start_planned"/>
+                                    <field name="work_time"/>
+                                    <field name="max_allow_time"/>
+                                </group>
+                                <group id="planning-right" string="Positioning">
+                                    <field name="longitude"/>
+                                    <field name="latitude"/>
+                                    <field name="start_location_id"/>
+                                    <field name="end_location_id"/>
+                                    <field name="last_location_id"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>

From e909c5f92fd9192c90cabf0da70b1b3d38cd0a46 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 31 Dec 2019 08:22:08 -0600
Subject: [PATCH 253/631] [IMP] fieldservice_route

---
 fieldservice_route/__manifest__.py             |  4 +---
 fieldservice_route/i18n/fieldservice_route.pot | 10 ++++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/fieldservice_route/__manifest__.py b/fieldservice_route/__manifest__.py
index 7d574e6503..e381a06aae 100644
--- a/fieldservice_route/__manifest__.py
+++ b/fieldservice_route/__manifest__.py
@@ -4,8 +4,7 @@
 
 {
     'name': 'Field Service Route',
-    'summary': '''A Field Service route is the sorted list of orders that one
-    worker/vehicle will perform during a day.''',
+    'summary': 'Organize the routes of each day.',
     'version': '12.0.1.0.0',
     'category': 'Field Service',
     'license': 'AGPL-3',
@@ -26,7 +25,6 @@
         'views/fsm_order.xml',
         'views/menu.xml',
     ],
-    'application': True,
     'development_status': 'Beta',
     'maintainers': [
         'max3903'
diff --git a/fieldservice_route/i18n/fieldservice_route.pot b/fieldservice_route/i18n/fieldservice_route.pot
index 64127504cd..6c1a2a6611 100644
--- a/fieldservice_route/i18n/fieldservice_route.pot
+++ b/fieldservice_route/i18n/fieldservice_route.pot
@@ -226,6 +226,11 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Positioning"
+msgstr ""
+
 #. module: fieldservice_route
 #: selection:fsm.stage,stage_type:0
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__fsm_route_id
@@ -296,6 +301,11 @@ msgstr ""
 msgid "Time before overtime (in hours)"
 msgstr ""
 
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Timing"
+msgstr ""
+
 #. module: fieldservice_route
 #: selection:fsm.route.day,name:0
 msgid "Tuesday"

From df179abdc40f8edde859b22965a56db40bae5023 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sat, 4 Jan 2020 13:52:38 +0000
Subject: [PATCH 254/631] fieldservice_route 12.0.1.1.0

---
 fieldservice_route/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_route/__manifest__.py b/fieldservice_route/__manifest__.py
index e381a06aae..bc0bd15a2f 100644
--- a/fieldservice_route/__manifest__.py
+++ b/fieldservice_route/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Field Service Route',
     'summary': 'Organize the routes of each day.',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.1.0',
     'category': 'Field Service',
     'license': 'AGPL-3',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',

From cd7ec453cc30821ab531cce95ca96f75585de251 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 6 Jan 2020 17:35:52 -0600
Subject: [PATCH 255/631] [FIX] fieldservice_route

---
 fieldservice_route/models/fsm_order.py        | 43 +++++++++++++++----
 .../models/fsm_route_dayroute.py              | 18 +++++++-
 .../security/ir.model.access.csv              |  6 +--
 .../views/fsm_route_dayroute.xml              |  2 +-
 4 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/fieldservice_route/models/fsm_order.py b/fieldservice_route/models/fsm_order.py
index 359974ee85..6278b6ea12 100644
--- a/fieldservice_route/models/fsm_order.py
+++ b/fieldservice_route/models/fsm_order.py
@@ -8,17 +8,35 @@
 class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
+    @api.model
+    def _get_default_person(self):
+        return self.fsm_route_id.fsm_person_id.id or False
+
     dayroute_id = fields.Many2one('fsm.route.dayroute',
                                   string='Day Route',
                                   index=True)
     fsm_route_id = fields.Many2one(related="location_id.fsm_route_id",
                                    string='Route')
 
+    person_id = fields.Many2one(
+        'fsm.person', string='Assigned To', index=True,
+        default=_get_default_person)
+
+    def prepare_dayroute_values(self, person_id, date_start):
+        return {
+            'person_id': person_id,
+            'date': date_start,
+            'route_id': self.fsm_route_id.id,
+            'team_id': self.team_id.id,
+            'order_ids': [(4, self.id)]
+        }
+
     def _manage_fsm_route(self, vals):
         fsm_route_obj = self.env['fsm.route.dayroute']
         for rec in self:
             old_route_id = False
-            person_id = vals.get('person_id') or rec.person_id.id
+            person_id = vals.get('person_id') or rec.person_id.id or \
+                        rec.fsm_route_id.fsm_person_id.id
             scheduled_date_start = vals.get('scheduled_date_start') or \
                 rec.scheduled_date_start
             fsm_route = fsm_route_obj.search([
@@ -31,17 +49,19 @@ def _manage_fsm_route(self, vals):
                 if old_route_id and not old_route_id.order_ids:
                     old_route_id.unlink()
             elif not fsm_route and person_id or scheduled_date_start:
-                fsm_route_obj.create({
-                    'person_id': person_id,
-                    'date': scheduled_date_start,
-                    'route_id': rec.fsm_route_id.id,
-                    'order_ids': [(4, rec.id)]
-                })
+                fsm_route_obj.create(rec.prepare_dayroute_values(
+                    person_id, scheduled_date_start
+                ))
                 if old_route_id and not old_route_id.order_ids:
                     old_route_id.unlink()
 
     @api.model
     def create(self, vals):
+        if not vals.get('person_id'):
+            location = self.env['fsm.location'].browse(vals.get('location_id'))
+            vals.update({
+                'person_id': location.fsm_route_id.fsm_person_id.id,
+            })
         res = super(FSMOrder, self).create(vals)
         if res.person_id and res.scheduled_date_start:
             res._manage_fsm_route(vals)
@@ -50,6 +70,13 @@ def create(self, vals):
     @api.multi
     def write(self, vals):
         for rec in self:
-            if vals.get('person_id') or vals.get('scheduled_date_start'):
+            if vals.get('route_id', False):
+                route = self.env['fsm.route'].browse(vals.get('route_id'))
+                vals.update({
+                    'person_id': route.person_id.id,
+                    'scheduled_date_start': route.date,
+                })
+            if vals.get('person_id', False) or \
+                    vals.get('scheduled_date_start', False):
                 rec._manage_fsm_route(vals)
         return super(FSMOrder, self).write(vals)
diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index a18b6cb5e9..540fb2525c 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -1,14 +1,18 @@
 # Copyright (C) 2019 Open Source Integrators
 # Copyright (C) 2019 Serpent consulting Services
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-
 from odoo import api, fields, models, _
+from odoo.exceptions import UserError
 
 
 class FSMRouteDayRoute(models.Model):
     _name = 'fsm.route.dayroute'
     _description = 'Field Service Route Dayroute'
 
+    @api.model
+    def _get_default_person(self):
+        return self.route_id.fsm_person_id.id or False
+
     @api.depends('route_id')
     def _compute_order_count(self):
         for rec in self:
@@ -18,7 +22,8 @@ def _compute_order_count(self):
 
     name = fields.Char(string='Name', required=True,
                        default=lambda self: _('New'))
-    person_id = fields.Many2one('fsm.person', string='Person')
+    person_id = fields.Many2one('fsm.person', string='Person',
+                                default=_get_default_person)
     route_id = fields.Many2one('fsm.route', string='Route')
     date = fields.Date(string='Date')
     team_id = fields.Many2one('fsm.team', string='Team')
@@ -61,3 +66,12 @@ def create(self, vals):
             vals['name'] = self.env['ir.sequence'].next_by_code(
                 'fsm.route.dayroute') or _('New')
         return super(FSMRouteDayRoute, self).create(vals)
+
+    @api.constrains('date', 'route_id')
+    def check_day(self):
+        # Get the day of the week in english
+        dayname = self.date.strftime('%A').lower()
+        day = self.env.ref('fieldservice_route.fsm_route_day_' + dayname)
+        if day.id not in self.route_id.day_ids.ids:
+            raise UserError(_("The route %s does not run on %s!" %
+                              self.route_id.name, day.name))
diff --git a/fieldservice_route/security/ir.model.access.csv b/fieldservice_route/security/ir.model.access.csv
index 163c5a29f6..a243f72a56 100644
--- a/fieldservice_route/security/ir.model.access.csv
+++ b/fieldservice_route/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_fsm_route_user,fsm.route.user,model_fsm_route,fieldservice.group_fsm_user,1,1,0,0
+access_fsm_route_user,fsm.route.user,model_fsm_route,fieldservice.group_fsm_user,1,0,0,0
 access_fsm_route_dispatcher,fsm.route.dispatcher,model_fsm_route,fieldservice.group_fsm_dispatcher,1,1,1,1
-access_fsm_route_day_user,fsm.route.day.user,model_fsm_route_day,fieldservice.group_fsm_user,1,1,0,0
-access_fsm_route_day_dispatcher,fsm.route.day.dispatcher,model_fsm_route_day,fieldservice.group_fsm_dispatcher,1,1,1,1
+access_fsm_route_day_user,fsm.route.day.user,model_fsm_route_day,fieldservice.group_fsm_user,1,0,0,0
+access_fsm_route_day_dispatcher,fsm.route.day.dispatcher,model_fsm_route_day,fieldservice.group_fsm_manager,1,1,0,0
 access_fsm_route_dayroute_user,fsm.route.dayroute.user,model_fsm_route_dayroute,fieldservice.group_fsm_user,1,1,0,0
 access_fsm_route_dayroute_dispatcher,fsm.route.dayroute.dispatcher,model_fsm_route_dayroute,fieldservice.group_fsm_dispatcher,1,1,1,1
diff --git a/fieldservice_route/views/fsm_route_dayroute.xml b/fieldservice_route/views/fsm_route_dayroute.xml
index 2f26ba3770..d828981c9c 100644
--- a/fieldservice_route/views/fsm_route_dayroute.xml
+++ b/fieldservice_route/views/fsm_route_dayroute.xml
@@ -35,7 +35,7 @@
                     <group id="main">
                         <group id="left">
                             <field name="person_id" required="1"/>
-                            <field name="team_id"/>
+                            <field name="team_id" groups="fieldservice.group_fsm_team"/>
                         </group>
                         <group id="right">
                             <field name="date" required="1"/>

From 65d6ab4ea22d7dac0ee0adeeaf48d96d991a7872 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 7 Jan 2020 09:14:26 -0600
Subject: [PATCH 256/631] [FIX] fieldservice_route

---
 fieldservice_route/models/fsm_order.py          | 2 +-
 fieldservice_route/models/fsm_route_dayroute.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_route/models/fsm_order.py b/fieldservice_route/models/fsm_order.py
index 6278b6ea12..a26e7545b7 100644
--- a/fieldservice_route/models/fsm_order.py
+++ b/fieldservice_route/models/fsm_order.py
@@ -36,7 +36,7 @@ def _manage_fsm_route(self, vals):
         for rec in self:
             old_route_id = False
             person_id = vals.get('person_id') or rec.person_id.id or \
-                        rec.fsm_route_id.fsm_person_id.id
+                rec.fsm_route_id.fsm_person_id.id
             scheduled_date_start = vals.get('scheduled_date_start') or \
                 rec.scheduled_date_start
             fsm_route = fsm_route_obj.search([
diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index 540fb2525c..63971822a7 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -25,7 +25,7 @@ def _compute_order_count(self):
     person_id = fields.Many2one('fsm.person', string='Person',
                                 default=_get_default_person)
     route_id = fields.Many2one('fsm.route', string='Route')
-    date = fields.Date(string='Date')
+    date = fields.Date(string='Date', required=True)
     team_id = fields.Many2one('fsm.team', string='Team')
     stage_id = fields.Many2one('fsm.stage', string='Stage',
                                domain="[('stage_type', '=', 'route')]",

From e001f956760a03f192e17524ac2ed9a2965f82fd Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Tue, 7 Jan 2020 09:55:35 -0800
Subject: [PATCH 257/631] [IMP] Fix Travis Redlight

---
 fieldservice_route/tests/test_fsm_order.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/fieldservice_route/tests/test_fsm_order.py b/fieldservice_route/tests/test_fsm_order.py
index 5e306437ec..1498a7339f 100644
--- a/fieldservice_route/tests/test_fsm_order.py
+++ b/fieldservice_route/tests/test_fsm_order.py
@@ -15,13 +15,23 @@ def setUp(self):
         self.fsm_route_obj = self.env['fsm.route']
         self.test_person = self.env.ref("fieldservice.test_person")
         self.test_location = self.env.ref("fieldservice.test_location")
+        self.date = datetime.now()
+        self.days = [
+                self.env.ref('fieldservice_route.fsm_route_day_sunday').id,
+                self.env.ref('fieldservice_route.fsm_route_day_monday').id,
+                self.env.ref('fieldservice_route.fsm_route_day_tuesday').id,
+                self.env.ref('fieldservice_route.fsm_route_day_wednesday').id,
+                self.env.ref('fieldservice_route.fsm_route_day_thursday').id,
+                self.env.ref('fieldservice_route.fsm_route_day_friday').id,
+                self.env.ref('fieldservice_route.fsm_route_day_saturday').id
+        ]
         self.fsm_route_id = self.fsm_route_obj.create(
             {
                 'name': 'Demo Route',
                 'fsm_person_id': self.test_person.id,
+                'day_ids': [(6, 0, self.days)]
             })
         self.test_location.fsm_route_id = self.fsm_route_id.id
-        self.date = datetime.now()
 
     def test_create_day_route(self):
         order = self.fsm_order_obj.create({'location_id':

From f04fa92b39f0ea4a6e01eb959288de3453f62f92 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Wed, 8 Jan 2020 18:30:49 +0530
Subject: [PATCH 258/631] [FIX] Travis

---
 fieldservice_route/tests/test_fsm_order.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fieldservice_route/tests/test_fsm_order.py b/fieldservice_route/tests/test_fsm_order.py
index 1498a7339f..60f8ff597e 100644
--- a/fieldservice_route/tests/test_fsm_order.py
+++ b/fieldservice_route/tests/test_fsm_order.py
@@ -17,13 +17,13 @@ def setUp(self):
         self.test_location = self.env.ref("fieldservice.test_location")
         self.date = datetime.now()
         self.days = [
-                self.env.ref('fieldservice_route.fsm_route_day_sunday').id,
-                self.env.ref('fieldservice_route.fsm_route_day_monday').id,
-                self.env.ref('fieldservice_route.fsm_route_day_tuesday').id,
-                self.env.ref('fieldservice_route.fsm_route_day_wednesday').id,
-                self.env.ref('fieldservice_route.fsm_route_day_thursday').id,
-                self.env.ref('fieldservice_route.fsm_route_day_friday').id,
-                self.env.ref('fieldservice_route.fsm_route_day_saturday').id
+            self.env.ref('fieldservice_route.fsm_route_day_sunday').id,
+            self.env.ref('fieldservice_route.fsm_route_day_monday').id,
+            self.env.ref('fieldservice_route.fsm_route_day_tuesday').id,
+            self.env.ref('fieldservice_route.fsm_route_day_wednesday').id,
+            self.env.ref('fieldservice_route.fsm_route_day_thursday').id,
+            self.env.ref('fieldservice_route.fsm_route_day_friday').id,
+            self.env.ref('fieldservice_route.fsm_route_day_saturday').id
         ]
         self.fsm_route_id = self.fsm_route_obj.create(
             {

From db7676d829558a3ef6622ad03bac1b1d89071a8a Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 9 Jan 2020 08:05:04 -0800
Subject: [PATCH 259/631] [IMP] fieldservice_route

---
 .../models/fsm_route_dayroute.py              | 21 ++++++++++++-------
 .../views/fsm_route_dayroute.xml              |  3 ++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index 63971822a7..565a035b1c 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -59,19 +59,26 @@ def _default_stage_id(self):
         return self.env['fsm.stage'].search([('stage_type', '=', 'route'),
                                              ('is_default', '=', True)],
                                             limit=1)
+    @api.onchange('route_id')
+    def _onchange_person(self):
+        self.fsm_person_id = self._get_default_person()
 
     @api.model
     def create(self, vals):
         if vals.get('name', _('New')) == _('New'):
             vals['name'] = self.env['ir.sequence'].next_by_code(
                 'fsm.route.dayroute') or _('New')
-        return super(FSMRouteDayRoute, self).create(vals)
+        return super().create(vals)
 
     @api.constrains('date', 'route_id')
     def check_day(self):
-        # Get the day of the week in english
-        dayname = self.date.strftime('%A').lower()
-        day = self.env.ref('fieldservice_route.fsm_route_day_' + dayname)
-        if day.id not in self.route_id.day_ids.ids:
-            raise UserError(_("The route %s does not run on %s!" %
-                              self.route_id.name, day.name))
+        for rec in self:
+            if rec.date and rec.route_id:
+                # Get the day of the week in english
+                dayname = rec.date.strftime('%A').lower()
+                day = self.env.ref(
+                    'fieldservice_route.fsm_route_day_' + dayname)
+                if day.id not in rec.route_id.day_ids.ids:
+                    raise UserError(_(
+                        "The route %s does not run on %s!" %
+                        (rec.route_id.name, day.name)))
diff --git a/fieldservice_route/views/fsm_route_dayroute.xml b/fieldservice_route/views/fsm_route_dayroute.xml
index d828981c9c..11c245b966 100644
--- a/fieldservice_route/views/fsm_route_dayroute.xml
+++ b/fieldservice_route/views/fsm_route_dayroute.xml
@@ -6,6 +6,7 @@
         <field name="arch" type="xml">
             <tree string="Day Routes">
                 <field name="name"/>
+                <field name="route_id"/>
                 <field name="person_id"/>
                 <field name="date"/>
                 <field name="stage_id"/>
@@ -34,12 +35,12 @@
                     </div>
                     <group id="main">
                         <group id="left">
+                            <field name="route_id"/>
                             <field name="person_id" required="1"/>
                             <field name="team_id" groups="fieldservice.group_fsm_team"/>
                         </group>
                         <group id="right">
                             <field name="date" required="1"/>
-                            <field name="route_id"/>
                             <field name="territory_id"/>
                         </group>
                     </group>

From 4f9f6d88928232d3c3bb52b90f514e109289a0af Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 9 Jan 2020 14:23:52 -0800
Subject: [PATCH 260/631] [FIX] fieldservice_route

---
 fieldservice_route/models/fsm_route_dayroute.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index 565a035b1c..030b5ad6c7 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -59,6 +59,7 @@ def _default_stage_id(self):
         return self.env['fsm.stage'].search([('stage_type', '=', 'route'),
                                              ('is_default', '=', True)],
                                             limit=1)
+
     @api.onchange('route_id')
     def _onchange_person(self):
         self.fsm_person_id = self._get_default_person()

From e0991c38a7acf7ec3f4f2e8a76470a1a089b67f4 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 14 Jan 2020 09:20:18 -0600
Subject: [PATCH 261/631] [FIX] fieldservice_route

---
 fieldservice_route/models/fsm_order.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fieldservice_route/models/fsm_order.py b/fieldservice_route/models/fsm_order.py
index a26e7545b7..112aa32993 100644
--- a/fieldservice_route/models/fsm_order.py
+++ b/fieldservice_route/models/fsm_order.py
@@ -76,7 +76,8 @@ def write(self, vals):
                     'person_id': route.person_id.id,
                     'scheduled_date_start': route.date,
                 })
-            if vals.get('person_id', False) or \
-                    vals.get('scheduled_date_start', False):
+            if (vals.get('person_id', False) or rec.person_id) and \
+                    (vals.get('scheduled_date_start', False) or
+                     rec.scheduled_date_start):
                 rec._manage_fsm_route(vals)
         return super(FSMOrder, self).write(vals)

From ac4180994c32f1bdc96c0e54721fd915cfdd2b57 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 14 Jan 2020 10:03:20 -0600
Subject: [PATCH 262/631] [FIX] fieldservice_route

---
 .../i18n/fieldservice_route.pot               | 17 +++++++++---
 fieldservice_route/models/fsm_order.py        | 27 ++++++++++---------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/fieldservice_route/i18n/fieldservice_route.pot b/fieldservice_route/i18n/fieldservice_route.pot
index 6c1a2a6611..52b6af56c7 100644
--- a/fieldservice_route/i18n/fieldservice_route.pot
+++ b/fieldservice_route/i18n/fieldservice_route.pot
@@ -23,6 +23,11 @@ msgstr ""
 msgid "Add Routes here."
 msgstr ""
 
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__person_id
+msgid "Assigned To"
+msgstr ""
+
 #. module: fieldservice_route
 #: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
 msgid "Create a Route Day."
@@ -187,9 +192,9 @@ msgid "Name"
 msgstr ""
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:20
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:60
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:62
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:24
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:69
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:71
 #, python-format
 msgid "New"
 msgstr ""
@@ -291,6 +296,12 @@ msgstr ""
 msgid "Territory"
 msgstr ""
 
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:85
+#, python-format
+msgid "The route %s does not run on %s!"
+msgstr ""
+
 #. module: fieldservice_route
 #: selection:fsm.route.day,name:0
 msgid "Thursday"
diff --git a/fieldservice_route/models/fsm_order.py b/fieldservice_route/models/fsm_order.py
index 112aa32993..42367dbd9a 100644
--- a/fieldservice_route/models/fsm_order.py
+++ b/fieldservice_route/models/fsm_order.py
@@ -32,28 +32,29 @@ def prepare_dayroute_values(self, person_id, date_start):
         }
 
     def _manage_fsm_route(self, vals):
-        fsm_route_obj = self.env['fsm.route.dayroute']
+        dayroute_obj = self.env['fsm.route.dayroute']
         for rec in self:
-            old_route_id = False
             person_id = vals.get('person_id') or rec.person_id.id or \
                 rec.fsm_route_id.fsm_person_id.id
             scheduled_date_start = vals.get('scheduled_date_start') or \
                 rec.scheduled_date_start
-            fsm_route = fsm_route_obj.search([
+            dayroute = dayroute_obj.search([
                 ('person_id', '=', person_id),
                 ('date', '=', scheduled_date_start)],
                 limit=1)
-            old_route_id = rec.dayroute_id
-            if fsm_route:
-                rec.dayroute_id = fsm_route.id
-                if old_route_id and not old_route_id.order_ids:
-                    old_route_id.unlink()
-            elif not fsm_route and person_id or scheduled_date_start:
-                fsm_route_obj.create(rec.prepare_dayroute_values(
+            old_dayroute_id = rec.dayroute_id
+            if dayroute:
+                vals.update({
+                    'dayroute_id': dayroute.id})
+                if old_dayroute_id and not old_dayroute_id.order_ids:
+                    old_dayroute_id.unlink()
+            elif not dayroute and person_id or scheduled_date_start:
+                dayroute_obj.create(rec.prepare_dayroute_values(
                     person_id, scheduled_date_start
                 ))
-                if old_route_id and not old_route_id.order_ids:
-                    old_route_id.unlink()
+                if old_dayroute_id and not old_dayroute_id.order_ids:
+                    old_dayroute_id.unlink()
+        return vals
 
     @api.model
     def create(self, vals):
@@ -79,5 +80,5 @@ def write(self, vals):
             if (vals.get('person_id', False) or rec.person_id) and \
                     (vals.get('scheduled_date_start', False) or
                      rec.scheduled_date_start):
-                rec._manage_fsm_route(vals)
+                vals = rec._manage_fsm_route(vals)
         return super(FSMOrder, self).write(vals)

From 85cd00aeffed7ddd5abe091e24f9f19f033244fb Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 14 Jan 2020 18:10:16 +0000
Subject: [PATCH 263/631] fieldservice_route 12.0.1.2.0

---
 fieldservice_route/__manifest__.py |   2 +-
 fieldservice_route/i18n/es_CL.po   | 346 +++++++++++++++++++++++++++++
 2 files changed, 347 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_route/i18n/es_CL.po

diff --git a/fieldservice_route/__manifest__.py b/fieldservice_route/__manifest__.py
index bc0bd15a2f..7d621a52e4 100644
--- a/fieldservice_route/__manifest__.py
+++ b/fieldservice_route/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Field Service Route',
     'summary': 'Organize the routes of each day.',
-    'version': '12.0.1.1.0',
+    'version': '12.0.1.2.0',
     'category': 'Field Service',
     'license': 'AGPL-3',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_route/i18n/es_CL.po b/fieldservice_route/i18n/es_CL.po
new file mode 100644
index 0000000000..d789d063ae
--- /dev/null
+++ b/fieldservice_route/i18n/es_CL.po
@@ -0,0 +1,346 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_route
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-01-16 22:38+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.10\n"
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute
+msgid "Add Day Routes here."
+msgstr "Agregue Rutas de Día aquí."
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route
+msgid "Add Routes here."
+msgstr "Agregar rutas aquí."
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__person_id
+msgid "Assigned To"
+msgstr "Asignado a"
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
+msgid "Create a Route Day."
+msgstr "Crea un día de ruta."
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_date
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date
+msgid "Date"
+msgstr "Fecha"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__dayroute_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Day Route"
+msgstr "Ruta del día"
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_report
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute_report
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_tree
+msgid "Day Routes"
+msgstr "Rutas de día"
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute_report
+msgid "Day Routes Report"
+msgstr "Informe de rutas diarias"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__day_ids
+msgid "Days"
+msgstr "Días"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__display_name
+msgid "Display Name"
+msgstr "Nombre para mostrar"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__end_location_id
+msgid "End Location"
+msgstr "Ubicación final"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Equipment"
+msgstr "Equipamento"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_location
+msgid "Field Service Location"
+msgstr "Ubicación del servicio de campo"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_order
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_route
+msgid "Field Service Route"
+msgstr "Ruta de Servicio de Campo"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_route_dayroute
+msgid "Field Service Route Dayroute"
+msgstr "Ruta de servicio de campo Dayroute"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_stage
+msgid "Field Service Stage"
+msgstr "Etapa de Servicio de Campo"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Friday"
+msgstr "Viernes"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__last_location_id
+msgid "Last Location"
+msgstr "Última ubicación"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute____last_update
+msgid "Last Modified on"
+msgstr "Última modificación el"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_uid
+msgid "Last Updated by"
+msgstr "Última actualización por"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_date
+msgid "Last Updated on"
+msgstr "Ultima actualización en"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__latitude
+msgid "Latitude"
+msgstr "Latitud"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__longitude
+msgid "Longitude"
+msgstr "Longitud"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_allow_time
+msgid "Maximal Allowable Time (in hours)"
+msgstr "Tiempo máximo permitido (en horas)"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Monday"
+msgstr "Lunes"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:24
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:69
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:71
+#, python-format
+msgid "New"
+msgstr "Nuevo"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_count
+msgid "Number of Orders"
+msgstr "Numero de Ordenes"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Order"
+msgstr "Orden"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Orders"
+msgstr "Pedidos"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__fsm_person_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__person_id
+msgid "Person"
+msgstr "Persona"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date_start_planned
+msgid "Planned Start Time"
+msgstr "Hora de Inicio Planificada"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Positioning"
+msgstr "Posicionamiento"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__fsm_route_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__fsm_route_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__route_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Route"
+msgstr "Ruta"
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_day
+#: model:ir.model,name:fieldservice_route.model_fsm_route_day
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_tree_view
+msgid "Route Day"
+msgstr "Día de la Ruta"
+
+#. module: fieldservice_route
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_day
+msgid "Route Days"
+msgstr "Días de Ruta"
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_tree
+msgid "Routes"
+msgstr "Rutas"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__stage_id
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__start_location_id
+msgid "Start Location"
+msgstr "Lugar de Inicio"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__team_id
+msgid "Team"
+msgstr "Equipo"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__territory_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__territory_id
+msgid "Territory"
+msgstr "Territorio"
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:85
+#, python-format
+msgid "The route %s does not run on %s!"
+msgstr "La ruta %s no corre en %s!"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Thursday"
+msgstr "Jueves"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__work_time
+msgid "Time before overtime (in hours)"
+msgstr "Tiempo antes de las horas extra (en horas)"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Timing"
+msgstr "Sincronización"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__stage_type
+msgid "Type"
+msgstr "Tipo"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Worker"
+msgstr "Trabajador"
+
+#. module: fieldservice_route
+#: sql_constraint:fsm.route.dayroute:0
+msgid "You cannot create 2 day routes for the same worker on the same day!"
+msgstr "¡No puede crear rutas de 2 días para el mismo trabajador el mismo día!"

From 2479a13332b9437697c018275b0986ce2b264126 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 17 Jan 2020 15:13:01 -0600
Subject: [PATCH 264/631] [FIX] fieldservice_route: Issue with locale

---
 fieldservice_route/data/fsm_route_day_data.xml  | 14 +++++++-------
 fieldservice_route/models/fsm_route_dayroute.py |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fieldservice_route/data/fsm_route_day_data.xml b/fieldservice_route/data/fsm_route_day_data.xml
index c9d4a499a0..b4fa0f06f2 100644
--- a/fieldservice_route/data/fsm_route_day_data.xml
+++ b/fieldservice_route/data/fsm_route_day_data.xml
@@ -1,30 +1,30 @@
 <odoo noupdate="1">
 
-    <record id="fsm_route_day_monday" model="fsm.route.day">
+    <record id="fsm_route_day_0" model="fsm.route.day">
         <field name="name">Monday</field>
     </record>
 
-    <record id="fsm_route_day_tuesday" model="fsm.route.day">
+    <record id="fsm_route_day_1" model="fsm.route.day">
         <field name="name">Tuesday</field>
     </record>
 
-    <record id="fsm_route_day_wednesday" model="fsm.route.day">
+    <record id="fsm_route_day_2" model="fsm.route.day">
         <field name="name">Wednesday</field>
     </record>
 
-    <record id="fsm_route_day_thursday" model="fsm.route.day">
+    <record id="fsm_route_day_3" model="fsm.route.day">
         <field name="name">Thursday</field>
     </record>
 
-    <record id="fsm_route_day_friday" model="fsm.route.day">
+    <record id="fsm_route_day_4" model="fsm.route.day">
         <field name="name">Friday</field>
     </record>
 
-    <record id="fsm_route_day_saturday" model="fsm.route.day">
+    <record id="fsm_route_day_5" model="fsm.route.day">
         <field name="name">Saturday</field>
     </record>
 
-    <record id="fsm_route_day_sunday" model="fsm.route.day">
+    <record id="fsm_route_day_6" model="fsm.route.day">
         <field name="name">Sunday</field>
     </record>
 
diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index 030b5ad6c7..7c77e1f236 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -75,10 +75,10 @@ def create(self, vals):
     def check_day(self):
         for rec in self:
             if rec.date and rec.route_id:
-                # Get the day of the week in english
-                dayname = rec.date.strftime('%A').lower()
+                # Get the day of the week: Monday -> 0, Sunday -> 6
+                day_index = rec.date.weekday()
                 day = self.env.ref(
-                    'fieldservice_route.fsm_route_day_' + dayname)
+                    'fieldservice_route.fsm_route_day_' + day_index)
                 if day.id not in rec.route_id.day_ids.ids:
                     raise UserError(_(
                         "The route %s does not run on %s!" %

From 663c28bdd9621e1962389dacff3c01fbbe2b2e73 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 17 Jan 2020 15:26:06 -0600
Subject: [PATCH 265/631] [FIX] fieldservice_route

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

diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index 7c77e1f236..20cb4fb863 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -78,7 +78,7 @@ def check_day(self):
                 # Get the day of the week: Monday -> 0, Sunday -> 6
                 day_index = rec.date.weekday()
                 day = self.env.ref(
-                    'fieldservice_route.fsm_route_day_' + day_index)
+                    'fieldservice_route.fsm_route_day_' + str(day_index))
                 if day.id not in rec.route_id.day_ids.ids:
                     raise UserError(_(
                         "The route %s does not run on %s!" %

From d851047c7ed71b8a80868f773e1931e272420cf3 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@ursainfosystems.com>
Date: Fri, 17 Jan 2020 15:53:03 -0600
Subject: [PATCH 266/631] Update test_fsm_order.py

---
 fieldservice_route/tests/test_fsm_order.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fieldservice_route/tests/test_fsm_order.py b/fieldservice_route/tests/test_fsm_order.py
index 60f8ff597e..b0ad3ac0c3 100644
--- a/fieldservice_route/tests/test_fsm_order.py
+++ b/fieldservice_route/tests/test_fsm_order.py
@@ -17,13 +17,13 @@ def setUp(self):
         self.test_location = self.env.ref("fieldservice.test_location")
         self.date = datetime.now()
         self.days = [
-            self.env.ref('fieldservice_route.fsm_route_day_sunday').id,
-            self.env.ref('fieldservice_route.fsm_route_day_monday').id,
-            self.env.ref('fieldservice_route.fsm_route_day_tuesday').id,
-            self.env.ref('fieldservice_route.fsm_route_day_wednesday').id,
-            self.env.ref('fieldservice_route.fsm_route_day_thursday').id,
-            self.env.ref('fieldservice_route.fsm_route_day_friday').id,
-            self.env.ref('fieldservice_route.fsm_route_day_saturday').id
+            self.env.ref('fieldservice_route.fsm_route_day_0').id,
+            self.env.ref('fieldservice_route.fsm_route_day_1').id,
+            self.env.ref('fieldservice_route.fsm_route_day_2').id,
+            self.env.ref('fieldservice_route.fsm_route_day_3').id,
+            self.env.ref('fieldservice_route.fsm_route_day_4').id,
+            self.env.ref('fieldservice_route.fsm_route_day_5').id,
+            self.env.ref('fieldservice_route.fsm_route_day_6').id
         ]
         self.fsm_route_id = self.fsm_route_obj.create(
             {

From 233bf78e15f082c0edfdfef8016be61404608865 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 28 Jan 2020 10:02:25 -0600
Subject: [PATCH 267/631] [ADD] fieldservice_route: Migration script

---
 fieldservice_route/__manifest__.py               |  2 +-
 .../migrations/12.0.2.0.0/pre-migration.py       | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_route/migrations/12.0.2.0.0/pre-migration.py

diff --git a/fieldservice_route/__manifest__.py b/fieldservice_route/__manifest__.py
index 7d621a52e4..c569e821b0 100644
--- a/fieldservice_route/__manifest__.py
+++ b/fieldservice_route/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Field Service Route',
     'summary': 'Organize the routes of each day.',
-    'version': '12.0.1.2.0',
+    'version': '12.0.2.0.0',
     'category': 'Field Service',
     'license': 'AGPL-3',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_route/migrations/12.0.2.0.0/pre-migration.py b/fieldservice_route/migrations/12.0.2.0.0/pre-migration.py
new file mode 100644
index 0000000000..0088ff5c8a
--- /dev/null
+++ b/fieldservice_route/migrations/12.0.2.0.0/pre-migration.py
@@ -0,0 +1,16 @@
+# 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
+
+    index = 0
+    for day in ('monday', 'tuesday', 'wednesday', 'thursday', 'friday',
+                'saturday', 'sunday'):
+        env.execute("""UPDATE ir_model_data
+        SET name='fsm_route_day_%s'
+        WHERE name='fsm_route_day_%s' AND module='fieldservice_route';""" %
+                    (index, day))
+        index += 1

From 6f32bca296150406a52a4f6c8150eefba4084f82 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sat, 1 Feb 2020 19:13:25 -0600
Subject: [PATCH 268/631] [IMP] fieldservice_route

---
 fieldservice_route/models/fsm_route.py        | 17 ++++++++++-
 .../models/fsm_route_dayroute.py              | 30 ++++++++++++++++---
 fieldservice_route/views/fsm_route.xml        | 23 ++++++++++++--
 .../views/fsm_route_dayroute.xml              | 27 +++++++++++++++--
 fieldservice_route/views/menu.xml             | 23 +++++++++-----
 5 files changed, 103 insertions(+), 17 deletions(-)

diff --git a/fieldservice_route/models/fsm_route.py b/fieldservice_route/models/fsm_route.py
index 56ae757c63..48f6ffd685 100644
--- a/fieldservice_route/models/fsm_route.py
+++ b/fieldservice_route/models/fsm_route.py
@@ -1,7 +1,6 @@
 # Copyright (C) 2019 Open Source Integrators
 # Copyright (C) 2019 Serpent consulting Services
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-
 from odoo import fields, models
 
 
@@ -13,3 +12,19 @@ class FSMRoute(models.Model):
     territory_id = fields.Many2one('fsm.territory', string='Territory')
     fsm_person_id = fields.Many2one('fsm.person', string='Person')
     day_ids = fields.Many2many('fsm.route.day', string='Days')
+    max_order = fields.Integer('Maximum Orders', default=0,
+                               help="Maximum number of orders per day route.")
+
+    def run_on(self, date):
+        """
+        :param date: date
+        :return: True if the route runs on the date, False otherwise.
+        """
+        if date:
+            day_index = date.weekday()
+            day = self.env.ref(
+                    'fieldservice_route.fsm_route_day_' + str(day_index))
+            if day in self.day_ids:
+                return True
+            else:
+                return False
diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index 20cb4fb863..01298abb3f 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -1,8 +1,9 @@
 # Copyright (C) 2019 Open Source Integrators
 # Copyright (C) 2019 Serpent consulting Services
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from datetime import datetime
 from odoo import api, fields, models, _
-from odoo.exceptions import UserError
+from odoo.exceptions import ValidationError
 
 
 class FSMRouteDayRoute(models.Model):
@@ -13,6 +14,13 @@ class FSMRouteDayRoute(models.Model):
     def _get_default_person(self):
         return self.route_id.fsm_person_id.id or False
 
+    @api.model
+    def _get_default_date_start_planned(self):
+        if self.date:
+            return datetime.combine(
+                # TODO: Use the worker timezone and working schedule
+                self.date, datetime.strptime("8:00:01", '%H:%M:%S').time())
+
     @api.depends('route_id')
     def _compute_order_count(self):
         for rec in self:
@@ -31,11 +39,14 @@ def _compute_order_count(self):
                                domain="[('stage_type', '=', 'route')]",
                                index=True, copy=False,
                                default=lambda self: self._default_stage_id())
-    territory_id = fields.Many2one('fsm.territory', string='Territory')
+    territory_id = fields.Many2one(
+        'fsm.territory', related='route_id.territory_id', string='Territory')
     longitude = fields.Float("Longitude")
     latitude = fields.Float("Latitude")
     last_location_id = fields.Many2one('fsm.location', string='Last Location')
-    date_start_planned = fields.Datetime(string='Planned Start Time')
+    date_start_planned = fields.Datetime(
+        string='Planned Start Time',
+        default=_get_default_date_start_planned)
     start_location_id = fields.Many2one(
         'fsm.location', string='Start Location')
     end_location_id = fields.Many2one('fsm.location', string='End Location')
@@ -47,6 +58,9 @@ def _compute_order_count(self):
                                 string='Orders')
     order_count = fields.Integer(string='Number of Orders',
                                  compute=_compute_order_count)
+    order_max = fields.Integer(
+        related='route_id.max_order', string="Capacity",
+        help="Maximum numbers of orders that can be added to this day route.")
 
     _sql_constraints = [
         ('fsm_route_dayroute_person_date_uniq',
@@ -80,6 +94,14 @@ def check_day(self):
                 day = self.env.ref(
                     'fieldservice_route.fsm_route_day_' + str(day_index))
                 if day.id not in rec.route_id.day_ids.ids:
-                    raise UserError(_(
+                    raise ValidationError(_(
                         "The route %s does not run on %s!" %
                         (rec.route_id.name, day.name)))
+
+    @api.constrains('order_max', 'order_count')
+    def check_capacity(self):
+        for rec in self:
+             if rec.order_count > rec.order_max:
+                 raise ValidationError(_(
+                     "The day route is exceeding the maximum number of "
+                     "orders of the route."))
diff --git a/fieldservice_route/views/fsm_route.xml b/fieldservice_route/views/fsm_route.xml
index 7dc4de5c3d..7989570cc8 100644
--- a/fieldservice_route/views/fsm_route.xml
+++ b/fieldservice_route/views/fsm_route.xml
@@ -24,10 +24,27 @@
                             <field name="name"/>
                         </h1>
                     </div>
-                    <group col="4">
-                        <field name="fsm_person_id"/>
-                        <field name="day_ids" widget="many2many_tags"/>
+                    <group id="main">
+                        <group id="left">
+                            <field name="fsm_person_id"/>
+                        </group>
+                        <group id="right">
+                            <field name="day_ids" widget="many2many_tags"/>
+                        </group>
                     </group>
+                    <notebook>
+                        <page id="capacity" string="Capacity">
+                            <group id="capacity">
+                                <group id="capacity-left">
+                                    <label for="max_order" string="Maximum"/>
+                                    <div>
+                                        <field name="max_order"/> orders per day route
+                                    </div>
+                                </group>
+                                <group id="capacity-right"/>
+                            </group>
+                        </page>
+                    </notebook>
                 </sheet>
             </form>
         </field>
diff --git a/fieldservice_route/views/fsm_route_dayroute.xml b/fieldservice_route/views/fsm_route_dayroute.xml
index 11c245b966..edf8293d08 100644
--- a/fieldservice_route/views/fsm_route_dayroute.xml
+++ b/fieldservice_route/views/fsm_route_dayroute.xml
@@ -48,13 +48,14 @@
                         <page string="Orders">
                             <group id="orders">
                                 <group id="orders-left">
+                                    <field name="order_max"/>
                                     <field name="order_count"/>
                                 </group>
                                 <group id="orders-right"/>
                             </group>
                             <field name="order_ids" nolabel="1"
                                    widget="many2many"
-                                   domain="[('route_id', '=', False)]">
+                                   domain="[('dayroute_id', '=', False), ('fsm_route_id', '=', route_id)]">
                                 <tree>
                                     <field name="sequence" widget="handle"/>
                                     <field name="name"/>
@@ -90,7 +91,7 @@
         <field name="name">Day Routes</field>
         <field name="res_model">fsm.route.dayroute</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">tree,calendar,form</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 Add Day Routes here.
@@ -98,6 +99,28 @@
         </field>
     </record>
 
+    <!-- Dashboard -->
+    <record id="fsm_route_dayroute_calendar" model="ir.ui.view">
+        <field name="name">fsm.route.dayroute.calendar</field>
+        <field name="model">fsm.route.dayroute</field>
+        <field name="arch" type="xml">
+            <calendar string="Day Routes"
+                      date_start="date_start_planned"
+                      date_delay="max_allow_time"
+                      color="route_id">
+                <field name="name"/>
+                <field name="person_id"/>
+            </calendar>
+        </field>
+    </record>
+
+    <record id="action_fsm_route_dayroute_dash" model="ir.actions.act_window">
+        <field name="name">Day Routes</field>
+        <field name="res_model">fsm.route.dayroute</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">calendar,tree</field>
+    </record>
+
     <!-- Reporting -->
     <record id="fsm_route_dayroute_graph_view" model="ir.ui.view">
         <field name="name">fsm.route.graph</field>
diff --git a/fieldservice_route/views/menu.xml b/fieldservice_route/views/menu.xml
index 11171fbb3b..96023f2019 100644
--- a/fieldservice_route/views/menu.xml
+++ b/fieldservice_route/views/menu.xml
@@ -1,28 +1,37 @@
 <odoo>
 
-    <!-- Routes -->
+    <!-- Dashboard -->
+    <menuitem id="menu_fsm_dash_dayroute"
+              name="Day Routes"
+              action="action_fsm_route_dayroute_dash"
+              parent="fieldservice.dashboard"
+              sequence="20"/>
+
+    <!-- Operations -->
     <menuitem id="menu_fsm_route_dayroute"
               name="Day Routes"
               action="action_fsm_route_dayroute"
               parent="fieldservice.operations"
               sequence="10"/>
 
+    <!-- Master Data -->
     <menuitem id="menu_fsm_route"
               name="Routes"
               action="action_fsm_route"
               parent="fieldservice.data"
               sequence="20"/>
 
-    <menuitem id="menu_fsm_route_day"
-              name="Route Days"
-              action="action_fsm_route_day"
-              parent="fieldservice.config"
-              sequence="30"/>
-
     <!-- Reporting -->
     <menuitem id="menu_fsm_route_dayroute_report"
               name="Day Routes"
               action="action_fsm_route_dayroute_report"
               parent="fieldservice.reporting"/>
 
+    <!-- Configuration -->
+    <menuitem id="menu_fsm_route_day"
+              name="Route Days"
+              action="action_fsm_route_day"
+              parent="fieldservice.config"
+              sequence="30"/>
+
 </odoo>

From 55cebe0aac6b7cf542ba85805a904a347eaedb8f Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sat, 1 Feb 2020 19:47:20 -0600
Subject: [PATCH 269/631] [FIX] fieldservice_route

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

diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index 01298abb3f..4a7e9ba6e6 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -101,7 +101,7 @@ def check_day(self):
     @api.constrains('order_max', 'order_count')
     def check_capacity(self):
         for rec in self:
-             if rec.order_count > rec.order_max:
-                 raise ValidationError(_(
-                     "The day route is exceeding the maximum number of "
-                     "orders of the route."))
+            if rec.order_count > rec.order_max:
+                raise ValidationError(_(
+                    "The day route is exceeding the maximum number of "
+                    "orders of the route."))

From 3ab97e0118aec2aaee49a962b274e6478ac138d4 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 6 Feb 2020 15:41:38 -0600
Subject: [PATCH 270/631] [FIX] fieldservice_route

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

diff --git a/fieldservice_route/models/fsm_route.py b/fieldservice_route/models/fsm_route.py
index 48f6ffd685..10070d1a2e 100644
--- a/fieldservice_route/models/fsm_route.py
+++ b/fieldservice_route/models/fsm_route.py
@@ -23,7 +23,7 @@ def run_on(self, date):
         if date:
             day_index = date.weekday()
             day = self.env.ref(
-                    'fieldservice_route.fsm_route_day_' + str(day_index))
+                'fieldservice_route.fsm_route_day_' + str(day_index))
             if day in self.day_ids:
                 return True
             else:

From 5f67c0b0656df120569bd2e425a3bdb989aa4067 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 9 Feb 2020 15:47:22 -0600
Subject: [PATCH 271/631] [FIX] fieldservice_route: Comments

---
 fieldservice_route/i18n/es_CL.po              |  52 ++-
 .../i18n/fieldservice_route.pot               |  48 ++-
 fieldservice_route/i18n/pt_BR.po              | 387 ++++++++++++++++++
 fieldservice_route/models/fsm_route.py        |   5 +-
 .../models/fsm_route_dayroute.py              |   6 +-
 .../views/fsm_route_dayroute.xml              |   2 +-
 6 files changed, 483 insertions(+), 17 deletions(-)
 create mode 100644 fieldservice_route/i18n/pt_BR.po

diff --git a/fieldservice_route/i18n/es_CL.po b/fieldservice_route/i18n/es_CL.po
index d789d063ae..24355a8be5 100644
--- a/fieldservice_route/i18n/es_CL.po
+++ b/fieldservice_route/i18n/es_CL.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_route
+# 	* fieldservice_route
 #
 msgid ""
 msgstr ""
@@ -31,6 +31,12 @@ msgstr "Agregar rutas aquí."
 msgid "Assigned To"
 msgstr "Asignado a"
 
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Capacity"
+msgstr ""
+
 #. module: fieldservice_route
 #: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
 msgid "Create a Route Day."
@@ -63,9 +69,12 @@ msgstr "Ruta del día"
 
 #. module: fieldservice_route
 #: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_dash
 #: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_report
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_dash_dayroute
 #: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute
 #: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute_report
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_calendar
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_graph_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_pivot_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_tree
@@ -182,6 +191,28 @@ msgstr "Longitud"
 msgid "Maximal Allowable Time (in hours)"
 msgstr "Tiempo máximo permitido (en horas)"
 
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Maximum"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__max_order
+#, fuzzy
+#| msgid "Number of Orders"
+msgid "Maximum Orders"
+msgstr "Numero de Ordenes"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,help:fieldservice_route.field_fsm_route__max_order
+msgid "Maximum number of orders per day route."
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,help:fieldservice_route.field_fsm_route_dayroute__max_order
+msgid "Maximum numbers of orders that can be added to this day route."
+msgstr ""
+
 #. module: fieldservice_route
 #: selection:fsm.route.day,name:0
 msgid "Monday"
@@ -195,9 +226,9 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:24
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:69
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:71
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:32
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:83
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:85
 #, python-format
 msgid "New"
 msgstr "Nuevo"
@@ -300,7 +331,13 @@ msgid "Territory"
 msgstr "Territorio"
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:85
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:105
+#, python-format
+msgid "The day route is exceeding the maximum number of orders of the route."
+msgstr ""
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:99
 #, python-format
 msgid "The route %s does not run on %s!"
 msgstr "La ruta %s no corre en %s!"
@@ -344,3 +381,8 @@ msgstr "Trabajador"
 #: sql_constraint:fsm.route.dayroute:0
 msgid "You cannot create 2 day routes for the same worker on the same day!"
 msgstr "¡No puede crear rutas de 2 días para el mismo trabajador el mismo día!"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "orders per day route"
+msgstr ""
diff --git a/fieldservice_route/i18n/fieldservice_route.pot b/fieldservice_route/i18n/fieldservice_route.pot
index 52b6af56c7..3e649b9170 100644
--- a/fieldservice_route/i18n/fieldservice_route.pot
+++ b/fieldservice_route/i18n/fieldservice_route.pot
@@ -28,6 +28,12 @@ msgstr ""
 msgid "Assigned To"
 msgstr ""
 
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Capacity"
+msgstr ""
+
 #. module: fieldservice_route
 #: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
 msgid "Create a Route Day."
@@ -60,9 +66,12 @@ msgstr ""
 
 #. module: fieldservice_route
 #: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_dash
 #: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_report
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_dash_dayroute
 #: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute
 #: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute_report
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_calendar
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_graph_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_pivot_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_tree
@@ -179,6 +188,26 @@ msgstr ""
 msgid "Maximal Allowable Time (in hours)"
 msgstr ""
 
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Maximum"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__max_order
+msgid "Maximum Orders"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,help:fieldservice_route.field_fsm_route__max_order
+msgid "Maximum number of orders per day route."
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,help:fieldservice_route.field_fsm_route_dayroute__max_order
+msgid "Maximum numbers of orders that can be added to this day route."
+msgstr ""
+
 #. module: fieldservice_route
 #: selection:fsm.route.day,name:0
 msgid "Monday"
@@ -192,9 +221,9 @@ msgid "Name"
 msgstr ""
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:24
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:69
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:71
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:32
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:83
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:85
 #, python-format
 msgid "New"
 msgstr ""
@@ -297,7 +326,13 @@ msgid "Territory"
 msgstr ""
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:85
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:105
+#, python-format
+msgid "The day route is exceeding the maximum number of orders of the route."
+msgstr ""
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:99
 #, python-format
 msgid "The route %s does not run on %s!"
 msgstr ""
@@ -342,3 +377,8 @@ msgstr ""
 msgid "You cannot create 2 day routes for the same worker on the same day!"
 msgstr ""
 
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "orders per day route"
+msgstr ""
+
diff --git a/fieldservice_route/i18n/pt_BR.po b/fieldservice_route/i18n/pt_BR.po
new file mode 100644
index 0000000000..03255450d0
--- /dev/null
+++ b/fieldservice_route/i18n/pt_BR.po
@@ -0,0 +1,387 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_route
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-02-10 15:33+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_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute
+msgid "Add Day Routes here."
+msgstr "Adicione Rotas do Dia aqui."
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route
+msgid "Add Routes here."
+msgstr "Adicione Rotas aqui."
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__person_id
+msgid "Assigned To"
+msgstr "Atribuído a"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Capacity"
+msgstr "Capacidade"
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
+msgid "Create a Route Day."
+msgstr "Crie um Dia de Rota."
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_uid
+msgid "Created by"
+msgstr "Criado por"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_date
+msgid "Created on"
+msgstr "Criado em"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date
+msgid "Date"
+msgstr "Data"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__dayroute_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Day Route"
+msgstr "Rota do Dia"
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_dash
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_report
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_dash_dayroute
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute_report
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_calendar
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_tree
+msgid "Day Routes"
+msgstr "Rotas Diurnas"
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute_report
+msgid "Day Routes Report"
+msgstr "Relatório de Rotas Diurnas"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__day_ids
+msgid "Days"
+msgstr "Dias"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__display_name
+msgid "Display Name"
+msgstr "Nome Exibido"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__end_location_id
+msgid "End Location"
+msgstr "Localização Final"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Equipment"
+msgstr "Equipamento"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_location
+msgid "Field Service Location"
+msgstr "Localização do Serviço de Campo"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_order
+msgid "Field Service Order"
+msgstr "Ordem de Serviço de Campo"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_route
+msgid "Field Service Route"
+msgstr "Rota de Serviço de Campo"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_route_dayroute
+msgid "Field Service Route Dayroute"
+msgstr "Dia da Rota do Serviço de Campo"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_stage
+msgid "Field Service Stage"
+msgstr "Estágio do Serviço de Campo"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Friday"
+msgstr "Sexta"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__id
+msgid "ID"
+msgstr "ID"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__last_location_id
+msgid "Last Location"
+msgstr "Última Localização"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute____last_update
+msgid "Last Modified on"
+msgstr "Última Modificação em"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_uid
+msgid "Last Updated by"
+msgstr "Última Atualização por"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_date
+msgid "Last Updated on"
+msgstr "Última Atualização em"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__latitude
+msgid "Latitude"
+msgstr "Latitude"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Location"
+msgstr "Localização"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__longitude
+msgid "Longitude"
+msgstr "Longitude"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_allow_time
+msgid "Maximal Allowable Time (in hours)"
+msgstr "Tempo Máximo Permitido (em horas)"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Maximum"
+msgstr "Máximo"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__max_order
+msgid "Maximum Orders"
+msgstr "Máximo de Ordens"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,help:fieldservice_route.field_fsm_route__max_order
+msgid "Maximum number of orders per day route."
+msgstr "Número máximo de ordens por rota diária."
+
+#. module: fieldservice_route
+#: model:ir.model.fields,help:fieldservice_route.field_fsm_route_dayroute__max_order
+msgid "Maximum numbers of orders that can be added to this day route."
+msgstr "Números máximos de ordens que podem ser adicionados a este dia de rota."
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Monday"
+msgstr "Segunda"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__name
+msgid "Name"
+msgstr "Nome"
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:32
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:83
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:85
+#, python-format
+msgid "New"
+msgstr "Novo"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_count
+msgid "Number of Orders"
+msgstr "Número de Pedidos"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Order"
+msgstr "Ordem"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Orders"
+msgstr "Ordens"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__fsm_person_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__person_id
+msgid "Person"
+msgstr "Pessoa"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date_start_planned
+msgid "Planned Start Time"
+msgstr "Horário de Início Planejado"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Planning"
+msgstr "Planejamento"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Positioning"
+msgstr "Posicionamento"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__fsm_route_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__fsm_route_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__route_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Route"
+msgstr "Rota"
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_day
+#: model:ir.model,name:fieldservice_route.model_fsm_route_day
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_tree_view
+msgid "Route Day"
+msgstr "Dia da Rota"
+
+#. module: fieldservice_route
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_day
+msgid "Route Days"
+msgstr "Dias de Rota"
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_tree
+msgid "Routes"
+msgstr "Rotas"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__stage_id
+msgid "Stage"
+msgstr "Estágio"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__start_location_id
+msgid "Start Location"
+msgstr "Localização Inical"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__team_id
+msgid "Team"
+msgstr "Equipe"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__territory_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__territory_id
+msgid "Territory"
+msgstr "Território"
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:105
+#, python-format
+msgid "The day route is exceeding the maximum number of orders of the route."
+msgstr "A rota do dia está excedendo o número máximo de ordens da rota."
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:99
+#, python-format
+msgid "The route %s does not run on %s!"
+msgstr "A rota %s não funciona em %s!"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Thursday"
+msgstr "Quinta"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__work_time
+msgid "Time before overtime (in hours)"
+msgstr "Tempo antes da hora extra (em horas)"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Timing"
+msgstr "Cronometragem"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Tuesday"
+msgstr "Terça"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__stage_type
+msgid "Type"
+msgstr "Tipo"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Wednesday"
+msgstr "Quarta"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Worker"
+msgstr "Profissional"
+
+#. module: fieldservice_route
+#: sql_constraint:fsm.route.dayroute:0
+msgid "You cannot create 2 day routes for the same worker on the same day!"
+msgstr ""
+"Você não pode criar rotas de 2 dias para o mesmo trabalhador no mesmo dia!"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "orders per day route"
+msgstr "ordens por dia de rota"
diff --git a/fieldservice_route/models/fsm_route.py b/fieldservice_route/models/fsm_route.py
index 10070d1a2e..5fd7f9e4ee 100644
--- a/fieldservice_route/models/fsm_route.py
+++ b/fieldservice_route/models/fsm_route.py
@@ -24,7 +24,4 @@ def run_on(self, date):
             day_index = date.weekday()
             day = self.env.ref(
                 'fieldservice_route.fsm_route_day_' + str(day_index))
-            if day in self.day_ids:
-                return True
-            else:
-                return False
+            return day in self.day_ids
diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index 4a7e9ba6e6..f13b990d60 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -58,7 +58,7 @@ def _compute_order_count(self):
                                 string='Orders')
     order_count = fields.Integer(string='Number of Orders',
                                  compute=_compute_order_count)
-    order_max = fields.Integer(
+    max_order = fields.Integer(
         related='route_id.max_order', string="Capacity",
         help="Maximum numbers of orders that can be added to this day route.")
 
@@ -98,10 +98,10 @@ def check_day(self):
                         "The route %s does not run on %s!" %
                         (rec.route_id.name, day.name)))
 
-    @api.constrains('order_max', 'order_count')
+    @api.constrains('max_order', 'order_count')
     def check_capacity(self):
         for rec in self:
-            if rec.order_count > rec.order_max:
+            if rec.order_count > rec.max_order:
                 raise ValidationError(_(
                     "The day route is exceeding the maximum number of "
                     "orders of the route."))
diff --git a/fieldservice_route/views/fsm_route_dayroute.xml b/fieldservice_route/views/fsm_route_dayroute.xml
index edf8293d08..ed4f77c9af 100644
--- a/fieldservice_route/views/fsm_route_dayroute.xml
+++ b/fieldservice_route/views/fsm_route_dayroute.xml
@@ -48,7 +48,7 @@
                         <page string="Orders">
                             <group id="orders">
                                 <group id="orders-left">
-                                    <field name="order_max"/>
+                                    <field name="max_order"/>
                                     <field name="order_count"/>
                                 </group>
                                 <group id="orders-right"/>

From a57d4936894c3d76e6260d130d107eaf6281c2b4 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 19 Mar 2020 17:55:50 -0600
Subject: [PATCH 272/631] [IMP] fieldservice_route

---
 .../i18n/fieldservice_route.pot               | 18 +++-
 fieldservice_route/models/fsm_order.py        | 86 +++++++++++--------
 .../models/fsm_route_dayroute.py              | 79 +++++++++--------
 fieldservice_route/tests/test_fsm_order.py    |  3 +-
 .../views/fsm_route_dayroute.xml              |  3 +-
 5 files changed, 116 insertions(+), 73 deletions(-)

diff --git a/fieldservice_route/i18n/fieldservice_route.pot b/fieldservice_route/i18n/fieldservice_route.pot
index 3e649b9170..86cb144f66 100644
--- a/fieldservice_route/i18n/fieldservice_route.pot
+++ b/fieldservice_route/i18n/fieldservice_route.pot
@@ -29,7 +29,11 @@ msgid "Assigned To"
 msgstr ""
 
 #. module: fieldservice_route
-#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_remaining
+msgid "Available Capacity"
+msgstr ""
+
+#. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "Capacity"
 msgstr ""
@@ -193,6 +197,11 @@ msgstr ""
 msgid "Maximum"
 msgstr ""
 
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
+msgid "Maximum Capacity"
+msgstr ""
+
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__max_order
 msgid "Maximum Orders"
@@ -327,12 +336,14 @@ msgstr ""
 
 #. module: fieldservice_route
 #: code:addons/fieldservice_route/models/fsm_route_dayroute.py:105
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:116
 #, python-format
 msgid "The day route is exceeding the maximum number of orders of the route."
 msgstr ""
 
 #. module: fieldservice_route
 #: code:addons/fieldservice_route/models/fsm_route_dayroute.py:99
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:110
 #, python-format
 msgid "The route %s does not run on %s!"
 msgstr ""
@@ -373,8 +384,9 @@ msgid "Worker"
 msgstr ""
 
 #. module: fieldservice_route
-#: sql_constraint:fsm.route.dayroute:0
-msgid "You cannot create 2 day routes for the same worker on the same day!"
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:22
+#, python-format
+msgid "You must create a FSM team first."
 msgstr ""
 
 #. module: fieldservice_route
diff --git a/fieldservice_route/models/fsm_order.py b/fieldservice_route/models/fsm_order.py
index 42367dbd9a..50c461fbad 100644
--- a/fieldservice_route/models/fsm_order.py
+++ b/fieldservice_route/models/fsm_order.py
@@ -1,8 +1,9 @@
 # Copyright (C) 2019 Open Source Integrators
 # Copyright (C) 2019 Serpent consulting Services
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-
+from datetime import datetime
 from odoo import api, fields, models
+from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
 
 
 class FSMOrder(models.Model):
@@ -22,51 +23,68 @@ def _get_default_person(self):
         'fsm.person', string='Assigned To', index=True,
         default=_get_default_person)
 
-    def prepare_dayroute_values(self, person_id, date_start):
+    def prepare_dayroute_values(self, values):
+        return {
+            'person_id': values['person_id'],
+            'date': values['date'],
+            'route_id': values['route_id']}
+
+    def _get_dayroute_values(self, vals):
+        date = False
+        if vals.get('scheduled_date_start'):
+            if type(vals.get('scheduled_date_start')) == str:
+                date = datetime.strptime(vals.get('scheduled_date_start'),
+                                         DEFAULT_SERVER_DATETIME_FORMAT).date()
+            elif isinstance(vals.get('scheduled_date_start'), datetime):
+                date = vals.get('scheduled_date_start').date()
         return {
-            'person_id': person_id,
-            'date': date_start,
-            'route_id': self.fsm_route_id.id,
-            'team_id': self.team_id.id,
-            'order_ids': [(4, self.id)]
+            'person_id':
+                vals.get('person_id') or self.person_id.id or
+                self.fsm_route_id.fsm_person_id.id,
+            'date': date or self.scheduled_date_start.date(),
+            'route_id': vals.get('fsm_route_id') or self.fsm_route_id.id,
         }
 
+    def _get_dayroute_domain(self, values):
+        domain = [('person_id', '=', values['person_id']),
+                  ('date', '=', values['date']),
+                  ('order_remaining', '>', 0)]
+        return domain
+
+    def _can_create_dayroute(self, values):
+        return values['person_id'] and values['date']
+
     def _manage_fsm_route(self, vals):
         dayroute_obj = self.env['fsm.route.dayroute']
-        for rec in self:
-            person_id = vals.get('person_id') or rec.person_id.id or \
-                rec.fsm_route_id.fsm_person_id.id
-            scheduled_date_start = vals.get('scheduled_date_start') or \
-                rec.scheduled_date_start
-            dayroute = dayroute_obj.search([
-                ('person_id', '=', person_id),
-                ('date', '=', scheduled_date_start)],
-                limit=1)
-            old_dayroute_id = rec.dayroute_id
-            if dayroute:
+        values = self._get_dayroute_values(vals)
+        domain = self._get_dayroute_domain(values)
+        dayroute = dayroute_obj.search(domain, limit=1)
+        if dayroute:
+            vals.update({'dayroute_id': dayroute.id})
+        else:
+            if self._can_create_dayroute(values):
+                dayroute = dayroute_obj.create(
+                    self.prepare_dayroute_values(values))
                 vals.update({
                     'dayroute_id': dayroute.id})
-                if old_dayroute_id and not old_dayroute_id.order_ids:
-                    old_dayroute_id.unlink()
-            elif not dayroute and person_id or scheduled_date_start:
-                dayroute_obj.create(rec.prepare_dayroute_values(
-                    person_id, scheduled_date_start
-                ))
-                if old_dayroute_id and not old_dayroute_id.order_ids:
-                    old_dayroute_id.unlink()
+        # If this was the last order of the dayroute,
+        # delete the dayroute
+        if self.dayroute_id and not self.dayroute_id.order_ids:
+            self.dayroute_id.unlink()
         return vals
 
     @api.model
     def create(self, vals):
+        location = self.env['fsm.location'].browse(vals.get('location_id'))
+        if not vals.get('fsm_route_id'):
+            vals.update({
+                'fsm_route_id': location.fsm_route_id.id})
         if not vals.get('person_id'):
-            location = self.env['fsm.location'].browse(vals.get('location_id'))
             vals.update({
-                'person_id': location.fsm_route_id.fsm_person_id.id,
-            })
-        res = super(FSMOrder, self).create(vals)
-        if res.person_id and res.scheduled_date_start:
-            res._manage_fsm_route(vals)
-        return res
+                'person_id': location.fsm_route_id.fsm_person_id.id})
+        if vals.get('person_id') and vals.get('scheduled_date_start'):
+            vals = self._manage_fsm_route(vals)
+        return super().create(vals)
 
     @api.multi
     def write(self, vals):
@@ -81,4 +99,4 @@ def write(self, vals):
                     (vals.get('scheduled_date_start', False) or
                      rec.scheduled_date_start):
                 vals = rec._manage_fsm_route(vals)
-        return super(FSMOrder, self).write(vals)
+        return super().write(vals)
diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index f13b990d60..b361796589 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -4,37 +4,37 @@
 from datetime import datetime
 from odoo import api, fields, models, _
 from odoo.exceptions import ValidationError
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT
 
 
 class FSMRouteDayRoute(models.Model):
     _name = 'fsm.route.dayroute'
     _description = 'Field Service Route Dayroute'
 
-    @api.model
-    def _get_default_person(self):
-        return self.route_id.fsm_person_id.id or False
-
-    @api.model
-    def _get_default_date_start_planned(self):
-        if self.date:
-            return datetime.combine(
-                # TODO: Use the worker timezone and working schedule
-                self.date, datetime.strptime("8:00:01", '%H:%M:%S').time())
+    def _default_team_id(self):
+        team_ids = self.env['fsm.team'].\
+            search([('company_id', 'in', (self.env.user.company_id.id,
+                                          False))],
+                   order='sequence asc', limit=1)
+        if team_ids:
+            return team_ids[0]
+        else:
+            raise ValidationError(_(
+                "You must create a FSM team first."))
 
-    @api.depends('route_id')
+    @api.depends('route_id', 'order_ids')
     def _compute_order_count(self):
         for rec in self:
-            rec.order_count = 0
-            if rec.order_ids:
-                rec.order_count = len(rec.order_ids)
+            rec.order_count = len(rec.order_ids)
+            rec.order_remaining = rec.max_order - rec.order_count
 
-    name = fields.Char(string='Name', required=True,
+    name = fields.Char(string='Name', required=True, copy=False,
                        default=lambda self: _('New'))
-    person_id = fields.Many2one('fsm.person', string='Person',
-                                default=_get_default_person)
+    person_id = fields.Many2one('fsm.person', string='Person')
     route_id = fields.Many2one('fsm.route', string='Route')
     date = fields.Date(string='Date', required=True)
-    team_id = fields.Many2one('fsm.team', string='Team')
+    team_id = fields.Many2one('fsm.team', string='Team',
+                              default=lambda self: self._default_team_id())
     stage_id = fields.Many2one('fsm.stage', string='Stage',
                                domain="[('stage_type', '=', 'route')]",
                                index=True, copy=False,
@@ -44,9 +44,7 @@ def _compute_order_count(self):
     longitude = fields.Float("Longitude")
     latitude = fields.Float("Latitude")
     last_location_id = fields.Many2one('fsm.location', string='Last Location')
-    date_start_planned = fields.Datetime(
-        string='Planned Start Time',
-        default=_get_default_date_start_planned)
+    date_start_planned = fields.Datetime(string='Planned Start Time')
     start_location_id = fields.Many2one(
         'fsm.location', string='Start Location')
     end_location_id = fields.Many2one('fsm.location', string='End Location')
@@ -56,19 +54,14 @@ def _compute_order_count(self):
                                   default=10.0)
     order_ids = fields.One2many('fsm.order', 'dayroute_id',
                                 string='Orders')
-    order_count = fields.Integer(string='Number of Orders',
-                                 compute=_compute_order_count)
+    order_count = fields.Integer(
+        compute=_compute_order_count, string='Number of Orders', store=True)
+    order_remaining = fields.Integer(
+        compute=_compute_order_count, string='Available Capacity', store=True)
     max_order = fields.Integer(
-        related='route_id.max_order', string="Capacity",
+        related='route_id.max_order', string="Maximum Capacity", store=True,
         help="Maximum numbers of orders that can be added to this day route.")
 
-    _sql_constraints = [
-        ('fsm_route_dayroute_person_date_uniq',
-         'unique (person_id, date)',
-         "You cannot create 2 day routes for the same"
-         " worker on the same day!"),
-    ]
-
     def _default_stage_id(self):
         return self.env['fsm.stage'].search([('stage_type', '=', 'route'),
                                              ('is_default', '=', True)],
@@ -76,13 +69,31 @@ def _default_stage_id(self):
 
     @api.onchange('route_id')
     def _onchange_person(self):
-        self.fsm_person_id = self._get_default_person()
+        self.person_id = self.route_id.fsm_person_id.id
+
+    @api.onchange('date')
+    def _onchange_date(self):
+        if self.date:
+            # TODO: Use the worker timezone and working schedule
+            self.date_start_planned = datetime.combine(
+                self.date, datetime.strptime("8:00:00", '%H:%M:%S').time())
 
     @api.model
     def create(self, vals):
         if vals.get('name', _('New')) == _('New'):
             vals['name'] = self.env['ir.sequence'].next_by_code(
                 'fsm.route.dayroute') or _('New')
+        if not vals.get('date_start_planned', False) and \
+                vals.get('date', False):
+            # TODO: Use the worker timezone and working schedule
+            date = vals.get('date')
+            if type(vals.get('date')) == str:
+                date = datetime.strptime(vals.get('date'),
+                                         DEFAULT_SERVER_DATE_FORMAT).date()
+            vals.update({
+                'date_start_planned': datetime.combine(
+                    date, datetime.strptime("8:00:00", '%H:%M:%S').time())
+            })
         return super().create(vals)
 
     @api.constrains('date', 'route_id')
@@ -98,10 +109,10 @@ def check_day(self):
                         "The route %s does not run on %s!" %
                         (rec.route_id.name, day.name)))
 
-    @api.constrains('max_order', 'order_count')
+    @api.constrains('route_id', 'max_order', 'order_count')
     def check_capacity(self):
         for rec in self:
-            if rec.order_count > rec.max_order:
+            if rec.route_id and rec.order_count > rec.max_order:
                 raise ValidationError(_(
                     "The day route is exceeding the maximum number of "
                     "orders of the route."))
diff --git a/fieldservice_route/tests/test_fsm_order.py b/fieldservice_route/tests/test_fsm_order.py
index b0ad3ac0c3..5bbb7de480 100644
--- a/fieldservice_route/tests/test_fsm_order.py
+++ b/fieldservice_route/tests/test_fsm_order.py
@@ -28,8 +28,9 @@ def setUp(self):
         self.fsm_route_id = self.fsm_route_obj.create(
             {
                 'name': 'Demo Route',
+                'max_order': 10,
                 'fsm_person_id': self.test_person.id,
-                'day_ids': [(6, 0, self.days)]
+                'day_ids': [(6, 0, self.days)],
             })
         self.test_location.fsm_route_id = self.fsm_route_id.id
 
diff --git a/fieldservice_route/views/fsm_route_dayroute.xml b/fieldservice_route/views/fsm_route_dayroute.xml
index ed4f77c9af..132c0413ca 100644
--- a/fieldservice_route/views/fsm_route_dayroute.xml
+++ b/fieldservice_route/views/fsm_route_dayroute.xml
@@ -50,6 +50,7 @@
                                 <group id="orders-left">
                                     <field name="max_order"/>
                                     <field name="order_count"/>
+                                    <field name="order_remaining"/>
                                 </group>
                                 <group id="orders-right"/>
                             </group>
@@ -118,7 +119,7 @@
         <field name="name">Day Routes</field>
         <field name="res_model">fsm.route.dayroute</field>
         <field name="view_type">form</field>
-        <field name="view_mode">calendar,tree</field>
+        <field name="view_mode">calendar,tree,form</field>
     </record>
 
     <!-- Reporting -->

From 9b14ebaabce56d4af60c20f97251d855ca19d930 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 23 Mar 2020 19:20:08 +0000
Subject: [PATCH 273/631] fieldservice_route 12.0.2.1.0

---
 fieldservice_route/__manifest__.py            |  2 +-
 fieldservice_route/i18n/es_CL.po              | 44 ++++++++++++-------
 .../i18n/fieldservice_route.pot               |  2 -
 fieldservice_route/i18n/pt_BR.po              | 34 ++++++++++----
 4 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/fieldservice_route/__manifest__.py b/fieldservice_route/__manifest__.py
index c569e821b0..8155abee9b 100644
--- a/fieldservice_route/__manifest__.py
+++ b/fieldservice_route/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Field Service Route',
     'summary': 'Organize the routes of each day.',
-    'version': '12.0.2.0.0',
+    'version': '12.0.2.1.0',
     'category': 'Field Service',
     'license': 'AGPL-3',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_route/i18n/es_CL.po b/fieldservice_route/i18n/es_CL.po
index 24355a8be5..eb7ed0936c 100644
--- a/fieldservice_route/i18n/es_CL.po
+++ b/fieldservice_route/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-01-16 22:38+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"
@@ -32,10 +32,14 @@ msgid "Assigned To"
 msgstr "Asignado a"
 
 #. module: fieldservice_route
-#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_remaining
+msgid "Available Capacity"
+msgstr "Capacidad Disponible"
+
+#. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "Capacity"
-msgstr ""
+msgstr "Capacidad"
 
 #. module: fieldservice_route
 #: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
@@ -194,24 +198,27 @@ msgstr "Tiempo máximo permitido (en horas)"
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "Maximum"
-msgstr ""
+msgstr "Máximo"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
+msgid "Maximum Capacity"
+msgstr "Capacidad Máxima"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__max_order
-#, fuzzy
-#| msgid "Number of Orders"
 msgid "Maximum Orders"
-msgstr "Numero de Ordenes"
+msgstr "Pedidos Máximos"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,help:fieldservice_route.field_fsm_route__max_order
 msgid "Maximum number of orders per day route."
-msgstr ""
+msgstr "Número máximo de pedidos por ruta diaria"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,help:fieldservice_route.field_fsm_route_dayroute__max_order
 msgid "Maximum numbers of orders that can be added to this day route."
-msgstr ""
+msgstr "Número máximo de pedidos que se pueden agregar a esta ruta de día."
 
 #. module: fieldservice_route
 #: selection:fsm.route.day,name:0
@@ -331,13 +338,13 @@ msgid "Territory"
 msgstr "Territorio"
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:105
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:116
 #, python-format
 msgid "The day route is exceeding the maximum number of orders of the route."
-msgstr ""
+msgstr "La ruta del día excede el número máximo de pedidos de la ruta."
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:99
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:110
 #, python-format
 msgid "The route %s does not run on %s!"
 msgstr "La ruta %s no corre en %s!"
@@ -378,11 +385,16 @@ msgid "Worker"
 msgstr "Trabajador"
 
 #. module: fieldservice_route
-#: sql_constraint:fsm.route.dayroute:0
-msgid "You cannot create 2 day routes for the same worker on the same day!"
-msgstr "¡No puede crear rutas de 2 días para el mismo trabajador el mismo día!"
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:22
+#, python-format
+msgid "You must create a FSM team first."
+msgstr "Primero debe crear un equipo FSM."
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "orders per day route"
-msgstr ""
+msgstr "pedidos por día ruta"
+
+#~ msgid "You cannot create 2 day routes for the same worker on the same day!"
+#~ msgstr ""
+#~ "¡No puede crear rutas de 2 días para el mismo trabajador el mismo día!"
diff --git a/fieldservice_route/i18n/fieldservice_route.pot b/fieldservice_route/i18n/fieldservice_route.pot
index 86cb144f66..d4f1e149c3 100644
--- a/fieldservice_route/i18n/fieldservice_route.pot
+++ b/fieldservice_route/i18n/fieldservice_route.pot
@@ -335,14 +335,12 @@ msgid "Territory"
 msgstr ""
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:105
 #: code:addons/fieldservice_route/models/fsm_route_dayroute.py:116
 #, python-format
 msgid "The day route is exceeding the maximum number of orders of the route."
 msgstr ""
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:99
 #: code:addons/fieldservice_route/models/fsm_route_dayroute.py:110
 #, python-format
 msgid "The route %s does not run on %s!"
diff --git a/fieldservice_route/i18n/pt_BR.po b/fieldservice_route/i18n/pt_BR.po
index 03255450d0..19874f4fe0 100644
--- a/fieldservice_route/i18n/pt_BR.po
+++ b/fieldservice_route/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_route
+# 	* fieldservice_route
 #
 msgid ""
 msgstr ""
@@ -32,7 +32,13 @@ msgid "Assigned To"
 msgstr "Atribuído a"
 
 #. module: fieldservice_route
-#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_remaining
+#, fuzzy
+#| msgid "Capacity"
+msgid "Available Capacity"
+msgstr "Capacidade"
+
+#. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "Capacity"
 msgstr "Capacidade"
@@ -196,6 +202,13 @@ msgstr "Tempo Máximo Permitido (em horas)"
 msgid "Maximum"
 msgstr "Máximo"
 
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
+#, fuzzy
+#| msgid "Capacity"
+msgid "Maximum Capacity"
+msgstr "Capacidade"
+
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__max_order
 msgid "Maximum Orders"
@@ -209,7 +222,8 @@ msgstr "Número máximo de ordens por rota diária."
 #. module: fieldservice_route
 #: model:ir.model.fields,help:fieldservice_route.field_fsm_route_dayroute__max_order
 msgid "Maximum numbers of orders that can be added to this day route."
-msgstr "Números máximos de ordens que podem ser adicionados a este dia de rota."
+msgstr ""
+"Números máximos de ordens que podem ser adicionados a este dia de rota."
 
 #. module: fieldservice_route
 #: selection:fsm.route.day,name:0
@@ -329,13 +343,13 @@ msgid "Territory"
 msgstr "Território"
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:105
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:116
 #, python-format
 msgid "The day route is exceeding the maximum number of orders of the route."
 msgstr "A rota do dia está excedendo o número máximo de ordens da rota."
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:99
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:110
 #, python-format
 msgid "The route %s does not run on %s!"
 msgstr "A rota %s não funciona em %s!"
@@ -376,12 +390,16 @@ msgid "Worker"
 msgstr "Profissional"
 
 #. module: fieldservice_route
-#: sql_constraint:fsm.route.dayroute:0
-msgid "You cannot create 2 day routes for the same worker on the same day!"
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:22
+#, python-format
+msgid "You must create a FSM team first."
 msgstr ""
-"Você não pode criar rotas de 2 dias para o mesmo trabalhador no mesmo dia!"
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "orders per day route"
 msgstr "ordens por dia de rota"
+
+#~ msgid "You cannot create 2 day routes for the same worker on the same day!"
+#~ msgstr ""
+#~ "Você não pode criar rotas de 2 dias para o mesmo trabalhador no mesmo dia!"

From 46926c5d2f2c20eefbaed93170a080a12814f01a Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 27 Mar 2020 21:11:01 -0600
Subject: [PATCH 274/631] [IMP] fieldservice_route

---
 fieldservice_route/i18n/fieldservice_route.pot | 10 ++++++++++
 .../views/fsm_route_dayroute.xml               | 18 +++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/fieldservice_route/i18n/fieldservice_route.pot b/fieldservice_route/i18n/fieldservice_route.pot
index d4f1e149c3..b0f667e524 100644
--- a/fieldservice_route/i18n/fieldservice_route.pot
+++ b/fieldservice_route/i18n/fieldservice_route.pot
@@ -33,11 +33,21 @@ msgstr ""
 msgid "Available Capacity"
 msgstr ""
 
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Cancel order"
+msgstr ""
+
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "Capacity"
 msgstr ""
 
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Complete order"
+msgstr ""
+
 #. module: fieldservice_route
 #: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
 msgid "Create a Route Day."
diff --git a/fieldservice_route/views/fsm_route_dayroute.xml b/fieldservice_route/views/fsm_route_dayroute.xml
index 132c0413ca..17d8f7f359 100644
--- a/fieldservice_route/views/fsm_route_dayroute.xml
+++ b/fieldservice_route/views/fsm_route_dayroute.xml
@@ -37,7 +37,8 @@
                         <group id="left">
                             <field name="route_id"/>
                             <field name="person_id" required="1"/>
-                            <field name="team_id" groups="fieldservice.group_fsm_team"/>
+                            <field name="team_id"
+                                   groups="fieldservice.group_fsm_team"/>
                         </group>
                         <group id="right">
                             <field name="date" required="1"/>
@@ -63,6 +64,15 @@
                                     <field name="location_id"/>
                                     <field name="scheduled_date_start"/>
                                     <field name="stage_id"/>
+                                    <button name="action_complete"
+                                            string="Complete order"
+                                            type="object"
+                                            icon="fa-check text-success"
+                                            attrs="{'invisible': [('stage_id', 'in', [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d])]}"/>
+                                    <button name="action_cancel"
+                                            string="Cancel order" type="object"
+                                            icon="fa-times-circle text-danger"
+                                            attrs="{'invisible': [('stage_id', 'in', [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d])]}"/>
                                 </tree>
                             </field>
                         </page>
@@ -73,7 +83,8 @@
                                     <field name="work_time"/>
                                     <field name="max_allow_time"/>
                                 </group>
-                                <group id="planning-right" string="Positioning">
+                                <group id="planning-right"
+                                       string="Positioning">
                                     <field name="longitude"/>
                                     <field name="latitude"/>
                                     <field name="start_location_id"/>
@@ -143,7 +154,8 @@
         </field>
     </record>
 
-    <record id="action_fsm_route_dayroute_report" model="ir.actions.act_window">
+    <record id="action_fsm_route_dayroute_report"
+            model="ir.actions.act_window">
         <field name="name">Day Routes</field>
         <field name="res_model">fsm.route.dayroute</field>
         <field name="view_type">form</field>

From c3c75a68e5b1f639e9231de01e7b4cc8d5906acc Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 2 Apr 2020 12:17:58 +0000
Subject: [PATCH 275/631] fieldservice_route 12.0.2.2.0

---
 fieldservice_route/__manifest__.py |   2 +-
 fieldservice_route/i18n/es_CL.po   |  12 +-
 fieldservice_route/i18n/pt_BR.po   |  29 ++-
 fieldservice_route/i18n/pt_PT.po   | 406 +++++++++++++++++++++++++++++
 4 files changed, 436 insertions(+), 13 deletions(-)
 create mode 100644 fieldservice_route/i18n/pt_PT.po

diff --git a/fieldservice_route/__manifest__.py b/fieldservice_route/__manifest__.py
index 8155abee9b..4a6375520e 100644
--- a/fieldservice_route/__manifest__.py
+++ b/fieldservice_route/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Field Service Route',
     'summary': 'Organize the routes of each day.',
-    'version': '12.0.2.1.0',
+    'version': '12.0.2.2.0',
     'category': 'Field Service',
     'license': 'AGPL-3',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_route/i18n/es_CL.po b/fieldservice_route/i18n/es_CL.po
index eb7ed0936c..bdfe97ef47 100644
--- a/fieldservice_route/i18n/es_CL.po
+++ b/fieldservice_route/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"
@@ -36,11 +36,21 @@ msgstr "Asignado a"
 msgid "Available Capacity"
 msgstr "Capacidad Disponible"
 
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Cancel order"
+msgstr "Cancelar orden"
+
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "Capacity"
 msgstr "Capacidad"
 
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Complete order"
+msgstr "Completar orden"
+
 #. module: fieldservice_route
 #: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
 msgid "Create a Route Day."
diff --git a/fieldservice_route/i18n/pt_BR.po b/fieldservice_route/i18n/pt_BR.po
index 19874f4fe0..c56d6c6e3c 100644
--- a/fieldservice_route/i18n/pt_BR.po
+++ b/fieldservice_route/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-10 15:33+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,16 +33,24 @@ msgstr "Atribuído a"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_remaining
-#, fuzzy
-#| msgid "Capacity"
 msgid "Available Capacity"
-msgstr "Capacidade"
+msgstr "Capacidade Disponível"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Cancel order"
+msgstr "Cancelar Ordem"
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "Capacity"
 msgstr "Capacidade"
 
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Complete order"
+msgstr "Completar Ordem"
+
 #. module: fieldservice_route
 #: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
 msgid "Create a Route Day."
@@ -117,7 +125,7 @@ msgstr "Equipamento"
 #. module: fieldservice_route
 #: model:ir.model,name:fieldservice_route.model_fsm_location
 msgid "Field Service Location"
-msgstr "Localização do Serviço de Campo"
+msgstr "Local do Serviço de Campo"
 
 #. module: fieldservice_route
 #: model:ir.model,name:fieldservice_route.model_fsm_order
@@ -127,7 +135,7 @@ msgstr "Ordem de Serviço de Campo"
 #. module: fieldservice_route
 #: model:ir.model,name:fieldservice_route.model_fsm_route
 msgid "Field Service Route"
-msgstr "Rota de Serviço de Campo"
+msgstr "Rota do Serviço de Campo"
 
 #. module: fieldservice_route
 #: model:ir.model,name:fieldservice_route.model_fsm_route_dayroute
@@ -161,7 +169,7 @@ msgstr "Última Localização"
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day____last_update
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute____last_update
 msgid "Last Modified on"
-msgstr "Última Modificação em"
+msgstr "Última Modificação Feita em"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_uid
@@ -204,10 +212,8 @@ msgstr "Máximo"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
-#, fuzzy
-#| msgid "Capacity"
 msgid "Maximum Capacity"
-msgstr "Capacidade"
+msgstr "Capacidade Máxima"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__max_order
@@ -394,6 +400,7 @@ msgstr "Profissional"
 #, python-format
 msgid "You must create a FSM team first."
 msgstr ""
+"Primeiro você deve criar uma equipe para o FSM (Field Services Management)."
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
diff --git a/fieldservice_route/i18n/pt_PT.po b/fieldservice_route/i18n/pt_PT.po
new file mode 100644
index 0000000000..30dc3ed484
--- /dev/null
+++ b/fieldservice_route/i18n/pt_PT.po
@@ -0,0 +1,406 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_route
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-07-21 10:19+0000\n"
+"Last-Translator: Daniel Reis <dgreis@sapo.pt>\n"
+"Language-Team: none\n"
+"Language: pt_PT\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_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute
+msgid "Add Day Routes here."
+msgstr "Adicione Rotas do Dia aqui."
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route
+msgid "Add Routes here."
+msgstr "Adicione Rotas aqui."
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__person_id
+msgid "Assigned To"
+msgstr "Atribuído a"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_remaining
+msgid "Available Capacity"
+msgstr "Capacidade Disponível"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Cancel order"
+msgstr "Cancelar ordem"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Capacity"
+msgstr "Capacidade"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Complete order"
+msgstr "Completar Ordem"
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
+msgid "Create a Route Day."
+msgstr "Crie um Dia de Rota."
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_uid
+msgid "Created by"
+msgstr "Criado por"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_date
+msgid "Created on"
+msgstr "Criado em"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date
+msgid "Date"
+msgstr "Data"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__dayroute_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Day Route"
+msgstr "Rota Dia"
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_dash
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_report
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_dash_dayroute
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute_report
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_calendar
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_tree
+msgid "Day Routes"
+msgstr "Rotas Dia"
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute_report
+msgid "Day Routes Report"
+msgstr "Relatório de Rotas Dia"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__day_ids
+msgid "Days"
+msgstr "Relatório de Rotas Diurnas"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__display_name
+msgid "Display Name"
+msgstr "Nome Apresentado"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__end_location_id
+msgid "End Location"
+msgstr "Localização Final"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Equipment"
+msgstr "Equipamento"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_location
+msgid "Field Service Location"
+msgstr "Local do Serviço de Campo"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_order
+msgid "Field Service Order"
+msgstr "Ordem de Serviço"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_route
+msgid "Field Service Route"
+msgstr "Rota do Serviço de Campo"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_route_dayroute
+msgid "Field Service Route Dayroute"
+msgstr "Rota Dia do Serviço de Campo"
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_stage
+msgid "Field Service Stage"
+msgstr "Etapa de Serviço de Campo"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Friday"
+msgstr "Sexta"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__id
+msgid "ID"
+msgstr "ID"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__last_location_id
+msgid "Last Location"
+msgstr "Última Localização"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute____last_update
+msgid "Last Modified on"
+msgstr "Última Modificação em"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_uid
+msgid "Last Updated by"
+msgstr "Última Atualização por"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_date
+msgid "Last Updated on"
+msgstr "Última Atualização em"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__latitude
+msgid "Latitude"
+msgstr "Latitude"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Location"
+msgstr "Localização"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__longitude
+msgid "Longitude"
+msgstr "Longitude"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_allow_time
+msgid "Maximal Allowable Time (in hours)"
+msgstr "Tempo Máximo Permitido (em horas)"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Maximum"
+msgstr "Máximo"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
+msgid "Maximum Capacity"
+msgstr "Capacidade Máxima"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__max_order
+msgid "Maximum Orders"
+msgstr "Máximo de Ordens"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,help:fieldservice_route.field_fsm_route__max_order
+msgid "Maximum number of orders per day route."
+msgstr "Número máximo de ordens por rota diária."
+
+#. module: fieldservice_route
+#: model:ir.model.fields,help:fieldservice_route.field_fsm_route_dayroute__max_order
+msgid "Maximum numbers of orders that can be added to this day route."
+msgstr "Números máximos de ordens que podem ser adicionados a esta rota dia."
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Monday"
+msgstr "Segunda"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__name
+msgid "Name"
+msgstr "Nome"
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:32
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:83
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:85
+#, python-format
+msgid "New"
+msgstr "Novo"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_count
+msgid "Number of Orders"
+msgstr "Número de Ordens"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Order"
+msgstr "Ordem"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Orders"
+msgstr "Ordens"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__fsm_person_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__person_id
+msgid "Person"
+msgstr "Pessoa"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date_start_planned
+msgid "Planned Start Time"
+msgstr "Hora de Início Planeada"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Planning"
+msgstr "Planeamento"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Positioning"
+msgstr "Posicionamento"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__fsm_route_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__fsm_route_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__route_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Route"
+msgstr "Rota"
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_day
+#: model:ir.model,name:fieldservice_route.model_fsm_route_day
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_tree_view
+msgid "Route Day"
+msgstr "Rota Dia"
+
+#. module: fieldservice_route
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_day
+msgid "Route Days"
+msgstr "Dias da Rota"
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_tree
+msgid "Routes"
+msgstr "Rotas"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__stage_id
+msgid "Stage"
+msgstr "Etapa"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__start_location_id
+msgid "Start Location"
+msgstr "Localização Inical"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__team_id
+msgid "Team"
+msgstr "Equipa"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__territory_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__territory_id
+msgid "Territory"
+msgstr "Território"
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:116
+#, python-format
+msgid "The day route is exceeding the maximum number of orders of the route."
+msgstr "A rota do dia excede o número máximo de ordens para a rota."
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:110
+#, python-format
+msgid "The route %s does not run on %s!"
+msgstr "A rota %s não funciona em %s!"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Thursday"
+msgstr "Quinta"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__work_time
+msgid "Time before overtime (in hours)"
+msgstr "Tempo antes de horas extra (em horas)"
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Timing"
+msgstr "Temporização"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Tuesday"
+msgstr "Terça"
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__stage_type
+msgid "Type"
+msgstr "Tipo"
+
+#. module: fieldservice_route
+#: selection:fsm.route.day,name:0
+msgid "Wednesday"
+msgstr "Quarta"
+
+#. module: fieldservice_route
+#: selection:fsm.stage,stage_type:0
+msgid "Worker"
+msgstr "Trabalhador"
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:22
+#, python-format
+msgid "You must create a FSM team first."
+msgstr "Antes deve criar uma Equipa FSM."
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "orders per day route"
+msgstr "ordens por rota dia"

From f82145ce06423dd7999dea6fe5cf71450a274781 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Thu, 20 Aug 2020 18:09:36 +0530
Subject: [PATCH 276/631] [IMP] Gave Access to portal user.

---
 fieldservice_route/security/ir.model.access.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fieldservice_route/security/ir.model.access.csv b/fieldservice_route/security/ir.model.access.csv
index a243f72a56..cc82d7de4e 100644
--- a/fieldservice_route/security/ir.model.access.csv
+++ b/fieldservice_route/security/ir.model.access.csv
@@ -5,3 +5,5 @@ access_fsm_route_day_user,fsm.route.day.user,model_fsm_route_day,fieldservice.gr
 access_fsm_route_day_dispatcher,fsm.route.day.dispatcher,model_fsm_route_day,fieldservice.group_fsm_manager,1,1,0,0
 access_fsm_route_dayroute_user,fsm.route.dayroute.user,model_fsm_route_dayroute,fieldservice.group_fsm_user,1,1,0,0
 access_fsm_route_dayroute_dispatcher,fsm.route.dayroute.dispatcher,model_fsm_route_dayroute,fieldservice.group_fsm_dispatcher,1,1,1,1
+access_fsm_route_dayroute_portal,access.fsm.route.dayroute.portal,model_fsm_route_dayroute,base.group_portal,1,1,1,0
+access_ir_sequence_portal,access.ir.sequence.portal,base.model_ir_sequence,base.group_portal,1,0,0,0

From 741fe5d89dcc893b131015d90438942c3c954a20 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 29 Sep 2020 18:43:50 +0000
Subject: [PATCH 277/631] fieldservice_route 12.0.2.3.0

---
 fieldservice_route/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_route/__manifest__.py b/fieldservice_route/__manifest__.py
index 4a6375520e..a0b4e1b343 100644
--- a/fieldservice_route/__manifest__.py
+++ b/fieldservice_route/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Field Service Route',
     'summary': 'Organize the routes of each day.',
-    'version': '12.0.2.2.0',
+    'version': '12.0.2.3.0',
     'category': 'Field Service',
     'license': 'AGPL-3',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',

From a372ba1644281aecc5e4b706760ad1f0e359009b Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Thu, 29 Oct 2020 12:11:44 +0100
Subject: [PATCH 278/631] [IMP] fieldservice: basic security

- Add a lower security group whose members only have access to their own
field service orders.
- Add related partner to location and worker forms to easily check the
relationship.
---
 fieldservice_route/security/ir.model.access.csv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fieldservice_route/security/ir.model.access.csv b/fieldservice_route/security/ir.model.access.csv
index cc82d7de4e..872c34946a 100644
--- a/fieldservice_route/security/ir.model.access.csv
+++ b/fieldservice_route/security/ir.model.access.csv
@@ -1,9 +1,9 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_fsm_route_user,fsm.route.user,model_fsm_route,fieldservice.group_fsm_user,1,0,0,0
+access_fsm_route_user,fsm.route.user,model_fsm_route,fieldservice.group_fsm_user_own,1,0,0,0
 access_fsm_route_dispatcher,fsm.route.dispatcher,model_fsm_route,fieldservice.group_fsm_dispatcher,1,1,1,1
-access_fsm_route_day_user,fsm.route.day.user,model_fsm_route_day,fieldservice.group_fsm_user,1,0,0,0
+access_fsm_route_day_user,fsm.route.day.user,model_fsm_route_day,fieldservice.group_fsm_user_own,1,0,0,0
 access_fsm_route_day_dispatcher,fsm.route.day.dispatcher,model_fsm_route_day,fieldservice.group_fsm_manager,1,1,0,0
-access_fsm_route_dayroute_user,fsm.route.dayroute.user,model_fsm_route_dayroute,fieldservice.group_fsm_user,1,1,0,0
+access_fsm_route_dayroute_user,fsm.route.dayroute.user,model_fsm_route_dayroute,fieldservice.group_fsm_user_own,1,1,0,0
 access_fsm_route_dayroute_dispatcher,fsm.route.dayroute.dispatcher,model_fsm_route_dayroute,fieldservice.group_fsm_dispatcher,1,1,1,1
 access_fsm_route_dayroute_portal,access.fsm.route.dayroute.portal,model_fsm_route_dayroute,base.group_portal,1,1,1,0
 access_ir_sequence_portal,access.ir.sequence.portal,base.model_ir_sequence,base.group_portal,1,0,0,0

From 346469cd93d68eea97e4ba43258dedfb0300edfb Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 5 Nov 2020 08:40:59 +0000
Subject: [PATCH 279/631] fieldservice_route 12.0.2.4.0

---
 fieldservice_route/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_route/__manifest__.py b/fieldservice_route/__manifest__.py
index a0b4e1b343..c030a790a6 100644
--- a/fieldservice_route/__manifest__.py
+++ b/fieldservice_route/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Field Service Route',
     'summary': 'Organize the routes of each day.',
-    'version': '12.0.2.3.0',
+    'version': '12.0.2.4.0',
     'category': 'Field Service',
     'license': 'AGPL-3',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',

From 7ca75f386113d3979f87b5d4be2b57dfde11929f Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Mon, 3 May 2021 14:13:58 +0530
Subject: [PATCH 280/631] [FIX] Travis

---
 fieldservice_route/__manifest__.py            |  46 +++---
 fieldservice_route/data/ir_sequence.xml       |   2 +-
 .../migrations/12.0.2.0.0/pre-migration.py    |  19 ++-
 fieldservice_route/models/fsm_location.py     |   4 +-
 fieldservice_route/models/fsm_order.py        |  98 +++++------
 fieldservice_route/models/fsm_route.py        |  20 +--
 fieldservice_route/models/fsm_route_day.py    |  24 +--
 .../models/fsm_route_dayroute.py              | 153 ++++++++++--------
 fieldservice_route/models/fsm_stage.py        |   4 +-
 fieldservice_route/readme/DESCRIPTION.rst     |   1 -
 fieldservice_route/readme/USAGE.rst           |   1 -
 fieldservice_route/tests/test_fsm_order.py    |  50 +++---
 fieldservice_route/views/fsm_location.xml     |   4 +-
 fieldservice_route/views/fsm_order.xml        |   6 +-
 fieldservice_route/views/fsm_route.xml        |  20 +--
 fieldservice_route/views/fsm_route_day.xml    |   4 +-
 .../views/fsm_route_dayroute.xml              | 130 ++++++++-------
 fieldservice_route/views/menu.xml             |  58 ++++---
 .../odoo/addons/fieldservice_route            |   1 +
 setup/fieldservice_route/setup.py             |   6 +
 20 files changed, 354 insertions(+), 297 deletions(-)
 create mode 120000 setup/fieldservice_route/odoo/addons/fieldservice_route
 create mode 100644 setup/fieldservice_route/setup.py

diff --git a/fieldservice_route/__manifest__.py b/fieldservice_route/__manifest__.py
index c030a790a6..0ee902e926 100644
--- a/fieldservice_route/__manifest__.py
+++ b/fieldservice_route/__manifest__.py
@@ -3,30 +3,26 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 {
-    'name': 'Field Service Route',
-    'summary': 'Organize the routes of each day.',
-    'version': '12.0.2.4.0',
-    'category': 'Field Service',
-    'license': 'AGPL-3',
-    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice'
-    ],
-    'data': [
-        'data/ir_sequence.xml',
-        'data/fsm_route_day_data.xml',
-        'data/fsm_stage_data.xml',
-        'security/ir.model.access.csv',
-        'views/fsm_route_day.xml',
-        'views/fsm_route.xml',
-        'views/fsm_location.xml',
-        'views/fsm_route_dayroute.xml',
-        'views/fsm_order.xml',
-        'views/menu.xml',
-    ],
-    'development_status': 'Beta',
-    'maintainers': [
-        'max3903'
+    "name": "Field Service Route",
+    "summary": "Organize the routes of each day.",
+    "version": "14.0.1.0.0",
+    "category": "Field Service",
+    "license": "AGPL-3",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": ["fieldservice"],
+    "data": [
+        "data/ir_sequence.xml",
+        "data/fsm_route_day_data.xml",
+        "data/fsm_stage_data.xml",
+        "security/ir.model.access.csv",
+        "views/fsm_route_day.xml",
+        "views/fsm_route.xml",
+        "views/fsm_location.xml",
+        "views/fsm_route_dayroute.xml",
+        "views/fsm_order.xml",
+        "views/menu.xml",
     ],
+    "development_status": "Beta",
+    "maintainers": ["max3903"],
 }
diff --git a/fieldservice_route/data/ir_sequence.xml b/fieldservice_route/data/ir_sequence.xml
index 1f3c2525b2..9be8770fa2 100644
--- a/fieldservice_route/data/ir_sequence.xml
+++ b/fieldservice_route/data/ir_sequence.xml
@@ -6,7 +6,7 @@
         <field name="code">fsm.route.dayroute</field>
         <field name="prefix">SR</field>
         <field name="padding">3</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
 
 </odoo>
diff --git a/fieldservice_route/migrations/12.0.2.0.0/pre-migration.py b/fieldservice_route/migrations/12.0.2.0.0/pre-migration.py
index 0088ff5c8a..88258e393c 100644
--- a/fieldservice_route/migrations/12.0.2.0.0/pre-migration.py
+++ b/fieldservice_route/migrations/12.0.2.0.0/pre-migration.py
@@ -7,10 +7,19 @@ def migrate(env, version):
         return
 
     index = 0
-    for day in ('monday', 'tuesday', 'wednesday', 'thursday', 'friday',
-                'saturday', 'sunday'):
-        env.execute("""UPDATE ir_model_data
+    for day in (
+        "monday",
+        "tuesday",
+        "wednesday",
+        "thursday",
+        "friday",
+        "saturday",
+        "sunday",
+    ):
+        env.execute(
+            """UPDATE ir_model_data
         SET name='fsm_route_day_%s'
-        WHERE name='fsm_route_day_%s' AND module='fieldservice_route';""" %
-                    (index, day))
+        WHERE name='fsm_route_day_%s' AND module='fieldservice_route';"""
+            % (index, day)
+        )
         index += 1
diff --git a/fieldservice_route/models/fsm_location.py b/fieldservice_route/models/fsm_location.py
index db787c4f68..7b94ee1f15 100644
--- a/fieldservice_route/models/fsm_location.py
+++ b/fieldservice_route/models/fsm_location.py
@@ -6,6 +6,6 @@
 
 
 class FSMLocation(models.Model):
-    _inherit = 'fsm.location'
+    _inherit = "fsm.location"
 
-    fsm_route_id = fields.Many2one('fsm.route', string='Route')
+    fsm_route_id = fields.Many2one("fsm.route", string="Route")
diff --git a/fieldservice_route/models/fsm_order.py b/fieldservice_route/models/fsm_order.py
index 50c461fbad..44d1ba6467 100644
--- a/fieldservice_route/models/fsm_order.py
+++ b/fieldservice_route/models/fsm_order.py
@@ -2,71 +2,71 @@
 # Copyright (C) 2019 Serpent consulting Services
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 from datetime import datetime
+
 from odoo import api, fields, models
 from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
     @api.model
     def _get_default_person(self):
         return self.fsm_route_id.fsm_person_id.id or False
 
-    dayroute_id = fields.Many2one('fsm.route.dayroute',
-                                  string='Day Route',
-                                  index=True)
-    fsm_route_id = fields.Many2one(related="location_id.fsm_route_id",
-                                   string='Route')
+    dayroute_id = fields.Many2one("fsm.route.dayroute", string="Day Route", index=True)
+    fsm_route_id = fields.Many2one(related="location_id.fsm_route_id", string="Route")
 
     person_id = fields.Many2one(
-        'fsm.person', string='Assigned To', index=True,
-        default=_get_default_person)
+        "fsm.person", string="Assigned To", index=True, default=_get_default_person
+    )
 
     def prepare_dayroute_values(self, values):
         return {
-            'person_id': values['person_id'],
-            'date': values['date'],
-            'route_id': values['route_id']}
+            "person_id": values["person_id"],
+            "date": values["date"],
+            "route_id": values["route_id"],
+        }
 
     def _get_dayroute_values(self, vals):
         date = False
-        if vals.get('scheduled_date_start'):
-            if type(vals.get('scheduled_date_start')) == str:
-                date = datetime.strptime(vals.get('scheduled_date_start'),
-                                         DEFAULT_SERVER_DATETIME_FORMAT).date()
-            elif isinstance(vals.get('scheduled_date_start'), datetime):
-                date = vals.get('scheduled_date_start').date()
+        if vals.get("scheduled_date_start"):
+            if type(vals.get("scheduled_date_start")) == str:
+                date = datetime.strptime(
+                    vals.get("scheduled_date_start"), DEFAULT_SERVER_DATETIME_FORMAT
+                ).date()
+            elif isinstance(vals.get("scheduled_date_start"), datetime):
+                date = vals.get("scheduled_date_start").date()
         return {
-            'person_id':
-                vals.get('person_id') or self.person_id.id or
-                self.fsm_route_id.fsm_person_id.id,
-            'date': date or self.scheduled_date_start.date(),
-            'route_id': vals.get('fsm_route_id') or self.fsm_route_id.id,
+            "person_id": vals.get("person_id")
+            or self.person_id.id
+            or self.fsm_route_id.fsm_person_id.id,
+            "date": date or self.scheduled_date_start.date(),
+            "route_id": vals.get("fsm_route_id") or self.fsm_route_id.id,
         }
 
     def _get_dayroute_domain(self, values):
-        domain = [('person_id', '=', values['person_id']),
-                  ('date', '=', values['date']),
-                  ('order_remaining', '>', 0)]
+        domain = [
+            ("person_id", "=", values["person_id"]),
+            ("date", "=", values["date"]),
+            ("order_remaining", ">", 0),
+        ]
         return domain
 
     def _can_create_dayroute(self, values):
-        return values['person_id'] and values['date']
+        return values["person_id"] and values["date"]
 
     def _manage_fsm_route(self, vals):
-        dayroute_obj = self.env['fsm.route.dayroute']
+        dayroute_obj = self.env["fsm.route.dayroute"]
         values = self._get_dayroute_values(vals)
         domain = self._get_dayroute_domain(values)
         dayroute = dayroute_obj.search(domain, limit=1)
         if dayroute:
-            vals.update({'dayroute_id': dayroute.id})
+            vals.update({"dayroute_id": dayroute.id})
         else:
             if self._can_create_dayroute(values):
-                dayroute = dayroute_obj.create(
-                    self.prepare_dayroute_values(values))
-                vals.update({
-                    'dayroute_id': dayroute.id})
+                dayroute = dayroute_obj.create(self.prepare_dayroute_values(values))
+                vals.update({"dayroute_id": dayroute.id})
         # If this was the last order of the dayroute,
         # delete the dayroute
         if self.dayroute_id and not self.dayroute_id.order_ids:
@@ -75,28 +75,28 @@ def _manage_fsm_route(self, vals):
 
     @api.model
     def create(self, vals):
-        location = self.env['fsm.location'].browse(vals.get('location_id'))
-        if not vals.get('fsm_route_id'):
-            vals.update({
-                'fsm_route_id': location.fsm_route_id.id})
-        if not vals.get('person_id'):
-            vals.update({
-                'person_id': location.fsm_route_id.fsm_person_id.id})
-        if vals.get('person_id') and vals.get('scheduled_date_start'):
+        location = self.env["fsm.location"].browse(vals.get("location_id"))
+        if not vals.get("fsm_route_id"):
+            vals.update({"fsm_route_id": location.fsm_route_id.id})
+        if not vals.get("person_id"):
+            vals.update({"person_id": location.fsm_route_id.fsm_person_id.id})
+        if vals.get("person_id") and vals.get("scheduled_date_start"):
             vals = self._manage_fsm_route(vals)
         return super().create(vals)
 
     @api.multi
     def write(self, vals):
         for rec in self:
-            if vals.get('route_id', False):
-                route = self.env['fsm.route'].browse(vals.get('route_id'))
-                vals.update({
-                    'person_id': route.person_id.id,
-                    'scheduled_date_start': route.date,
-                })
-            if (vals.get('person_id', False) or rec.person_id) and \
-                    (vals.get('scheduled_date_start', False) or
-                     rec.scheduled_date_start):
+            if vals.get("route_id", False):
+                route = self.env["fsm.route"].browse(vals.get("route_id"))
+                vals.update(
+                    {
+                        "person_id": route.person_id.id,
+                        "scheduled_date_start": route.date,
+                    }
+                )
+            if (vals.get("person_id", False) or rec.person_id) and (
+                vals.get("scheduled_date_start", False) or rec.scheduled_date_start
+            ):
                 vals = rec._manage_fsm_route(vals)
         return super().write(vals)
diff --git a/fieldservice_route/models/fsm_route.py b/fieldservice_route/models/fsm_route.py
index 5fd7f9e4ee..f0f88b4083 100644
--- a/fieldservice_route/models/fsm_route.py
+++ b/fieldservice_route/models/fsm_route.py
@@ -5,15 +5,16 @@
 
 
 class FSMRoute(models.Model):
-    _name = 'fsm.route'
-    _description = 'Field Service Route'
+    _name = "fsm.route"
+    _description = "Field Service Route"
 
-    name = fields.Char('Name', required=True)
-    territory_id = fields.Many2one('fsm.territory', string='Territory')
-    fsm_person_id = fields.Many2one('fsm.person', string='Person')
-    day_ids = fields.Many2many('fsm.route.day', string='Days')
-    max_order = fields.Integer('Maximum Orders', default=0,
-                               help="Maximum number of orders per day route.")
+    name = fields.Char("Name", required=True)
+    territory_id = fields.Many2one("fsm.territory", string="Territory")
+    fsm_person_id = fields.Many2one("fsm.person", string="Person")
+    day_ids = fields.Many2many("fsm.route.day", string="Days")
+    max_order = fields.Integer(
+        "Maximum Orders", default=0, help="Maximum number of orders per day route."
+    )
 
     def run_on(self, date):
         """
@@ -22,6 +23,5 @@ def run_on(self, date):
         """
         if date:
             day_index = date.weekday()
-            day = self.env.ref(
-                'fieldservice_route.fsm_route_day_' + str(day_index))
+            day = self.env.ref("fieldservice_route.fsm_route_day_" + str(day_index))
             return day in self.day_ids
diff --git a/fieldservice_route/models/fsm_route_day.py b/fieldservice_route/models/fsm_route_day.py
index 683a8214af..8ccc015777 100644
--- a/fieldservice_route/models/fsm_route_day.py
+++ b/fieldservice_route/models/fsm_route_day.py
@@ -6,16 +6,18 @@
 
 
 class FSMRouteDay(models.Model):
-    _name = 'fsm.route.day'
-    _description = 'Route Day'
+    _name = "fsm.route.day"
+    _description = "Route Day"
 
-    name = fields.Selection([
-        ('Monday', 'Monday'),
-        ('Tuesday', 'Tuesday'),
-        ('Wednesday', 'Wednesday'),
-        ('Thursday', 'Thursday'),
-        ('Friday', 'Friday'),
-        ('Saturday', 'Saturday'),
-        ('Sunday', 'Sunday')],
-        string='Name'
+    name = fields.Selection(
+        [
+            ("Monday", "Monday"),
+            ("Tuesday", "Tuesday"),
+            ("Wednesday", "Wednesday"),
+            ("Thursday", "Thursday"),
+            ("Friday", "Friday"),
+            ("Saturday", "Saturday"),
+            ("Sunday", "Sunday"),
+        ],
+        string="Name",
     )
diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index b361796589..d94cf8e880 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -2,117 +2,138 @@
 # Copyright (C) 2019 Serpent consulting Services
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 from datetime import datetime
-from odoo import api, fields, models, _
+
+from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools import DEFAULT_SERVER_DATE_FORMAT
 
 
 class FSMRouteDayRoute(models.Model):
-    _name = 'fsm.route.dayroute'
-    _description = 'Field Service Route Dayroute'
+    _name = "fsm.route.dayroute"
+    _description = "Field Service Route Dayroute"
 
     def _default_team_id(self):
-        team_ids = self.env['fsm.team'].\
-            search([('company_id', 'in', (self.env.user.company_id.id,
-                                          False))],
-                   order='sequence asc', limit=1)
+        team_ids = self.env["fsm.team"].search(
+            [("company_id", "in", (self.env.user.company_id.id, False))],
+            order="sequence asc",
+            limit=1,
+        )
         if team_ids:
             return team_ids[0]
         else:
-            raise ValidationError(_(
-                "You must create a FSM team first."))
+            raise ValidationError(_("You must create a FSM team first."))
 
-    @api.depends('route_id', 'order_ids')
+    @api.depends("route_id", "order_ids")
     def _compute_order_count(self):
         for rec in self:
             rec.order_count = len(rec.order_ids)
             rec.order_remaining = rec.max_order - rec.order_count
 
-    name = fields.Char(string='Name', required=True, copy=False,
-                       default=lambda self: _('New'))
-    person_id = fields.Many2one('fsm.person', string='Person')
-    route_id = fields.Many2one('fsm.route', string='Route')
-    date = fields.Date(string='Date', required=True)
-    team_id = fields.Many2one('fsm.team', string='Team',
-                              default=lambda self: self._default_team_id())
-    stage_id = fields.Many2one('fsm.stage', string='Stage',
-                               domain="[('stage_type', '=', 'route')]",
-                               index=True, copy=False,
-                               default=lambda self: self._default_stage_id())
+    name = fields.Char(
+        string="Name", required=True, copy=False, default=lambda self: _("New")
+    )
+    person_id = fields.Many2one("fsm.person", string="Person")
+    route_id = fields.Many2one("fsm.route", string="Route")
+    date = fields.Date(string="Date", required=True)
+    team_id = fields.Many2one(
+        "fsm.team", string="Team", default=lambda self: self._default_team_id()
+    )
+    stage_id = fields.Many2one(
+        "fsm.stage",
+        string="Stage",
+        domain="[('stage_type', '=', 'route')]",
+        index=True,
+        copy=False,
+        default=lambda self: self._default_stage_id(),
+    )
     territory_id = fields.Many2one(
-        'fsm.territory', related='route_id.territory_id', string='Territory')
+        "fsm.territory", related="route_id.territory_id", string="Territory"
+    )
     longitude = fields.Float("Longitude")
     latitude = fields.Float("Latitude")
-    last_location_id = fields.Many2one('fsm.location', string='Last Location')
-    date_start_planned = fields.Datetime(string='Planned Start Time')
-    start_location_id = fields.Many2one(
-        'fsm.location', string='Start Location')
-    end_location_id = fields.Many2one('fsm.location', string='End Location')
-    work_time = fields.Float(string='Time before overtime (in hours)',
-                             default=8.0)
-    max_allow_time = fields.Float(string="Maximal Allowable Time (in hours)",
-                                  default=10.0)
-    order_ids = fields.One2many('fsm.order', 'dayroute_id',
-                                string='Orders')
+    last_location_id = fields.Many2one("fsm.location", string="Last Location")
+    date_start_planned = fields.Datetime(string="Planned Start Time")
+    start_location_id = fields.Many2one("fsm.location", string="Start Location")
+    end_location_id = fields.Many2one("fsm.location", string="End Location")
+    work_time = fields.Float(string="Time before overtime (in hours)", default=8.0)
+    max_allow_time = fields.Float(
+        string="Maximal Allowable Time (in hours)", default=10.0
+    )
+    order_ids = fields.One2many("fsm.order", "dayroute_id", string="Orders")
     order_count = fields.Integer(
-        compute=_compute_order_count, string='Number of Orders', store=True)
+        compute=_compute_order_count, string="Number of Orders", store=True
+    )
     order_remaining = fields.Integer(
-        compute=_compute_order_count, string='Available Capacity', store=True)
+        compute=_compute_order_count, string="Available Capacity", store=True
+    )
     max_order = fields.Integer(
-        related='route_id.max_order', string="Maximum Capacity", store=True,
-        help="Maximum numbers of orders that can be added to this day route.")
+        related="route_id.max_order",
+        string="Maximum Capacity",
+        store=True,
+        help="Maximum numbers of orders that can be added to this day route.",
+    )
 
     def _default_stage_id(self):
-        return self.env['fsm.stage'].search([('stage_type', '=', 'route'),
-                                             ('is_default', '=', True)],
-                                            limit=1)
+        return self.env["fsm.stage"].search(
+            [("stage_type", "=", "route"), ("is_default", "=", True)], limit=1
+        )
 
-    @api.onchange('route_id')
+    @api.onchange("route_id")
     def _onchange_person(self):
         self.person_id = self.route_id.fsm_person_id.id
 
-    @api.onchange('date')
+    @api.onchange("date")
     def _onchange_date(self):
         if self.date:
             # TODO: Use the worker timezone and working schedule
             self.date_start_planned = datetime.combine(
-                self.date, datetime.strptime("8:00:00", '%H:%M:%S').time())
+                self.date, datetime.strptime("8:00:00", "%H:%M:%S").time()
+            )
 
     @api.model
     def create(self, vals):
-        if vals.get('name', _('New')) == _('New'):
-            vals['name'] = self.env['ir.sequence'].next_by_code(
-                'fsm.route.dayroute') or _('New')
-        if not vals.get('date_start_planned', False) and \
-                vals.get('date', False):
+        if vals.get("name", _("New")) == _("New"):
+            vals["name"] = self.env["ir.sequence"].next_by_code(
+                "fsm.route.dayroute"
+            ) or _("New")
+        if not vals.get("date_start_planned", False) and vals.get("date", False):
             # TODO: Use the worker timezone and working schedule
-            date = vals.get('date')
-            if type(vals.get('date')) == str:
-                date = datetime.strptime(vals.get('date'),
-                                         DEFAULT_SERVER_DATE_FORMAT).date()
-            vals.update({
-                'date_start_planned': datetime.combine(
-                    date, datetime.strptime("8:00:00", '%H:%M:%S').time())
-            })
+            date = vals.get("date")
+            if type(vals.get("date")) == str:
+                date = datetime.strptime(
+                    vals.get("date"), DEFAULT_SERVER_DATE_FORMAT
+                ).date()
+            vals.update(
+                {
+                    "date_start_planned": datetime.combine(
+                        date, datetime.strptime("8:00:00", "%H:%M:%S").time()
+                    )
+                }
+            )
         return super().create(vals)
 
-    @api.constrains('date', 'route_id')
+    @api.constrains("date", "route_id")
     def check_day(self):
         for rec in self:
             if rec.date and rec.route_id:
                 # Get the day of the week: Monday -> 0, Sunday -> 6
                 day_index = rec.date.weekday()
-                day = self.env.ref(
-                    'fieldservice_route.fsm_route_day_' + str(day_index))
+                day = self.env.ref("fieldservice_route.fsm_route_day_" + str(day_index))
                 if day.id not in rec.route_id.day_ids.ids:
-                    raise ValidationError(_(
-                        "The route %s does not run on %s!" %
-                        (rec.route_id.name, day.name)))
+                    raise ValidationError(
+                        _(
+                            "The route %s does not run on %s!"
+                            % (rec.route_id.name, day.name)
+                        )
+                    )
 
-    @api.constrains('route_id', 'max_order', 'order_count')
+    @api.constrains("route_id", "max_order", "order_count")
     def check_capacity(self):
         for rec in self:
             if rec.route_id and rec.order_count > rec.max_order:
-                raise ValidationError(_(
-                    "The day route is exceeding the maximum number of "
-                    "orders of the route."))
+                raise ValidationError(
+                    _(
+                        "The day route is exceeding the maximum number of "
+                        "orders of the route."
+                    )
+                )
diff --git a/fieldservice_route/models/fsm_stage.py b/fieldservice_route/models/fsm_stage.py
index 7a3773dab3..d3393bb705 100644
--- a/fieldservice_route/models/fsm_stage.py
+++ b/fieldservice_route/models/fsm_stage.py
@@ -6,6 +6,6 @@
 
 
 class FSMStage(models.Model):
-    _inherit = 'fsm.stage'
+    _inherit = "fsm.stage"
 
-    stage_type = fields.Selection(selection_add=[('route', 'Route')])
+    stage_type = fields.Selection(selection_add=[("route", "Route")])
diff --git a/fieldservice_route/readme/DESCRIPTION.rst b/fieldservice_route/readme/DESCRIPTION.rst
index 94f9854196..6a1b20d6d3 100644
--- a/fieldservice_route/readme/DESCRIPTION.rst
+++ b/fieldservice_route/readme/DESCRIPTION.rst
@@ -1,4 +1,3 @@
 A Field Service route is the sorted list of orders that one worker/vehicle will perform during a day.
 
 This module allows you to manage your Field Service routes: when assigning an order to a worker and scheduling it, a route is automatically created for that worker and day.
-
diff --git a/fieldservice_route/readme/USAGE.rst b/fieldservice_route/readme/USAGE.rst
index ee41b9c759..88f573ad1f 100644
--- a/fieldservice_route/readme/USAGE.rst
+++ b/fieldservice_route/readme/USAGE.rst
@@ -4,4 +4,3 @@ To use this module, you need to:
 * Create or select an order
 * Assign it to a worker and schedule it
 * Go to Field Service > Dashboard > Day Routes. A new record has been created.
-
diff --git a/fieldservice_route/tests/test_fsm_order.py b/fieldservice_route/tests/test_fsm_order.py
index 5bbb7de480..a224dfbb3b 100644
--- a/fieldservice_route/tests/test_fsm_order.py
+++ b/fieldservice_route/tests/test_fsm_order.py
@@ -2,46 +2,48 @@
 # Copyright (C) 2019 Serpent consulting Services
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-from odoo.tests.common import TransactionCase
 from datetime import datetime
 
+from odoo.tests.common import TransactionCase
 
-class FSMOrderRouteCase(TransactionCase):
 
+class FSMOrderRouteCase(TransactionCase):
     def setUp(self):
         super(FSMOrderRouteCase, self).setUp()
-        self.fsm_stage_obj = self.env['fsm.stage']
-        self.fsm_order_obj = self.env['fsm.order']
-        self.fsm_route_obj = self.env['fsm.route']
+        self.fsm_stage_obj = self.env["fsm.stage"]
+        self.fsm_order_obj = self.env["fsm.order"]
+        self.fsm_route_obj = self.env["fsm.route"]
         self.test_person = self.env.ref("fieldservice.test_person")
         self.test_location = self.env.ref("fieldservice.test_location")
         self.date = datetime.now()
         self.days = [
-            self.env.ref('fieldservice_route.fsm_route_day_0').id,
-            self.env.ref('fieldservice_route.fsm_route_day_1').id,
-            self.env.ref('fieldservice_route.fsm_route_day_2').id,
-            self.env.ref('fieldservice_route.fsm_route_day_3').id,
-            self.env.ref('fieldservice_route.fsm_route_day_4').id,
-            self.env.ref('fieldservice_route.fsm_route_day_5').id,
-            self.env.ref('fieldservice_route.fsm_route_day_6').id
+            self.env.ref("fieldservice_route.fsm_route_day_0").id,
+            self.env.ref("fieldservice_route.fsm_route_day_1").id,
+            self.env.ref("fieldservice_route.fsm_route_day_2").id,
+            self.env.ref("fieldservice_route.fsm_route_day_3").id,
+            self.env.ref("fieldservice_route.fsm_route_day_4").id,
+            self.env.ref("fieldservice_route.fsm_route_day_5").id,
+            self.env.ref("fieldservice_route.fsm_route_day_6").id,
         ]
         self.fsm_route_id = self.fsm_route_obj.create(
             {
-                'name': 'Demo Route',
-                'max_order': 10,
-                'fsm_person_id': self.test_person.id,
-                'day_ids': [(6, 0, self.days)],
-            })
+                "name": "Demo Route",
+                "max_order": 10,
+                "fsm_person_id": self.test_person.id,
+                "day_ids": [(6, 0, self.days)],
+            }
+        )
         self.test_location.fsm_route_id = self.fsm_route_id.id
 
     def test_create_day_route(self):
-        order = self.fsm_order_obj.create({'location_id':
-                                           self.test_location.id,
-                                           'person_id': self.test_person.id,
-                                           'scheduled_date_start': self.date,
-                                           })
+        order = self.fsm_order_obj.create(
+            {
+                "location_id": self.test_location.id,
+                "person_id": self.test_person.id,
+                "scheduled_date_start": self.date,
+            }
+        )
         self.assertEqual(order.fsm_route_id, self.test_location.fsm_route_id)
         self.assertEqual(order.dayroute_id.person_id, order.person_id)
-        self.assertEqual(order.dayroute_id.date,
-                         order.scheduled_date_start.date())
+        self.assertEqual(order.dayroute_id.date, order.scheduled_date_start.date())
         self.assertEqual(order.dayroute_id.route_id, order.fsm_route_id)
diff --git a/fieldservice_route/views/fsm_location.xml b/fieldservice_route/views/fsm_location.xml
index 8cd4bd0d50..f86a00223f 100644
--- a/fieldservice_route/views/fsm_location.xml
+++ b/fieldservice_route/views/fsm_location.xml
@@ -3,10 +3,10 @@
     <record id="fsm_location_form_view_route_inherit" model="ir.ui.view">
         <field name="name">fsm.location.form</field>
         <field name="model">fsm.location</field>
-        <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">
             <field name="category_id" position="after">
-                <field name="fsm_route_id"/>
+                <field name="fsm_route_id" />
             </field>
         </field>
     </record>
diff --git a/fieldservice_route/views/fsm_order.xml b/fieldservice_route/views/fsm_order.xml
index af0579ae41..53099b5438 100644
--- a/fieldservice_route/views/fsm_order.xml
+++ b/fieldservice_route/views/fsm_order.xml
@@ -3,13 +3,13 @@
     <record id="fsm_order_form_inherit_route" model="ir.ui.view">
         <field name="name">fsm.order.form</field>
         <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">
             <field name="location_id" position="after">
-                <field name="fsm_route_id"/>
+                <field name="fsm_route_id" />
             </field>
             <field name="scheduled_date_end" position="after">
-                <field name="dayroute_id" readonly="1"/>
+                <field name="dayroute_id" readonly="1" />
             </field>
         </field>
     </record>
diff --git a/fieldservice_route/views/fsm_route.xml b/fieldservice_route/views/fsm_route.xml
index 7989570cc8..1ae96cef5f 100644
--- a/fieldservice_route/views/fsm_route.xml
+++ b/fieldservice_route/views/fsm_route.xml
@@ -5,10 +5,10 @@
         <field name="model">fsm.route</field>
         <field name="arch" type="xml">
             <tree string="Routes">
-                <field name="name"/>
-                <field name="territory_id"/>
-                <field name="fsm_person_id"/>
-                <field name="day_ids"/>
+                <field name="name" />
+                <field name="territory_id" />
+                <field name="fsm_person_id" />
+                <field name="day_ids" />
             </tree>
         </field>
     </record>
@@ -21,27 +21,27 @@
                 <sheet>
                     <div class="oe_title">
                         <h1>
-                            <field name="name"/>
+                            <field name="name" />
                         </h1>
                     </div>
                     <group id="main">
                         <group id="left">
-                            <field name="fsm_person_id"/>
+                            <field name="fsm_person_id" />
                         </group>
                         <group id="right">
-                            <field name="day_ids" widget="many2many_tags"/>
+                            <field name="day_ids" widget="many2many_tags" />
                         </group>
                     </group>
                     <notebook>
                         <page id="capacity" string="Capacity">
                             <group id="capacity">
                                 <group id="capacity-left">
-                                    <label for="max_order" string="Maximum"/>
+                                    <label for="max_order" string="Maximum" />
                                     <div>
-                                        <field name="max_order"/> orders per day route
+                                        <field name="max_order" /> orders per day route
                                     </div>
                                 </group>
-                                <group id="capacity-right"/>
+                                <group id="capacity-right" />
                             </group>
                         </page>
                     </notebook>
diff --git a/fieldservice_route/views/fsm_route_day.xml b/fieldservice_route/views/fsm_route_day.xml
index 509be21162..d9cb238075 100644
--- a/fieldservice_route/views/fsm_route_day.xml
+++ b/fieldservice_route/views/fsm_route_day.xml
@@ -5,7 +5,7 @@
         <field name="model">fsm.route.day</field>
         <field name="arch" type="xml">
             <tree string="Route Day">
-                <field name="name"/>
+                <field name="name" />
             </tree>
         </field>
     </record>
@@ -17,7 +17,7 @@
             <form string="Route Day">
                 <sheet>
                     <group>
-                        <field name="name"/>
+                        <field name="name" />
                     </group>
                 </sheet>
             </form>
diff --git a/fieldservice_route/views/fsm_route_dayroute.xml b/fieldservice_route/views/fsm_route_dayroute.xml
index 17d8f7f359..f37d6645c6 100644
--- a/fieldservice_route/views/fsm_route_dayroute.xml
+++ b/fieldservice_route/views/fsm_route_dayroute.xml
@@ -5,11 +5,11 @@
         <field name="model">fsm.route.dayroute</field>
         <field name="arch" type="xml">
             <tree string="Day Routes">
-                <field name="name"/>
-                <field name="route_id"/>
-                <field name="person_id"/>
-                <field name="date"/>
-                <field name="stage_id"/>
+                <field name="name" />
+                <field name="route_id" />
+                <field name="person_id" />
+                <field name="date" />
+                <field name="stage_id" />
             </tree>
         </field>
     </record>
@@ -20,76 +20,87 @@
         <field name="arch" type="xml">
             <form string="Day Route">
                 <header>
-                    <field name="stage_id"
-                           widget="statusbar"
-                           options="{'fold_field': 'fold'}"
-                           clickable="True"
-                           domain="[('stage_type', '=', 'route')]"/>
+                    <field
+                        name="stage_id"
+                        widget="statusbar"
+                        options="{'fold_field': 'fold'}"
+                        clickable="True"
+                        domain="[('stage_type', '=', 'route')]"
+                    />
                 </header>
                 <sheet>
-                    <div class="oe_button_box" name="button_box"/>
+                    <div class="oe_button_box" name="button_box" />
                     <div class="oe_title">
                         <h1>
-                            <field name="name" readonly="1"/>
+                            <field name="name" readonly="1" />
                         </h1>
                     </div>
                     <group id="main">
                         <group id="left">
-                            <field name="route_id"/>
-                            <field name="person_id" required="1"/>
-                            <field name="team_id"
-                                   groups="fieldservice.group_fsm_team"/>
+                            <field name="route_id" />
+                            <field name="person_id" required="1" />
+                            <field
+                                name="team_id"
+                                groups="fieldservice.group_fsm_team"
+                            />
                         </group>
                         <group id="right">
-                            <field name="date" required="1"/>
-                            <field name="territory_id"/>
+                            <field name="date" required="1" />
+                            <field name="territory_id" />
                         </group>
                     </group>
                     <notebook>
                         <page string="Orders">
                             <group id="orders">
                                 <group id="orders-left">
-                                    <field name="max_order"/>
-                                    <field name="order_count"/>
-                                    <field name="order_remaining"/>
+                                    <field name="max_order" />
+                                    <field name="order_count" />
+                                    <field name="order_remaining" />
                                 </group>
-                                <group id="orders-right"/>
+                                <group id="orders-right" />
                             </group>
-                            <field name="order_ids" nolabel="1"
-                                   widget="many2many"
-                                   domain="[('dayroute_id', '=', False), ('fsm_route_id', '=', route_id)]">
+                            <field
+                                name="order_ids"
+                                nolabel="1"
+                                widget="many2many"
+                                domain="[('dayroute_id', '=', False), ('fsm_route_id', '=', route_id)]"
+                            >
                                 <tree>
-                                    <field name="sequence" widget="handle"/>
-                                    <field name="name"/>
-                                    <field name="location_id"/>
-                                    <field name="scheduled_date_start"/>
-                                    <field name="stage_id"/>
-                                    <button name="action_complete"
-                                            string="Complete order"
-                                            type="object"
-                                            icon="fa-check text-success"
-                                            attrs="{'invisible': [('stage_id', 'in', [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d])]}"/>
-                                    <button name="action_cancel"
-                                            string="Cancel order" type="object"
-                                            icon="fa-times-circle text-danger"
-                                            attrs="{'invisible': [('stage_id', 'in', [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d])]}"/>
+                                    <field name="sequence" widget="handle" />
+                                    <field name="name" />
+                                    <field name="location_id" />
+                                    <field name="scheduled_date_start" />
+                                    <field name="stage_id" />
+                                    <button
+                                        name="action_complete"
+                                        string="Complete order"
+                                        type="object"
+                                        icon="fa-check text-success"
+                                        attrs="{'invisible': [('stage_id', 'in', [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d])]}"
+                                    />
+                                    <button
+                                        name="action_cancel"
+                                        string="Cancel order"
+                                        type="object"
+                                        icon="fa-times-circle text-danger"
+                                        attrs="{'invisible': [('stage_id', 'in', [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d])]}"
+                                    />
                                 </tree>
                             </field>
                         </page>
                         <page string="Planning">
                             <group id="planning">
                                 <group id="planning-left" string="Timing">
-                                    <field name="date_start_planned"/>
-                                    <field name="work_time"/>
-                                    <field name="max_allow_time"/>
+                                    <field name="date_start_planned" />
+                                    <field name="work_time" />
+                                    <field name="max_allow_time" />
                                 </group>
-                                <group id="planning-right"
-                                       string="Positioning">
-                                    <field name="longitude"/>
-                                    <field name="latitude"/>
-                                    <field name="start_location_id"/>
-                                    <field name="end_location_id"/>
-                                    <field name="last_location_id"/>
+                                <group id="planning-right" string="Positioning">
+                                    <field name="longitude" />
+                                    <field name="latitude" />
+                                    <field name="start_location_id" />
+                                    <field name="end_location_id" />
+                                    <field name="last_location_id" />
                                 </group>
                             </group>
                         </page>
@@ -116,12 +127,14 @@
         <field name="name">fsm.route.dayroute.calendar</field>
         <field name="model">fsm.route.dayroute</field>
         <field name="arch" type="xml">
-            <calendar string="Day Routes"
-                      date_start="date_start_planned"
-                      date_delay="max_allow_time"
-                      color="route_id">
-                <field name="name"/>
-                <field name="person_id"/>
+            <calendar
+                string="Day Routes"
+                date_start="date_start_planned"
+                date_delay="max_allow_time"
+                color="route_id"
+            >
+                <field name="name" />
+                <field name="person_id" />
             </calendar>
         </field>
     </record>
@@ -139,7 +152,7 @@
         <field name="model">fsm.route.dayroute</field>
         <field name="arch" type="xml">
             <graph string="Day Routes" type="bar">
-                <field name="date" type="row"/>
+                <field name="date" type="row" />
             </graph>
         </field>
     </record>
@@ -149,13 +162,12 @@
         <field name="model">fsm.route.dayroute</field>
         <field name="arch" type="xml">
             <pivot string="Day Routes" display_quantity="true">
-                <field name="date" type="row"/>
+                <field name="date" type="row" />
             </pivot>
         </field>
     </record>
 
-    <record id="action_fsm_route_dayroute_report"
-            model="ir.actions.act_window">
+    <record id="action_fsm_route_dayroute_report" model="ir.actions.act_window">
         <field name="name">Day Routes</field>
         <field name="res_model">fsm.route.dayroute</field>
         <field name="view_type">form</field>
diff --git a/fieldservice_route/views/menu.xml b/fieldservice_route/views/menu.xml
index 96023f2019..7f437ab106 100644
--- a/fieldservice_route/views/menu.xml
+++ b/fieldservice_route/views/menu.xml
@@ -1,37 +1,47 @@
 <odoo>
 
     <!-- Dashboard -->
-    <menuitem id="menu_fsm_dash_dayroute"
-              name="Day Routes"
-              action="action_fsm_route_dayroute_dash"
-              parent="fieldservice.dashboard"
-              sequence="20"/>
+    <menuitem
+        id="menu_fsm_dash_dayroute"
+        name="Day Routes"
+        action="action_fsm_route_dayroute_dash"
+        parent="fieldservice.dashboard"
+        sequence="20"
+    />
 
     <!-- Operations -->
-    <menuitem id="menu_fsm_route_dayroute"
-              name="Day Routes"
-              action="action_fsm_route_dayroute"
-              parent="fieldservice.operations"
-              sequence="10"/>
+    <menuitem
+        id="menu_fsm_route_dayroute"
+        name="Day Routes"
+        action="action_fsm_route_dayroute"
+        parent="fieldservice.operations"
+        sequence="10"
+    />
 
     <!-- Master Data -->
-    <menuitem id="menu_fsm_route"
-              name="Routes"
-              action="action_fsm_route"
-              parent="fieldservice.data"
-              sequence="20"/>
+    <menuitem
+        id="menu_fsm_route"
+        name="Routes"
+        action="action_fsm_route"
+        parent="fieldservice.data"
+        sequence="20"
+    />
 
     <!-- Reporting -->
-    <menuitem id="menu_fsm_route_dayroute_report"
-              name="Day Routes"
-              action="action_fsm_route_dayroute_report"
-              parent="fieldservice.reporting"/>
+    <menuitem
+        id="menu_fsm_route_dayroute_report"
+        name="Day Routes"
+        action="action_fsm_route_dayroute_report"
+        parent="fieldservice.reporting"
+    />
 
     <!-- Configuration -->
-    <menuitem id="menu_fsm_route_day"
-              name="Route Days"
-              action="action_fsm_route_day"
-              parent="fieldservice.config"
-              sequence="30"/>
+    <menuitem
+        id="menu_fsm_route_day"
+        name="Route Days"
+        action="action_fsm_route_day"
+        parent="fieldservice.config"
+        sequence="30"
+    />
 
 </odoo>
diff --git a/setup/fieldservice_route/odoo/addons/fieldservice_route b/setup/fieldservice_route/odoo/addons/fieldservice_route
new file mode 120000
index 0000000000..1e43bdbd68
--- /dev/null
+++ b/setup/fieldservice_route/odoo/addons/fieldservice_route
@@ -0,0 +1 @@
+../../../../fieldservice_route
\ No newline at end of file
diff --git a/setup/fieldservice_route/setup.py b/setup/fieldservice_route/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_route/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 7f4188471276e37ccb04d02deb9089096dc888ca Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Mon, 3 May 2021 14:23:02 +0530
Subject: [PATCH 281/631] [14.0][MIG] fieldservice_route

---
 fieldservice_route/README.rst                       | 13 ++++++-------
 .../{12.0.2.0.0 => 14.0.1.0.0}/pre-migration.py     |  0
 fieldservice_route/models/fsm_order.py              |  3 +--
 fieldservice_route/models/fsm_route.py              |  1 -
 fieldservice_route/models/fsm_route_dayroute.py     |  3 ---
 fieldservice_route/models/fsm_stage.py              |  4 +++-
 fieldservice_route/readme/CONTRIBUTORS.rst          |  1 +
 fieldservice_route/security/ir.model.access.csv     |  6 +++---
 fieldservice_route/static/description/index.html    |  9 +++++----
 fieldservice_route/tests/test_fsm_order.py          |  3 ++-
 fieldservice_route/views/fsm_route.xml              |  2 --
 fieldservice_route/views/fsm_route_day.xml          |  1 -
 fieldservice_route/views/fsm_route_dayroute.xml     |  4 ----
 13 files changed, 21 insertions(+), 29 deletions(-)
 rename fieldservice_route/migrations/{12.0.2.0.0 => 14.0.1.0.0}/pre-migration.py (100%)

diff --git a/fieldservice_route/README.rst b/fieldservice_route/README.rst
index d6e6a25790..097e32bcd4 100644
--- a/fieldservice_route/README.rst
+++ b/fieldservice_route/README.rst
@@ -14,13 +14,13 @@ Field Service Route
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github
-    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_route
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_route
     :alt: OCA/field-service
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_route
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_route
     :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| 
@@ -29,7 +29,6 @@ A Field Service route is the sorted list of orders that one worker/vehicle will
 
 This module allows you to manage your Field Service routes: when assigning an order to a worker and scheduling it, a route is automatically created for that worker and day.
 
-
 **Table of contents**
 
 .. contents::
@@ -55,14 +54,13 @@ To use this module, you need to:
 * Assign it to a worker and schedule it
 * Go to Field Service > Dashboard > Day Routes. A new record has been created.
 
-
 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_route%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_route%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.
 
@@ -79,6 +77,7 @@ Contributors
 
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Nikul Chaudhary <nikul.chaudhary.serpentcs@gmail.com>
+* Freni Patel <fpatel@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -109,6 +108,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_route>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_route>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_route/migrations/12.0.2.0.0/pre-migration.py b/fieldservice_route/migrations/14.0.1.0.0/pre-migration.py
similarity index 100%
rename from fieldservice_route/migrations/12.0.2.0.0/pre-migration.py
rename to fieldservice_route/migrations/14.0.1.0.0/pre-migration.py
diff --git a/fieldservice_route/models/fsm_order.py b/fieldservice_route/models/fsm_order.py
index 44d1ba6467..30def9041f 100644
--- a/fieldservice_route/models/fsm_order.py
+++ b/fieldservice_route/models/fsm_order.py
@@ -82,9 +82,8 @@ def create(self, vals):
             vals.update({"person_id": location.fsm_route_id.fsm_person_id.id})
         if vals.get("person_id") and vals.get("scheduled_date_start"):
             vals = self._manage_fsm_route(vals)
-        return super().create(vals)
+        return super(FSMOrder, self).create(vals)
 
-    @api.multi
     def write(self, vals):
         for rec in self:
             if vals.get("route_id", False):
diff --git a/fieldservice_route/models/fsm_route.py b/fieldservice_route/models/fsm_route.py
index f0f88b4083..dad5ecc765 100644
--- a/fieldservice_route/models/fsm_route.py
+++ b/fieldservice_route/models/fsm_route.py
@@ -9,7 +9,6 @@ class FSMRoute(models.Model):
     _description = "Field Service Route"
 
     name = fields.Char("Name", required=True)
-    territory_id = fields.Many2one("fsm.territory", string="Territory")
     fsm_person_id = fields.Many2one("fsm.person", string="Person")
     day_ids = fields.Many2many("fsm.route.day", string="Days")
     max_order = fields.Integer(
diff --git a/fieldservice_route/models/fsm_route_dayroute.py b/fieldservice_route/models/fsm_route_dayroute.py
index d94cf8e880..473f267918 100644
--- a/fieldservice_route/models/fsm_route_dayroute.py
+++ b/fieldservice_route/models/fsm_route_dayroute.py
@@ -46,9 +46,6 @@ def _compute_order_count(self):
         copy=False,
         default=lambda self: self._default_stage_id(),
     )
-    territory_id = fields.Many2one(
-        "fsm.territory", related="route_id.territory_id", string="Territory"
-    )
     longitude = fields.Float("Longitude")
     latitude = fields.Float("Latitude")
     last_location_id = fields.Many2one("fsm.location", string="Last Location")
diff --git a/fieldservice_route/models/fsm_stage.py b/fieldservice_route/models/fsm_stage.py
index d3393bb705..4463534905 100644
--- a/fieldservice_route/models/fsm_stage.py
+++ b/fieldservice_route/models/fsm_stage.py
@@ -8,4 +8,6 @@
 class FSMStage(models.Model):
     _inherit = "fsm.stage"
 
-    stage_type = fields.Selection(selection_add=[("route", "Route")])
+    stage_type = fields.Selection(
+        selection_add=[("route", "Route")], ondelete={"route": "cascade"}
+    )
diff --git a/fieldservice_route/readme/CONTRIBUTORS.rst b/fieldservice_route/readme/CONTRIBUTORS.rst
index f4dcda0602..48fb291d73 100644
--- a/fieldservice_route/readme/CONTRIBUTORS.rst
+++ b/fieldservice_route/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Nikul Chaudhary <nikul.chaudhary.serpentcs@gmail.com>
+* Freni Patel <fpatel@opensourceintegrators.com>
diff --git a/fieldservice_route/security/ir.model.access.csv b/fieldservice_route/security/ir.model.access.csv
index 872c34946a..cc82d7de4e 100644
--- a/fieldservice_route/security/ir.model.access.csv
+++ b/fieldservice_route/security/ir.model.access.csv
@@ -1,9 +1,9 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_fsm_route_user,fsm.route.user,model_fsm_route,fieldservice.group_fsm_user_own,1,0,0,0
+access_fsm_route_user,fsm.route.user,model_fsm_route,fieldservice.group_fsm_user,1,0,0,0
 access_fsm_route_dispatcher,fsm.route.dispatcher,model_fsm_route,fieldservice.group_fsm_dispatcher,1,1,1,1
-access_fsm_route_day_user,fsm.route.day.user,model_fsm_route_day,fieldservice.group_fsm_user_own,1,0,0,0
+access_fsm_route_day_user,fsm.route.day.user,model_fsm_route_day,fieldservice.group_fsm_user,1,0,0,0
 access_fsm_route_day_dispatcher,fsm.route.day.dispatcher,model_fsm_route_day,fieldservice.group_fsm_manager,1,1,0,0
-access_fsm_route_dayroute_user,fsm.route.dayroute.user,model_fsm_route_dayroute,fieldservice.group_fsm_user_own,1,1,0,0
+access_fsm_route_dayroute_user,fsm.route.dayroute.user,model_fsm_route_dayroute,fieldservice.group_fsm_user,1,1,0,0
 access_fsm_route_dayroute_dispatcher,fsm.route.dayroute.dispatcher,model_fsm_route_dayroute,fieldservice.group_fsm_dispatcher,1,1,1,1
 access_fsm_route_dayroute_portal,access.fsm.route.dayroute.portal,model_fsm_route_dayroute,base.group_portal,1,1,1,0
 access_ir_sequence_portal,access.ir.sequence.portal,base.model_ir_sequence,base.group_portal,1,0,0,0
diff --git a/fieldservice_route/static/description/index.html b/fieldservice_route/static/description/index.html
index fa256530f0..b518de1ffc 100644
--- a/fieldservice_route/static/description/index.html
+++ b/fieldservice_route/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 Route</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Field Service Route</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_route"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_route"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" 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><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_route"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_route"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" 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 Field Service route is the sorted list of orders that one worker/vehicle will perform during a day.</p>
 <p>This module allows you to manage your Field Service routes: when assigning an order to a worker and scheduling it, a route is automatically created for that worker and day.</p>
 <p><strong>Table of contents</strong></p>
@@ -410,7 +410,7 @@ <h1><a class="toc-backref" href="#id3">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_route%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_route%0Aversion:%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">
@@ -426,6 +426,7 @@ <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
 <li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Nikul Chaudhary &lt;<a class="reference external" href="mailto:nikul.chaudhary.serpentcs&#64;gmail.com">nikul.chaudhary.serpentcs&#64;gmail.com</a>&gt;</li>
+<li>Freni Patel &lt;<a class="reference external" href="mailto:fpatel&#64;opensourceintegrators.com">fpatel&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -445,7 +446,7 @@ <h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" 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_route">OCA/field-service</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/14.0/fieldservice_route">OCA/field-service</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/fieldservice_route/tests/test_fsm_order.py b/fieldservice_route/tests/test_fsm_order.py
index a224dfbb3b..e8e094220b 100644
--- a/fieldservice_route/tests/test_fsm_order.py
+++ b/fieldservice_route/tests/test_fsm_order.py
@@ -15,7 +15,8 @@ def setUp(self):
         self.fsm_route_obj = self.env["fsm.route"]
         self.test_person = self.env.ref("fieldservice.test_person")
         self.test_location = self.env.ref("fieldservice.test_location")
-        self.date = datetime.now()
+        date = datetime.now()
+        self.date = date.replace(microsecond=0)
         self.days = [
             self.env.ref("fieldservice_route.fsm_route_day_0").id,
             self.env.ref("fieldservice_route.fsm_route_day_1").id,
diff --git a/fieldservice_route/views/fsm_route.xml b/fieldservice_route/views/fsm_route.xml
index 1ae96cef5f..5ddc65a230 100644
--- a/fieldservice_route/views/fsm_route.xml
+++ b/fieldservice_route/views/fsm_route.xml
@@ -6,7 +6,6 @@
         <field name="arch" type="xml">
             <tree string="Routes">
                 <field name="name" />
-                <field name="territory_id" />
                 <field name="fsm_person_id" />
                 <field name="day_ids" />
             </tree>
@@ -53,7 +52,6 @@
     <record id="action_fsm_route" model="ir.actions.act_window">
         <field name="name">Routes</field>
         <field name="res_model">fsm.route</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
diff --git a/fieldservice_route/views/fsm_route_day.xml b/fieldservice_route/views/fsm_route_day.xml
index d9cb238075..3dcf030634 100644
--- a/fieldservice_route/views/fsm_route_day.xml
+++ b/fieldservice_route/views/fsm_route_day.xml
@@ -27,7 +27,6 @@
     <record id="action_fsm_route_day" model="ir.actions.act_window">
         <field name="name">Route Day</field>
         <field name="res_model">fsm.route.day</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
diff --git a/fieldservice_route/views/fsm_route_dayroute.xml b/fieldservice_route/views/fsm_route_dayroute.xml
index f37d6645c6..3bd01db521 100644
--- a/fieldservice_route/views/fsm_route_dayroute.xml
+++ b/fieldservice_route/views/fsm_route_dayroute.xml
@@ -46,7 +46,6 @@
                         </group>
                         <group id="right">
                             <field name="date" required="1" />
-                            <field name="territory_id" />
                         </group>
                     </group>
                     <notebook>
@@ -113,7 +112,6 @@
     <record id="action_fsm_route_dayroute" model="ir.actions.act_window">
         <field name="name">Day Routes</field>
         <field name="res_model">fsm.route.dayroute</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree,calendar,form</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -142,7 +140,6 @@
     <record id="action_fsm_route_dayroute_dash" model="ir.actions.act_window">
         <field name="name">Day Routes</field>
         <field name="res_model">fsm.route.dayroute</field>
-        <field name="view_type">form</field>
         <field name="view_mode">calendar,tree,form</field>
     </record>
 
@@ -170,7 +167,6 @@
     <record id="action_fsm_route_dayroute_report" model="ir.actions.act_window">
         <field name="name">Day Routes</field>
         <field name="res_model">fsm.route.dayroute</field>
-        <field name="view_type">form</field>
         <field name="view_mode">graph,pivot</field>
         <field name="help" type="html">
             <p>

From fdba750dc5f8905dcfbcae090546ef5be43a22b2 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Thu, 8 Jul 2021 13:22:09 +0000
Subject: [PATCH 282/631] [UPD] Update fieldservice_account_analytic.pot

---
 .../i18n/fieldservice_account_analytic.pot    | 56 +++++++++++++++----
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
index 9ec0a906fa..1c3f16e196 100644
--- a/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
+++ b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_account_analytic
+# 	* fieldservice_account_analytic
 #
 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"
@@ -30,12 +30,12 @@ msgid "Analytic Line"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__contact
 msgid "Bill Contact"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__location
 msgid "Bill Location"
 msgstr ""
 
@@ -69,6 +69,16 @@ msgstr ""
 msgid "Customer"
 msgstr ""
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
@@ -102,17 +112,44 @@ msgid "Filter the Location on an FSM Order by the Contact"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
-msgid "Invoice Line"
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__id
+msgid "ID"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
-#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: code:addons/fieldservice_account_analytic/models/account_move.py:0
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:0
 #, python-format
 msgid "No analytic account set on the order's Location."
 msgstr ""
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
 msgid "Time Type"
@@ -122,4 +159,3 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
 msgid "Total Cost"
 msgstr ""
-

From 5008d27d5602e481e8dba7871d1f7499f695bfe3 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Thu, 8 Jul 2021 13:22:11 +0000
Subject: [PATCH 283/631] [UPD] Update fieldservice_route.pot

---
 .../i18n/fieldservice_route.pot               | 67 ++++++++-----------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/fieldservice_route/i18n/fieldservice_route.pot b/fieldservice_route/i18n/fieldservice_route.pot
index b0f667e524..086fdf0981 100644
--- a/fieldservice_route/i18n/fieldservice_route.pot
+++ b/fieldservice_route/i18n/fieldservice_route.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_route
+# 	* fieldservice_route
 #
 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"
@@ -103,9 +103,11 @@ msgid "Days"
 msgstr ""
 
 #. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__display_name
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__display_name
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__display_name
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -114,11 +116,6 @@ msgstr ""
 msgid "End Location"
 msgstr ""
 
-#. module: fieldservice_route
-#: selection:fsm.stage,stage_type:0
-msgid "Equipment"
-msgstr ""
-
 #. module: fieldservice_route
 #: model:ir.model,name:fieldservice_route.model_fsm_location
 msgid "Field Service Location"
@@ -145,14 +142,17 @@ msgid "Field Service Stage"
 msgstr ""
 
 #. module: fieldservice_route
-#: selection:fsm.route.day,name:0
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__friday
 msgid "Friday"
 msgstr ""
 
 #. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__id
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__id
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__id
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__id
 msgid "ID"
 msgstr ""
 
@@ -162,9 +162,12 @@ msgid "Last Location"
 msgstr ""
 
 #. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order____last_update
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route____last_update
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day____last_update
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -187,11 +190,6 @@ msgstr ""
 msgid "Latitude"
 msgstr ""
 
-#. module: fieldservice_route
-#: selection:fsm.stage,stage_type:0
-msgid "Location"
-msgstr ""
-
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__longitude
 msgid "Longitude"
@@ -228,7 +226,7 @@ msgid "Maximum numbers of orders that can be added to this day route."
 msgstr ""
 
 #. module: fieldservice_route
-#: selection:fsm.route.day,name:0
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__monday
 msgid "Monday"
 msgstr ""
 
@@ -240,9 +238,10 @@ msgid "Name"
 msgstr ""
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:32
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:83
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:85
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
 #, python-format
 msgid "New"
 msgstr ""
@@ -253,7 +252,7 @@ msgid "Number of Orders"
 msgstr ""
 
 #. module: fieldservice_route
-#: selection:fsm.stage,stage_type:0
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__display_name
 msgid "Order"
 msgstr ""
 
@@ -285,10 +284,10 @@ msgid "Positioning"
 msgstr ""
 
 #. module: fieldservice_route
-#: selection:fsm.stage,stage_type:0
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__fsm_route_id
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__fsm_route_id
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__route_id
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_stage__stage_type__route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "Route"
 msgstr ""
@@ -314,7 +313,7 @@ msgid "Routes"
 msgstr ""
 
 #. module: fieldservice_route
-#: selection:fsm.route.day,name:0
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__saturday
 msgid "Saturday"
 msgstr ""
 
@@ -329,7 +328,7 @@ msgid "Start Location"
 msgstr ""
 
 #. module: fieldservice_route
-#: selection:fsm.route.day,name:0
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__sunday
 msgid "Sunday"
 msgstr ""
 
@@ -339,25 +338,19 @@ msgid "Team"
 msgstr ""
 
 #. module: fieldservice_route
-#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__territory_id
-#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__territory_id
-msgid "Territory"
-msgstr ""
-
-#. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:116
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
 #, python-format
 msgid "The day route is exceeding the maximum number of orders of the route."
 msgstr ""
 
 #. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:110
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
 #, python-format
 msgid "The route %s does not run on %s!"
 msgstr ""
 
 #. module: fieldservice_route
-#: selection:fsm.route.day,name:0
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__thursday
 msgid "Thursday"
 msgstr ""
 
@@ -372,7 +365,7 @@ msgid "Timing"
 msgstr ""
 
 #. module: fieldservice_route
-#: selection:fsm.route.day,name:0
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__tuesday
 msgid "Tuesday"
 msgstr ""
 
@@ -382,17 +375,12 @@ msgid "Type"
 msgstr ""
 
 #. module: fieldservice_route
-#: selection:fsm.route.day,name:0
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__wednesday
 msgid "Wednesday"
 msgstr ""
 
 #. module: fieldservice_route
-#: selection:fsm.stage,stage_type:0
-msgid "Worker"
-msgstr ""
-
-#. module: fieldservice_route
-#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:22
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
 #, python-format
 msgid "You must create a FSM team first."
 msgstr ""
@@ -401,4 +389,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "orders per day route"
 msgstr ""
-

From 07a0b66ea47cbde3ba064f4a560d8e2f8d2c3bb7 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 8 Jul 2021 13:26:29 +0000
Subject: [PATCH 284/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 40296026b6..edda4dcf1d 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ addon | version | summary
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
+[fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills
 [fieldservice_timeline](fieldservice_timeline/) | 14.0.1.1.1 | This module is a display timeline view of the Field Service order in Odoo.
 

From 17d9426639ebd42ff6dc388fc77f5d6f87ce406e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 8 Jul 2021 13:26:31 +0000
Subject: [PATCH 285/631] [UPD] README.rst

---
 fieldservice_route/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_route/static/description/index.html b/fieldservice_route/static/description/index.html
index b518de1ffc..b3ba38abf6 100644
--- a/fieldservice_route/static/description/index.html
+++ b/fieldservice_route/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: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Field Service Route</title>
 <style type="text/css">
 

From 212df3456a8db47d3215408642ba2ef3849beed5 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 8 Jul 2021 13:26:31 +0000
Subject: [PATCH 286/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index d32771e585..c047fb414c 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210707.0
\ No newline at end of file
+14.0.20210708.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 97a4f85f9a..e23b0a1a70 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -14,6 +14,7 @@
         'odoo14-addon-fieldservice_account_analytic',
         'odoo14-addon-fieldservice_crm',
         'odoo14-addon-fieldservice_project',
+        'odoo14-addon-fieldservice_route',
         'odoo14-addon-fieldservice_skill',
         'odoo14-addon-fieldservice_timeline',
     ],

From 22ca9c7d651ec4859f4cf3613c09847fa760cda0 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Thu, 8 Jul 2021 13:26:41 +0000
Subject: [PATCH 287/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-14.0/field-service-14.0-fieldservice_account_analytic
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_account_analytic/
---
 fieldservice_account_analytic/i18n/es.po    | 54 +++++++++++++++++---
 fieldservice_account_analytic/i18n/es_AR.po | 56 ++++++++++++++++++---
 fieldservice_account_analytic/i18n/es_CL.po | 49 +++++++++++++++---
 fieldservice_account_analytic/i18n/pt_BR.po | 54 +++++++++++++++++---
 fieldservice_account_analytic/i18n/pt_PT.po | 51 ++++++++++++++++---
 5 files changed, 229 insertions(+), 35 deletions(-)

diff --git a/fieldservice_account_analytic/i18n/es.po b/fieldservice_account_analytic/i18n/es.po
index 77f10545fe..8af92bf989 100644
--- a/fieldservice_account_analytic/i18n/es.po
+++ b/fieldservice_account_analytic/i18n/es.po
@@ -33,12 +33,12 @@ msgid "Analytic Line"
 msgstr "Linea Analitica"
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__contact
 msgid "Bill Contact"
 msgstr "Contacto de Facturación"
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__location
 msgid "Bill Location"
 msgstr "Dirección de Facturación"
 
@@ -72,6 +72,16 @@ msgstr "Contacto"
 msgid "Customer"
 msgstr "Cliente"
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
@@ -105,17 +115,44 @@ msgid "Filter the Location on an FSM Order by the Contact"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
-msgid "Invoice Line"
-msgstr "Línea de factura"
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
 
 #. module: fieldservice_account_analytic
-#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
-#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#: code:addons/fieldservice_account_analytic/models/account_move.py:0
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:0
 #, python-format
 msgid "No analytic account set on the order's Location."
 msgstr "No hay una cuenta analítica establecida en la ubicación del pedido."
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
 msgid "Time Type"
@@ -126,5 +163,8 @@ msgstr "Tipo de Tiempo"
 msgid "Total Cost"
 msgstr "Coste Total"
 
+#~ msgid "Invoice Line"
+#~ msgstr "Línea de factura"
+
 #~ msgid "Field Service Location Person Info"
 #~ msgstr "Servicio de campo Ubicación Información de la persona"
diff --git a/fieldservice_account_analytic/i18n/es_AR.po b/fieldservice_account_analytic/i18n/es_AR.po
index 965e516fe5..548dff7817 100644
--- a/fieldservice_account_analytic/i18n/es_AR.po
+++ b/fieldservice_account_analytic/i18n/es_AR.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_account_analytic
+# 	* fieldservice_account_analytic
 #
 msgid ""
 msgstr ""
@@ -33,12 +33,12 @@ msgid "Analytic Line"
 msgstr "Línea Analítica"
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__contact
 msgid "Bill Contact"
 msgstr "Factura de Contacto"
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__location
 msgid "Bill Location"
 msgstr "Ubicación de Factura"
 
@@ -72,6 +72,16 @@ msgstr "Contacto"
 msgid "Customer"
 msgstr "Cliente"
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
@@ -105,17 +115,44 @@ msgid "Filter the Location on an FSM Order by the Contact"
 msgstr "Filtrar la Ubicación por Contacto en un Pedido FSM"
 
 #. module: fieldservice_account_analytic
-#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
-msgid "Invoice Line"
-msgstr "Línea de Factura"
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
 
 #. module: fieldservice_account_analytic
-#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
-#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#: code:addons/fieldservice_account_analytic/models/account_move.py:0
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:0
 #, python-format
 msgid "No analytic account set on the order's Location."
 msgstr "No hay una cuenta analítica establecida en la Ubicación del pedido."
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
 msgid "Time Type"
@@ -125,3 +162,6 @@ msgstr "Tipo de Tiempo"
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
 msgid "Total Cost"
 msgstr "Costo Total"
+
+#~ msgid "Invoice Line"
+#~ msgstr "Línea de Factura"
diff --git a/fieldservice_account_analytic/i18n/es_CL.po b/fieldservice_account_analytic/i18n/es_CL.po
index cfe0014f8f..9c04323013 100644
--- a/fieldservice_account_analytic/i18n/es_CL.po
+++ b/fieldservice_account_analytic/i18n/es_CL.po
@@ -33,12 +33,12 @@ msgid "Analytic Line"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__contact
 msgid "Bill Contact"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__location
 msgid "Bill Location"
 msgstr ""
 
@@ -72,6 +72,16 @@ msgstr ""
 msgid "Customer"
 msgstr ""
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
@@ -105,17 +115,44 @@ msgid "Filter the Location on an FSM Order by the Contact"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
-msgid "Invoice Line"
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
+msgid "Journal Item"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
-#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: code:addons/fieldservice_account_analytic/models/account_move.py:0
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:0
 #, python-format
 msgid "No analytic account set on the order's Location."
 msgstr ""
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
 msgid "Time Type"
diff --git a/fieldservice_account_analytic/i18n/pt_BR.po b/fieldservice_account_analytic/i18n/pt_BR.po
index e44e795ee0..09078d656a 100644
--- a/fieldservice_account_analytic/i18n/pt_BR.po
+++ b/fieldservice_account_analytic/i18n/pt_BR.po
@@ -33,12 +33,12 @@ msgid "Analytic Line"
 msgstr "Linha Analitica"
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__contact
 msgid "Bill Contact"
 msgstr "Conta do Contato"
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__location
 msgid "Bill Location"
 msgstr "Localização de Conta"
 
@@ -72,6 +72,16 @@ msgstr "Contato"
 msgid "Customer"
 msgstr "Cliente"
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
@@ -106,17 +116,44 @@ msgstr ""
 "Filtrar por contato o local em um pedido do FSM (Field Services Management)"
 
 #. module: fieldservice_account_analytic
-#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
-msgid "Invoice Line"
-msgstr "Linha de Fatura"
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
 
 #. module: fieldservice_account_analytic
-#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
-#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#: code:addons/fieldservice_account_analytic/models/account_move.py:0
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:0
 #, python-format
 msgid "No analytic account set on the order's Location."
 msgstr "Nenhuma conta analítica definida na Localização do ordem."
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
 msgid "Time Type"
@@ -126,3 +163,6 @@ msgstr "Tipo de Tempo"
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
 msgid "Total Cost"
 msgstr "Custo Total"
+
+#~ msgid "Invoice Line"
+#~ msgstr "Linha de Fatura"
diff --git a/fieldservice_account_analytic/i18n/pt_PT.po b/fieldservice_account_analytic/i18n/pt_PT.po
index bf9ae769dc..f1c685c519 100644
--- a/fieldservice_account_analytic/i18n/pt_PT.po
+++ b/fieldservice_account_analytic/i18n/pt_PT.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_account_analytic
+# 	* fieldservice_account_analytic
 #
 msgid ""
 msgstr ""
@@ -33,12 +33,12 @@ msgid "Analytic Line"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__contact
 msgid "Bill Contact"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: selection:fsm.order,bill_to:0
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__location
 msgid "Bill Location"
 msgstr ""
 
@@ -72,6 +72,16 @@ msgstr ""
 msgid "Customer"
 msgstr ""
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
@@ -105,17 +115,44 @@ msgid "Filter the Location on an FSM Order by the Contact"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: model:ir.model,name:fieldservice_account_analytic.model_account_invoice_line
-msgid "Invoice Line"
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
+msgid "Journal Item"
 msgstr ""
 
 #. module: fieldservice_account_analytic
-#: code:addons/fieldservice_account_analytic/models/account_invoice_line.py:19
-#: code:addons/fieldservice_account_analytic/models/analytic_account.py:21
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: code:addons/fieldservice_account_analytic/models/account_move.py:0
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:0
 #, python-format
 msgid "No analytic account set on the order's Location."
 msgstr ""
 
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
 msgid "Time Type"

From cbb221316a3ed163b28c3fe80b564bbd383e96f0 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 9 Oct 2019 21:31:49 -0500
Subject: [PATCH 288/631] [FIX] fieldservice_isp_flow

[UPD] README.rst
---
 fieldservice_isp_flow/README.rst                 | 16 ++++++++++++----
 fieldservice_isp_flow/readme/CONFIGURE.rst       |  2 +-
 .../static/description/index.html                | 14 ++++++++------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/fieldservice_isp_flow/README.rst b/fieldservice_isp_flow/README.rst
index dbfb75599c..4086b24d86 100644
--- a/fieldservice_isp_flow/README.rst
+++ b/fieldservice_isp_flow/README.rst
@@ -14,10 +14,10 @@ Field Service - Flow for ISP
     :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_default_flow
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_isp_flow
     :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_default_flow
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_isp_flow
     :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
@@ -69,7 +69,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/field-service/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_default_flow%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_isp_flow%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.
 
@@ -109,6 +109,14 @@ 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.
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_default_flow>`_ project on GitHub.
+.. |maintainer-osi-scampbell| image:: https://github.com/osi-scampbell.png?size=40px
+    :target: https://github.com/osi-scampbell
+    :alt: osi-scampbell
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-osi-scampbell| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_isp_flow>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_isp_flow/readme/CONFIGURE.rst b/fieldservice_isp_flow/readme/CONFIGURE.rst
index 4d278bc30f..2c099913f4 100644
--- a/fieldservice_isp_flow/readme/CONFIGURE.rst
+++ b/fieldservice_isp_flow/readme/CONFIGURE.rst
@@ -7,4 +7,4 @@ comes pre-configured for use.
 #. Set the name for the stage.
 #. Set the sequence order for the stage.
 #. Select *Order* type to apply this stage to your orders.
-#. Additonally, you can set a color for the stage.
\ No newline at end of file
+#. Additonally, you can set a color for the stage.
diff --git a/fieldservice_isp_flow/static/description/index.html b/fieldservice_isp_flow/static/description/index.html
index 6dc05bc0f4..f7a1d6f7f8 100644
--- a/fieldservice_isp_flow/static/description/index.html
+++ b/fieldservice_isp_flow/static/description/index.html
@@ -4,7 +4,7 @@
 <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 - Default Flow</title>
+<title>Field Service - Flow for ISP</title>
 <style type="text/css">
 
 /*
@@ -360,14 +360,14 @@
 </style>
 </head>
 <body>
-<div class="document" id="field-service-default-flow">
-<h1 class="title">Field Service - Default Flow</h1>
+<div class="document" id="field-service-flow-for-isp">
+<h1 class="title">Field Service - Flow for ISP</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_default_flow"><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_default_flow"><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><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_isp_flow"><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_isp_flow"><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>This module is an add-on for the Field Service application in Odoo.
 It provides default stages for orders and some validation logic when changing current stage.</p>
 <p><strong>Table of contents</strong></p>
@@ -420,7 +420,7 @@ <h1><a class="toc-backref" href="#id4">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_default_flow%0Aversion:%2012.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_isp_flow%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">
@@ -454,7 +454,9 @@ <h2><a class="toc-backref" href="#id9">Maintainers</a></h2>
 <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>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/12.0/fieldservice_default_flow">OCA/field-service</a> project on GitHub.</p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
+<p><a class="reference external" href="https://github.com/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.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_isp_flow">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 e45dd50894d9edcee9c861ec18b97078118185ae Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 14 Oct 2019 10:49:02 -0400
Subject: [PATCH 289/631] [FIX] Unassigned Unscheduled Order Filters

---
 fieldservice_isp_flow/views/fsm_order.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/fieldservice_isp_flow/views/fsm_order.xml b/fieldservice_isp_flow/views/fsm_order.xml
index dfe24d6944..99f255b2ad 100644
--- a/fieldservice_isp_flow/views/fsm_order.xml
+++ b/fieldservice_isp_flow/views/fsm_order.xml
@@ -95,15 +95,6 @@
                ref="fieldservice.fsm_order_search_view"/>
         <field name="arch" type="xml">
             <search string="Orders">
-                
-                <filter name="todo" position="after">
-                    <filter string="Unassigned"
-                            domain="[('person_id', '=', False)]"
-                            name="unassigned"/>
-                    <filter string="Unscheduled"
-                            domain="[('scheduled_date_start', '=', False)]"
-                            name="unscheduled"/>
-                </filter>
                 <filter name="order_today" position="before">
                     <filter string="Past Due Orders"
                             domain="[('stage_id.name', 'not in', ['Started', 'Completed', 'Cancelled']), ('scheduled_date_start', '&lt;', current_date)]"

From 636e3712314830b5e27a74dded0f85acf9814712 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 11 Oct 2019 12:32:09 -0500
Subject: [PATCH 290/631] [IMP] fieldservice_isp_flow

[UPD] Update fieldservice_isp_flow.pot

Added translation using Weblate (Spanish (Chile))

Translated using Weblate (Spanish (Chile))

Currently translated at 100.0% (15 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_isp_flow
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_isp_flow/es_CL/

Added translation using Weblate (German)

Translated using Weblate (German)

Currently translated at 20.0% (3 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_isp_flow
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_isp_flow/de/
---
 fieldservice_isp_flow/__manifest__.py         |   2 +-
 fieldservice_isp_flow/i18n/de.po              |  98 +++++++++++++++++
 fieldservice_isp_flow/i18n/es_CL.po           | 101 ++++++++++++++++++
 .../i18n/fieldservice_isp_flow.pot            |  96 +++++++++++++++++
 4 files changed, 296 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_isp_flow/i18n/de.po
 create mode 100644 fieldservice_isp_flow/i18n/es_CL.po
 create mode 100644 fieldservice_isp_flow/i18n/fieldservice_isp_flow.pot

diff --git a/fieldservice_isp_flow/__manifest__.py b/fieldservice_isp_flow/__manifest__.py
index 60e7abfbca..d1bcef9fa8 100644
--- a/fieldservice_isp_flow/__manifest__.py
+++ b/fieldservice_isp_flow/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Flow for ISP',
-    'summary': 'FSM Stages for Internet Service Providers',
+    'summary': 'Field Service workflow for Internet Service Providers',
     'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author':
diff --git a/fieldservice_isp_flow/i18n/de.po b/fieldservice_isp_flow/i18n/de.po
new file mode 100644
index 0000000000..c1217144aa
--- /dev/null
+++ b/fieldservice_isp_flow/i18n/de.po
@@ -0,0 +1,98 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_isp_flow
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-26 11:58+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_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Assign"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:27
+#, python-format
+msgid "Cannot move to Assigned until 'Assigned To' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:52
+#, python-format
+msgid "Cannot move to Complete until 'Actual End' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:55
+#, python-format
+msgid "Cannot move to Complete until 'Resolution' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:17
+#, python-format
+msgid "Cannot move to Requested until 'Request Workers' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:35
+#, python-format
+msgid "Cannot move to Scheduled until both 'Assigned To' and 'Scheduled Start Date' are filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:45
+#, python-format
+msgid "Cannot move to Start until 'Actual Start' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "En Route"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model:ir.model,name:fieldservice_isp_flow.model_fsm_order
+msgid "Field Service Order"
+msgstr "Field-Service-Auftrag"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_search_view
+msgid "Orders"
+msgstr "Aufträge"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_search_view
+msgid "Past Due Orders"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Request"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Schedule"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Start"
+msgstr ""
diff --git a/fieldservice_isp_flow/i18n/es_CL.po b/fieldservice_isp_flow/i18n/es_CL.po
new file mode 100644
index 0000000000..3e02a6f232
--- /dev/null
+++ b/fieldservice_isp_flow/i18n/es_CL.po
@@ -0,0 +1,101 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_isp_flow
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-22 04:35+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.8\n"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Assign"
+msgstr "Asignar"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:27
+#, python-format
+msgid "Cannot move to Assigned until 'Assigned To' is filled in"
+msgstr "No se puede mover a Asignado hasta que se complete 'Asignado a'"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:52
+#, python-format
+msgid "Cannot move to Complete until 'Actual End' is filled in"
+msgstr "No se puede mover a Completado hasta que se complete 'Fin Real'"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:55
+#, python-format
+msgid "Cannot move to Complete until 'Resolution' is filled in"
+msgstr "No se puede mover a Completo hasta que se complete 'Resolución'"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:17
+#, python-format
+msgid "Cannot move to Requested until 'Request Workers' is filled in"
+msgstr ""
+"No se puede pasar a Solicitado hasta que se complete 'Solicitar trabajadores'"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:35
+#, python-format
+msgid "Cannot move to Scheduled until both 'Assigned To' and 'Scheduled Start Date' are filled in"
+msgstr ""
+"No se puede mover a Programado hasta que se completen tanto 'Asignado a' "
+"como 'Fecha de inicio programada'"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:45
+#, python-format
+msgid "Cannot move to Start until 'Actual Start' is filled in"
+msgstr "No se puede mover a Inicio hasta que se complete 'Inicio Real'"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "En Route"
+msgstr "En Ruta"
+
+#. module: fieldservice_isp_flow
+#: model:ir.model,name:fieldservice_isp_flow.model_fsm_order
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_search_view
+msgid "Orders"
+msgstr "Ordenes"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_search_view
+msgid "Past Due Orders"
+msgstr "Órdenes Vencidas"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Request"
+msgstr "Solicitud"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Schedule"
+msgstr "Calendario"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Start"
+msgstr "Iniciar"
diff --git a/fieldservice_isp_flow/i18n/fieldservice_isp_flow.pot b/fieldservice_isp_flow/i18n/fieldservice_isp_flow.pot
new file mode 100644
index 0000000000..cf71f11d0b
--- /dev/null
+++ b/fieldservice_isp_flow/i18n/fieldservice_isp_flow.pot
@@ -0,0 +1,96 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_isp_flow
+#
+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_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Assign"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:27
+#, python-format
+msgid "Cannot move to Assigned until 'Assigned To' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:52
+#, python-format
+msgid "Cannot move to Complete until 'Actual End' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:55
+#, python-format
+msgid "Cannot move to Complete until 'Resolution' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:17
+#, python-format
+msgid "Cannot move to Requested until 'Request Workers' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:35
+#, python-format
+msgid "Cannot move to Scheduled until both 'Assigned To' and 'Scheduled Start Date' are filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:45
+#, python-format
+msgid "Cannot move to Start until 'Actual Start' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Confirm"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "En Route"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model:ir.model,name:fieldservice_isp_flow.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_search_view
+msgid "Orders"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_search_view
+msgid "Past Due Orders"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Request"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Schedule"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Start"
+msgstr ""
+

From 24429cd3f889bb48f420d8f320fa102492626cbf Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Tue, 26 Nov 2019 10:46:33 -0800
Subject: [PATCH 291/631] [IMP] Remove Duplicate Method + Return Super

---
 fieldservice_isp_flow/models/fsm_order.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/fieldservice_isp_flow/models/fsm_order.py b/fieldservice_isp_flow/models/fsm_order.py
index cffaa01e55..df153e010c 100644
--- a/fieldservice_isp_flow/models/fsm_order.py
+++ b/fieldservice_isp_flow/models/fsm_order.py
@@ -54,9 +54,4 @@ def action_complete(self):
         if not self.resolution:
             raise ValidationError(_("Cannot move to Complete " +
                                     "until 'Resolution' is filled in"))
-        return self.write({'stage_id': self.env.ref(
-            'fieldservice.fsm_stage_completed').id})
-
-    def action_cancel(self):
-        return self.write({'stage_id': self.env.ref(
-            'fieldservice.fsm_stage_cancelled').id})
+        return super(FSMOrder, self).action_complete()

From 2f26170e45eee4f55de50738eca59a2a916e7d7a Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 27 Nov 2019 14:55:28 +0000
Subject: [PATCH 292/631] fieldservice_isp_flow 12.0.1.0.1

---
 fieldservice_isp_flow/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_isp_flow/__manifest__.py b/fieldservice_isp_flow/__manifest__.py
index d1bcef9fa8..dd46cbc7d9 100644
--- a/fieldservice_isp_flow/__manifest__.py
+++ b/fieldservice_isp_flow/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Flow for ISP',
     'summary': 'Field Service workflow for Internet Service Providers',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.0.1',
     'category': 'Field Service',
     'author':
         'Open Source Integrators, '

From c6d89045cd1426a24831aec9f8cafccd5ad77769 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 27 Nov 2019 10:33:29 -0800
Subject: [PATCH 293/631] [FIX] ETA Missing on Form

---
 fieldservice_isp_flow/views/fsm_order.xml | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/fieldservice_isp_flow/views/fsm_order.xml b/fieldservice_isp_flow/views/fsm_order.xml
index 99f255b2ad..b0359a4211 100644
--- a/fieldservice_isp_flow/views/fsm_order.xml
+++ b/fieldservice_isp_flow/views/fsm_order.xml
@@ -45,22 +45,7 @@
                         type="object"
                         groups="fieldservice.group_fsm_dispatcher"
                         attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_scheduled)d, %(fieldservice_isp_flow.fsm_stage_enroute)d))]}"/>
-            </button>
-            <field name="scheduled_date_start" position="attributes">
-                <attribute name="invisible">[('stage_id', 'in',
-                       (%(fieldservice.fsm_stage_new)d,
-                        %(fieldservice_isp_flow.fsm_stage_confirmed)d,
-                        %(fieldservice_isp_flow.fsm_stage_requested)d,
-                        %(fieldservice_isp_flow.fsm_stage_assigned)d))]</attribute>
-            </field>
-
-            <field name="scheduled_date_start" position="attributes">
-                <attribute name="invisible">[('stage_id', 'in',
-                       (%(fieldservice_isp_flow.fsm_stage_scheduled)d,
-                        %(fieldservice_isp_flow.fsm_stage_enroute)d,
-                        %(fieldservice_isp_flow.fsm_stage_started)d,
-                        %(fieldservice.fsm_stage_completed)d))]</attribute>
-            </field>   
+            </button> 
         </field>       
     </record>
 

From ca6f0c51d93874df4aa7664e363216febb36442e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 29 Nov 2019 20:33:18 +0000
Subject: [PATCH 294/631] fieldservice_isp_flow 12.0.1.1.0

Added translation using Weblate (Portuguese (Brazil))

[ADD] Spanish (es) translation

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (15 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_isp_flow
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_isp_flow/pt_BR/
---
 fieldservice_isp_flow/__manifest__.py |   2 +-
 fieldservice_isp_flow/i18n/es.po      | 101 +++++++++++++++++++++++++
 fieldservice_isp_flow/i18n/pt_BR.po   | 102 ++++++++++++++++++++++++++
 3 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_isp_flow/i18n/es.po
 create mode 100644 fieldservice_isp_flow/i18n/pt_BR.po

diff --git a/fieldservice_isp_flow/__manifest__.py b/fieldservice_isp_flow/__manifest__.py
index dd46cbc7d9..a904bb553d 100644
--- a/fieldservice_isp_flow/__manifest__.py
+++ b/fieldservice_isp_flow/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Flow for ISP',
     'summary': 'Field Service workflow for Internet Service Providers',
-    'version': '12.0.1.0.1',
+    'version': '12.0.1.1.0',
     'category': 'Field Service',
     'author':
         'Open Source Integrators, '
diff --git a/fieldservice_isp_flow/i18n/es.po b/fieldservice_isp_flow/i18n/es.po
new file mode 100644
index 0000000000..effb8f77c2
--- /dev/null
+++ b/fieldservice_isp_flow/i18n/es.po
@@ -0,0 +1,101 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_isp_flow
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-22 04:35+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.8\n"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Assign"
+msgstr "Asignar"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:27
+#, python-format
+msgid "Cannot move to Assigned until 'Assigned To' is filled in"
+msgstr "No se puede mover a Asignado hasta que se complete 'Asignado a'"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:52
+#, python-format
+msgid "Cannot move to Complete until 'Actual End' is filled in"
+msgstr "No se puede mover a Completado hasta que se complete 'Fin Real'"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:55
+#, python-format
+msgid "Cannot move to Complete until 'Resolution' is filled in"
+msgstr "No se puede mover a Completo hasta que se complete 'Resolución'"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:17
+#, python-format
+msgid "Cannot move to Requested until 'Request Workers' is filled in"
+msgstr ""
+"No se puede pasar a Solicitado hasta que se complete 'Solicitar trabajadores'"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:35
+#, python-format
+msgid "Cannot move to Scheduled until both 'Assigned To' and 'Scheduled Start Date' are filled in"
+msgstr ""
+"No se puede mover a Programado hasta que se completen tanto 'Asignado a' "
+"como 'Fecha de inicio programada'"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:45
+#, python-format
+msgid "Cannot move to Start until 'Actual Start' is filled in"
+msgstr "No se puede mover a Inicio hasta que se complete 'Inicio Real'"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "En Route"
+msgstr "En Ruta"
+
+#. module: fieldservice_isp_flow
+#: model:ir.model,name:fieldservice_isp_flow.model_fsm_order
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_search_view
+msgid "Orders"
+msgstr "Ordenes"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_search_view
+msgid "Past Due Orders"
+msgstr "Órdenes Vencidas"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Request"
+msgstr "Solicitud"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Schedule"
+msgstr "Calendario"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Start"
+msgstr "Iniciar"
diff --git a/fieldservice_isp_flow/i18n/pt_BR.po b/fieldservice_isp_flow/i18n/pt_BR.po
new file mode 100644
index 0000000000..946f08b3ca
--- /dev/null
+++ b/fieldservice_isp_flow/i18n/pt_BR.po
@@ -0,0 +1,102 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_isp_flow
+#
+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"
+"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_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Assign"
+msgstr "Atribuir"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:27
+#, python-format
+msgid "Cannot move to Assigned until 'Assigned To' is filled in"
+msgstr "Não pode passar para Atribuído até que 'Atribuído' seja preenchido"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:52
+#, python-format
+msgid "Cannot move to Complete until 'Actual End' is filled in"
+msgstr "Não pode passar para Completado até que ‘Fim Real’ seja preenchido"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:55
+#, python-format
+msgid "Cannot move to Complete until 'Resolution' is filled in"
+msgstr "Não pode passar para Concluído até que 'Resolução' seja preenchida"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:17
+#, python-format
+msgid "Cannot move to Requested until 'Request Workers' is filled in"
+msgstr ""
+"Não pode mover para Solicitado até que ’Solicitar trabalhadores' seja "
+"preenchido"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:35
+#, python-format
+msgid "Cannot move to Scheduled until both 'Assigned To' and 'Scheduled Start Date' are filled in"
+msgstr ""
+"Não pode passar para Agendado até que tanto 'Atribuído' quanto 'Data de "
+"início programada' sejam preenchidos"
+
+#. module: fieldservice_isp_flow
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:45
+#, python-format
+msgid "Cannot move to Start until 'Actual Start' is filled in"
+msgstr "Não pode passar para Iniciado até que ‘Inicio Real seja preenchido"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "En Route"
+msgstr "Em Rota"
+
+#. module: fieldservice_isp_flow
+#: model:ir.model,name:fieldservice_isp_flow.model_fsm_order
+msgid "Field Service Order"
+msgstr "Ordem de Serviço de Campo"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_search_view
+msgid "Orders"
+msgstr "Ordens"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_search_view
+msgid "Past Due Orders"
+msgstr "Ordens Vencidas"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Request"
+msgstr "Requisição"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Schedule"
+msgstr "Cronograma"
+
+#. module: fieldservice_isp_flow
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
+msgid "Start"
+msgstr "Iniciar"

From 5d12afb9449b8d89e3c44d7989446c2b882d798f Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 28 May 2020 12:45:44 -0700
Subject: [PATCH 295/631] [IMP] ISP Stage Notifications

[IMP] Flake8
---
 fieldservice_isp_flow/models/fsm_order.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/fieldservice_isp_flow/models/fsm_order.py b/fieldservice_isp_flow/models/fsm_order.py
index df153e010c..fd89b2d82d 100644
--- a/fieldservice_isp_flow/models/fsm_order.py
+++ b/fieldservice_isp_flow/models/fsm_order.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import models, _
+from odoo import api, models, _
 from odoo.exceptions import ValidationError
 
 
@@ -55,3 +55,24 @@ def action_complete(self):
             raise ValidationError(_("Cannot move to Complete " +
                                     "until 'Resolution' is filled in"))
         return super(FSMOrder, self).action_complete()
+
+    @api.multi
+    def _track_subtype(self, init_values):
+        self.ensure_one()
+        if 'stage_id' in init_values:
+            if self.stage_id.id == self.env.\
+                    ref('fieldservice_isp_flow.fsm_stage_confirmed').id:
+                return 'fieldservice.mt_order_confirmed'
+            if self.stage_id.id == self.env.\
+                    ref('fieldservice_isp_flow.fsm_stage_scheduled').id:
+                return 'fieldservice.mt_order_scheduled'
+            if self.stage_id.id == self.env.\
+                    ref('fieldservice_isp_flow.fsm_stage_assigned').id:
+                return 'fieldservice.mt_order_assigned'
+            if self.stage_id.id == self.env.\
+                    ref('fieldservice_isp_flow.fsm_stage_enroute').id:
+                return 'fieldservice.mt_order_enroute'
+            if self.stage_id.id == self.env.\
+                    ref('fieldservice_isp_flow.fsm_stage_started').id:
+                return 'fieldservice.mt_order_started'
+        return super()._track_subtype(init_values)

From ab921cc98ff581a48bf36a695c9ac433a4812507 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 3 Jun 2020 13:54:07 +0000
Subject: [PATCH 296/631] fieldservice_isp_flow 12.0.1.1.1

---
 fieldservice_isp_flow/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_isp_flow/__manifest__.py b/fieldservice_isp_flow/__manifest__.py
index a904bb553d..1de6eb78dc 100644
--- a/fieldservice_isp_flow/__manifest__.py
+++ b/fieldservice_isp_flow/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Flow for ISP',
     'summary': 'Field Service workflow for Internet Service Providers',
-    'version': '12.0.1.1.0',
+    'version': '12.0.1.1.1',
     'category': 'Field Service',
     'author':
         'Open Source Integrators, '

From e8ee9bdc10e36345698f343bd72b6605d69d80d9 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 11 Feb 2021 11:47:39 +0530
Subject: [PATCH 297/631] [14.0][MIG]fieldservice_isp_flow

---
 fieldservice_isp_flow/__manifest__.py         |  34 +++--
 fieldservice_isp_flow/models/fsm_order.py     | 124 +++++++++++-------
 fieldservice_isp_flow/tests/__init__.py       |   4 +
 .../tests/test_fsm_isp_flow.py                | 116 ++++++++++++++++
 fieldservice_isp_flow/views/fsm_order.xml     | 113 +++++++++-------
 .../odoo/addons/fieldservice_isp_flow         |   1 +
 setup/fieldservice_isp_flow/setup.py          |   6 +
 7 files changed, 286 insertions(+), 112 deletions(-)
 create mode 100644 fieldservice_isp_flow/tests/__init__.py
 create mode 100644 fieldservice_isp_flow/tests/test_fsm_isp_flow.py
 create mode 120000 setup/fieldservice_isp_flow/odoo/addons/fieldservice_isp_flow
 create mode 100644 setup/fieldservice_isp_flow/setup.py

diff --git a/fieldservice_isp_flow/__manifest__.py b/fieldservice_isp_flow/__manifest__.py
index 1de6eb78dc..149b33e44c 100644
--- a/fieldservice_isp_flow/__manifest__.py
+++ b/fieldservice_isp_flow/__manifest__.py
@@ -1,24 +1,22 @@
-# Copyright (C) 2019 - Akretion
+# Copyright (C) 2021 - Akretion
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - Flow for ISP',
-    'summary': 'Field Service workflow for Internet Service Providers',
-    'version': '12.0.1.1.1',
-    'category': 'Field Service',
-    'author':
-        'Open Source Integrators, '
-        'Akretion, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice',
+    "name": "Field Service - Flow for ISP",
+    "summary": "Field Service workflow for Internet Service Providers",
+    "version": "14.0.1.0.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, " "Akretion, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": [
+        "fieldservice",
     ],
-    'data': [
-        'data/fsm_stage.xml',
-        'views/fsm_order.xml',
+    "data": [
+        "data/fsm_stage.xml",
+        "views/fsm_order.xml",
     ],
-    'application': False,
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': ['osi-scampbell'],
+    "application": False,
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": ["osi-scampbell"],
 }
diff --git a/fieldservice_isp_flow/models/fsm_order.py b/fieldservice_isp_flow/models/fsm_order.py
index fd89b2d82d..5084550b8c 100644
--- a/fieldservice_isp_flow/models/fsm_order.py
+++ b/fieldservice_isp_flow/models/fsm_order.py
@@ -1,78 +1,110 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2021 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, models, _
+from odoo import _, models
 from odoo.exceptions import ValidationError
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
     def action_confirm(self):
-        return self.write({'stage_id': self.env.ref(
-            'fieldservice_isp_flow.fsm_stage_confirmed').id})
+        return self.write(
+            {"stage_id": self.env.ref("fieldservice_isp_flow.fsm_stage_confirmed").id}
+        )
 
     def action_request(self):
         if not self.person_ids:
-            raise ValidationError(_("Cannot move to Requested " +
-                                    "until 'Request Workers' is filled in"))
-        return self.write({'stage_id': self.env.ref(
-            'fieldservice_isp_flow.fsm_stage_requested').id})
+            raise ValidationError(
+                _("Cannot move to Requested " + "until 'Request Workers' is filled in")
+            )
+        return self.write(
+            {"stage_id": self.env.ref("fieldservice_isp_flow.fsm_stage_requested").id}
+        )
 
     def action_assign(self):
         if self.person_id:
-            return self.write({'stage_id': self.env.ref(
-                'fieldservice_isp_flow.fsm_stage_assigned').id})
+            return self.write(
+                {
+                    "stage_id": self.env.ref(
+                        "fieldservice_isp_flow.fsm_stage_assigned"
+                    ).id
+                }
+            )
         else:
-            raise ValidationError(_("Cannot move to Assigned " +
-                                    "until 'Assigned To' is filled in"))
+            raise ValidationError(
+                _("Cannot move to Assigned " + "until 'Assigned To' is filled in")
+            )
 
     def action_schedule(self):
         if self.scheduled_date_start and self.person_id:
-            return self.write({'stage_id': self.env.ref(
-                'fieldservice_isp_flow.fsm_stage_scheduled').id})
+            return self.write(
+                {
+                    "stage_id": self.env.ref(
+                        "fieldservice_isp_flow.fsm_stage_scheduled"
+                    ).id
+                }
+            )
         else:
-            raise ValidationError(_("Cannot move to Scheduled " +
-                                    "until both 'Assigned To' and " +
-                                    "'Scheduled Start Date' are filled in"))
+            raise ValidationError(
+                _(
+                    "Cannot move to Scheduled "
+                    + "until both 'Assigned To' and "
+                    + "'Scheduled Start Date' are filled in"
+                )
+            )
 
     def action_enroute(self):
-        return self.write({'stage_id': self.env.ref(
-            'fieldservice_isp_flow.fsm_stage_enroute').id})
+        return self.write(
+            {"stage_id": self.env.ref("fieldservice_isp_flow.fsm_stage_enroute").id}
+        )
 
     def action_start(self):
         if not self.date_start:
-            raise ValidationError(_("Cannot move to Start " +
-                                    "until 'Actual Start' is filled in"))
-        return self.write({'stage_id': self.env.ref(
-            'fieldservice_isp_flow.fsm_stage_started').id})
+            raise ValidationError(
+                _("Cannot move to Start " + "until 'Actual Start' is filled in")
+            )
+        return self.write(
+            {"stage_id": self.env.ref("fieldservice_isp_flow.fsm_stage_started").id}
+        )
 
     def action_complete(self):
         if not self.date_end:
-            raise ValidationError(_("Cannot move to Complete " +
-                                    "until 'Actual End' is filled in"))
+            raise ValidationError(
+                _("Cannot move to Complete " + "until 'Actual End' is filled in")
+            )
         if not self.resolution:
-            raise ValidationError(_("Cannot move to Complete " +
-                                    "until 'Resolution' is filled in"))
+            raise ValidationError(
+                _("Cannot move to Complete " + "until 'Resolution' is filled in")
+            )
         return super(FSMOrder, self).action_complete()
 
-    @api.multi
     def _track_subtype(self, init_values):
         self.ensure_one()
-        if 'stage_id' in init_values:
-            if self.stage_id.id == self.env.\
-                    ref('fieldservice_isp_flow.fsm_stage_confirmed').id:
-                return 'fieldservice.mt_order_confirmed'
-            if self.stage_id.id == self.env.\
-                    ref('fieldservice_isp_flow.fsm_stage_scheduled').id:
-                return 'fieldservice.mt_order_scheduled'
-            if self.stage_id.id == self.env.\
-                    ref('fieldservice_isp_flow.fsm_stage_assigned').id:
-                return 'fieldservice.mt_order_assigned'
-            if self.stage_id.id == self.env.\
-                    ref('fieldservice_isp_flow.fsm_stage_enroute').id:
-                return 'fieldservice.mt_order_enroute'
-            if self.stage_id.id == self.env.\
-                    ref('fieldservice_isp_flow.fsm_stage_started').id:
-                return 'fieldservice.mt_order_started'
-        return super()._track_subtype(init_values)
+        if "stage_id" in init_values:
+            if (
+                self.stage_id.id
+                == self.env.ref("fieldservice_isp_flow.fsm_stage_confirmed").id
+            ):
+                return self.env.ref("fieldservice.mt_order_confirmed")
+            if (
+                self.stage_id.id
+                == self.env.ref("fieldservice_isp_flow.fsm_stage_scheduled").id
+            ):
+                return self.env.ref("fieldservice.mt_order_scheduled")
+            if (
+                self.stage_id.id
+                == self.env.ref("fieldservice_isp_flow.fsm_stage_assigned").id
+            ):
+                return self.env.ref("fieldservice.mt_order_assigned")
+            if (
+                self.stage_id.id
+                == self.env.ref("fieldservice_isp_flow.fsm_stage_enroute").id
+            ):
+                return self.env.ref("fieldservice.mt_order_enroute")
+            if (
+                self.stage_id.id
+                == self.env.ref("fieldservice_isp_flow.fsm_stage_started").id
+            ):
+                return self.env.ref("fieldservice.mt_order_started")
+        return super(FSMOrder, self)._track_subtype(init_values)
diff --git a/fieldservice_isp_flow/tests/__init__.py b/fieldservice_isp_flow/tests/__init__.py
new file mode 100644
index 0000000000..292d750c1b
--- /dev/null
+++ b/fieldservice_isp_flow/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright 2019 Brian McMaster <brian@mcmpest.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from . import test_fsm_isp_flow
diff --git a/fieldservice_isp_flow/tests/test_fsm_isp_flow.py b/fieldservice_isp_flow/tests/test_fsm_isp_flow.py
new file mode 100644
index 0000000000..623f4bfaa6
--- /dev/null
+++ b/fieldservice_isp_flow/tests/test_fsm_isp_flow.py
@@ -0,0 +1,116 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from datetime import timedelta
+
+from odoo import fields
+from odoo.exceptions import ValidationError
+from odoo.tests.common import Form, TransactionCase
+
+
+class FSMIspFlowCase(TransactionCase):
+    def setUp(self):
+        super(FSMIspFlowCase, self).setUp()
+        self.WorkOrder = self.env["fsm.order"]
+        self.Worker = self.env["fsm.person"]
+        view_id = "fieldservice.fsm_person_form"
+        with Form(self.Worker, view=view_id) as f:
+            f.name = "Worker A"
+        self.worker = f.save()
+        self.test_partner = self.env["res.partner"].create(
+            {"name": "Test Partner", "phone": "123", "email": "tp@email.com"}
+        )
+        # create a Res Partner to be converted to FSM Location/Person
+        self.test_loc_partner = self.env["res.partner"].create(
+            {"name": "Test Loc Partner", "phone": "ABC", "email": "tlp@email.com"}
+        )
+        self.test_location = self.env.ref("fieldservice.test_location")
+        self.init_values = {
+            "stage_id": self.env.ref("fieldservice_isp_flow.fsm_stage_confirmed").id
+        }
+        self.stage1 = self.env.ref("fieldservice_isp_flow.fsm_stage_confirmed")
+        self.stage2 = self.env.ref("fieldservice_isp_flow.fsm_stage_scheduled")
+        self.stage3 = self.env.ref("fieldservice_isp_flow.fsm_stage_assigned")
+        self.stage4 = self.env.ref("fieldservice_isp_flow.fsm_stage_enroute")
+        self.stage5 = self.env.ref("fieldservice_isp_flow.fsm_stage_started")
+
+    def test_fsm_orders(self):
+        """Test creating new workorders, and test following functions."""
+        # Create an Orders
+        hours_diff = 100
+        date_start = fields.Datetime.today()
+
+        order = self.WorkOrder.create(
+            {
+                "location_id": self.test_location.id,
+                "date_start": date_start,
+                "date_end": date_start + timedelta(hours=hours_diff),
+                "request_early": fields.Datetime.today(),
+            }
+        )
+        order2 = self.WorkOrder.create(
+            {
+                "location_id": self.test_location.id,
+                "request_early": fields.Datetime.today(),
+                "person_id": self.worker.id,
+                "date_end": date_start + timedelta(hours=hours_diff),
+                "scheduled_date_start": date_start,
+            }
+        )
+        order3 = self.WorkOrder.create(
+            {
+                "location_id": self.test_location.id,
+                "stage_id": self.stage1.id,
+            }
+        )
+        order4 = self.WorkOrder.create(
+            {
+                "location_id": self.test_location.id,
+                "stage_id": self.stage2.id,
+            }
+        )
+        order5 = self.WorkOrder.create(
+            {
+                "location_id": self.test_location.id,
+                "stage_id": self.stage3.id,
+            }
+        )
+        order6 = self.WorkOrder.create(
+            {
+                "location_id": self.test_location.id,
+                "stage_id": self.stage4.id,
+            }
+        )
+        order7 = self.WorkOrder.create(
+            {
+                "location_id": self.test_location.id,
+                "stage_id": self.stage5.id,
+            }
+        )
+        order.action_confirm()
+        order.action_enroute()
+        order.action_start()
+        order2.action_assign()
+        order2.action_schedule()
+        order3._track_subtype(self.init_values)
+        order4._track_subtype(self.init_values)
+        order5._track_subtype(self.init_values)
+        order6._track_subtype(self.init_values)
+        order7._track_subtype(self.init_values)
+        order._track_subtype(self.init_values)
+        order._track_subtype(self.init_values)
+        data_dict = order2.action_schedule()
+        self.assertEqual(data_dict, True)
+        with self.assertRaises(ValidationError):
+            order2.action_complete()
+        with self.assertRaises(ValidationError):
+            order.action_request()
+        with self.assertRaises(ValidationError):
+            order.action_assign()
+        with self.assertRaises(ValidationError):
+            order.action_schedule()
+        with self.assertRaises(ValidationError):
+            order.date_end = False
+            order.action_complete()
+        with self.assertRaises(ValidationError):
+            order2.action_start()
diff --git a/fieldservice_isp_flow/views/fsm_order.xml b/fieldservice_isp_flow/views/fsm_order.xml
index b0359a4211..caf1ff5422 100644
--- a/fieldservice_isp_flow/views/fsm_order.xml
+++ b/fieldservice_isp_flow/views/fsm_order.xml
@@ -1,59 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <!-- Operations -->
     <record id="fsm_order_form" model="ir.ui.view">
         <field name="name">fsm.order.form</field>
         <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">
             <button name="action_complete" position="before">
-                <button id="action_confirm"
-                        name="action_confirm" string="Confirm"
-                        class="oe_highlight"
-                        type="object"
-                        groups="fieldservice.group_fsm_dispatcher"
-                        attrs="{'invisible': [('stage_id', '!=', %(fieldservice.fsm_stage_new)d)]}"/>
-                <button id="action_request"
-                        name="action_request" string="Request"
-                        class="oe_highlight"
-                        type="object"
-                        groups="fieldservice.group_fsm_dispatcher"
-                        attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_confirmed)d, %(fieldservice_isp_flow.fsm_stage_requested)d))]}"/>
-                <button id="action_assign"
-                        name="action_assign" string="Assign"
-                        class="oe_highlight"
-                        type="object"
-                        groups="fieldservice.group_fsm_dispatcher"
-                        attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_confirmed)d, %(fieldservice_isp_flow.fsm_stage_requested)d))]}"/>
-                <button id="action_schedule"
-                        name="action_schedule" string="Schedule"
-                        class="oe_highlight"
-                        type="object"
-                        groups="fieldservice.group_fsm_dispatcher"
-                        attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_assigned)d, %(fieldservice_isp_flow.fsm_stage_confirmed)d, %(fieldservice_isp_flow.fsm_stage_requested)d))]}"/>
-                <button id="action_enroute"
-                        name="action_enroute" string="En Route"
-                        class="oe_highlight"
-                        type="object"
-                        groups="fieldservice.group_fsm_dispatcher"
-                        attrs="{'invisible': [('stage_id', '!=', %(fieldservice_isp_flow.fsm_stage_scheduled)d)]}"/>
-                <button id="action_start"
-                        name="action_start" string="Start"
-                        class="oe_highlight"
-                        type="object"
-                        groups="fieldservice.group_fsm_dispatcher"
-                        attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_scheduled)d, %(fieldservice_isp_flow.fsm_stage_enroute)d))]}"/>
-            </button> 
-        </field>       
+                <button
+                    id="action_confirm"
+                    name="action_confirm"
+                    string="Confirm"
+                    class="oe_highlight"
+                    type="object"
+                    groups="fieldservice.group_fsm_dispatcher"
+                    attrs="{'invisible': [('stage_id', '!=', %(fieldservice.fsm_stage_new)d)]}"
+                />
+                <button
+                    id="action_request"
+                    name="action_request"
+                    string="Request"
+                    class="oe_highlight"
+                    type="object"
+                    groups="fieldservice.group_fsm_dispatcher"
+                    attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_confirmed)d, %(fieldservice_isp_flow.fsm_stage_requested)d))]}"
+                />
+                <button
+                    id="action_assign"
+                    name="action_assign"
+                    string="Assign"
+                    class="oe_highlight"
+                    type="object"
+                    groups="fieldservice.group_fsm_dispatcher"
+                    attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_confirmed)d, %(fieldservice_isp_flow.fsm_stage_requested)d))]}"
+                />
+                <button
+                    id="action_schedule"
+                    name="action_schedule"
+                    string="Schedule"
+                    class="oe_highlight"
+                    type="object"
+                    groups="fieldservice.group_fsm_dispatcher"
+                    attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_assigned)d, %(fieldservice_isp_flow.fsm_stage_confirmed)d, %(fieldservice_isp_flow.fsm_stage_requested)d))]}"
+                />
+                <button
+                    id="action_enroute"
+                    name="action_enroute"
+                    string="En Route"
+                    class="oe_highlight"
+                    type="object"
+                    groups="fieldservice.group_fsm_dispatcher"
+                    attrs="{'invisible': [('stage_id', '!=', %(fieldservice_isp_flow.fsm_stage_scheduled)d)]}"
+                />
+                <button
+                    id="action_start"
+                    name="action_start"
+                    string="Start"
+                    class="oe_highlight"
+                    type="object"
+                    groups="fieldservice.group_fsm_dispatcher"
+                    attrs="{'invisible': [('stage_id', 'not in', (%(fieldservice_isp_flow.fsm_stage_scheduled)d, %(fieldservice_isp_flow.fsm_stage_enroute)d))]}"
+                />
+            </button>
+        </field>
     </record>
 
     <record id="fsm_order_tree_view" model="ir.ui.view">
         <field name="name">fsm.order.tree</field>
         <field name="model">fsm.order</field>
-        <field name="inherit_id"
-               ref="fieldservice.fsm_order_tree_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_order_tree_view" />
         <field name="arch" type="xml">
             <tree name="orders" position="attributes">
                 <attribute name="decoration-danger">stage_id in (
@@ -76,14 +92,15 @@
     <record id="fsm_order_search_view" model="ir.ui.view">
         <field name="name">fsm.order.search</field>
         <field name="model">fsm.order</field>
-        <field name="inherit_id"
-               ref="fieldservice.fsm_order_search_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_order_search_view" />
         <field name="arch" type="xml">
             <search string="Orders">
                 <filter name="order_today" position="before">
-                    <filter string="Past Due Orders"
-                            domain="[('stage_id.name', 'not in', ['Started', 'Completed', 'Cancelled']), ('scheduled_date_start', '&lt;', current_date)]"
-                            name="past_due"/>
+                    <filter
+                        string="Past Due Orders"
+                        domain="[('stage_id.name', 'not in', ['Started', 'Completed', 'Cancelled']), ('scheduled_date_start', '&lt;', current_date)]"
+                        name="past_due"
+                    />
                 </filter>
             </search>
         </field>
diff --git a/setup/fieldservice_isp_flow/odoo/addons/fieldservice_isp_flow b/setup/fieldservice_isp_flow/odoo/addons/fieldservice_isp_flow
new file mode 120000
index 0000000000..1bff0a58fa
--- /dev/null
+++ b/setup/fieldservice_isp_flow/odoo/addons/fieldservice_isp_flow
@@ -0,0 +1 @@
+../../../../fieldservice_isp_flow
\ No newline at end of file
diff --git a/setup/fieldservice_isp_flow/setup.py b/setup/fieldservice_isp_flow/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_isp_flow/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 899b701d4012cf3f1bdafabdd5b22327808dc9d2 Mon Sep 17 00:00:00 2001
From: Patrick Wilson <36892066+patrickrwilson@users.noreply.github.com>
Date: Wed, 5 May 2021 10:49:10 -0600
Subject: [PATCH 298/631] [14.0][MIG] fieldservice_agreement (Version 12.0 to
 14.0)

[MIG] Black

[MIG] Added more coverage to tests

[MIG] Add contract to dependancy

Add maintainer

Update CONTRIBUTORS.rst

add eol
---
 fieldservice_agreement/__manifest__.py        | 47 +++++------
 fieldservice_agreement/models/__init__.py     |  8 +-
 fieldservice_agreement/models/agreement.py    | 62 +++++++-------
 .../models/fsm_equipment.py                   |  7 +-
 fieldservice_agreement/models/fsm_location.py | 23 +++---
 fieldservice_agreement/models/fsm_order.py    |  7 +-
 fieldservice_agreement/models/fsm_person.py   | 38 +++++----
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../tests/test_fsm_agreement.py               | 82 +++++++++++--------
 .../views/agreement_view.xml                  | 82 +++++++++++++------
 .../views/fsm_equipment_view.xml              | 27 +++---
 fieldservice_agreement/views/fsm_location.xml | 10 +--
 .../views/fsm_order_view.xml                  | 24 ++++--
 fieldservice_agreement/views/fsm_person.xml   | 22 +++--
 oca_dependencies.txt                          |  1 +
 15 files changed, 248 insertions(+), 193 deletions(-)

diff --git a/fieldservice_agreement/__manifest__.py b/fieldservice_agreement/__manifest__.py
index 4e819bef80..df29ae4ed7 100644
--- a/fieldservice_agreement/__manifest__.py
+++ b/fieldservice_agreement/__manifest__.py
@@ -2,31 +2,28 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - Agreements',
-    'summary': 'Manage Field Service agreements and contracts',
-    'author': 'Open Source Integrators, '
-              'Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'category': 'Field Service',
-    'license': 'AGPL-3',
-    'version': '12.0.1.0.0',
-    'depends': [
-        'fieldservice',
-        'agreement_serviceprofile',
+    "name": "Field Service - Agreements",
+    "summary": "Manage Field Service agreements and contracts",
+    "author": "Open Source Integrators, " "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "category": "Field Service",
+    "license": "AGPL-3",
+    "version": "14.0.1.0.0",
+    "depends": ["fieldservice", "agreement_serviceprofile"],
+    "data": [
+        "views/fsm_order_view.xml",
+        "views/fsm_equipment_view.xml",
+        "views/agreement_view.xml",
+        "views/fsm_person.xml",
+        "views/fsm_location.xml",
     ],
-    'data': [
-        'views/fsm_order_view.xml',
-        'views/fsm_equipment_view.xml',
-        'views/agreement_view.xml',
-        'views/fsm_person.xml',
-        'views/fsm_location.xml'
-    ],
-    'installable': True,
-    'development_status': 'Beta',
-    'maintainers': [
-        'max3903',
-        'bodedra',
-        'smangukiya',
-        'osi-scampbell'
+    "installable": True,
+    "development_status": "Beta",
+    "maintainers": [
+        "max3903",
+        "bodedra",
+        "smangukiya",
+        "osi-scampbell",
+        "patrickrwilson",
     ],
 }
diff --git a/fieldservice_agreement/models/__init__.py b/fieldservice_agreement/models/__init__.py
index 98a54f21cc..07872822b7 100644
--- a/fieldservice_agreement/models/__init__.py
+++ b/fieldservice_agreement/models/__init__.py
@@ -1,9 +1,3 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import (
-    agreement,
-    fsm_equipment,
-    fsm_location,
-    fsm_order,
-    fsm_person,
-)
+from . import agreement, fsm_equipment, fsm_location, fsm_order, fsm_person
diff --git a/fieldservice_agreement/models/agreement.py b/fieldservice_agreement/models/agreement.py
index 5154c7960f..df5c92fa76 100644
--- a/fieldservice_agreement/models/agreement.py
+++ b/fieldservice_agreement/models/agreement.py
@@ -1,60 +1,56 @@
 # Copyright (C) 2018 - TODAY, 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 Agreement(models.Model):
-    _inherit = 'agreement'
+    _inherit = "agreement"
 
     service_order_count = fields.Integer(
-        compute='_compute_service_order_count',
-        string='# Service Orders'
+        compute="_compute_service_order_count", string="# Service Orders"
     )
-    equipment_count = fields.Integer('# Equipments',
-                                     compute='_compute_equipment_count')
-    fsm_location_id = fields.Many2one('fsm.location', string="FSM Location")
+    equipment_count = fields.Integer("# Equipments", compute="_compute_equipment_count")
+    fsm_location_id = fields.Many2one("fsm.location", string="FSM Location")
 
-    @api.multi
     def _compute_service_order_count(self):
         for agreement in self:
-            agreement.service_order_count = self.env['fsm.order'].search_count(
-                [('agreement_id', '=', agreement.id)])
+            agreement.service_order_count = self.env["fsm.order"].search_count(
+                [("agreement_id", "=", agreement.id)]
+            )
 
-    @api.multi
     def action_view_service_order(self):
         for agreement in self:
-            fsm_order_ids = self.env['fsm.order'].search(
-                [('agreement_id', '=', agreement.id)])
-            action = self.env.ref(
-                'fieldservice.action_fsm_operation_order').read()[0]
+            fsm_order_ids = self.env["fsm.order"].search(
+                [("agreement_id", "=", agreement.id)]
+            )
+            action = self.env.ref("fieldservice.action_fsm_operation_order").read()[0]
             if len(fsm_order_ids) == 1:
-                action['views'] = [(
-                    self.env.ref('fieldservice.fsm_order_form').id,
-                    'form')]
-                action['res_id'] = fsm_order_ids.ids[0]
+                action["views"] = [
+                    (self.env.ref("fieldservice.fsm_order_form").id, "form")
+                ]
+                action["res_id"] = fsm_order_ids.ids[0]
             else:
-                action['domain'] = [('id', 'in', fsm_order_ids.ids)]
+                action["domain"] = [("id", "in", fsm_order_ids.ids)]
             return action
 
-    @api.multi
     def _compute_equipment_count(self):
         for agreement in self:
-            agreement.equipment_count = self.env['fsm.equipment'].search_count(
-                [('agreement_id', '=', agreement.id)])
+            agreement.equipment_count = self.env["fsm.equipment"].search_count(
+                [("agreement_id", "=", agreement.id)]
+            )
 
-    @api.multi
     def action_view_fsm_equipment(self):
         for agreement in self:
-            equipment_ids = self.env['fsm.equipment'].search(
-                [('agreement_id', '=', agreement.id)])
-            action = self.env.ref(
-                'fieldservice.action_fsm_equipment').read()[0]
+            equipment_ids = self.env["fsm.equipment"].search(
+                [("agreement_id", "=", agreement.id)]
+            )
+            action = self.env.ref("fieldservice.action_fsm_equipment").read()[0]
             if len(equipment_ids) == 1:
-                action['views'] = [(
-                    self.env.ref('fieldservice.fsm_equipment_form_view').id,
-                    'form')]
-                action['res_id'] = equipment_ids.ids[0]
+                action["views"] = [
+                    (self.env.ref("fieldservice.fsm_equipment_form_view").id, "form")
+                ]
+                action["res_id"] = equipment_ids.ids[0]
             else:
-                action['domain'] = [('id', 'in', equipment_ids.ids)]
+                action["domain"] = [("id", "in", equipment_ids.ids)]
             return action
diff --git a/fieldservice_agreement/models/fsm_equipment.py b/fieldservice_agreement/models/fsm_equipment.py
index 235b538ab1..2410b54777 100644
--- a/fieldservice_agreement/models/fsm_equipment.py
+++ b/fieldservice_agreement/models/fsm_equipment.py
@@ -5,8 +5,7 @@
 
 
 class FSMEquipment(models.Model):
-    _inherit = 'fsm.equipment'
+    _inherit = "fsm.equipment"
 
-    agreement_id = fields.Many2one('agreement', string='Agreement')
-    serviceprofile_id = fields.Many2one('agreement.serviceprofile',
-                                        'Service Profile')
+    agreement_id = fields.Many2one("agreement", string="Agreement")
+    serviceprofile_id = fields.Many2one("agreement.serviceprofile", "Service Profile")
diff --git a/fieldservice_agreement/models/fsm_location.py b/fieldservice_agreement/models/fsm_location.py
index 7e7c258fe5..053ae93b16 100644
--- a/fieldservice_agreement/models/fsm_location.py
+++ b/fieldservice_agreement/models/fsm_location.py
@@ -1,25 +1,28 @@
 # Copyright (C) 2018 - TODAY, 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 FSMLocation(models.Model):
-    _inherit = 'fsm.location'
+    _inherit = "fsm.location"
 
-    serviceprofile_ids = fields.Many2many('agreement.serviceprofile',
-                                          string="Service Profiles",
-                                          compute='_compute_service_ids')
+    serviceprofile_ids = fields.Many2many(
+        "agreement.serviceprofile",
+        string="Service Profiles",
+        compute="_compute_service_ids",
+    )
 
-    @api.multi
     def _compute_service_ids(self):
         for loc in self:
-            agreements = self.env['agreement'].\
-                search([('fsm_location_id', '=', loc.id)])
+            agreements = self.env["agreement"].search(
+                [("fsm_location_id", "=", loc.id)]
+            )
             ids = []
             for agree in agreements:
-                servpros = self.env['agreement.serviceprofile'].\
-                    search([('agreement_id', '=', agree.id)])
+                servpros = self.env["agreement.serviceprofile"].search(
+                    [("agreement_id", "=", agree.id)]
+                )
                 for ser in servpros:
                     if ser.id not in ids:
                         ids.append(ser.id)
diff --git a/fieldservice_agreement/models/fsm_order.py b/fieldservice_agreement/models/fsm_order.py
index 20d5f22470..a6e0151247 100644
--- a/fieldservice_agreement/models/fsm_order.py
+++ b/fieldservice_agreement/models/fsm_order.py
@@ -5,8 +5,7 @@
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
-    agreement_id = fields.Many2one('agreement', string='Agreement')
-    serviceprofile_id = fields.Many2one('agreement.serviceprofile',
-                                        'Service Profile')
+    agreement_id = fields.Many2one("agreement", string="Agreement")
+    serviceprofile_id = fields.Many2one("agreement.serviceprofile", "Service Profile")
diff --git a/fieldservice_agreement/models/fsm_person.py b/fieldservice_agreement/models/fsm_person.py
index 3dcebee5f6..7f12f32fb4 100644
--- a/fieldservice_agreement/models/fsm_person.py
+++ b/fieldservice_agreement/models/fsm_person.py
@@ -1,31 +1,37 @@
 # Copyright (C) 2019 - TODAY, 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 FSMPerson(models.Model):
-    _inherit = 'fsm.person'
+    _inherit = "fsm.person"
 
-    agreement_count = fields.Integer(string='# of Agreements',
-                                     compute='_compute_agreements')
+    agreement_count = fields.Integer(
+        string="# of Agreements", compute="_compute_agreements"
+    )
 
     def _compute_agreements(self):
-        self.agreement_count = self.env['agreement'].search_count([
-            ('partner_id', '=', self.name)])
+        self.agreement_count = self.env["agreement"].search_count(
+            [("partner_id", "=", self.name)]
+        )
 
-    @api.multi
     def action_view_agreements(self):
         for person in self:
-            action = self.env.\
-                ref('agreement_legal.agreement_operations_agreement').\
-                read()[0]
-            agreements = self.env['agreement'].search(
-                [('partner_id', '=', person.partner_id.id)])
+            action = self.env.ref(
+                "agreement_legal.agreement_operations_agreement"
+            ).read()[0]
+            agreements = self.env["agreement"].search(
+                [("partner_id", "=", person.partner_id.id)]
+            )
             if len(agreements) == 1:
-                action['views'] = [(self.env.ref(
-                    'agreement_legal.partner_agreement_form_view').id, 'form')]
-                action['res_id'] = agreements.id
+                action["views"] = [
+                    (
+                        self.env.ref("agreement_legal.partner_agreement_form_view").id,
+                        "form",
+                    )
+                ]
+                action["res_id"] = agreements.id
             else:
-                action['domain'] = [('id', 'in', agreements.ids)]
+                action["domain"] = [("id", "in", agreements.ids)]
             return action
diff --git a/fieldservice_agreement/readme/CONTRIBUTORS.rst b/fieldservice_agreement/readme/CONTRIBUTORS.rst
index ffd570ce46..a31aa4664e 100644
--- a/fieldservice_agreement/readme/CONTRIBUTORS.rst
+++ b/fieldservice_agreement/readme/CONTRIBUTORS.rst
@@ -1,3 +1,4 @@
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Patrick Wilson <pwilson@opensourceintegrators.com>
diff --git a/fieldservice_agreement/tests/test_fsm_agreement.py b/fieldservice_agreement/tests/test_fsm_agreement.py
index 4dd9dbe19f..c3fc9b6418 100644
--- a/fieldservice_agreement/tests/test_fsm_agreement.py
+++ b/fieldservice_agreement/tests/test_fsm_agreement.py
@@ -2,23 +2,20 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields
-from odoo.tests.common import TransactionCase, Form
+from odoo.tests.common import Form, TransactionCase
 
 
 class FSMOrder(TransactionCase):
-
     def setUp(self):
         super(FSMOrder, self).setUp()
-        self.Order = self.env['fsm.order']
-        self.Agreement = self.env['agreement']
-        self.Serviceprofile = self.env['agreement.serviceprofile']
-        self.Equipment = self.env['fsm.equipment']
-        self.test_location = self.env.ref('fieldservice.test_location')
-        self.agreement_type = self.env.\
-            ref('agreement_legal.agreement_type_agreement')
-        self.test_person = self.env.ref('fieldservice.test_person')
-        self.service = self.env.ref(
-            'product.product_product_1_product_template')
+        self.Order = self.env["fsm.order"]
+        self.Agreement = self.env["agreement"]
+        self.Serviceprofile = self.env["agreement.serviceprofile"]
+        self.Equipment = self.env["fsm.equipment"]
+        self.test_location = self.env.ref("fieldservice.test_location")
+        self.agreement_type = self.env.ref("agreement_legal.agreement_type_agreement")
+        self.test_person = self.env.ref("fieldservice.test_person")
+        self.service = self.env.ref("product.product_product_1_product_template")
 
     def test_fsm_agreement(self):
         """
@@ -28,51 +25,66 @@ def test_fsm_agreement(self):
         - Person (partner) can relate back to agreement correctly
         """
         # Create agreement and assign to test location
-        view_id = ('agreement_legal.partner_agreement_form_view')
+        view_id = "agreement_legal.partner_agreement_form_view"
         with Form(self.Agreement, view=view_id) as f:
-            f.name = 'Test Agreement'
+            f.name = "Test Agreement"
             f.agreement_type_id = self.agreement_type
-            f.description = 'Test Agreement'
+            f.description = "Test Agreement"
             f.start_date = f.end_date = fields.Date.today()
             f.fsm_location_id = self.test_location
             f.partner_id = self.test_person.partner_id
         agreement = f.save()
-        profile = self.Serviceprofile.create({'name': 'Test Profile',
-                                              'agreement_id': agreement.id,
-                                              'product_id': self.service.id})
+        profile = self.Serviceprofile.create(
+            {
+                "name": "Test Profile",
+                "agreement_id": agreement.id,
+                "product_id": self.service.id,
+            }
+        )
         # Create 2 Orders, that link to this agreement
         vals = {
-            'name': 'Order1',
-            'location_id': self.test_location.id,
-            'agreement_id': agreement.id
+            "name": "Order1",
+            "location_id": self.test_location.id,
+            "agreement_id": agreement.id,
         }
         order1 = self.Order.create(vals)
+        agreement._compute_service_order_count()
+        self.assertEqual(agreement.service_order_count, 1)
+        self.assertEqual(order1.id, agreement.action_view_service_order()["res_id"])
         vals = {
-            'name': 'Order2',
-            'location_id': self.test_location.id,
-            'agreement_id': agreement.id
+            "name": "Order2",
+            "location_id": self.test_location.id,
+            "agreement_id": agreement.id,
         }
         order2 = self.Order.create(vals)
         agreement._compute_service_order_count()
         self.assertEqual(agreement.service_order_count, 2)
-        self.assertEqual([order1.id, order2.id],
-                         agreement.action_view_service_order()['domain'][0][2])
+        self.assertEqual(
+            [order1.id, order2.id],
+            agreement.action_view_service_order()["domain"][0][2],
+        )
         # Create 3 equipment, that link to this agreement
         vals = {
-            'name': 'EQ1',
-            'current_location_id': self.test_location.id,
-            'agreement_id': agreement.id
+            "name": "EQ1",
+            "current_location_id": self.test_location.id,
+            "agreement_id": agreement.id,
         }
         equipment1 = self.Equipment.create(vals)
-        equipment2 = equipment1.copy({'name': 'EQ2'})
-        equipment3 = equipment1.copy({'name': 'EQ3'})
+        agreement._compute_service_order_count()
+        self.assertEqual(agreement.equipment_count, 1)
+        self.assertEqual(equipment1.id, agreement.action_view_fsm_equipment()["res_id"])
+        equipment2 = equipment1.copy({"name": "EQ2"})
+        equipment3 = equipment1.copy({"name": "EQ3"})
         agreement._compute_equipment_count()
         self.assertEqual(agreement.equipment_count, 3)
-        self.assertEqual([equipment1.id, equipment2.id, equipment3.id],
-                         agreement.action_view_fsm_equipment()['domain'][0][2])
+        self.assertEqual(
+            [equipment1.id, equipment2.id, equipment3.id],
+            agreement.action_view_fsm_equipment()["domain"][0][2],
+        )
         # Location's service profile display correctly
         self.assertEqual(self.test_location.serviceprofile_ids, profile)
         # Person (partner) can relate back to agreement correctly
         self.assertEqual(self.test_person.agreement_count, 1)
-        self.assertEqual(self.test_person.action_view_agreements()['res_id'],
-                         agreement.id)
+        self.assertEqual(
+            self.test_person.action_view_agreements()["res_id"], agreement.id
+        )
diff --git a/fieldservice_agreement/views/agreement_view.xml b/fieldservice_agreement/views/agreement_view.xml
index 051957d5e7..250de8d60f 100644
--- a/fieldservice_agreement/views/agreement_view.xml
+++ b/fieldservice_agreement/views/agreement_view.xml
@@ -1,30 +1,39 @@
 <odoo>
+
     <!-- Agreement Form View -->
     <record id="agreement_fsm_order_form_view" model="ir.ui.view">
         <field name="name">agreement.form.fsm.order.view</field>
         <field name="model">agreement</field>
-        <field name="inherit_id" ref="agreement_legal.partner_agreement_form_view"/>
+        <field name="inherit_id" ref="agreement_legal.partner_agreement_form_view" />
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
-                <button name="action_view_service_order"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-map">
-                    <field name="service_order_count"
-                           widget="statinfo"
-                           string="Service Orders"/>
+                <button
+                    name="action_view_service_order"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-map"
+                >
+                    <field
+                        name="service_order_count"
+                        widget="statinfo"
+                        string="Service Orders"
+                    />
                 </button>
-                <button name="action_view_fsm_equipment"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-laptop"
-                        context="{'default_agreement_id': active_id}"
-                        groups="fieldservice.group_fsm_equipment">
+                <button
+                    name="action_view_fsm_equipment"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-laptop"
+                    context="{'default_agreement_id': active_id}"
+                    groups="fieldservice.group_fsm_equipment"
+                >
                     <div class="o_field_widget o_stat_info">
                         <span class="o_stat_value">
-                            <field name="equipment_count"
-                                   widget="statinfo"
-                                   nolabel="1"/>
+                            <field
+                                name="equipment_count"
+                                widget="statinfo"
+                                nolabel="1"
+                            />
                         </span>
                         <span class="o_stat_text">Equipments</span>
                     </div>
@@ -34,9 +43,9 @@
                 <page string="Field Service">
                     <group id="fsm">
                         <group id="fsm-left">
-                            <field name="fsm_location_id"/>
+                            <field name="fsm_location_id" />
                         </group>
-                        <group id="fsm-right"/>
+                        <group id="fsm-right" />
                     </group>
                 </page>
             </notebook>
@@ -47,10 +56,10 @@
         <field name="name">agreement.search.fields</field>
         <field name="model">agreement</field>
         <field name="type">search</field>
-        <field name="inherit_id" ref="agreement_legal.partner_agreement_search_view"/>
+        <field name="inherit_id" ref="agreement_legal.partner_agreement_search_view" />
         <field name="arch" type="xml">
             <xpath expr="/search/filter[1]" position="before">
-                <field name="fsm_location_id"/>
+                <field name="fsm_location_id" />
             </xpath>
         </field>
     </record>
@@ -59,20 +68,41 @@
         <field name="name">agreement.form.context.fix</field>
         <field name="model">agreement</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="agreement_legal.partner_agreement_form_view"/>
+        <field name="inherit_id" ref="agreement_legal.partner_agreement_form_view" />
         <field name="arch" type="xml">
             <field name="recital_ids" position="replace">
-                <field name="recital_ids" default_order="sequence" nolabel="1" context="{'default_agreement_id': active_id}"/>
+                <field
+                    name="recital_ids"
+                    default_order="sequence"
+                    nolabel="1"
+                    context="{'default_agreement_id': active_id}"
+                />
             </field>
             <field name="clauses_ids" position="replace">
-                <field name="clauses_ids" default_order="sequence" nolabel="1" context="{'default_agreement_id': active_id}"/>
+                <field
+                    name="clauses_ids"
+                    default_order="sequence"
+                    nolabel="1"
+                    context="{'default_agreement_id': active_id}"
+                />
             </field>
             <field name="sections_ids" position="replace">
-                <field name="sections_ids" default_order="sequence" nolabel="1" context="{'default_agreement_id': active_id}"/>
+                <field
+                    name="sections_ids"
+                    default_order="sequence"
+                    nolabel="1"
+                    context="{'default_agreement_id': active_id}"
+                />
             </field>
             <field name="appendix_ids" position="replace">
-                <field name="appendix_ids" default_order="sequence" nolabel="1" context="{'default_agreement_id': active_id}"/>
+                <field
+                    name="appendix_ids"
+                    default_order="sequence"
+                    nolabel="1"
+                    context="{'default_agreement_id': active_id}"
+                />
             </field>
         </field>
     </record>
+
 </odoo>
diff --git a/fieldservice_agreement/views/fsm_equipment_view.xml b/fieldservice_agreement/views/fsm_equipment_view.xml
index ac3f1ecf09..46c0a6aebe 100644
--- a/fieldservice_agreement/views/fsm_equipment_view.xml
+++ b/fieldservice_agreement/views/fsm_equipment_view.xml
@@ -1,22 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <!-- Fields Service equipment Form View -->
     <record id="fsm_equipment_form_view_agreement" model="ir.ui.view">
         <field name="name">fsm.equipment.agreement.form</field>
         <field name="model">fsm.equipment</field>
-        <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view" />
         <field name="arch" type="xml">
             <notebook position="inside">
                 <page string="Agreement">
                     <group>
                         <group id="agreement-left">
-                            <field name="agreement_id"
-                                   domain="[('fsm_location_id', '=', location_id)]"/>
-                            <field name="serviceprofile_id"
-                                   domain="[('agreement_id', '=', agreement_id)]"/>
+                            <field
+                                name="agreement_id"
+                                domain="[('fsm_location_id', '=', location_id)]"
+                            />
+                            <field
+                                name="serviceprofile_id"
+                                domain="[('agreement_id', '=', agreement_id)]"
+                            />
                         </group>
-                        <group id="agreement-right"/>
+                        <group id="agreement-right" />
                     </group>
                 </page>
             </notebook>
@@ -27,11 +30,15 @@
     <record id="fsm_equipment_search_view_agreement" model="ir.ui.view">
         <field name="name">fsm.equipment.select.agreement</field>
         <field name="model">fsm.equipment</field>
-        <field name="inherit_id" ref="fieldservice.fsm_equipment_search_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_equipment_search_view" />
         <field name="arch" type="xml">
             <xpath expr="//group" position="inside">
-                <filter name="serviceprofile_id" string="Service Profile" domain="[]"
-                        context="{'group_by': 'serviceprofile_id'}"/>
+                <filter
+                    name="serviceprofile_id"
+                    string="Service Profile"
+                    domain="[]"
+                    context="{'group_by': 'serviceprofile_id'}"
+                />
             </xpath>
         </field>
     </record>
diff --git a/fieldservice_agreement/views/fsm_location.xml b/fieldservice_agreement/views/fsm_location.xml
index e657aa1033..9719ae2b0c 100644
--- a/fieldservice_agreement/views/fsm_location.xml
+++ b/fieldservice_agreement/views/fsm_location.xml
@@ -1,19 +1,17 @@
-<!-- Copyright 2019 Open Source Integrators
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) -->
 <odoo>
 
     <record id="fsm_location_agreement_serviceprofile" model="ir.ui.view">
         <field name="name">fsm.location.agreement.serviceprofile</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">
             <notebook position="inside">
                 <page string="Service Profiles">
                     <field name="serviceprofile_ids">
                         <tree>
-                            <field name="name"/>
-                            <field name="agreement_id"/>
-                            <field name="notes"/>
+                            <field name="name" />
+                            <field name="agreement_id" />
+                            <field name="notes" />
                         </tree>
                     </field>
                 </page>
diff --git a/fieldservice_agreement/views/fsm_order_view.xml b/fieldservice_agreement/views/fsm_order_view.xml
index 03b0dbd2af..8afe637275 100644
--- a/fieldservice_agreement/views/fsm_order_view.xml
+++ b/fieldservice_agreement/views/fsm_order_view.xml
@@ -4,13 +4,17 @@
     <record id="fsm_order_agreement_form" model="ir.ui.view">
         <field name="name">fsm.order.agreement.form</field>
         <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">
             <field name="location_id" position="after">
-                <field name="agreement_id"
-                       domain="[('fsm_location_id', '=', location_id), ('is_template', '=', False)]"/>
-                <field name="serviceprofile_id"
-                       domain="[('agreement_id', '=', agreement_id)]"/>
+                <field
+                    name="agreement_id"
+                    domain="[('fsm_location_id', '=', location_id), ('is_template', '=', False)]"
+                />
+                <field
+                    name="serviceprofile_id"
+                    domain="[('agreement_id', '=', agreement_id)]"
+                />
             </field>
         </field>
     </record>
@@ -19,11 +23,15 @@
     <record id="search_fsm_order_filter_agreement" model="ir.ui.view">
         <field name="name">fsm.order.select.agreement</field>
         <field name="model">fsm.order</field>
-        <field name="inherit_id" ref="fieldservice.fsm_order_search_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_order_search_view" />
         <field name="arch" type="xml">
             <xpath expr="//group" position="inside">
-                <filter name="serviceprofile_id" string="Service Profile" domain="[]"
-                        context="{'group_by': 'serviceprofile_id'}"/>
+                <filter
+                    name="serviceprofile_id"
+                    string="Service Profile"
+                    domain="[]"
+                    context="{'group_by': 'serviceprofile_id'}"
+                />
             </xpath>
         </field>
     </record>
diff --git a/fieldservice_agreement/views/fsm_person.xml b/fieldservice_agreement/views/fsm_person.xml
index 8e44da2a6b..26de17f35d 100644
--- a/fieldservice_agreement/views/fsm_person.xml
+++ b/fieldservice_agreement/views/fsm_person.xml
@@ -1,19 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <record id="fsm_person_form" model="ir.ui.view">
         <field name="name">fsm.person.form</field>
         <field name="model">fsm.person</field>
-        <field name="inherit_id" ref="fieldservice.fsm_person_form"/>
+        <field name="inherit_id" ref="fieldservice.fsm_person_form" />
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <button type="object"
-                        name="action_view_agreements"
-                        class="oe_stat_button"
-                        icon="fa-folder"
-                        groups="base.group_user">
-                    <field name="agreement_count" widget="statinfo"
-                           string="Agreements"/>
+                <button
+                    type="object"
+                    name="action_view_agreements"
+                    class="oe_stat_button"
+                    icon="fa-folder"
+                    groups="base.group_user"
+                >
+                    <field
+                        name="agreement_count"
+                        widget="statinfo"
+                        string="Agreements"
+                    />
                 </button>
             </div>
         </field>
diff --git a/oca_dependencies.txt b/oca_dependencies.txt
index c0772185a0..8587170ab9 100644
--- a/oca_dependencies.txt
+++ b/oca_dependencies.txt
@@ -1 +1,2 @@
+contract
 web

From 5117441fbd2aa797cade3c727c7853338e531459 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 16:37:12 +0000
Subject: [PATCH 299/631] Added translation using Weblate (Turkish)

---
 fieldservice_route/i18n/tr.po | 392 ++++++++++++++++++++++++++++++++++
 1 file changed, 392 insertions(+)
 create mode 100644 fieldservice_route/i18n/tr.po

diff --git a/fieldservice_route/i18n/tr.po b/fieldservice_route/i18n/tr.po
new file mode 100644
index 0000000000..d11fef762b
--- /dev/null
+++ b/fieldservice_route/i18n/tr.po
@@ -0,0 +1,392 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_route
+#
+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: tr\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_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute
+msgid "Add Day Routes here."
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route
+msgid "Add Routes here."
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__person_id
+msgid "Assigned To"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_remaining
+msgid "Available Capacity"
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Cancel order"
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Capacity"
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Complete order"
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
+msgid "Create a Route Day."
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date
+msgid "Date"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__dayroute_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Day Route"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_dash
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute_report
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_dash_dayroute
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_dayroute_report
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_calendar
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_tree
+msgid "Day Routes"
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute_report
+msgid "Day Routes Report"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__day_ids
+msgid "Days"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__display_name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__end_location_id
+msgid "End Location"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_route
+msgid "Field Service Route"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_route_dayroute
+msgid "Field Service Route Dayroute"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model,name:fieldservice_route.model_fsm_stage
+msgid "Field Service Stage"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__friday
+msgid "Friday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__last_location_id
+msgid "Last Location"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute____last_update
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_uid
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_date
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__latitude
+msgid "Latitude"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__longitude
+msgid "Longitude"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_allow_time
+msgid "Maximal Allowable Time (in hours)"
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Maximum"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
+msgid "Maximum Capacity"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__max_order
+msgid "Maximum Orders"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,help:fieldservice_route.field_fsm_route__max_order
+msgid "Maximum number of orders per day route."
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,help:fieldservice_route.field_fsm_route_dayroute__max_order
+msgid "Maximum numbers of orders that can be added to this day route."
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__monday
+msgid "Monday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__name
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_count
+msgid "Number of Orders"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Orders"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__fsm_person_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__person_id
+msgid "Person"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date_start_planned
+msgid "Planned Start Time"
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Planning"
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Positioning"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__fsm_route_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__fsm_route_id
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__route_id
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_stage__stage_type__route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "Route"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_day
+#: model:ir.model,name:fieldservice_route.model_fsm_route_day
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_tree_view
+msgid "Route Day"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_day
+msgid "Route Days"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route
+#: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_tree
+msgid "Routes"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__saturday
+msgid "Saturday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__stage_id
+msgid "Stage"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__start_location_id
+msgid "Start Location"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__sunday
+msgid "Sunday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__team_id
+msgid "Team"
+msgstr ""
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
+#, python-format
+msgid "The day route is exceeding the maximum number of orders of the route."
+msgstr ""
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
+#, python-format
+msgid "The route %s does not run on %s!"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__thursday
+msgid "Thursday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__work_time
+msgid "Time before overtime (in hours)"
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
+msgid "Timing"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__tuesday
+msgid "Tuesday"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__stage_type
+msgid "Type"
+msgstr ""
+
+#. module: fieldservice_route
+#: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__wednesday
+msgid "Wednesday"
+msgstr ""
+
+#. module: fieldservice_route
+#: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
+#, python-format
+msgid "You must create a FSM team first."
+msgstr ""
+
+#. module: fieldservice_route
+#: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
+msgid "orders per day route"
+msgstr ""

From c2d6fe0c987313406311a37d5536110cb3041b40 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 18:30:37 +0000
Subject: [PATCH 300/631] Translated using Weblate (Turkish)

Currently translated at 7.6% (5 of 65 strings)

Translation: field-service-14.0/field-service-14.0-fieldservice_route
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_route/tr/
---
 fieldservice_route/i18n/tr.po | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/fieldservice_route/i18n/tr.po b/fieldservice_route/i18n/tr.po
index d11fef762b..67fc0f258a 100644
--- a/fieldservice_route/i18n/tr.po
+++ b/fieldservice_route/i18n/tr.po
@@ -6,38 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2021-07-09 18:31+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\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_route
 #: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute
 msgid "Add Day Routes here."
-msgstr ""
+msgstr "Buraya Günlük Rotaları ekleyin."
 
 #. module: fieldservice_route
 #: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route
 msgid "Add Routes here."
-msgstr ""
+msgstr "Rotaları buraya ekleyin."
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__person_id
 msgid "Assigned To"
-msgstr ""
+msgstr "Atanan"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_remaining
 msgid "Available Capacity"
-msgstr ""
+msgstr "Mevcut Kapasite"
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
 msgid "Cancel order"
-msgstr ""
+msgstr "Siparişi İptal Et"
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form

From 7e4ba3d5ae2be350f1f51b7e60d0342b906577e6 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 18:38:11 +0000
Subject: [PATCH 301/631] Translated using Weblate (Turkish)

Currently translated at 7.1% (2 of 28 strings)

Translation: field-service-14.0/field-service-14.0-base_territory
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-base_territory/tr/
---
 base_territory/i18n/tr.po | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/base_territory/i18n/tr.po b/base_territory/i18n/tr.po
index 1d7250166a..f7c68ece50 100644
--- a/base_territory/i18n/tr.po
+++ b/base_territory/i18n/tr.po
@@ -6,24 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2021-07-09 18:38+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\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: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__branch_id
 #: model_terms:ir.ui.view,arch_db:base_territory.res_branch_form_view
 msgid "Branch"
-msgstr ""
+msgstr "Şube"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__partner_id
 msgid "Branch Manager"
-msgstr ""
+msgstr "Şube Müdürü"
 
 #. module: base_territory
 #: model:ir.actions.act_window,name:base_territory.action_res_branch

From defe89ca93e22fcca938acf4ef3e0a3aa61d5c50 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 18:40:53 +0000
Subject: [PATCH 302/631] Added translation using Weblate (Turkish)

---
 fieldservice_account_analytic/i18n/tr.po | 162 +++++++++++++++++++++++
 1 file changed, 162 insertions(+)
 create mode 100644 fieldservice_account_analytic/i18n/tr.po

diff --git a/fieldservice_account_analytic/i18n/tr.po b/fieldservice_account_analytic/i18n/tr.po
new file mode 100644
index 0000000000..9008fcd464
--- /dev/null
+++ b/fieldservice_account_analytic/i18n/tr.po
@@ -0,0 +1,162 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_account_analytic
+#
+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: tr\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_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_order_form_analytic
+msgid "Accounting"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__analytic_account_id
+msgid "Analytic Account"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__contact
+msgid "Bill Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__location
+msgid "Bill Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
+msgid "Bill to"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
+msgid "Billed Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
+msgid "Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_search_view_analytic
+msgid "Customer"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__display_name
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__fsm_filter_location_by_contact
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__fsm_filter_location_by_contact
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter Contacts with Location"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.res_config_settings_view_form_filter
+msgid "Filter the Location on an FSM Order by the Contact"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__id
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_wizard____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: code:addons/fieldservice_account_analytic/models/account_move.py:0
+#: code:addons/fieldservice_account_analytic/models/analytic_account.py:0
+#, python-format
+msgid "No analytic account set on the order's Location."
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
+msgid "Time Type"
+msgstr ""
+
+#. module: fieldservice_account_analytic
+#: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
+msgid "Total Cost"
+msgstr ""

From a99843350c4e520afdb12ee3c7f1d92b0d88592a Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 16:36:03 +0000
Subject: [PATCH 303/631] Translated using Weblate (Turkish)

Currently translated at 56.5% (303 of 536 strings)

Translation: field-service-14.0/field-service-14.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice/tr/
---
 fieldservice/i18n/tr.po | 582 ++++++++++++++++++++--------------------
 1 file changed, 293 insertions(+), 289 deletions(-)

diff --git a/fieldservice/i18n/tr.po b/fieldservice/i18n/tr.po
index 5bda20ce73..8f30f49a13 100644
--- a/fieldservice/i18n/tr.po
+++ b/fieldservice/i18n/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-06-26 17:48+0000\n"
+"PO-Revision-Date: 2021-07-09 18:49+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\n"
@@ -113,13 +113,13 @@ msgstr "Bu iş ortağıyla ilgili bir Saha Servis Çalışanı zaten var."
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_payable_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_payable_id
 msgid "Account Payable"
-msgstr ""
+msgstr "Borç Hesabı"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_receivable_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_receivable_id
 msgid "Account Receivable"
-msgstr ""
+msgstr "Alacak Hesabı"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_needaction
@@ -128,20 +128,20 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_needaction
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_needaction
 msgid "Action Needed"
-msgstr ""
+msgstr "Eylem Gerekli"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__active
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__active
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__active
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__active_lang_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__active_lang_count
 msgid "Active Lang Count"
-msgstr ""
+msgstr "Etkin Dil Sayısı"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_ids
@@ -150,7 +150,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_ids
 msgid "Activities"
-msgstr ""
+msgstr "Aktiviteler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_exception_decoration
@@ -159,7 +159,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_exception_decoration
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_exception_decoration
 msgid "Activity Exception Decoration"
-msgstr ""
+msgstr "Aktivite İstisnası Dekorasyonu"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_state
@@ -168,7 +168,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_state
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_state
 msgid "Activity State"
-msgstr ""
+msgstr "Aktivite Durumu"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_type_icon
@@ -177,66 +177,66 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_type_icon
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_type_icon
 msgid "Activity Type Icon"
-msgstr ""
+msgstr "Aktivite Simge Türü"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__date_end
 msgid "Actual End"
-msgstr ""
+msgstr "Fiili Bitiş"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__date_start
 msgid "Actual Start"
-msgstr ""
+msgstr "Fiili Başlama"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__duration
 msgid "Actual duration"
-msgstr ""
+msgstr "Fiili Süre"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_order__duration
 msgid "Actual duration in hours"
-msgstr ""
+msgstr "Saat cinsinden gerçek süre"
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_person
 msgid "Add Field Service Workers here."
-msgstr ""
+msgstr "Saha Servisi Çalışan'ları buraya ekleyin."
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_dash_equipment
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_equipment
 msgid "Add a Field Service Equipment here."
-msgstr ""
+msgstr "Buraya bir Saha Servis Ekipmanı ekleyin."
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_category
 msgid "Add a Field Service Worker Category here."
-msgstr ""
+msgstr "Buraya bir Saha Servisi Çalışanı Kategorisi ekleyin."
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
 msgid "Add a description..."
-msgstr ""
+msgstr "Bir açıklama ekle..."
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__additional_info
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__additional_info
 msgid "Additional info"
-msgstr ""
+msgstr "İlave Bilgisi"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "Address"
-msgstr ""
+msgstr "Adres"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__type
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__type
 msgid "Address Type"
-msgstr ""
+msgstr "Adres Türü"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_order__state_name
@@ -247,12 +247,12 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "All"
-msgstr ""
+msgstr "Hepsi"
 
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.menu_fsm_operation_order
 msgid "All Orders"
-msgstr ""
+msgstr "Bütün Siparişler"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
@@ -277,17 +277,17 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__location_id
 msgid "Assigned Location"
-msgstr ""
+msgstr "Atanan Konum"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__person_id
 msgid "Assigned Operator"
-msgstr ""
+msgstr "Atanan Operatör"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__person_id
 msgid "Assigned To"
-msgstr ""
+msgstr "Atanan"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_attachment_count
@@ -296,7 +296,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_attachment_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_attachment_count
 msgid "Attachment Count"
-msgstr ""
+msgstr "Ek Sayısı"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
@@ -345,19 +345,19 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
 msgid "Bank"
-msgstr ""
+msgstr "Banak"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_ids
 msgid "Banks"
-msgstr ""
+msgstr "Bankalar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__barcode
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__barcode
 msgid "Barcode"
-msgstr ""
+msgstr "Barkon"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__is_blacklisted
@@ -390,12 +390,12 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "Branch"
-msgstr ""
+msgstr "Şube"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__branch_manager_id
 msgid "Branch Manager"
-msgstr ""
+msgstr "Şube Müdürü"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_crm
@@ -406,12 +406,12 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.partner_wizard_view
 msgid "Cancel"
-msgstr ""
+msgstr "İptal"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 msgid "Cancel Order"
-msgstr ""
+msgstr "Siparişi İptal Et"
 
 #. module: fieldservice
 #: code:addons/fieldservice/models/fsm_stage.py:0
@@ -434,17 +434,17 @@ msgstr ""
 #: model:ir.ui.menu,name:fieldservice.menu_hr_skill
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_category_tree_view
 msgid "Categories"
-msgstr ""
+msgstr "Kategoriler"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_category_form_view
 msgid "Category"
-msgstr ""
+msgstr "Kategori"
 
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_category_name_uniq
 msgid "Category name already exists!"
-msgstr ""
+msgstr "Kategori adı zaten var!"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_change_management
@@ -455,7 +455,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__channel_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__channel_ids
 msgid "Channels"
-msgstr ""
+msgstr "Kanallar"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
@@ -499,7 +499,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__child_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
 msgid "Children"
-msgstr ""
+msgstr "Alt"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__team_id
@@ -513,7 +513,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "City"
-msgstr ""
+msgstr "Şehir"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_order__tag_ids
@@ -523,7 +523,7 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__custom_color
 msgid "Color Code"
-msgstr ""
+msgstr "Renk Kodu"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__color
@@ -534,7 +534,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__color
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__color
 msgid "Color Index"
-msgstr ""
+msgstr "Renk İndeksi"
 
 #. module: fieldservice
 #: code:addons/fieldservice/models/fsm_stage.py:0
@@ -551,7 +551,7 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Şirketler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__ref_company_ids
@@ -570,13 +570,13 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__company_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_template__company_id
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__company_name
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__company_name
 msgid "Company Name"
-msgstr ""
+msgstr "Firma Adı"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__commercial_company_name
@@ -588,7 +588,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__company_type
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__company_type
 msgid "Company Type"
-msgstr ""
+msgstr "Firma Türü"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_gid
@@ -629,28 +629,28 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 msgid "Complete"
-msgstr ""
+msgstr "Tamamlayınız"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contact_address
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__contact_address
 msgid "Complete Address"
-msgstr ""
+msgstr "Tam Adresi"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__complete_name
 msgid "Complete Name"
-msgstr ""
+msgstr "Tam Ad"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Yapılandırma Ayarları"
 
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.config
 msgid "Configuration"
-msgstr ""
+msgstr "Yapılandırma"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_res_partner
@@ -658,32 +658,32 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__contact_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__child_ids
 msgid "Contact"
-msgstr ""
+msgstr "Kontak"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 msgid "Contacts"
-msgstr ""
+msgstr "Kontaklar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contact_count
 msgid "Contacts Count"
-msgstr ""
+msgstr "Kontak Sayısı"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.partner_wizard_view
 msgid "Convert"
-msgstr ""
+msgstr "Dönüştürme"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.partner_fsm_action
 msgid "Convert to FSM Record"
-msgstr ""
+msgstr "FSM Kaydına Dönüştür"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.partner_wizard_view
 msgid "Convert to a Field Service Worker or Location"
-msgstr ""
+msgstr "Saha Servisi Personeline veya Konumuna Dönüştür"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__payment_token_count
@@ -704,7 +704,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "Country"
-msgstr ""
+msgstr "Ülke"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
@@ -714,38 +714,38 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_customer
 msgid "Create a Customer."
-msgstr ""
+msgstr "Müşteri Oluşturun."
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_location
 msgid "Create a Service Location"
-msgstr ""
+msgstr "Servis Konumu Oluşturun"
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_stage
 msgid "Create a Stage."
-msgstr ""
+msgstr "Bir Aşama Oluşturun."
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_team_settings
 msgid "Create a new team"
-msgstr ""
+msgstr "Yeni bir ekip oluştur"
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_tag
 msgid "Create a tag."
-msgstr ""
+msgstr "Etiket Oluştur."
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_dash_order
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_operation_order
 msgid "Create an Order."
-msgstr ""
+msgstr "Sipariş Oluşturun."
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_template
 msgid "Create an order template"
-msgstr ""
+msgstr "Bir sipariş şablonu oluşturun"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
@@ -755,7 +755,7 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_location_person
 msgid "Create the linked locations of a worker."
-msgstr ""
+msgstr "Bir çalışanın bağlantılı konumlarını oluşturun."
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
@@ -779,7 +779,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_template__create_uid
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Oluşturan"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__create_date
@@ -796,35 +796,35 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_template__create_date
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Oluşturulma"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__credit_limit
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__credit_limit
 msgid "Credit Limit"
-msgstr ""
+msgstr "Kredi Limiti"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__currency_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__currency_id
 msgid "Currency"
-msgstr ""
+msgstr "Para Birimi"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__current_date
 msgid "Current Date"
-msgstr ""
+msgstr "Şimdiki Tarih"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__current_location_id
 msgid "Current Location"
-msgstr ""
+msgstr "Geçerli Konum"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
 msgid "Customer Payment Terms"
-msgstr ""
+msgstr "Müşteri Ödeme Koşulları"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__customer_rank
@@ -836,28 +836,28 @@ msgstr ""
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_customer
 #: model:ir.ui.menu,name:fieldservice.menu_fsm_customer
 msgid "Customers"
-msgstr ""
+msgstr "Müşteriler"
 
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.dashboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Gösterge Paneli"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__date
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__date
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: fieldservice
 #: model:fsm.team,name:fieldservice.fsm_team_default
 msgid "Default Team"
-msgstr ""
+msgstr "Varsayılan Takım"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
 msgid "Default duration in hours"
-msgstr ""
+msgstr "Saat cinsinden varsayılan süre"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__trust
@@ -869,7 +869,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_kanban_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_kanban_view
 msgid "Delete"
-msgstr ""
+msgstr "Sil"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
@@ -880,7 +880,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 #: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
 msgid "Description"
-msgstr ""
+msgstr "Açıklama"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__direction
@@ -911,7 +911,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_res_partner__display_name
 #: model:ir.model.fields,field_description:fieldservice.field_res_territory__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Görünüm Adı"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
@@ -925,18 +925,18 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "District"
-msgstr ""
+msgstr "İlçe"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__district_manager_id
 msgid "District Manager"
-msgstr ""
+msgstr "İlçe Müdürü"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "Done"
-msgstr ""
+msgstr "Biten"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_kanban_view
@@ -947,17 +947,17 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "Due Within 30 Days"
-msgstr ""
+msgstr "Son 30 Gün"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "Due Within 7 Days"
-msgstr ""
+msgstr "Son 7 Gün"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_template__duration
 msgid "Duration"
-msgstr ""
+msgstr "Süre"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__request_early
@@ -968,7 +968,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_kanban_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_kanban_view
 msgid "Edit"
-msgstr ""
+msgstr "Düzenle"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__partner_share
@@ -984,13 +984,13 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__email
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__email
 msgid "Email"
-msgstr ""
+msgstr "Eposta"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__employee
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__employee
 msgid "Employee"
-msgstr ""
+msgstr "Personel"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__equipment_count
@@ -1000,12 +1000,12 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_tree_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 msgid "Equipment"
-msgstr ""
+msgstr "Ekipman"
 
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_equipment_name_uniq
 msgid "Equipment name already exists!"
-msgstr ""
+msgstr "Ekipman adı zaten var!"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_report_equipment
@@ -1019,7 +1019,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "Equipments"
-msgstr ""
+msgstr "Ekipmanlar"
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_report_equipment
@@ -1029,7 +1029,7 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 msgid "Execution"
-msgstr ""
+msgstr "Yürütme"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_stage__legend_priority
@@ -1051,43 +1051,43 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
 msgid "FSM Equipment Name"
-msgstr ""
+msgstr "FSM Ekipman Adı"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "FSM Location Builder"
-msgstr ""
+msgstr "FSM Konum Oluşturucu"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_graph_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_pivot_view
 msgid "FSM Locations"
-msgstr ""
+msgstr "FSM Konumları"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "FSM Order Name"
-msgstr ""
+msgstr "FSM Sipariş Adı"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_calendar_view
 msgid "FSM Orders"
-msgstr ""
+msgstr "FSM Siparişleri"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_person_calendar_filter
 msgid "FSM Person Calendar Filter"
-msgstr ""
+msgstr "FSM Kişi Takvim Filtresi"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_wizard
 msgid "FSM Record Conversion"
-msgstr ""
+msgstr "FSM Kayıt Dönüştürme"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__fsm_person_id
 msgid "FSM Worker"
-msgstr ""
+msgstr "FSM Personeli"
 
 #. module: fieldservice
 #: model:ir.module.category,name:fieldservice.fsm
@@ -1095,70 +1095,70 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_partner_fields
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "Field Service"
-msgstr ""
+msgstr "Saha Servisi"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_category
 msgid "Field Service Category"
-msgstr ""
+msgstr "Saha Servis Kategorisi"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_dash_equipment
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_equipment
 #: model:ir.model,name:fieldservice.model_fsm_equipment
 msgid "Field Service Equipment"
-msgstr ""
+msgstr "Saha Servis Ekipmanları"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_location
 msgid "Field Service Location"
-msgstr ""
+msgstr "Saha Servis Konumu"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_location_person
 msgid "Field Service Location Person Info"
-msgstr ""
+msgstr "Saha Servis Konum Kişi Bilgileri"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Saha Servis Siparişi"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_template
 msgid "Field Service Order Template"
-msgstr ""
+msgstr "Saha Servis Siparişi Şablonu"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_order_type
 msgid "Field Service Order Type"
-msgstr ""
+msgstr "Saha Servis Sipariş Türü"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_stage
 msgid "Field Service Stage"
-msgstr ""
+msgstr "Saha Servis Aşaması"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_tag
 msgid "Field Service Tag"
-msgstr ""
+msgstr "Saha Servis Etiketi"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_team
 msgid "Field Service Team"
-msgstr ""
+msgstr "Saha Servis Ekibi"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_person
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "Field Service Worker"
-msgstr ""
+msgstr "Saha Servis Çalışanı"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_fsm_category
 msgid "Field Service Worker Category"
-msgstr ""
+msgstr "Saha Servis Çalışanı Kategorisi"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_person
@@ -1167,7 +1167,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_tree
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_territory_form_view_inherit
 msgid "Field Service Workers"
-msgstr ""
+msgstr "Saha Servis Çalışanları"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_sanitized
@@ -1176,6 +1176,8 @@ msgid ""
 "Field used to store sanitized phone number. Helps speeding up searches and "
 "comparisons."
 msgstr ""
+"Temizlenmiş telefon numarasını saklamak için kullanılan alan. Aramaları ve "
+"karşılaştırmaları hızlandırmaya yardımcı olur."
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_position_id
@@ -1186,7 +1188,7 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__fold
 msgid "Folded in Kanban"
-msgstr ""
+msgstr "Kanban'da katlanmış"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_follower_ids
@@ -1195,7 +1197,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_follower_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_follower_ids
 msgid "Followers"
-msgstr ""
+msgstr "Takipçiler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_channel_ids
@@ -1204,7 +1206,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_channel_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_channel_ids
 msgid "Followers (Channels)"
-msgstr ""
+msgstr "Takipçiler (Kanallar)"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_partner_ids
@@ -1213,7 +1215,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_partner_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_partner_ids
 msgid "Followers (Partners)"
-msgstr ""
+msgstr "Takipçiler (Ortaklar)"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_type_icon
@@ -1234,40 +1236,40 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__email_formatted
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__email_formatted
 msgid "Formatted Email"
-msgstr ""
+msgstr "Biçimlendirilmiş E-posta"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__full_name
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__full_name
 msgid "Full Name"
-msgstr ""
+msgstr "Tam Adı"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "Future Orders"
-msgstr ""
+msgstr "Gelecek Siparişler"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 msgid "General Notes"
-msgstr ""
+msgstr "Genel Notlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_latitude
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_latitude
 msgid "Geo Latitude"
-msgstr ""
+msgstr "Coğrafi Enlem"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 msgid "Geo Location"
-msgstr ""
+msgstr "Coğrafi Konum"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_longitude
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_longitude
 msgid "Geo Longitude"
-msgstr ""
+msgstr "Coğrafi Boylam"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
@@ -1291,7 +1293,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "Group By"
-msgstr ""
+msgstr "Grupla"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__has_unreconciled_entries
@@ -1304,12 +1306,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__hide
 msgid "Hide"
-msgstr ""
+msgstr "Gizle"
 
 #. module: fieldservice
 #: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__2
 msgid "High"
-msgstr ""
+msgstr "Yüksek"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__id
@@ -1345,7 +1347,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_exception_icon
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_exception_icon
 msgid "Icon"
-msgstr ""
+msgstr "İkon"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_exception_icon
@@ -1412,7 +1414,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_1920
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_1920
 msgid "Image"
-msgstr ""
+msgstr "Görsel"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_1024
@@ -1460,7 +1462,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__industry_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__industry_id
 msgid "Industry"
-msgstr ""
+msgstr "Endüstri"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__todo
@@ -1469,19 +1471,19 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_template_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
 msgid "Instructions"
-msgstr ""
+msgstr "Talimatlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__internal_type
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__internal_type
 msgid "Internal Type"
-msgstr ""
+msgstr "İç Tip"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_warn
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__type
@@ -1494,7 +1496,7 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_account
 msgid "Invoice your FSM orders"
-msgstr ""
+msgstr "FSM siparişlerinizi faturalandırın"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
@@ -1505,7 +1507,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_ids
 msgid "Invoices"
-msgstr ""
+msgstr "Faturalar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__is_button
@@ -1519,13 +1521,13 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_is_follower
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_is_follower
 msgid "Is Follower"
-msgstr ""
+msgstr "Takipçi mi"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__is_company
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__is_company
 msgid "Is a Company"
-msgstr ""
+msgstr "Bu bir Firmamı"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fsm_location
@@ -1533,7 +1535,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_res_partner__fsm_location
 #: model:ir.model.fields,field_description:fieldservice.field_res_users__fsm_location
 msgid "Is a FS Location"
-msgstr ""
+msgstr "Bir FS Konumu mu"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fsm_person
@@ -1541,7 +1543,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_res_partner__fsm_person
 #: model:ir.model.fields,field_description:fieldservice.field_res_users__fsm_person
 msgid "Is a FS Worker"
-msgstr ""
+msgstr "FS Çalışanı mı"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__is_closed
@@ -1557,19 +1559,19 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__function
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__function
 msgid "Job Position"
-msgstr ""
+msgstr "İş Pozisyonu"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__journal_item_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__journal_item_count
 msgid "Journal Items"
-msgstr ""
+msgstr "Yevmiye Öğeleri"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__lang
 msgid "Language"
-msgstr ""
+msgstr "Dil"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category____last_update
@@ -1590,7 +1592,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_res_partner____last_update
 #: model:ir.model.fields,field_description:fieldservice.field_res_territory____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Son Düzenlenme"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__write_uid
@@ -1607,7 +1609,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_template__write_uid
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "Son Güncelleyen"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__write_date
@@ -1624,7 +1626,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_template__write_date
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "Son Güncellenme"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__calendar_last_notif_ack
@@ -1650,7 +1652,7 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__request_late
 msgid "Latest Request Date"
-msgstr ""
+msgstr "Son Talep Tarihi"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_repair
@@ -1696,7 +1698,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__location_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "Linked Locations"
-msgstr ""
+msgstr "Bağlantılı Konumlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__location_id
@@ -1708,44 +1710,44 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_search_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
 msgid "Location"
-msgstr ""
+msgstr "Konum"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__location_directions
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 msgid "Location Directions"
-msgstr ""
+msgstr "Konum Talimatlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__notes
 msgid "Location Notes"
-msgstr ""
+msgstr "Konum Notları"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_location_person
 msgid "Location Persons"
-msgstr ""
+msgstr "Konum Personelleri"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__phone
 msgid "Location Phone"
-msgstr ""
+msgstr "Konum Telefonu"
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_report_location
 msgid "Location Reports."
-msgstr ""
+msgstr "Konum Raporları."
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_form_view
 msgid "Location Worker"
-msgstr ""
+msgstr "Konum Çalışanı"
 
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.menu_fsm_location_person
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_tree_view
 msgid "Location Workers"
-msgstr ""
+msgstr "Konum Çalışanları"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_report_location
@@ -1755,12 +1757,12 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_tree_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "Locations"
-msgstr ""
+msgstr "Konumlar"
 
 #. module: fieldservice
 #: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__1
 msgid "Low"
-msgstr ""
+msgstr "Düşük"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
@@ -2001,7 +2003,7 @@ msgstr ""
 #. module: fieldservice
 #: model:res.groups,name:fieldservice.group_fsm_manager
 msgid "Manager"
-msgstr ""
+msgstr "Yönetici"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
@@ -2011,18 +2013,18 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.data
 msgid "Master Data"
-msgstr ""
+msgstr "Ana Veriler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__user_id
 msgid "Me"
-msgstr ""
+msgstr "Ben"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__meeting_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__meeting_ids
 msgid "Meetings"
-msgstr ""
+msgstr "Toplantılar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error
@@ -2046,14 +2048,14 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_ids
 msgid "Messages"
-msgstr ""
+msgstr "Mesajlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__mobile
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__mobile
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__mobile
 msgid "Mobile"
-msgstr ""
+msgstr "Mobil"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__my_activity_date_deadline
@@ -2067,7 +2069,7 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "My Orders"
-msgstr ""
+msgstr "Siparişlerim"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__name
@@ -2081,12 +2083,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__name
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_template__name
 msgid "Name"
-msgstr ""
+msgstr "Adı"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "Need Assigned"
-msgstr ""
+msgstr "Atanan Gerekiyor"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
@@ -2097,7 +2099,7 @@ msgstr ""
 #: code:addons/fieldservice/models/fsm_order.py:0
 #, python-format
 msgid "New"
-msgstr ""
+msgstr "Yeni"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_date_deadline
@@ -2131,12 +2133,12 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "Next Stage"
-msgstr ""
+msgstr "Sonraki Aşama"
 
 #. module: fieldservice
 #: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__email_normalized
@@ -2150,7 +2152,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__comment
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
 msgid "Notes"
-msgstr ""
+msgstr "Notlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_needaction_counter
@@ -2205,123 +2207,123 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.operations
 msgid "Operations"
-msgstr ""
+msgstr "Operasyonlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__opportunity_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__opportunity_ids
 msgid "Opportunities"
-msgstr ""
+msgstr "Fırsatlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__opportunity_count
 msgid "Opportunity"
-msgstr ""
+msgstr "Fırsat"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__display_name
 #: model:ir.model.fields.selection,name:fieldservice.selection__fsm_stage__stage_type__order
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 msgid "Order"
-msgstr ""
+msgstr "Sipariş"
 
 #. module: fieldservice
 #: model:mail.message.subtype,name:fieldservice.mt_order_assigned
 msgid "Order Assigned"
-msgstr ""
+msgstr "Sipariş Atandı"
 
 #. module: fieldservice
 #: model:mail.message.subtype,name:fieldservice.mt_order_cancelled
 msgid "Order Cancelled"
-msgstr ""
+msgstr "Servis İptal Edildi"
 
 #. module: fieldservice
 #: model:mail.message.subtype,name:fieldservice.mt_order_completed
 msgid "Order Completed"
-msgstr ""
+msgstr "Servis Tamamlandı"
 
 #. module: fieldservice
 #: model:mail.message.subtype,name:fieldservice.mt_order_confirmed
 msgid "Order Confirmed"
-msgstr ""
+msgstr "Sipariş Onaylandı"
 
 #. module: fieldservice
 #: model:mail.message.subtype,name:fieldservice.mt_order_new
 msgid "Order Created"
-msgstr ""
+msgstr "Sipariş Oluşturuldu"
 
 #. module: fieldservice
 #: model:mail.message.subtype,name:fieldservice.mt_order_enroute
 msgid "Order En Route"
-msgstr ""
+msgstr "Sipariş Yolda"
 
 #. module: fieldservice
 #: model:mail.message.subtype,name:fieldservice.mt_order_scheduled
 msgid "Order Scheduled"
-msgstr ""
+msgstr "Sipariş Planlandı"
 
 #. module: fieldservice
 #: model:mail.message.subtype,name:fieldservice.mt_order_started
 msgid "Order Started"
-msgstr ""
+msgstr "Sipariş Başladı"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_form
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_tree
 msgid "Order Team"
-msgstr ""
+msgstr "Sipariş Ekibi"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_template
 msgid "Order Templates"
-msgstr ""
+msgstr "Sipariş Şablonları"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_order_type
 #: model:ir.ui.menu,name:fieldservice.menu_fsm_order_type
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_type_tree_view
 msgid "Order Types"
-msgstr ""
+msgstr "Sipariş Türleri"
 
 #. module: fieldservice
 #: model:mail.message.subtype,description:fieldservice.mt_order_assigned
 msgid "Order assigned"
-msgstr ""
+msgstr "Sipariş atanan"
 
 #. module: fieldservice
 #: model:mail.message.subtype,description:fieldservice.mt_order_cancelled
 msgid "Order cancelled"
-msgstr ""
+msgstr "Sipariş iptal edildi"
 
 #. module: fieldservice
 #: model:mail.message.subtype,description:fieldservice.mt_order_completed
 msgid "Order completed"
-msgstr ""
+msgstr "Sipariş tamamlandı"
 
 #. module: fieldservice
 #: model:mail.message.subtype,description:fieldservice.mt_order_confirmed
 msgid "Order confirmed"
-msgstr ""
+msgstr "Sipariş onaylandı"
 
 #. module: fieldservice
 #: model:mail.message.subtype,description:fieldservice.mt_order_new
 msgid "Order created"
-msgstr ""
+msgstr "Sipariş oluşturuldu"
 
 #. module: fieldservice
 #: model:mail.message.subtype,description:fieldservice.mt_order_enroute
 msgid "Order en route"
-msgstr ""
+msgstr "Sipariş yolda"
 
 #. module: fieldservice
 #: model:mail.message.subtype,description:fieldservice.mt_order_scheduled
 msgid "Order scheduled"
-msgstr ""
+msgstr "Sipariş planlandı"
 
 #. module: fieldservice
 #: model:mail.message.subtype,description:fieldservice.mt_order_started
 msgid "Order started"
-msgstr ""
+msgstr "Sipariş Başladı"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_dash_order
@@ -2337,12 +2339,12 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "Orders"
-msgstr ""
+msgstr "Siparişler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__order_count
 msgid "Orders Count"
-msgstr ""
+msgstr "Sipariş Sayısı"
 
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_report_order
@@ -2362,7 +2364,7 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 msgid "Others"
-msgstr ""
+msgstr "Diğer"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
@@ -2382,7 +2384,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__owner_id
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
 msgid "Owner"
-msgstr ""
+msgstr "Sahibi"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__parent_id
@@ -2390,13 +2392,13 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fsm_parent_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__parent_id
 msgid "Parent"
-msgstr ""
+msgstr "Üst"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__parent_name
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__parent_name
 msgid "Parent name"
-msgstr ""
+msgstr "Üst Adı"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contract_ids
@@ -2414,13 +2416,13 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__debit_limit
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__debit_limit
 msgid "Payable Limit"
-msgstr ""
+msgstr "Borç Limit"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_method_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_method_id
 msgid "Payment Method"
-msgstr ""
+msgstr "Ödeme Şekli"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__payment_token_ids
@@ -2433,7 +2435,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__phone
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone_sanitized_blacklisted
@@ -2444,7 +2446,7 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 msgid "Planning"
-msgstr ""
+msgstr "Planlama"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
@@ -2465,13 +2467,13 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "Previous Stage"
-msgstr ""
+msgstr "Önceki Aşama"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_product_pricelist
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_product_pricelist
 msgid "Pricelist"
-msgstr ""
+msgstr "Fiyat Listesi"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__territory_manager_id
@@ -2482,7 +2484,7 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contact_id
 msgid "Primary Contact"
-msgstr ""
+msgstr "Birincil Kontak"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__service_location_id
@@ -2495,7 +2497,7 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__priority
 msgid "Priority"
-msgstr ""
+msgstr "Öncelik"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__legend_priority
@@ -2515,13 +2517,13 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
 msgid "Record Type"
-msgstr ""
+msgstr "Kayıt Türü"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__ref
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__ref
 msgid "Reference"
-msgstr ""
+msgstr "Referans"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__region_id
@@ -2530,18 +2532,18 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "Region"
-msgstr ""
+msgstr "Bölge"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__region_manager_id
 msgid "Region Manager"
-msgstr ""
+msgstr "Bölge Müdürü"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__parent_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__parent_id
 msgid "Related Company"
-msgstr ""
+msgstr "İlişkili Şirket"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owner_id
@@ -2557,28 +2559,28 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Raporlama"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 msgid "Request Workers"
-msgstr ""
+msgstr "Personel Talebi"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 msgid "Requirements"
-msgstr ""
+msgstr "Gereksinimler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__resolution
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 msgid "Resolution"
-msgstr ""
+msgstr "Çözüm"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
 msgid "Resolution Notes"
-msgstr ""
+msgstr "Çözünürlük Notları"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_user_id
@@ -2587,12 +2589,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_user_id
 msgid "Responsible User"
-msgstr ""
+msgstr "Sorumlu Kullanıcı"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "Routes"
-msgstr ""
+msgstr "Rotalar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_sms_error
@@ -2607,39 +2609,39 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
 msgid "Sales Team"
-msgstr ""
+msgstr "Satış Ekibi"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
 msgid "Salesperson"
-msgstr ""
+msgstr "Satış Temsilcisi"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone_sanitized
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone_sanitized
 msgid "Sanitized Number"
-msgstr ""
+msgstr "Arındırılmış  Numarası"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 msgid "Schedule Details"
-msgstr ""
+msgstr "Planma Ayrıntıları"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__scheduled_date_end
 msgid "Scheduled End"
-msgstr ""
+msgstr "Planlanan Bitiş"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__scheduled_date_start
 msgid "Scheduled Start (ETA)"
-msgstr ""
+msgstr "Planlanan Başlama (ETA)"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__scheduled_duration
 msgid "Scheduled duration"
-msgstr ""
+msgstr "Planlanan Süre"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_order__scheduled_duration
@@ -2685,6 +2687,8 @@ msgid ""
 "Select whether you want to convert this record to a Field\n"
 "                    Service Worker or Location."
 msgstr ""
+"Bu kaydı bir Saha Servisine dönüştürmek isteyip istemediğinizi seçin\n"
+"                    Çalışan veya Konum."
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
@@ -2717,23 +2721,23 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__sequence
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__sequence
 msgid "Sequence"
-msgstr ""
+msgstr "Sıra"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_location
 msgid "Service Locations"
-msgstr ""
+msgstr "Servis Konumları"
 
 #. module: fieldservice
 #: model:ir.actions.report,name:fieldservice.action_report_fsm_order
 msgid "Service Order"
-msgstr ""
+msgstr "Servis Siparişi"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_graph_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_pivot_view
 msgid "Service Orders"
-msgstr ""
+msgstr "Servis Siparişleri"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_stage__is_closed
@@ -2745,7 +2749,7 @@ msgstr ""
 #: model:ir.ui.menu,name:fieldservice.settings
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "Settings"
-msgstr ""
+msgstr "Ayarlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_share
@@ -2791,22 +2795,22 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_tree_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
 msgid "Stage"
-msgstr ""
+msgstr "Aşama"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__custom_color
 msgid "Stage Color"
-msgstr ""
+msgstr "Aşama Rengi"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
 msgid "Stage Description and Tooltips"
-msgstr ""
+msgstr "Aşama Tanımı ve Araç İpuçları"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__stage_name
 msgid "Stage Name"
-msgstr ""
+msgstr "Aşama Adı"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_stage
@@ -2814,7 +2818,7 @@ msgstr ""
 #: model:ir.ui.menu,name:fieldservice.menu_fsm_stage
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_tree_view
 msgid "Stages"
-msgstr ""
+msgstr "Aşamalar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__state_id
@@ -2843,36 +2847,36 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__street
 msgid "Street"
-msgstr ""
+msgstr "Cade"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "Street 2..."
-msgstr ""
+msgstr "Adres 2..."
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "Street..."
-msgstr ""
+msgstr "Adres..."
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street2
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street2
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__street2
 msgid "Street2"
-msgstr ""
+msgstr "Adres2"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sublocation_count
 msgid "Sub Locations"
-msgstr ""
+msgstr "Alt Konumlar"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 msgid "Sub-Locations"
-msgstr ""
+msgstr "Alt-Konumlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
@@ -2883,7 +2887,7 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_tag_name_uniq
 msgid "Tag name already exists!"
-msgstr ""
+msgstr "Etiket adı zaten var!"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_tag
@@ -2892,35 +2896,35 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__category_id
 #: model:ir.ui.menu,name:fieldservice.menu_fsm_tag
 msgid "Tags"
-msgstr ""
+msgstr "Etiketler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__task_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__task_ids
 msgid "Tasks"
-msgstr ""
+msgstr "Görevler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__vat
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__vat
 msgid "Tax ID"
-msgstr ""
+msgstr "Vergi No"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__team_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_template__team_id
 msgid "Team"
-msgstr ""
+msgstr "Ekip"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_form
 msgid "Team Name"
-msgstr ""
+msgstr "Ekip Adı"
 
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_team_name_uniq
 msgid "Team name already exists!"
-msgstr ""
+msgstr "Etiket adı zaten mevcut!"
 
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_team_dashboard
@@ -2929,23 +2933,23 @@ msgstr ""
 #: model:ir.ui.menu,name:fieldservice.menu_fsm_dash_team
 #: model:ir.ui.menu,name:fieldservice.menu_fsm_team
 msgid "Teams"
-msgstr ""
+msgstr "Ekipler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__template_id
 msgid "Template"
-msgstr ""
+msgstr "Şablon"
 
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.menu_fsm_template
 msgid "Templates"
-msgstr ""
+msgstr "Şablonlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__territory_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "Territories"
-msgstr ""
+msgstr "Sahalar"
 
 #. module: fieldservice
 #: model:ir.model,name:fieldservice.model_res_territory
@@ -2956,7 +2960,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "Territory"
-msgstr ""
+msgstr "Saha"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__vat
@@ -3056,7 +3060,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__tz
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__tz
 msgid "Timezone"
-msgstr ""
+msgstr "Saat Dilimi"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__tz_offset
@@ -3068,7 +3072,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__title
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__title
 msgid "Title"
-msgstr ""
+msgstr "Başlık"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
@@ -3079,47 +3083,47 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "To Do"
-msgstr ""
+msgstr "Yapılacak"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "To Schedule"
-msgstr ""
+msgstr "Planlama"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "Today Orders"
-msgstr ""
+msgstr "Bugün Siparişler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__total_invoiced
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__total_invoiced
 msgid "Total Invoiced"
-msgstr ""
+msgstr "Toplam Faturalanan"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__debit
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__debit
 msgid "Total Payable"
-msgstr ""
+msgstr "Toplam Borç"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__credit
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__credit
 msgid "Total Receivable"
-msgstr ""
+msgstr "Toplam Alacak"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__credit
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__credit
 msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "Bu müşterinin size borçlu olduğu toplam tutar."
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__debit
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__debit
 msgid "Total amount you have to pay to this vendor."
-msgstr ""
+msgstr "Bu tedarikçi ödemeniz gereken toplam tutar."
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__type
@@ -3128,7 +3132,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_type_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_search_view
 msgid "Type"
-msgstr ""
+msgstr "Tür"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_exception_decoration
@@ -3137,12 +3141,12 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__activity_exception_decoration
 #: model:ir.model.fields,help:fieldservice.field_fsm_team__activity_exception_decoration
 msgid "Type of the exception activity on record."
-msgstr ""
+msgstr "Kayıttaki istisna etkinliğinin türü."
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "Unassigned"
-msgstr ""
+msgstr "Atanmamış"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_unread
@@ -3151,7 +3155,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_unread
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_unread
 msgid "Unread Messages"
-msgstr ""
+msgstr "Okunmamış Mesajlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_unread_counter
@@ -3165,12 +3169,12 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
 msgid "Unscheduled"
-msgstr ""
+msgstr "Planlanmamış"
 
 #. module: fieldservice
 #: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__3
 msgid "Urgent"
-msgstr ""
+msgstr "Acil"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_location_builder
@@ -3217,7 +3221,7 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_stage__is_default
 msgid "Used a default stage"
-msgstr ""
+msgstr "Bu varsayılan Aşamasımı"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_stage__sequence
@@ -3232,13 +3236,13 @@ msgstr ""
 #. module: fieldservice
 #: model:res.groups,name:fieldservice.group_fsm_user
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_ids
 msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__currency_id
@@ -3249,13 +3253,13 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "Vehicles"
-msgstr ""
+msgstr "Araçlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id
 msgid "Vendor Payment Terms"
-msgstr ""
+msgstr "Tedarikçi Ödeme Koşulları"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__website
@@ -3299,12 +3303,12 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_search_view
 msgid "Worker"
-msgstr ""
+msgstr "Çalışan"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__person_phone
 msgid "Worker Phone"
-msgstr ""
+msgstr "Çalışan Telefonu"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__person_ids
@@ -3312,12 +3316,12 @@ msgstr ""
 #: model:ir.ui.menu,name:fieldservice.menu_fsm_person
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "Workers"
-msgstr ""
+msgstr "Çalışanlar"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__calendar_id
 msgid "Working Schedule"
-msgstr ""
+msgstr "Çalışma Program"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
@@ -3336,7 +3340,7 @@ msgstr ""
 #: code:addons/fieldservice/models/fsm_order.py:0
 #, python-format
 msgid "You cannot delete this order."
-msgstr ""
+msgstr "Bu siparişi silemezsiniz."
 
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_person_calendar_filter_user_id_fsm_person_id_unique
@@ -3359,31 +3363,31 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "ZIP"
-msgstr ""
+msgstr "PK"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__zip
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__zip
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__zip
 msgid "Zip"
-msgstr ""
+msgstr "Pk"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_tag_form_view
 msgid "tag"
-msgstr ""
+msgstr "etiket"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_tag_tree_view
 msgid "tags"
-msgstr ""
+msgstr "etiketler"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_template_form_view
 msgid "template"
-msgstr ""
+msgstr "şablon"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_template_tree_view
 msgid "templates"
-msgstr ""
+msgstr "şablonlar"

From be9265d90c92c954e0b1728b0ad890d96740b74c Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 18:40:14 +0000
Subject: [PATCH 304/631] Translated using Weblate (Turkish)

Currently translated at 100.0% (28 of 28 strings)

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

diff --git a/base_territory/i18n/tr.po b/base_territory/i18n/tr.po
index f7c68ece50..78cc942592 100644
--- a/base_territory/i18n/tr.po
+++ b/base_territory/i18n/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-07-09 18:38+0000\n"
+"PO-Revision-Date: 2021-07-09 18:49+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\n"
@@ -32,18 +32,18 @@ msgstr "Şube Müdürü"
 #: model:ir.ui.menu,name:base_territory.menu_res_branch
 #: model_terms:ir.ui.view,arch_db:base_territory.res_branch_tree_view
 msgid "Branches"
-msgstr ""
+msgstr "Şubeler"
 
 #. module: base_territory
 #: model:ir.model,name:base_territory.model_res_country
 #: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__country
 msgid "Country"
-msgstr ""
+msgstr "Ülke"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__country_ids
 msgid "Country Names"
-msgstr ""
+msgstr "Ülke Adları"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__create_uid
@@ -51,7 +51,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__create_uid
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Oluşturan"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__create_date
@@ -59,12 +59,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__create_date
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Oluşturulma"
 
 #. module: base_territory
 #: model_terms:ir.ui.view,arch_db:base_territory.res_territory_form_view
 msgid "Definition"
-msgstr ""
+msgstr "Tanım"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__description
@@ -72,7 +72,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__description
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__description
 msgid "Description"
-msgstr ""
+msgstr "Açıklama"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__display_name
@@ -81,7 +81,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__display_name
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Görünüm Adı"
 
 #. module: base_territory
 #: model:ir.model,name:base_territory.model_res_district
@@ -89,19 +89,19 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__district_id
 #: model_terms:ir.ui.view,arch_db:base_territory.res_district_form_view
 msgid "District"
-msgstr ""
+msgstr "İlçe"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_district__partner_id
 msgid "District Manager"
-msgstr ""
+msgstr "İlçe Müdürü"
 
 #. module: base_territory
 #: model:ir.actions.act_window,name:base_territory.action_res_district
 #: model:ir.ui.menu,name:base_territory.menu_res_district
 #: model_terms:ir.ui.view,arch_db:base_territory.res_district_tree_view
 msgid "Districts"
-msgstr ""
+msgstr "İlçeler"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__id
@@ -110,7 +110,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__id
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch____last_update
@@ -119,7 +119,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region____last_update
 #: model:ir.model.fields,field_description:base_territory.field_res_territory____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Son Düzenlenme"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__write_uid
@@ -127,7 +127,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__write_uid
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "Son Güncelleyen"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__write_date
@@ -135,7 +135,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__write_date
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "Son Güncellenme"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__name
@@ -143,7 +143,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__name
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__name
 msgid "Name"
-msgstr ""
+msgstr "Adı"
 
 #. module: base_territory
 #: model:ir.model,name:base_territory.model_res_region
@@ -151,12 +151,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__region_id
 #: model_terms:ir.ui.view,arch_db:base_territory.res_region_form_view
 msgid "Region"
-msgstr ""
+msgstr "Bölge"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_region__partner_id
 msgid "Region Manager"
-msgstr ""
+msgstr "Bölge Müdürü"
 
 #. module: base_territory
 #: model:ir.actions.act_window,name:base_territory.action_res_region
@@ -164,43 +164,43 @@ msgstr ""
 #: model:ir.ui.menu,name:base_territory.menu_res_region
 #: model_terms:ir.ui.view,arch_db:base_territory.res_region_tree_view
 msgid "Regions"
-msgstr ""
+msgstr "Bölgeler"
 
 #. module: base_territory
 #: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__state
 msgid "State"
-msgstr ""
+msgstr "İl"
 
 #. module: base_territory
 #: model:ir.actions.act_window,name:base_territory.action_res_territory
 #: model:ir.ui.menu,name:base_territory.menu_res_territory
 #: model_terms:ir.ui.view,arch_db:base_territory.res_territory_tree_view
 msgid "Territories"
-msgstr ""
+msgstr "Sahalar"
 
 #. module: base_territory
 #: model:ir.model,name:base_territory.model_res_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_country__territory_id
 #: model_terms:ir.ui.view,arch_db:base_territory.res_territory_form_view
 msgid "Territory"
-msgstr ""
+msgstr "Saha"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__type
 msgid "Type"
-msgstr ""
+msgstr "Tür"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__zip_codes
 msgid "ZIP Codes"
-msgstr ""
+msgstr "Posta Kodları"
 
 #. module: base_territory
 #: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__zip
 msgid "Zip"
-msgstr ""
+msgstr "Pk"
 
 #. module: base_territory
 #: model:ir.model,name:base_territory.model_res_branch
 msgid "branch"
-msgstr ""
+msgstr "şube"

From e72d2c5708c3466cd49d2373a41f54ec934acd11 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 18:37:27 +0000
Subject: [PATCH 305/631] Translated using Weblate (Turkish)

Currently translated at 100.0% (65 of 65 strings)

Translation: field-service-14.0/field-service-14.0-fieldservice_route
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_route/tr/
---
 fieldservice_route/i18n/tr.po | 122 +++++++++++++++++-----------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/fieldservice_route/i18n/tr.po b/fieldservice_route/i18n/tr.po
index 67fc0f258a..64a976cf88 100644
--- a/fieldservice_route/i18n/tr.po
+++ b/fieldservice_route/i18n/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-07-09 18:31+0000\n"
+"PO-Revision-Date: 2021-07-09 18:49+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\n"
@@ -44,42 +44,42 @@ msgstr "Siparişi İptal Et"
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "Capacity"
-msgstr ""
+msgstr "Kapasite"
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
 msgid "Complete order"
-msgstr ""
+msgstr "Siparişi Tamamla"
 
 #. module: fieldservice_route
 #: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_day
 msgid "Create a Route Day."
-msgstr ""
+msgstr "Bir Rota Günü Oluşturun."
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_uid
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_uid
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Oluşturan"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__create_date
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__create_date
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Oluşturulma"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__dayroute_id
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
 msgid "Day Route"
-msgstr ""
+msgstr "Gün Rotası"
 
 #. module: fieldservice_route
 #: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_dayroute
@@ -93,17 +93,17 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_pivot_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_tree
 msgid "Day Routes"
-msgstr ""
+msgstr "Gün Rotaları"
 
 #. module: fieldservice_route
 #: model_terms:ir.actions.act_window,help:fieldservice_route.action_fsm_route_dayroute_report
 msgid "Day Routes Report"
-msgstr ""
+msgstr "Gün Rota Raporları"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__day_ids
 msgid "Days"
-msgstr ""
+msgstr "Gün"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__display_name
@@ -112,42 +112,42 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__display_name
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Görünüm Adı"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__end_location_id
 msgid "End Location"
-msgstr ""
+msgstr "Bitiş Konumu"
 
 #. module: fieldservice_route
 #: model:ir.model,name:fieldservice_route.model_fsm_location
 msgid "Field Service Location"
-msgstr ""
+msgstr "Saha Servis Konumu"
 
 #. module: fieldservice_route
 #: model:ir.model,name:fieldservice_route.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Saha Servis Siparişi"
 
 #. module: fieldservice_route
 #: model:ir.model,name:fieldservice_route.model_fsm_route
 msgid "Field Service Route"
-msgstr ""
+msgstr "Saha Hizmet Rotası"
 
 #. module: fieldservice_route
 #: model:ir.model,name:fieldservice_route.model_fsm_route_dayroute
 msgid "Field Service Route Dayroute"
-msgstr ""
+msgstr "Saha Servis Günlük Rotası"
 
 #. module: fieldservice_route
 #: model:ir.model,name:fieldservice_route.model_fsm_stage
 msgid "Field Service Stage"
-msgstr ""
+msgstr "Saha Servis Aşaması"
 
 #. module: fieldservice_route
 #: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__friday
 msgid "Friday"
-msgstr ""
+msgstr "Cuma"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__id
@@ -157,12 +157,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__id
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__last_location_id
 msgid "Last Location"
-msgstr ""
+msgstr "Son Konum"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location____last_update
@@ -172,73 +172,73 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute____last_update
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Son Düzenlenme"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_uid
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_uid
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "Son Güncelleyen"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__write_date
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__write_date
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "Son Güncellenme"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__latitude
 msgid "Latitude"
-msgstr ""
+msgstr "Enlem"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__longitude
 msgid "Longitude"
-msgstr ""
+msgstr "Boylam"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_allow_time
 msgid "Maximal Allowable Time (in hours)"
-msgstr ""
+msgstr "İzin Verilen Maksimum Süre (saat olarak)"
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "Maximum"
-msgstr ""
+msgstr "Maksimum"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__max_order
 msgid "Maximum Capacity"
-msgstr ""
+msgstr "Maksimum Kapasite"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__max_order
 msgid "Maximum Orders"
-msgstr ""
+msgstr "Maksimum sipariş"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,help:fieldservice_route.field_fsm_route__max_order
 msgid "Maximum number of orders per day route."
-msgstr ""
+msgstr "Günlük rota başına maksimum sipariş sayısı."
 
 #. module: fieldservice_route
 #: model:ir.model.fields,help:fieldservice_route.field_fsm_route_dayroute__max_order
 msgid "Maximum numbers of orders that can be added to this day route."
-msgstr ""
+msgstr "Bu günlük rotaya eklenebilecek maksimum sipariş sayısı."
 
 #. module: fieldservice_route
 #: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__monday
 msgid "Monday"
-msgstr ""
+msgstr "Pazartesi"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__name
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_day__name
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__name
 msgid "Name"
-msgstr ""
+msgstr "Adı"
 
 #. module: fieldservice_route
 #: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
@@ -247,44 +247,44 @@ msgstr ""
 #: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
 #, python-format
 msgid "New"
-msgstr ""
+msgstr "Yeni"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_count
 msgid "Number of Orders"
-msgstr ""
+msgstr "Sipariş Sayısı"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_order__display_name
 msgid "Order"
-msgstr ""
+msgstr "Sipariş"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__order_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
 msgid "Orders"
-msgstr ""
+msgstr "Siparişler"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route__fsm_person_id
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__person_id
 msgid "Person"
-msgstr ""
+msgstr "Personel"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__date_start_planned
 msgid "Planned Start Time"
-msgstr ""
+msgstr "Planlanan Başlangıç Zamanı"
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
 msgid "Planning"
-msgstr ""
+msgstr "Planlama"
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
 msgid "Positioning"
-msgstr ""
+msgstr "Konumlandırma"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_location__fsm_route_id
@@ -293,7 +293,7 @@ msgstr ""
 #: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_stage__stage_type__route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "Route"
-msgstr ""
+msgstr "Rota"
 
 #. module: fieldservice_route
 #: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route_day
@@ -301,94 +301,94 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_day_tree_view
 msgid "Route Day"
-msgstr ""
+msgstr "Rota Gün"
 
 #. module: fieldservice_route
 #: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route_day
 msgid "Route Days"
-msgstr ""
+msgstr "Rota Günleri"
 
 #. module: fieldservice_route
 #: model:ir.actions.act_window,name:fieldservice_route.action_fsm_route
 #: model:ir.ui.menu,name:fieldservice_route.menu_fsm_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_tree
 msgid "Routes"
-msgstr ""
+msgstr "Rotalar"
 
 #. module: fieldservice_route
 #: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__saturday
 msgid "Saturday"
-msgstr ""
+msgstr "Cumartesi"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__stage_id
 msgid "Stage"
-msgstr ""
+msgstr "Aşama"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__start_location_id
 msgid "Start Location"
-msgstr ""
+msgstr "Başlama Konumu"
 
 #. module: fieldservice_route
 #: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__sunday
 msgid "Sunday"
-msgstr ""
+msgstr "Pazar"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__team_id
 msgid "Team"
-msgstr ""
+msgstr "Ekip"
 
 #. module: fieldservice_route
 #: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
 #, python-format
 msgid "The day route is exceeding the maximum number of orders of the route."
-msgstr ""
+msgstr "Günlük rota, rotanın maksimum sipariş sayısını aşıyor."
 
 #. module: fieldservice_route
 #: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
 #, python-format
 msgid "The route %s does not run on %s!"
-msgstr ""
+msgstr "%s rotası %s üzerinde çalışmıyor!"
 
 #. module: fieldservice_route
 #: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__thursday
 msgid "Thursday"
-msgstr ""
+msgstr "Perşembe"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_route_dayroute__work_time
 msgid "Time before overtime (in hours)"
-msgstr ""
+msgstr "Fazla mesai öncesi süre (saat olarak)"
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_dayroute_form
 msgid "Timing"
-msgstr ""
+msgstr "Zamanlama"
 
 #. module: fieldservice_route
 #: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__tuesday
 msgid "Tuesday"
-msgstr ""
+msgstr "Salı"
 
 #. module: fieldservice_route
 #: model:ir.model.fields,field_description:fieldservice_route.field_fsm_stage__stage_type
 msgid "Type"
-msgstr ""
+msgstr "Tür"
 
 #. module: fieldservice_route
 #: model:ir.model.fields.selection,name:fieldservice_route.selection__fsm_route_day__name__wednesday
 msgid "Wednesday"
-msgstr ""
+msgstr "Çarşamba"
 
 #. module: fieldservice_route
 #: code:addons/fieldservice_route/models/fsm_route_dayroute.py:0
 #, python-format
 msgid "You must create a FSM team first."
-msgstr ""
+msgstr "Önce bir FSM ekibi oluşturmalısınız."
 
 #. module: fieldservice_route
 #: model_terms:ir.ui.view,arch_db:fieldservice_route.fsm_route_form
 msgid "orders per day route"
-msgstr ""
+msgstr "günlük rota siparişleri"

From e0bf6d957bef7174bdb19dfdffc683d0d4eafca7 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 19:15:30 +0000
Subject: [PATCH 306/631] Added translation using Weblate (Turkish)

---
 fieldservice_account/i18n/tr.po | 97 +++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 fieldservice_account/i18n/tr.po

diff --git a/fieldservice_account/i18n/tr.po b/fieldservice_account/i18n/tr.po
new file mode 100644
index 0000000000..337fdee3b8
--- /dev/null
+++ b/fieldservice_account/i18n/tr.po
@@ -0,0 +1,97 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_account
+#
+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: tr\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_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__display_name
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_count
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_count
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__fsm_order_ids
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_count
+#: model_terms:ir.ui.view,arch_db:fieldservice_account.account_invoice_form
+#: model_terms:ir.ui.view,arch_db:fieldservice_account.invoice_search_view_fso
+msgid "FSM Orders"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model,name:fieldservice_account.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_account.vendor_bill_form_view_fso
+msgid "Field Service Orders"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_ids
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_ids
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_ids
+msgid "Field Service orders associated to this invoice"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__invoice_count
+msgid "Invoice Count"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__invoice_lines
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__invoice_ids
+msgid "Invoices"
+msgstr ""
+
+#. module: fieldservice_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_account.view_fsm_order_form_inherit_account
+msgid "Invoices/Bills"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model,name:fieldservice_account.model_account_move
+msgid "Journal Entry"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model,name:fieldservice_account.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__display_name
+msgid "Order"
+msgstr ""

From 3b62ab8f88233e859f604a1edeebb52d21e11a8c Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Fri, 9 Jul 2021 18:54:14 +0000
Subject: [PATCH 307/631] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (536 of 536 strings)

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

diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index 98b0c48db1..e329cad7b7 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-06-09 22:49+0000\n"
+"PO-Revision-Date: 2021-07-09 21:48+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_AR\n"
@@ -2111,7 +2111,7 @@ msgstr "Celular"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__my_activity_date_deadline
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__my_activity_date_deadline
 msgid "My Activity Deadline"
-msgstr ""
+msgstr "Mi Plazo de Actividad"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view

From 02781df50c098e8924332b71efc50df6f1ee239f Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 19:08:55 +0000
Subject: [PATCH 308/631] Translated using Weblate (Turkish)

Currently translated at 60.2% (323 of 536 strings)

Translation: field-service-14.0/field-service-14.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice/tr/
---
 fieldservice/i18n/tr.po | 49 +++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/fieldservice/i18n/tr.po b/fieldservice/i18n/tr.po
index 8f30f49a13..a281917cf7 100644
--- a/fieldservice/i18n/tr.po
+++ b/fieldservice/i18n/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-07-09 18:49+0000\n"
+"PO-Revision-Date: 2021-07-09 21:48+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\n"
@@ -978,6 +978,9 @@ msgid ""
 "partner is a customer without access or with a limited access created for "
 "sharing data."
 msgstr ""
+"Ya müşteri (kullanıcı değil), ya paylaşılan kullanıcı. Mevcut ortağın, "
+"erişimi olmayan veya veri paylaşımı için sınırlı erişime sahip bir müşteri "
+"olduğu belirtilir."
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__email
@@ -1024,7 +1027,7 @@ msgstr "Ekipmanlar"
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_report_equipment
 msgid "Equipments Report"
-msgstr ""
+msgstr "Ekipman Raporu"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
@@ -1041,7 +1044,7 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
 msgid "FS Order #"
-msgstr ""
+msgstr "FS Sipariş #"
 
 #. module: fieldservice
 #: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order_type__internal_type__fsm
@@ -1183,7 +1186,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_position_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_position_id
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Mali Pozisyon"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__fold
@@ -1492,6 +1495,8 @@ msgid ""
 "Invoice & Delivery addresses are used in sales orders. Private addresses are "
 "only visible by authorized users."
 msgstr ""
+"Satış siparişlerinde Fatura & Teslimat adresleri kullanılmaktadır. Özel "
+"adresler yalnızca yetkili kullanıcılar tarafından görülebilir."
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_account
@@ -1501,7 +1506,7 @@ msgstr "FSM siparişlerinizi faturalandırın"
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "Invoice your Service Orders"
-msgstr ""
+msgstr "Servis Siparişlerinizi Faturalandırın"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_ids
@@ -1527,7 +1532,7 @@ msgstr "Takipçi mi"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__is_company
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__is_company
 msgid "Is a Company"
-msgstr "Bu bir Firmamı"
+msgstr "Bu Firmamı"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fsm_location
@@ -1535,7 +1540,7 @@ msgstr "Bu bir Firmamı"
 #: model:ir.model.fields,field_description:fieldservice.field_res_partner__fsm_location
 #: model:ir.model.fields,field_description:fieldservice.field_res_users__fsm_location
 msgid "Is a FS Location"
-msgstr "Bir FS Konumu mu"
+msgstr "FS Konumu"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fsm_person
@@ -1543,7 +1548,7 @@ msgstr "Bir FS Konumu mu"
 #: model:ir.model.fields,field_description:fieldservice.field_res_partner__fsm_person
 #: model:ir.model.fields,field_description:fieldservice.field_res_users__fsm_person
 msgid "Is a FS Worker"
-msgstr "FS Çalışanı mı"
+msgstr "FS Çalışanı"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__is_closed
@@ -1942,12 +1947,12 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "Manage recurring orders"
-msgstr ""
+msgstr "Yinelenen siparişleri yönetin"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_route
 msgid "Manage routes"
-msgstr ""
+msgstr "Rotaları Yönet"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
@@ -1983,7 +1988,7 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "Manage templates"
-msgstr ""
+msgstr "Şablonları Yönet"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
@@ -2349,17 +2354,17 @@ msgstr "Sipariş Sayısı"
 #. module: fieldservice
 #: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_report_order
 msgid "Orders Reports."
-msgstr ""
+msgstr "Sipariş Raporları."
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__order_need_assign_count
 msgid "Orders to Assign"
-msgstr ""
+msgstr "Atanacak Siparişler"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__order_need_schedule_count
 msgid "Orders to Schedule"
-msgstr ""
+msgstr "Planlanacak Siparişler"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
@@ -2369,7 +2374,7 @@ msgstr "Diğer"
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
 msgid "Owned By"
-msgstr ""
+msgstr "Sahibi"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_ids
@@ -2479,7 +2484,7 @@ msgstr "Fiyat Listesi"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__territory_manager_id
 #: model:ir.model.fields,field_description:fieldservice.field_res_territory__person_id
 msgid "Primary Assignment"
-msgstr ""
+msgstr "Birinci Atama"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contact_id
@@ -2492,7 +2497,7 @@ msgstr "Birincil Kontak"
 #: model:ir.model.fields,field_description:fieldservice.field_res_partner__service_location_id
 #: model:ir.model.fields,field_description:fieldservice.field_res_users__service_location_id
 msgid "Primary Service Location"
-msgstr ""
+msgstr "Birinci Servi Konumu"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__priority
@@ -2548,13 +2553,13 @@ msgstr "İlişkili Şirket"
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owner_id
 msgid "Related Owner"
-msgstr ""
+msgstr "İlişkili Sahibi"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_id
 msgid "Related Partner"
-msgstr ""
+msgstr "İlişkili İş Ortağı"
 
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
@@ -2651,7 +2656,7 @@ msgstr ""
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
 msgid "Search FSM Location"
-msgstr ""
+msgstr "FSM Konumunu Ara"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_search_view
@@ -2827,7 +2832,7 @@ msgstr "Aşamalar"
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
 msgid "State"
-msgstr ""
+msgstr "İl/Eyalet"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_state
@@ -3077,7 +3082,7 @@ msgstr "Başlık"
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "To Assign"
-msgstr ""
+msgstr "Atama"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view

From 61d86875a6ad5224ee353689b5db52fb6e663941 Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Fri, 9 Jul 2021 19:00:06 +0000
Subject: [PATCH 309/631] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (25 of 25 strings)

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

diff --git a/fieldservice_account_analytic/i18n/es_AR.po b/fieldservice_account_analytic/i18n/es_AR.po
index 548dff7817..b229a143e8 100644
--- a/fieldservice_account_analytic/i18n/es_AR.po
+++ b/fieldservice_account_analytic/i18n/es_AR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-09-10 08:00+0000\n"
+"PO-Revision-Date: 2021-07-09 21:48+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 3.10\n"
+"X-Generator: Weblate 4.3.2\n"
 
 #. module: fieldservice_account_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
@@ -80,7 +80,7 @@ msgstr "Cliente"
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__display_name
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Mostrar Nombre"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
@@ -123,12 +123,12 @@ msgstr "Filtrar la Ubicación por Contacto en un Pedido FSM"
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__id
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
 msgid "Journal Item"
-msgstr ""
+msgstr "Apunte Contable"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line____last_update
@@ -139,7 +139,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company____last_update
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Última Modificación el"
 
 #. module: fieldservice_account_analytic
 #: code:addons/fieldservice_account_analytic/models/account_move.py:0
@@ -151,7 +151,7 @@ msgstr "No hay una cuenta analítica establecida en la Ubicación del pedido."
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__display_name
 msgid "Order"
-msgstr ""
+msgstr "Pedido"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id

From 7cb2ddd0a4c01190d45f3939a20d7113064d6474 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 19:22:33 +0000
Subject: [PATCH 310/631] Translated using Weblate (Turkish)

Currently translated at 76.0% (19 of 25 strings)

Translation: field-service-14.0/field-service-14.0-fieldservice_account_analytic
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_account_analytic/tr/
---
 fieldservice_account_analytic/i18n/tr.po | 42 +++++++++++++-----------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/fieldservice_account_analytic/i18n/tr.po b/fieldservice_account_analytic/i18n/tr.po
index 9008fcd464..e0fa2a1d4c 100644
--- a/fieldservice_account_analytic/i18n/tr.po
+++ b/fieldservice_account_analytic/i18n/tr.po
@@ -6,39 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2021-07-09 21:48+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\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_account_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_order_form_analytic
 msgid "Accounting"
-msgstr ""
+msgstr "Muhasebe"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__analytic_account_id
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitik Hesap"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Analitik Satır"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__contact
 msgid "Bill Contact"
-msgstr ""
+msgstr "Fatura Kontak"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__location
 msgid "Bill Location"
-msgstr ""
+msgstr "Fatura Konum"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
@@ -53,22 +55,22 @@ msgstr ""
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Şirketler"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Yapılandırma Ayarları"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
-msgstr ""
+msgstr "Kontak"
 
 #. module: fieldservice_account_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_search_view_analytic
 msgid "Customer"
-msgstr ""
+msgstr "Müşteri"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__display_name
@@ -78,27 +80,27 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__display_name
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Görünüm Adı"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
-msgstr ""
+msgstr "FSM Siparişi"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
 msgid "FSM Record Conversion"
-msgstr ""
+msgstr "FSM Kayıt Dönüştürme"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_location
 msgid "Field Service Location"
-msgstr ""
+msgstr "Saha Servis Konumu"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Saha Servis Siparişi"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__fsm_filter_location_by_contact
@@ -121,12 +123,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company__id
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
 msgid "Journal Item"
-msgstr ""
+msgstr "Yevmiye Öğesi"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line____last_update
@@ -137,7 +139,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_company____last_update
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_res_config_settings____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Son Düzenlenme"
 
 #. module: fieldservice_account_analytic
 #: code:addons/fieldservice_account_analytic/models/account_move.py:0
@@ -149,7 +151,7 @@ msgstr ""
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__display_name
 msgid "Order"
-msgstr ""
+msgstr "Sipariş"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
@@ -159,4 +161,4 @@ msgstr ""
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
 msgid "Total Cost"
-msgstr ""
+msgstr "Toplam Tutar"

From e67876b1225901a0336316781d605aca466434c3 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 19:21:52 +0000
Subject: [PATCH 311/631] Translated using Weblate (Turkish)

Currently translated at 100.0% (14 of 14 strings)

Translation: field-service-14.0/field-service-14.0-fieldservice_account
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_account/tr/
---
 fieldservice_account/i18n/tr.po | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/fieldservice_account/i18n/tr.po b/fieldservice_account/i18n/tr.po
index 337fdee3b8..62093a1cbf 100644
--- a/fieldservice_account/i18n/tr.po
+++ b/fieldservice_account/i18n/tr.po
@@ -6,19 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2021-07-09 21:48+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\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_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__display_name
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Görünüm Adı"
 
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_count
@@ -28,70 +30,70 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.account_invoice_form
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.invoice_search_view_fso
 msgid "FSM Orders"
-msgstr ""
+msgstr "FSM Siparişleri"
 
 #. module: fieldservice_account
 #: model:ir.model,name:fieldservice_account.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Saha Servis Siparişi"
 
 #. module: fieldservice_account
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.vendor_bill_form_view_fso
 msgid "Field Service Orders"
-msgstr ""
+msgstr "Saha Servis Siparişleri"
 
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_ids
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_ids
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_ids
 msgid "Field Service orders associated to this invoice"
-msgstr ""
+msgstr "Bu faturayla ilişkili Saha Servisi siparişleri"
 
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__id
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__id
 #: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__invoice_count
 msgid "Invoice Count"
-msgstr ""
+msgstr "Fatura Sayısı"
 
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__invoice_lines
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Fatura Satırları"
 
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__invoice_ids
 msgid "Invoices"
-msgstr ""
+msgstr "Faturalar"
 
 #. module: fieldservice_account
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.view_fsm_order_form_inherit_account
 msgid "Invoices/Bills"
-msgstr ""
+msgstr "M Faturalar/ T Faturalar"
 
 #. module: fieldservice_account
 #: model:ir.model,name:fieldservice_account.model_account_move
 msgid "Journal Entry"
-msgstr ""
+msgstr "Yevmiye Girişi"
 
 #. module: fieldservice_account
 #: model:ir.model,name:fieldservice_account.model_account_move_line
 msgid "Journal Item"
-msgstr ""
+msgstr "Yevmiye Öğesi"
 
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move____last_update
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line____last_update
 #: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Son Düzenlenme"
 
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__display_name
 msgid "Order"
-msgstr ""
+msgstr "Sipariş"

From 252c0b2fb4f210efc024079f8faaa140a9cf3316 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Fri, 9 Jul 2021 22:27:04 +0000
Subject: [PATCH 312/631] [UPD] Update fieldservice.pot

---
 fieldservice/i18n/fieldservice.pot | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/fieldservice/i18n/fieldservice.pot b/fieldservice/i18n/fieldservice.pot
index b73f52da80..a182c1493f 100644
--- a/fieldservice/i18n/fieldservice.pot
+++ b/fieldservice/i18n/fieldservice.pot
@@ -818,6 +818,12 @@ msgstr ""
 msgid "Current Location"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_customer
+msgid "Customer Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
@@ -2036,6 +2042,12 @@ msgstr ""
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
@@ -2688,7 +2700,9 @@ msgstr ""
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -2838,6 +2852,12 @@ msgid ""
 "Planned: Future activities."
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn
+msgid "Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
@@ -2992,6 +3012,20 @@ msgid ""
 "the invoices & payments matching was performed."
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_customer
+msgid ""
+"The stock location used as destination when sending goods to this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_supplier
+msgid ""
+"The stock location used as source when receiving goods from this contact."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
 msgid "The worker is already linked to this location."
@@ -3251,6 +3285,12 @@ msgstr ""
 msgid "Vehicles"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_supplier
+msgid "Vendor Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id

From 59267b2ca5311c726eba824f1ef733749033a4ca Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Fri, 9 Jul 2021 22:27:08 +0000
Subject: [PATCH 313/631] [UPD] Update fieldservice_stock.pot

---
 .../i18n/fieldservice_stock.pot               | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/fieldservice_stock/i18n/fieldservice_stock.pot b/fieldservice_stock/i18n/fieldservice_stock.pot
index 8e5a953614..faaec04a3e 100644
--- a/fieldservice_stock/i18n/fieldservice_stock.pot
+++ b/fieldservice_stock/i18n/fieldservice_stock.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 13.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -28,6 +28,17 @@ msgstr ""
 msgid "Delivery Orders"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_wizard__display_name
+#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group__display_name
+#: model:ir.model.fields,field_description:fieldservice_stock.field_res_territory__display_name
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move__display_name
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking__display_name
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_rule__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Done Quantity"
@@ -51,6 +62,18 @@ msgstr ""
 msgid "Field Service Order"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_wizard__id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group__id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_res_territory__id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move__id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking__id
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_rule__id
+msgid "ID"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.ui.menu,name:fieldservice_stock.menu_fsm_stock_inventory
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
@@ -63,6 +86,18 @@ msgstr ""
 msgid "Inventory Location"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_wizard____last_update
+#: model:ir.model.fields,field_description:fieldservice_stock.field_procurement_group____last_update
+#: model:ir.model.fields,field_description:fieldservice_stock.field_res_territory____last_update
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_move____last_update
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_picking____last_update
+#: model:ir.model.fields,field_description:fieldservice_stock.field_stock_rule____last_update
+msgid "Last Modified on"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_stock.view_fsm_order_form_inherit_stock
 msgid "Moves"
@@ -73,6 +108,11 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
+#. module: fieldservice_stock
+#: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_stock
 #: model:ir.model,name:fieldservice_stock.model_procurement_group
 #: model:ir.model.fields,field_description:fieldservice_stock.field_fsm_order__procurement_group_id

From 9491303979a61ad791c9f1fcf5aae4586bd01caf Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 9 Jul 2021 22:31:30 +0000
Subject: [PATCH 314/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index edda4dcf1d..d5528ebb8a 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ addon | version | summary
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
 [fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills
+[fieldservice_stock](fieldservice_stock/) | 14.0.1.0.0 | Integrate the logistics operations with Field Service
 [fieldservice_timeline](fieldservice_timeline/) | 14.0.1.1.1 | This module is a display timeline view of the Field Service order in Odoo.
 
 [//]: # (end addons)

From 3b88b7decfa5b0f984bd93074aaa2157faa4179b Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 9 Jul 2021 22:31:36 +0000
Subject: [PATCH 315/631] [UPD] README.rst

---
 fieldservice_stock/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_stock/static/description/index.html b/fieldservice_stock/static/description/index.html
index 02b650895c..a078fd0095 100644
--- a/fieldservice_stock/static/description/index.html
+++ b/fieldservice_stock/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: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Field Service - Stock</title>
 <style type="text/css">
 

From 0a69e74f27c87b7f65844270e301a356269bd894 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 9 Jul 2021 22:31:38 +0000
Subject: [PATCH 316/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index c047fb414c..5b183e0ecb 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210708.0
\ No newline at end of file
+14.0.20210709.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index e23b0a1a70..dd7ee9d2ff 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -16,6 +16,7 @@
         'odoo14-addon-fieldservice_project',
         'odoo14-addon-fieldservice_route',
         'odoo14-addon-fieldservice_skill',
+        'odoo14-addon-fieldservice_stock',
         'odoo14-addon-fieldservice_timeline',
     ],
     classifiers=[

From f3d82bf917245f75202300cb8a6c1a83c45cc90f Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Fri, 9 Jul 2021 22:32:10 +0000
Subject: [PATCH 317/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-14.0/field-service-14.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice/
---
 fieldservice/i18n/de.po    | 40 ++++++++++++++++++++++
 fieldservice/i18n/es.po    | 68 ++++++++++++++++++++++++--------------
 fieldservice/i18n/es_AR.po | 40 ++++++++++++++++++++++
 fieldservice/i18n/es_CL.po | 68 ++++++++++++++++++++++++--------------
 fieldservice/i18n/fr.po    | 40 ++++++++++++++++++++++
 fieldservice/i18n/fr_FR.po | 40 ++++++++++++++++++++++
 fieldservice/i18n/pt_BR.po | 66 +++++++++++++++++++++++-------------
 fieldservice/i18n/tr.po    | 40 ++++++++++++++++++++++
 8 files changed, 331 insertions(+), 71 deletions(-)

diff --git a/fieldservice/i18n/de.po b/fieldservice/i18n/de.po
index 5d90affae5..e61d25c599 100644
--- a/fieldservice/i18n/de.po
+++ b/fieldservice/i18n/de.po
@@ -824,6 +824,12 @@ msgstr ""
 msgid "Current Location"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_customer
+msgid "Customer Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
@@ -2049,6 +2055,12 @@ msgstr ""
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
@@ -2700,7 +2712,9 @@ msgstr ""
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -2850,6 +2864,12 @@ msgid ""
 "Planned: Future activities."
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn
+msgid "Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
@@ -3004,6 +3024,20 @@ msgid ""
 "the invoices & payments matching was performed."
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_customer
+msgid ""
+"The stock location used as destination when sending goods to this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_supplier
+msgid ""
+"The stock location used as source when receiving goods from this contact."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
 msgid "The worker is already linked to this location."
@@ -3263,6 +3297,12 @@ msgstr ""
 msgid "Vehicles"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_supplier
+msgid "Vendor Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id
diff --git a/fieldservice/i18n/es.po b/fieldservice/i18n/es.po
index 500f926099..5599a203b8 100644
--- a/fieldservice/i18n/es.po
+++ b/fieldservice/i18n/es.po
@@ -840,6 +840,12 @@ msgstr "Fecha Actual"
 msgid "Current Location"
 msgstr "Ubicación Actual"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_customer
+msgid "Customer Location"
+msgstr "Ubicación del Cliente"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
@@ -2080,6 +2086,12 @@ msgstr "Error de Mensaje de Entrega"
 msgid "Message for Invoice"
 msgstr "Mensaje para factura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr "Mensaje para Despacho"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
@@ -2736,7 +2748,9 @@ msgstr ""
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -2894,6 +2908,12 @@ msgstr ""
 "Hoy: la fecha de actividad es hoy\n"
 "Planificado: Actividades futuras."
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn
+msgid "Stock Picking"
+msgstr "Despacho"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
@@ -3054,6 +3074,24 @@ msgstr ""
 "El socio tiene al menos un débito y crédito no conciliado desde la última "
 "vez que se realizó la conciliación de facturas y pagos."
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_customer
+msgid ""
+"The stock location used as destination when sending goods to this contact."
+msgstr ""
+"La ubicación de stock utilizada como destino al enviar mercancías a este "
+"contacto."
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_supplier
+msgid ""
+"The stock location used as source when receiving goods from this contact."
+msgstr ""
+"La ubicación de stock utilizada como fuente al recibir productos de este "
+"contacto."
+
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
 msgid "The worker is already linked to this location."
@@ -3325,6 +3363,12 @@ msgstr "Campo de utilidad para expresar la cantidad de moneda"
 msgid "Vehicles"
 msgstr "Vehículos"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_supplier
+msgid "Vendor Location"
+msgstr "Ubicación de Proveedor"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id
@@ -3528,9 +3572,6 @@ msgstr "plantillas"
 #~ msgid "Create a schedule."
 #~ msgstr "Crea un horario."
 
-#~ msgid "Customer Location"
-#~ msgstr "Ubicación del Cliente"
-
 #~ msgid "Definition"
 #~ msgstr "Definición"
 
@@ -3576,9 +3617,6 @@ msgstr "plantillas"
 #~ msgid "Message for Sales Order"
 #~ msgstr "Mensaje para Pedido de Venta"
 
-#~ msgid "Message for Stock Picking"
-#~ msgstr "Mensaje para Despacho"
-
 #~ msgid "Overdue"
 #~ msgstr "Atrasado"
 
@@ -3634,9 +3672,6 @@ msgstr "plantillas"
 #~ msgid "State Names"
 #~ msgstr "Nombre de Estado"
 
-#~ msgid "Stock Picking"
-#~ msgstr "Despacho"
-
 #~ msgid "Supplier Currency"
 #~ msgstr "Moneda de Proveedor"
 
@@ -3652,18 +3687,6 @@ msgstr "plantillas"
 #~ "se usa para elegir y representar valores de fecha y hora: la zona horaria "
 #~ "de su computadora."
 
-#~ msgid ""
-#~ "The stock location used as destination when sending goods to this contact."
-#~ msgstr ""
-#~ "La ubicación de stock utilizada como destino al enviar mercancías a este "
-#~ "contacto."
-
-#~ msgid ""
-#~ "The stock location used as source when receiving goods from this contact."
-#~ msgstr ""
-#~ "La ubicación de stock utilizada como fuente al recibir productos de este "
-#~ "contacto."
-
 #~ msgid ""
 #~ "This currency will be used, instead of the default one, for purchases "
 #~ "from the current partner"
@@ -3696,9 +3719,6 @@ msgstr "plantillas"
 #~ "Utilizado por las aplicaciones de ventas y compras para seleccionar la "
 #~ "dirección relevante según el contexto."
 
-#~ msgid "Vendor Location"
-#~ msgstr "Ubicación de Proveedor"
-
 #~ msgid "ZIP Codes"
 #~ msgstr "Código Postal"
 
diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index e329cad7b7..375cefc364 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -841,6 +841,12 @@ msgstr "Fecha Actual"
 msgid "Current Location"
 msgstr "Ubicación Actual"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_customer
+msgid "Customer Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
@@ -2088,6 +2094,12 @@ msgstr "Error de Mensaje de Entrega"
 msgid "Message for Invoice"
 msgstr "Mensaje para Factura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
@@ -2743,7 +2755,9 @@ msgstr ""
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -2901,6 +2915,12 @@ msgstr ""
 "Hoy: la fecha de actividad es hoy\n"
 "Planificado: Actividades futuras."
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn
+msgid "Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
@@ -3060,6 +3080,20 @@ msgstr ""
 "El socio tiene al menos un débito y crédito no conciliados desde la última "
 "vez que se realizó la conciliación de facturas y pagos."
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_customer
+msgid ""
+"The stock location used as destination when sending goods to this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_supplier
+msgid ""
+"The stock location used as source when receiving goods from this contact."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
 msgid "The worker is already linked to this location."
@@ -3334,6 +3368,12 @@ msgstr "Campo de utilidad para expresar la cantidad de moneda"
 msgid "Vehicles"
 msgstr "Vehículos"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_supplier
+msgid "Vendor Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id
diff --git a/fieldservice/i18n/es_CL.po b/fieldservice/i18n/es_CL.po
index 67f587c711..82c111e765 100644
--- a/fieldservice/i18n/es_CL.po
+++ b/fieldservice/i18n/es_CL.po
@@ -840,6 +840,12 @@ msgstr "Fecha Actual"
 msgid "Current Location"
 msgstr "Ubicación Actual"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_customer
+msgid "Customer Location"
+msgstr "Ubicación del Cliente"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
@@ -2080,6 +2086,12 @@ msgstr "Error de Mensaje de Entrega"
 msgid "Message for Invoice"
 msgstr "Mensaje para factura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr "Mensaje para Despacho"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
@@ -2736,7 +2748,9 @@ msgstr ""
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -2894,6 +2908,12 @@ msgstr ""
 "Hoy: la fecha de actividad es hoy\n"
 "Planificado: Actividades futuras."
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn
+msgid "Stock Picking"
+msgstr "Despacho"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
@@ -3054,6 +3074,24 @@ msgstr ""
 "El socio tiene al menos un débito y crédito no conciliado desde la última "
 "vez que se realizó la conciliación de facturas y pagos."
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_customer
+msgid ""
+"The stock location used as destination when sending goods to this contact."
+msgstr ""
+"La ubicación de stock utilizada como destino al enviar mercancías a este "
+"contacto."
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_supplier
+msgid ""
+"The stock location used as source when receiving goods from this contact."
+msgstr ""
+"La ubicación de stock utilizada como fuente al recibir productos de este "
+"contacto."
+
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
 msgid "The worker is already linked to this location."
@@ -3325,6 +3363,12 @@ msgstr "Campo de utilidad para expresar la cantidad de moneda"
 msgid "Vehicles"
 msgstr "Vehículos"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_supplier
+msgid "Vendor Location"
+msgstr "Ubicación de Proveedor"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id
@@ -3528,9 +3572,6 @@ msgstr "plantillas"
 #~ msgid "Create a schedule."
 #~ msgstr "Crea un horario."
 
-#~ msgid "Customer Location"
-#~ msgstr "Ubicación del Cliente"
-
 #~ msgid "Definition"
 #~ msgstr "Definición"
 
@@ -3576,9 +3617,6 @@ msgstr "plantillas"
 #~ msgid "Message for Sales Order"
 #~ msgstr "Mensaje para Pedido de Venta"
 
-#~ msgid "Message for Stock Picking"
-#~ msgstr "Mensaje para Despacho"
-
 #~ msgid "Overdue"
 #~ msgstr "Atrasado"
 
@@ -3634,9 +3672,6 @@ msgstr "plantillas"
 #~ msgid "State Names"
 #~ msgstr "Nombre de Estado"
 
-#~ msgid "Stock Picking"
-#~ msgstr "Despacho"
-
 #~ msgid "Supplier Currency"
 #~ msgstr "Moneda de Proveedor"
 
@@ -3652,18 +3687,6 @@ msgstr "plantillas"
 #~ "se usa para elegir y representar valores de fecha y hora: la zona horaria "
 #~ "de su computadora."
 
-#~ msgid ""
-#~ "The stock location used as destination when sending goods to this contact."
-#~ msgstr ""
-#~ "La ubicación de stock utilizada como destino al enviar mercancías a este "
-#~ "contacto."
-
-#~ msgid ""
-#~ "The stock location used as source when receiving goods from this contact."
-#~ msgstr ""
-#~ "La ubicación de stock utilizada como fuente al recibir productos de este "
-#~ "contacto."
-
 #~ msgid ""
 #~ "This currency will be used, instead of the default one, for purchases "
 #~ "from the current partner"
@@ -3696,9 +3719,6 @@ msgstr "plantillas"
 #~ "Utilizado por las aplicaciones de ventas y compras para seleccionar la "
 #~ "dirección relevante según el contexto."
 
-#~ msgid "Vendor Location"
-#~ msgstr "Ubicación de Proveedor"
-
 #~ msgid "ZIP Codes"
 #~ msgstr "Código Postal"
 
diff --git a/fieldservice/i18n/fr.po b/fieldservice/i18n/fr.po
index 128c88eefc..2932070776 100644
--- a/fieldservice/i18n/fr.po
+++ b/fieldservice/i18n/fr.po
@@ -841,6 +841,12 @@ msgstr "Date du jour"
 msgid "Current Location"
 msgstr "Lieu actuel"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_customer
+msgid "Customer Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
@@ -2100,6 +2106,12 @@ msgstr "Erreur de livraison du message"
 msgid "Message for Invoice"
 msgstr "Message pour la facturation"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
@@ -2752,7 +2764,9 @@ msgstr ""
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -2910,6 +2924,12 @@ msgstr ""
 "Aujourd'hui : La date de l'activité est aujourd'hui\n"
 "Planifié : Activités futures."
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn
+msgid "Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
@@ -3070,6 +3090,20 @@ msgstr ""
 "dernière fois que le rapprochement des factures et des paiements a été "
 "effectué."
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_customer
+msgid ""
+"The stock location used as destination when sending goods to this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_supplier
+msgid ""
+"The stock location used as source when receiving goods from this contact."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
 msgid "The worker is already linked to this location."
@@ -3343,6 +3377,12 @@ msgstr "Champ utilitaire pour exprimer la devise du montant"
 msgid "Vehicles"
 msgstr "Véhicules"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_supplier
+msgid "Vendor Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id
diff --git a/fieldservice/i18n/fr_FR.po b/fieldservice/i18n/fr_FR.po
index 7d9ed32324..58b0cb5fe1 100644
--- a/fieldservice/i18n/fr_FR.po
+++ b/fieldservice/i18n/fr_FR.po
@@ -844,6 +844,12 @@ msgstr "Date du jour"
 msgid "Current Location"
 msgstr "Lieu actuel"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_customer
+msgid "Customer Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
@@ -2097,6 +2103,12 @@ msgstr "Erreur de livraison du message"
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
@@ -2749,7 +2761,9 @@ msgstr ""
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -2903,6 +2917,12 @@ msgstr ""
 "Aujourd'hui : La date de l'activité est aujourd'hui\n"
 "Planifié : Activités futures."
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn
+msgid "Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
@@ -3059,6 +3079,20 @@ msgid ""
 "the invoices & payments matching was performed."
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_customer
+msgid ""
+"The stock location used as destination when sending goods to this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_supplier
+msgid ""
+"The stock location used as source when receiving goods from this contact."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
 msgid "The worker is already linked to this location."
@@ -3322,6 +3356,12 @@ msgstr ""
 msgid "Vehicles"
 msgstr "Véhicules"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_supplier
+msgid "Vendor Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id
diff --git a/fieldservice/i18n/pt_BR.po b/fieldservice/i18n/pt_BR.po
index cc6d7803f2..6a966e9161 100644
--- a/fieldservice/i18n/pt_BR.po
+++ b/fieldservice/i18n/pt_BR.po
@@ -835,6 +835,12 @@ msgstr "Data atual"
 msgid "Current Location"
 msgstr "Localização Atual"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_customer
+msgid "Customer Location"
+msgstr "Local do Cliente"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
@@ -2082,6 +2088,12 @@ msgstr "Erro de entrega de Mensagem"
 msgid "Message for Invoice"
 msgstr "Mensagem para Fatura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr "Mensagem para Separação de Estoque"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
@@ -2737,7 +2749,9 @@ msgstr ""
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -2894,6 +2908,12 @@ msgstr ""
 "Hoje: Data de atividade é hoje\n"
 "Planejado: Atividades futuras."
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn
+msgid "Stock Picking"
+msgstr "Separação de Estoque"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
@@ -3053,6 +3073,23 @@ msgstr ""
 "O parceiro tem pelo menos um débito e um crédito não reconciliados desde a "
 "última vez em que a conciliação de faturas e pagamentos foi realizada."
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_customer
+msgid ""
+"The stock location used as destination when sending goods to this contact."
+msgstr ""
+"O local de estoque usado como destino ao enviar mercadorias para este "
+"contato."
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_supplier
+msgid ""
+"The stock location used as source when receiving goods from this contact."
+msgstr ""
+"O local de estoque usado como fonte ao receber mercadorias deste contato."
+
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
 msgid "The worker is already linked to this location."
@@ -3326,6 +3363,12 @@ msgstr "Campo Utilitário para expressar o valor da moeda"
 msgid "Vehicles"
 msgstr "Veículos"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_supplier
+msgid "Vendor Location"
+msgstr "Localização de Fornecedor"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id
@@ -3537,9 +3580,6 @@ msgstr "modelos"
 #~ msgid "Create a schedule."
 #~ msgstr "Crie um cronograma."
 
-#~ msgid "Customer Location"
-#~ msgstr "Local do Cliente"
-
 #~ msgid "Definition"
 #~ msgstr "Definição"
 
@@ -3576,9 +3616,6 @@ msgstr "modelos"
 #~ msgid "Message for Sales Order"
 #~ msgstr "Mensagem para Pedido de Vendas"
 
-#~ msgid "Message for Stock Picking"
-#~ msgstr "Mensagem para Separação de Estoque"
-
 #~ msgid "Overdue"
 #~ msgstr "Vencido"
 
@@ -3624,23 +3661,9 @@ msgstr "modelos"
 #~ msgid "State Names"
 #~ msgstr "Nomes do Estado"
 
-#~ msgid "Stock Picking"
-#~ msgstr "Separação de Estoque"
-
 #~ msgid "Supplier Currency"
 #~ msgstr "Moeda do Fornecedor"
 
-#~ msgid ""
-#~ "The stock location used as destination when sending goods to this contact."
-#~ msgstr ""
-#~ "O local de estoque usado como destino ao enviar mercadorias para este "
-#~ "contato."
-
-#~ msgid ""
-#~ "The stock location used as source when receiving goods from this contact."
-#~ msgstr ""
-#~ "O local de estoque usado como fonte ao receber mercadorias deste contato."
-
 #~ msgid ""
 #~ "This field holds the image used as avatar for this contact, limited to "
 #~ "1024x1024px"
@@ -3663,9 +3686,6 @@ msgstr "modelos"
 #~ "Usado pelos aplicativos de vendas e compras para selecionar o endereço "
 #~ "relevante, dependendo do contexto."
 
-#~ msgid "Vendor Location"
-#~ msgstr "Localização de Fornecedor"
-
 #~ msgid "ZIP Codes"
 #~ msgstr "CEPs"
 
diff --git a/fieldservice/i18n/tr.po b/fieldservice/i18n/tr.po
index a281917cf7..81ceac27f6 100644
--- a/fieldservice/i18n/tr.po
+++ b/fieldservice/i18n/tr.po
@@ -820,6 +820,12 @@ msgstr "Şimdiki Tarih"
 msgid "Current Location"
 msgstr "Geçerli Konum"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_customer
+msgid "Customer Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
@@ -2046,6 +2052,12 @@ msgstr ""
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
@@ -2697,7 +2709,9 @@ msgstr ""
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -2847,6 +2861,12 @@ msgid ""
 "Planned: Future activities."
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn
+msgid "Stock Picking"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
@@ -3001,6 +3021,20 @@ msgid ""
 "the invoices & payments matching was performed."
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_customer
+msgid ""
+"The stock location used as destination when sending goods to this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_supplier
+msgid ""
+"The stock location used as source when receiving goods from this contact."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
 msgid "The worker is already linked to this location."
@@ -3260,6 +3294,12 @@ msgstr ""
 msgid "Vehicles"
 msgstr "Araçlar"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_supplier
+msgid "Vendor Location"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id

From e28198784636b31fdb00b318f3dbd903667f75f4 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Fri, 9 Jul 2021 22:49:29 +0000
Subject: [PATCH 318/631] [UPD] Update fieldservice_distribution.pot

---
 .../i18n/fieldservice_distribution.pot        | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/fieldservice_distribution/i18n/fieldservice_distribution.pot b/fieldservice_distribution/i18n/fieldservice_distribution.pot
index 7253d9283a..72dd413ce6 100644
--- a/fieldservice_distribution/i18n/fieldservice_distribution.pot
+++ b/fieldservice_distribution/i18n/fieldservice_distribution.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_distribution
+# 	* fieldservice_distribution
 #
 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"
@@ -18,6 +18,11 @@ msgstr ""
 msgid "# of distributed sub-locations"
 msgstr ""
 
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_distribution
 #: model_terms:ir.ui.view,arch_db:fieldservice_distribution.fsm_location_form_view
 msgid "Distributed To"
@@ -33,8 +38,17 @@ msgstr ""
 msgid "Field Service Location"
 msgstr ""
 
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__id
+msgid "ID"
+msgstr ""
+
 #. module: fieldservice_distribution
 #: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__is_a_distribution
 msgid "Is a Distribution"
 msgstr ""
 
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location____last_update
+msgid "Last Modified on"
+msgstr ""

From 8108889046fc74f74cffb579047bd651000cd13f Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 9 Jul 2021 22:54:12 +0000
Subject: [PATCH 319/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d5528ebb8a..4efd1fd342 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ addon | version | summary
 [fieldservice_account](fieldservice_account/) | 14.0.1.0.0 | Track invoices linked to Field Service orders
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
+[fieldservice_distribution](fieldservice_distribution/) | 14.0.1.0.0 | Manage your distribution structure
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
 [fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills

From c65786386d17664a3ad97abfaee8de460688dd78 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 9 Jul 2021 22:54:15 +0000
Subject: [PATCH 320/631] [UPD] README.rst

---
 fieldservice_distribution/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_distribution/static/description/index.html b/fieldservice_distribution/static/description/index.html
index 7899cd9f39..4c73dd510e 100644
--- a/fieldservice_distribution/static/description/index.html
+++ b/fieldservice_distribution/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: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Field Service - Distribution</title>
 <style type="text/css">
 

From d48a01b769165c819edcb908d5ee19604b9cf5b7 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 9 Jul 2021 22:54:15 +0000
Subject: [PATCH 321/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 5b183e0ecb..de52411613 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210709.0
\ No newline at end of file
+14.0.20210709.1
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index dd7ee9d2ff..fa2a096982 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -13,6 +13,7 @@
         'odoo14-addon-fieldservice_account',
         'odoo14-addon-fieldservice_account_analytic',
         'odoo14-addon-fieldservice_crm',
+        'odoo14-addon-fieldservice_distribution',
         'odoo14-addon-fieldservice_project',
         'odoo14-addon-fieldservice_route',
         'odoo14-addon-fieldservice_skill',

From 908a6549708b05220d20eb961a2dddaa9ad1abfd Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Fri, 9 Jul 2021 23:04:08 +0000
Subject: [PATCH 322/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-14.0/field-service-14.0-fieldservice_distribution
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_distribution/
---
 fieldservice_distribution/i18n/de.po | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/fieldservice_distribution/i18n/de.po b/fieldservice_distribution/i18n/de.po
index bfb39b5403..25f043b5d6 100644
--- a/fieldservice_distribution/i18n/de.po
+++ b/fieldservice_distribution/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_distribution
+# 	* fieldservice_distribution
 #
 msgid ""
 msgstr ""
@@ -21,6 +21,11 @@ msgstr ""
 msgid "# of distributed sub-locations"
 msgstr ""
 
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_distribution
 #: model_terms:ir.ui.view,arch_db:fieldservice_distribution.fsm_location_form_view
 msgid "Distributed To"
@@ -36,7 +41,17 @@ msgstr ""
 msgid "Field Service Location"
 msgstr "Field-Service-Ort"
 
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__id
+msgid "ID"
+msgstr ""
+
 #. module: fieldservice_distribution
 #: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location__is_a_distribution
 msgid "Is a Distribution"
 msgstr ""
+
+#. module: fieldservice_distribution
+#: model:ir.model.fields,field_description:fieldservice_distribution.field_fsm_location____last_update
+msgid "Last Modified on"
+msgstr ""

From 7ab210146e87ea791429ba72a5c52de9a6b362b1 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Fri, 9 Jul 2021 23:10:05 +0000
Subject: [PATCH 323/631] [UPD] Update fieldservice_isp_flow.pot

---
 .../i18n/fieldservice_isp_flow.pot            | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/fieldservice_isp_flow/i18n/fieldservice_isp_flow.pot b/fieldservice_isp_flow/i18n/fieldservice_isp_flow.pot
index cf71f11d0b..0fa1f4f616 100644
--- a/fieldservice_isp_flow/i18n/fieldservice_isp_flow.pot
+++ b/fieldservice_isp_flow/i18n/fieldservice_isp_flow.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_isp_flow
+# 	* fieldservice_isp_flow
 #
 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"
@@ -19,37 +19,39 @@ msgid "Assign"
 msgstr ""
 
 #. module: fieldservice_isp_flow
-#: code:addons/fieldservice_isp_flow/models/fsm_order.py:27
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:0
 #, python-format
 msgid "Cannot move to Assigned until 'Assigned To' is filled in"
 msgstr ""
 
 #. module: fieldservice_isp_flow
-#: code:addons/fieldservice_isp_flow/models/fsm_order.py:52
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:0
 #, python-format
 msgid "Cannot move to Complete until 'Actual End' is filled in"
 msgstr ""
 
 #. module: fieldservice_isp_flow
-#: code:addons/fieldservice_isp_flow/models/fsm_order.py:55
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:0
 #, python-format
 msgid "Cannot move to Complete until 'Resolution' is filled in"
 msgstr ""
 
 #. module: fieldservice_isp_flow
-#: code:addons/fieldservice_isp_flow/models/fsm_order.py:17
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:0
 #, python-format
 msgid "Cannot move to Requested until 'Request Workers' is filled in"
 msgstr ""
 
 #. module: fieldservice_isp_flow
-#: code:addons/fieldservice_isp_flow/models/fsm_order.py:35
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:0
 #, python-format
-msgid "Cannot move to Scheduled until both 'Assigned To' and 'Scheduled Start Date' are filled in"
+msgid ""
+"Cannot move to Scheduled until both 'Assigned To' and 'Scheduled Start Date'"
+" are filled in"
 msgstr ""
 
 #. module: fieldservice_isp_flow
-#: code:addons/fieldservice_isp_flow/models/fsm_order.py:45
+#: code:addons/fieldservice_isp_flow/models/fsm_order.py:0
 #, python-format
 msgid "Cannot move to Start until 'Actual Start' is filled in"
 msgstr ""
@@ -69,6 +71,21 @@ msgstr ""
 msgid "Field Service Order"
 msgstr ""
 
+#. module: fieldservice_isp_flow
+#: model:ir.model.fields,field_description:fieldservice_isp_flow.field_fsm_order__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model:ir.model.fields,field_description:fieldservice_isp_flow.field_fsm_order____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_isp_flow
+#: model:ir.model.fields,field_description:fieldservice_isp_flow.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_isp_flow
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_search_view
 msgid "Orders"
@@ -93,4 +110,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_flow.fsm_order_form
 msgid "Start"
 msgstr ""
-

From cbcc0b20a60031289c6e4c30dd735ca7682faef8 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 9 Jul 2021 23:14:35 +0000
Subject: [PATCH 324/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4efd1fd342..562e87ae09 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ addon | version | summary
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
 [fieldservice_distribution](fieldservice_distribution/) | 14.0.1.0.0 | Manage your distribution structure
+[fieldservice_isp_flow](fieldservice_isp_flow/) | 14.0.1.0.0 | Field Service workflow for Internet Service Providers
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
 [fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills

From 9f33c85c56969ef029adc23950591f9af2b3cd48 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 9 Jul 2021 23:14:37 +0000
Subject: [PATCH 325/631] [UPD] README.rst

---
 fieldservice_isp_flow/README.rst                    | 10 +++++-----
 fieldservice_isp_flow/static/description/index.html |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fieldservice_isp_flow/README.rst b/fieldservice_isp_flow/README.rst
index 4086b24d86..c47030f7b7 100644
--- a/fieldservice_isp_flow/README.rst
+++ b/fieldservice_isp_flow/README.rst
@@ -14,13 +14,13 @@ Field Service - Flow for ISP
     :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_isp_flow
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_isp_flow
     :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_isp_flow
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_isp_flow
     :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| 
@@ -69,7 +69,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/field-service/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_isp_flow%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_isp_flow%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.
 
@@ -117,6 +117,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-osi-scampbell| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_isp_flow>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_isp_flow>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_isp_flow/static/description/index.html b/fieldservice_isp_flow/static/description/index.html
index f7a1d6f7f8..acb1500dbf 100644
--- a/fieldservice_isp_flow/static/description/index.html
+++ b/fieldservice_isp_flow/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Flow for ISP</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_isp_flow"><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_isp_flow"><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><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_isp_flow"><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_isp_flow"><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>This module is an add-on for the Field Service application in Odoo.
 It provides default stages for orders and some validation logic when changing current stage.</p>
 <p><strong>Table of contents</strong></p>
@@ -420,7 +420,7 @@ <h1><a class="toc-backref" href="#id4">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_isp_flow%0Aversion:%2012.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_isp_flow%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">
@@ -456,7 +456,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">maintainer</a>:</p>
 <p><a class="reference external" href="https://github.com/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.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_isp_flow">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/14.0/fieldservice_isp_flow">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 8c9ddfa59773c8b4b7906db3f358c61a69b08a6d Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 9 Jul 2021 23:14:38 +0000
Subject: [PATCH 326/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index de52411613..128285832b 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210709.1
\ No newline at end of file
+14.0.20210709.2
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index fa2a096982..440932a532 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -14,6 +14,7 @@
         'odoo14-addon-fieldservice_account_analytic',
         'odoo14-addon-fieldservice_crm',
         'odoo14-addon-fieldservice_distribution',
+        'odoo14-addon-fieldservice_isp_flow',
         'odoo14-addon-fieldservice_project',
         'odoo14-addon-fieldservice_route',
         'odoo14-addon-fieldservice_skill',

From 6eff846d484d47a0ad22860280dc0dfbe46b506a Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Sat, 10 Jul 2021 15:18:28 +0000
Subject: [PATCH 327/631] [UPD] Update fieldservice.pot

---
 fieldservice/i18n/fieldservice.pot | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/fieldservice/i18n/fieldservice.pot b/fieldservice/i18n/fieldservice.pot
index a182c1493f..8d29a912f9 100644
--- a/fieldservice/i18n/fieldservice.pot
+++ b/fieldservice/i18n/fieldservice.pot
@@ -251,6 +251,12 @@ msgstr ""
 msgid "All Orders"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_all_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_all_ids
+msgid "All relations with current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
@@ -1303,6 +1309,24 @@ msgstr ""
 msgid "Has Unreconciled Entries"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_type_id
+msgid "Has relation of type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_id
+msgid "Has relation with"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_category_id
+msgid "Has relation with a partner in category"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
@@ -2566,6 +2590,18 @@ msgstr ""
 msgid "Related Partner"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_count
+msgid "Relation Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_date
+msgid "Relation valid"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
 msgid "Reporting"

From da7a2c114ebc7514243e73797b2c1837e6d22c48 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Sat, 10 Jul 2021 15:18:32 +0000
Subject: [PATCH 328/631] [UPD] Update fieldservice_partner_multi_relation.pot

---
 .../fieldservice_partner_multi_relation.pot   | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/fieldservice_partner_multi_relation/i18n/fieldservice_partner_multi_relation.pot b/fieldservice_partner_multi_relation/i18n/fieldservice_partner_multi_relation.pot
index fb907a2e08..9b98919c2a 100644
--- a/fieldservice_partner_multi_relation/i18n/fieldservice_partner_multi_relation.pot
+++ b/fieldservice_partner_multi_relation/i18n/fieldservice_partner_multi_relation.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_partner_multi_relation
+# 	* fieldservice_partner_multi_relation
 #
 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"
@@ -24,7 +24,15 @@ msgid "Contact"
 msgstr ""
 
 #. module: fieldservice_partner_multi_relation
-#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:16
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_res_partner__display_name
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_res_partner_relation_all__display_name
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_res_partner_relation_type__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:0
 #, python-format
 msgid "FSM Location"
 msgstr ""
@@ -35,25 +43,41 @@ msgid "Field Service Location"
 msgstr ""
 
 #. module: fieldservice_partner_multi_relation
-#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:102
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_res_partner__id
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_res_partner_relation_all__id
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_res_partner_relation_type__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_res_partner____last_update
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_res_partner_relation_all____last_update
+#: model:ir.model.fields,field_description:fieldservice_partner_multi_relation.field_res_partner_relation_type____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_partner_multi_relation
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:0
 #, python-format
 msgid "Left Partner not type Company"
 msgstr ""
 
 #. module: fieldservice_partner_multi_relation
-#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:105
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:0
 #, python-format
 msgid "Left Partner not type FSM Location"
 msgstr ""
 
 #. module: fieldservice_partner_multi_relation
-#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:99
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:0
 #, python-format
 msgid "Left Partner not type Person"
 msgstr ""
 
 #. module: fieldservice_partner_multi_relation
-#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:14
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:0
 #, python-format
 msgid "Organisation"
 msgstr ""
@@ -64,7 +88,7 @@ msgid "Partner Relation Type"
 msgstr ""
 
 #. module: fieldservice_partner_multi_relation
-#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:15
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_type.py:0
 #, python-format
 msgid "Person"
 msgstr ""
@@ -77,19 +101,19 @@ msgid "Relations"
 msgstr ""
 
 #. module: fieldservice_partner_multi_relation
-#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:112
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:0
 #, python-format
 msgid "Right Partner not type Company"
 msgstr ""
 
 #. module: fieldservice_partner_multi_relation
-#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:116
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:0
 #, python-format
 msgid "Right Partner not type FSM Location"
 msgstr ""
 
 #. module: fieldservice_partner_multi_relation
-#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:109
+#: code:addons/fieldservice_partner_multi_relation/models/res_partner_relation_all.py:0
 #, python-format
 msgid "Right Partner not type Person"
 msgstr ""
@@ -303,4 +327,3 @@ msgstr ""
 #: model:res.partner.relation.type,name:fieldservice_partner_multi_relation.rel_type_pays_invoices_per
 msgid "[P+L] pays the invoices for"
 msgstr ""
-

From ad863968a7b7a4f2b8b66e536740125cb63f73ad Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sat, 10 Jul 2021 15:23:08 +0000
Subject: [PATCH 329/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 562e87ae09..e2be8b7d51 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ addon | version | summary
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
 [fieldservice_distribution](fieldservice_distribution/) | 14.0.1.0.0 | Manage your distribution structure
 [fieldservice_isp_flow](fieldservice_isp_flow/) | 14.0.1.0.0 | Field Service workflow for Internet Service Providers
+[fieldservice_partner_multi_relation](fieldservice_partner_multi_relation/) | 14.0.1.0.0 | Manage relations between contacts, companies and locations
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
 [fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills

From 705cb8a1dface0700722b9799b4c9f45bff9f9b1 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sat, 10 Jul 2021 15:23:11 +0000
Subject: [PATCH 330/631] [UPD] README.rst

---
 fieldservice_partner_multi_relation/README.rst         | 10 +++++-----
 .../static/description/index.html                      |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fieldservice_partner_multi_relation/README.rst b/fieldservice_partner_multi_relation/README.rst
index febb21a839..266c005163 100644
--- a/fieldservice_partner_multi_relation/README.rst
+++ b/fieldservice_partner_multi_relation/README.rst
@@ -14,13 +14,13 @@ Field Service Partner Relations
     :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_partner_multi_relation
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_partner_multi_relation
     :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_partner_multi_relation
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_partner_multi_relation
     :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| 
@@ -75,7 +75,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_partner_multi_relation%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_partner_multi_relation%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.
 
@@ -121,6 +121,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_partner_multi_relation>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_partner_multi_relation>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_partner_multi_relation/static/description/index.html b/fieldservice_partner_multi_relation/static/description/index.html
index 0dee5b6d8b..34a3563646 100644
--- a/fieldservice_partner_multi_relation/static/description/index.html
+++ b/fieldservice_partner_multi_relation/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service Partner Relations</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_partner_multi_relation"><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_partner_multi_relation"><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><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_partner_multi_relation"><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_partner_multi_relation"><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>Partner Multi Relations does not support FSM Locations as a left or right
 partner_id, only Organisation and Person</p>
 <p>This module allows you to connect partner_multi_relations with FSM Locations and
@@ -424,7 +424,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_partner_multi_relation%0Aversion:%2012.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_partner_multi_relation%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">
@@ -458,7 +458,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">maintainer</a>:</p>
 <p><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_partner_multi_relation">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/14.0/fieldservice_partner_multi_relation">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 050da74f7bcf7089dfe9444e09892ea732ac4675 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sat, 10 Jul 2021 15:23:11 +0000
Subject: [PATCH 331/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 128285832b..2f7433d44f 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210709.2
\ No newline at end of file
+14.0.20210710.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 440932a532..a1352aa983 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -15,6 +15,7 @@
         'odoo14-addon-fieldservice_crm',
         'odoo14-addon-fieldservice_distribution',
         'odoo14-addon-fieldservice_isp_flow',
+        'odoo14-addon-fieldservice_partner_multi_relation',
         'odoo14-addon-fieldservice_project',
         'odoo14-addon-fieldservice_route',
         'odoo14-addon-fieldservice_skill',

From 2d0669a938ff819caefb48af9f9620aa12f64ae4 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Sat, 10 Jul 2021 15:23:22 +0000
Subject: [PATCH 332/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-14.0/field-service-14.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice/
---
 fieldservice/i18n/de.po    | 36 +++++++++++++++++++++++++
 fieldservice/i18n/es.po    | 54 +++++++++++++++++++++++++-------------
 fieldservice/i18n/es_AR.po | 36 +++++++++++++++++++++++++
 fieldservice/i18n/es_CL.po | 54 +++++++++++++++++++++++++-------------
 fieldservice/i18n/fr.po    | 36 +++++++++++++++++++++++++
 fieldservice/i18n/fr_FR.po | 36 +++++++++++++++++++++++++
 fieldservice/i18n/pt_BR.po | 54 +++++++++++++++++++++++++-------------
 fieldservice/i18n/tr.po    | 36 +++++++++++++++++++++++++
 8 files changed, 288 insertions(+), 54 deletions(-)

diff --git a/fieldservice/i18n/de.po b/fieldservice/i18n/de.po
index e61d25c599..006bc9c3af 100644
--- a/fieldservice/i18n/de.po
+++ b/fieldservice/i18n/de.po
@@ -255,6 +255,12 @@ msgstr "Alle"
 msgid "All Orders"
 msgstr "Alle Aufträge"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_all_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_all_ids
+msgid "All relations with current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
@@ -1309,6 +1315,24 @@ msgstr ""
 msgid "Has Unreconciled Entries"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_type_id
+msgid "Has relation of type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_id
+msgid "Has relation with"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_category_id
+msgid "Has relation with a partner in category"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
@@ -2578,6 +2602,18 @@ msgstr ""
 msgid "Related Partner"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_count
+msgid "Relation Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_date
+msgid "Relation valid"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
 msgid "Reporting"
diff --git a/fieldservice/i18n/es.po b/fieldservice/i18n/es.po
index 5599a203b8..2071b26aeb 100644
--- a/fieldservice/i18n/es.po
+++ b/fieldservice/i18n/es.po
@@ -257,6 +257,12 @@ msgstr "Todo"
 msgid "All Orders"
 msgstr "Todas las Órdenes"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_all_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_all_ids
+msgid "All relations with current partner"
+msgstr "Todas las relaciones con el socio actual"
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
@@ -1331,6 +1337,24 @@ msgstr "Agrupar Por"
 msgid "Has Unreconciled Entries"
 msgstr "Tiene Entradas no Reconciliada"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_type_id
+msgid "Has relation of type"
+msgstr "Tiene relación de tipo"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_id
+msgid "Has relation with"
+msgstr "Tiene relación con"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_category_id
+msgid "Has relation with a partner in category"
+msgstr "Tiene relación con un compañero en la categoría"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
@@ -2611,6 +2635,18 @@ msgstr "Dueño Relacionado"
 msgid "Related Partner"
 msgstr "Contacto Relacionado"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_count
+msgid "Relation Count"
+msgstr "Recuento de Relaciones"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_date
+msgid "Relation valid"
+msgstr "Relación Válida"
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
 msgid "Reporting"
@@ -3534,9 +3570,6 @@ msgstr "plantillas"
 #~ msgid "Agreements"
 #~ msgstr "Acuerdos"
 
-#~ msgid "All relations with current partner"
-#~ msgstr "Todas las relaciones con el socio actual"
-
 #~ msgid "Apply"
 #~ msgstr "Aplicar"
 
@@ -3581,15 +3614,6 @@ msgstr "plantillas"
 #~ msgid "Districts"
 #~ msgstr "Distritos"
 
-#~ msgid "Has relation of type"
-#~ msgstr "Tiene relación de tipo"
-
-#~ msgid "Has relation with"
-#~ msgstr "Tiene relación con"
-
-#~ msgid "Has relation with a partner in category"
-#~ msgstr "Tiene relación con un compañero en la categoría"
-
 #~ msgid "If checked new messages require your attention."
 #~ msgstr "Si está marcado, los nuevos mensajes requieren su atención."
 
@@ -3635,12 +3659,6 @@ msgstr "plantillas"
 #~ msgid "Regions"
 #~ msgstr "Regiones"
 
-#~ msgid "Relation Count"
-#~ msgstr "Recuento de Relaciones"
-
-#~ msgid "Relation valid"
-#~ msgstr "Relación Válida"
-
 #~ msgid "Route"
 #~ msgstr "Ruta"
 
diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index 375cefc364..68df09df3d 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -257,6 +257,12 @@ msgstr "Todo"
 msgid "All Orders"
 msgstr "Todas las Órdenes"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_all_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_all_ids
+msgid "All relations with current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
@@ -1333,6 +1339,24 @@ msgstr "Agrupar por"
 msgid "Has Unreconciled Entries"
 msgstr "Tiene Entradas no Reconciliadas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_type_id
+msgid "Has relation of type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_id
+msgid "Has relation with"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_category_id
+msgid "Has relation with a partner in category"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
@@ -2619,6 +2643,18 @@ msgstr "Propietario Relacionado"
 msgid "Related Partner"
 msgstr "Socio Relacionado"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_count
+msgid "Relation Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_date
+msgid "Relation valid"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
 msgid "Reporting"
diff --git a/fieldservice/i18n/es_CL.po b/fieldservice/i18n/es_CL.po
index 82c111e765..0cc44bb07e 100644
--- a/fieldservice/i18n/es_CL.po
+++ b/fieldservice/i18n/es_CL.po
@@ -257,6 +257,12 @@ msgstr "Todo"
 msgid "All Orders"
 msgstr "Todas las Órdenes"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_all_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_all_ids
+msgid "All relations with current partner"
+msgstr "Todas las relaciones con el socio actual"
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
@@ -1331,6 +1337,24 @@ msgstr "Agrupar Por"
 msgid "Has Unreconciled Entries"
 msgstr "Tiene Entradas no Reconciliada"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_type_id
+msgid "Has relation of type"
+msgstr "Tiene relación de tipo"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_id
+msgid "Has relation with"
+msgstr "Tiene relación con"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_category_id
+msgid "Has relation with a partner in category"
+msgstr "Tiene relación con un compañero en la categoría"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
@@ -2611,6 +2635,18 @@ msgstr "Dueño Relacionado"
 msgid "Related Partner"
 msgstr "Contacto Relacionado"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_count
+msgid "Relation Count"
+msgstr "Recuento de Relaciones"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_date
+msgid "Relation valid"
+msgstr "Relación Válida"
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
 msgid "Reporting"
@@ -3534,9 +3570,6 @@ msgstr "plantillas"
 #~ msgid "Agreements"
 #~ msgstr "Acuerdos"
 
-#~ msgid "All relations with current partner"
-#~ msgstr "Todas las relaciones con el socio actual"
-
 #~ msgid "Apply"
 #~ msgstr "Aplicar"
 
@@ -3581,15 +3614,6 @@ msgstr "plantillas"
 #~ msgid "Districts"
 #~ msgstr "Distritos"
 
-#~ msgid "Has relation of type"
-#~ msgstr "Tiene relación de tipo"
-
-#~ msgid "Has relation with"
-#~ msgstr "Tiene relación con"
-
-#~ msgid "Has relation with a partner in category"
-#~ msgstr "Tiene relación con un compañero en la categoría"
-
 #~ msgid "If checked new messages require your attention."
 #~ msgstr "Si está marcado, los nuevos mensajes requieren su atención."
 
@@ -3635,12 +3659,6 @@ msgstr "plantillas"
 #~ msgid "Regions"
 #~ msgstr "Regiones"
 
-#~ msgid "Relation Count"
-#~ msgstr "Recuento de Relaciones"
-
-#~ msgid "Relation valid"
-#~ msgstr "Relación Válida"
-
 #~ msgid "Route"
 #~ msgstr "Ruta"
 
diff --git a/fieldservice/i18n/fr.po b/fieldservice/i18n/fr.po
index 2932070776..ebcdf05189 100644
--- a/fieldservice/i18n/fr.po
+++ b/fieldservice/i18n/fr.po
@@ -256,6 +256,12 @@ msgstr "Tout"
 msgid "All Orders"
 msgstr "Toutes les commandes"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_all_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_all_ids
+msgid "All relations with current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
@@ -1335,6 +1341,24 @@ msgstr "Groupe de"
 msgid "Has Unreconciled Entries"
 msgstr "A des écritures non rapprochées"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_type_id
+msgid "Has relation of type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_id
+msgid "Has relation with"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_category_id
+msgid "Has relation with a partner in category"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
@@ -2627,6 +2651,18 @@ msgstr "Propriétaire associé"
 msgid "Related Partner"
 msgstr "Partenaire associé"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_count
+msgid "Relation Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_date
+msgid "Relation valid"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
 msgid "Reporting"
diff --git a/fieldservice/i18n/fr_FR.po b/fieldservice/i18n/fr_FR.po
index 58b0cb5fe1..1cec7ffae0 100644
--- a/fieldservice/i18n/fr_FR.po
+++ b/fieldservice/i18n/fr_FR.po
@@ -256,6 +256,12 @@ msgstr "Tout"
 msgid "All Orders"
 msgstr "Toutes les commandes"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_all_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_all_ids
+msgid "All relations with current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
@@ -1337,6 +1343,24 @@ msgstr "Groupe de"
 msgid "Has Unreconciled Entries"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_type_id
+msgid "Has relation of type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_id
+msgid "Has relation with"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_category_id
+msgid "Has relation with a partner in category"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
@@ -2624,6 +2648,18 @@ msgstr "Propriétaire associé"
 msgid "Related Partner"
 msgstr "Partenaire associé"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_count
+msgid "Relation Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_date
+msgid "Relation valid"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
 msgid "Reporting"
diff --git a/fieldservice/i18n/pt_BR.po b/fieldservice/i18n/pt_BR.po
index 6a966e9161..3444150b2c 100644
--- a/fieldservice/i18n/pt_BR.po
+++ b/fieldservice/i18n/pt_BR.po
@@ -256,6 +256,12 @@ msgstr "Tudo"
 msgid "All Orders"
 msgstr "Todos os Ordens"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_all_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_all_ids
+msgid "All relations with current partner"
+msgstr "Todas as relações com o parceiro atual"
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
@@ -1327,6 +1333,24 @@ msgstr "Agrupar Por"
 msgid "Has Unreconciled Entries"
 msgstr "Tem Entradas não Reconciliadas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_type_id
+msgid "Has relation of type"
+msgstr "Tem Relação do Tipo"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_id
+msgid "Has relation with"
+msgstr "Tem Relação Com"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_category_id
+msgid "Has relation with a partner in category"
+msgstr "Tem relação com um parceiro na categoria"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
@@ -2613,6 +2637,18 @@ msgstr "Proprietário Relacionado"
 msgid "Related Partner"
 msgstr "Parceiro Relacionado"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_count
+msgid "Relation Count"
+msgstr "Contagem de Relações"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_date
+msgid "Relation valid"
+msgstr "Relação válida"
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
 msgid "Reporting"
@@ -3542,9 +3578,6 @@ msgstr "modelos"
 #~ msgid "Agreements"
 #~ msgstr "Contratos"
 
-#~ msgid "All relations with current partner"
-#~ msgstr "Todas as relações com o parceiro atual"
-
 #~ msgid "Apply"
 #~ msgstr "Aplicar"
 
@@ -3589,15 +3622,6 @@ msgstr "modelos"
 #~ msgid "Districts"
 #~ msgstr "Cidades"
 
-#~ msgid "Has relation of type"
-#~ msgstr "Tem Relação do Tipo"
-
-#~ msgid "Has relation with"
-#~ msgstr "Tem Relação Com"
-
-#~ msgid "Has relation with a partner in category"
-#~ msgstr "Tem relação com um parceiro na categoria"
-
 #~ msgid "If checked new messages require your attention."
 #~ msgstr "Se marcado, novas mensagens solicitarão sua atenção."
 
@@ -3634,12 +3658,6 @@ msgstr "modelos"
 #~ msgid "Regions"
 #~ msgstr "Regiões"
 
-#~ msgid "Relation Count"
-#~ msgstr "Contagem de Relações"
-
-#~ msgid "Relation valid"
-#~ msgstr "Relação válida"
-
 #~ msgid "Route"
 #~ msgstr "Rota"
 
diff --git a/fieldservice/i18n/tr.po b/fieldservice/i18n/tr.po
index 81ceac27f6..a134544c80 100644
--- a/fieldservice/i18n/tr.po
+++ b/fieldservice/i18n/tr.po
@@ -254,6 +254,12 @@ msgstr "Hepsi"
 msgid "All Orders"
 msgstr "Bütün Siparişler"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_all_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_all_ids
+msgid "All relations with current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
@@ -1310,6 +1316,24 @@ msgstr "Grupla"
 msgid "Has Unreconciled Entries"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_type_id
+msgid "Has relation of type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_id
+msgid "Has relation with"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_category_id
+msgid "Has relation with a partner in category"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
@@ -2573,6 +2597,18 @@ msgstr "İlişkili Sahibi"
 msgid "Related Partner"
 msgstr "İlişkili İş Ortağı"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_count
+msgid "Relation Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_date
+msgid "Relation valid"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
 msgid "Reporting"

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

---
 fieldservice_sale/README.rst                  |   13 +-
 fieldservice_sale/__manifest__.py             |   13 +-
 .../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 +-
 18 files changed, 585 insertions(+), 969 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/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..3f0825c3a6 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: 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 c6db17db2fa6d891e02b266b153d646abbef4d75 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 26 Nov 2019 16:59:14 -0500
Subject: [PATCH 334/631] [IMP] fieldservice_account: Simplify module

- This change removes most of the invoicing logic from fieldservice_account and puts it into its own module
---
 fieldservice_isp_account/README.rst           | 121 +++++
 fieldservice_isp_account/__init__.py          |   4 +
 fieldservice_isp_account/__manifest__.py      |  26 +
 .../data/time_products.xml                    |  36 ++
 .../models/account_invoice_line.py            |  34 ++
 fieldservice_isp_account/models/fsm_order.py  | 184 +++++++
 fieldservice_isp_account/models/fsm_person.py |  29 ++
 fieldservice_isp_account/readme/CONFIGURE.rst |   1 +
 .../readme/CONTRIBUTORS.rst                   |   3 +
 fieldservice_isp_account/readme/CREDITS.rst   |   3 +
 .../readme/DESCRIPTION.rst                    |   4 +
 fieldservice_isp_account/readme/INSTALL.rst   |   1 +
 fieldservice_isp_account/readme/USAGE.rst     |  12 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 460 ++++++++++++++++++
 fieldservice_isp_account/tests/__init__.py    |   4 +
 .../tests/test_isp_account.py                 | 178 +++++++
 fieldservice_isp_account/views/account.xml    |  29 ++
 fieldservice_isp_account/views/fsm_order.xml  |  89 ++++
 fieldservice_isp_account/views/fsm_person.xml |  21 +
 .../views/hr_timesheet.xml                    |  36 ++
 21 files changed, 1275 insertions(+)
 create mode 100644 fieldservice_isp_account/README.rst
 create mode 100644 fieldservice_isp_account/__init__.py
 create mode 100644 fieldservice_isp_account/__manifest__.py
 create mode 100644 fieldservice_isp_account/data/time_products.xml
 create mode 100644 fieldservice_isp_account/models/account_invoice_line.py
 create mode 100644 fieldservice_isp_account/models/fsm_order.py
 create mode 100644 fieldservice_isp_account/models/fsm_person.py
 create mode 100644 fieldservice_isp_account/readme/CONFIGURE.rst
 create mode 100644 fieldservice_isp_account/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_isp_account/readme/CREDITS.rst
 create mode 100644 fieldservice_isp_account/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_isp_account/readme/INSTALL.rst
 create mode 100644 fieldservice_isp_account/readme/USAGE.rst
 create mode 100644 fieldservice_isp_account/static/description/icon.png
 create mode 100644 fieldservice_isp_account/static/description/index.html
 create mode 100644 fieldservice_isp_account/tests/__init__.py
 create mode 100644 fieldservice_isp_account/tests/test_isp_account.py
 create mode 100644 fieldservice_isp_account/views/account.xml
 create mode 100644 fieldservice_isp_account/views/fsm_order.xml
 create mode 100644 fieldservice_isp_account/views/fsm_person.xml
 create mode 100644 fieldservice_isp_account/views/hr_timesheet.xml

diff --git a/fieldservice_isp_account/README.rst b/fieldservice_isp_account/README.rst
new file mode 100644
index 0000000000..278e295c55
--- /dev/null
+++ b/fieldservice_isp_account/README.rst
@@ -0,0 +1,121 @@
+==========================
+Field Service - Accounting
+==========================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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/12.0/fieldservice_account
+    :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_account
+    :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
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module adds the ability to track employee time and contractor
+costs for Field Service Orders. It also adds functionality to create
+a customer invoice and a vendor bill when a Field Service Order is
+completed.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Installation
+============
+
+No special installation instructions
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+* Go to Field Service > Master Data > Locations
+* Create or select a location and set their analytic account
+
+Usage
+=====
+
+To use the module:
+
+On a field service order, open the "Accounting" tab. Depending on 
+whether the logged in user or an employee or not, they will see 
+either a place to enter timesheet records or contractor costs.
+
+The total cost of the order is calculated based on the entries in 
+the employee timesheet entries and contractor costs.
+
+When an order is completed, a customer invoice will be generated for
+the employee time and the contractor costs. A vendor bill will be 
+created for the contractor costs.
+
+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_account%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+
+Contributors
+~~~~~~~~~~~~
+
+* Michael Allen <mallen@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.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-osimallen| image:: https://github.com/osimallen.png?size=40px
+    :target: https://github.com/osimallen
+    :alt: osimallen
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-osimallen| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_account>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_isp_account/__init__.py b/fieldservice_isp_account/__init__.py
new file mode 100644
index 0000000000..66ca882fcc
--- /dev/null
+++ b/fieldservice_isp_account/__init__.py
@@ -0,0 +1,4 @@
+# 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_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
new file mode 100644
index 0000000000..cd184a7c82
--- /dev/null
+++ b/fieldservice_isp_account/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2018 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - ISP Accounting',
+    'summary': """Invoice Field Service orders based on employee time
+                  or contractor costs""",
+    'version': '12.0.2.0.1',
+    'category': 'Field Service',
+    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice_account_analytic',
+        'hr_timesheet',
+    ],
+    'data': [
+        'data/time_products.xml',
+        'views/account.xml',
+        'views/fsm_order.xml',
+        'views/fsm_person.xml',
+        'views/hr_timesheet.xml',
+    ],
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': ['osimallen'],
+}
diff --git a/fieldservice_isp_account/data/time_products.xml b/fieldservice_isp_account/data/time_products.xml
new file mode 100644
index 0000000000..96a1a4bee3
--- /dev/null
+++ b/fieldservice_isp_account/data/time_products.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="field_service_travel_time" model="product.template">
+        <field name="name">FSM Travel Time</field>
+        <field name="categ_id" ref="product.product_category_all"/>
+        <field name="type">service</field>
+        <field name="uom_id" ref="uom.product_uom_hour"/>
+        <field name="uom_po_id" ref="uom.product_uom_hour"/>
+        <field name="description_sale">Travel time for Field Service
+            Employees
+        </field>
+    </record>
+
+    <record id="field_service_regular_time" model="product.template">
+        <field name="name">FSM Regular Time</field>
+        <field name="categ_id" ref="product.product_category_all"/>
+        <field name="type">service</field>
+        <field name="uom_id" ref="uom.product_uom_hour"/>
+        <field name="uom_po_id" ref="uom.product_uom_hour"/>
+        <field name="description_sale">Regular time for Field Service
+            Employees
+        </field>
+    </record>
+
+    <record id="field_service_overtime" model="product.template">
+        <field name="name">FSM Overtime</field>
+        <field name="categ_id" ref="product.product_category_all"/>
+        <field name="type">service</field>
+        <field name="uom_id" ref="uom.product_uom_hour"/>
+        <field name="uom_po_id" ref="uom.product_uom_hour"/>
+        <field name="description_sale">Overtime for Field Service Employees
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_isp_account/models/account_invoice_line.py b/fieldservice_isp_account/models/account_invoice_line.py
new file mode 100644
index 0000000000..1f64c10bcb
--- /dev/null
+++ b/fieldservice_isp_account/models/account_invoice_line.py
@@ -0,0 +1,34 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models, _
+from odoo.exceptions import ValidationError
+
+
+class AccountInvoiceLine(models.Model):
+    _inherit = "account.invoice.line"
+
+    @api.onchange('product_id', 'quantity')
+    def onchange_product_id(self):
+        for line in self:
+            if line.fsm_order_id:
+                partner = line.fsm_order_id.person_id and\
+                    line.fsm_order_id.person_id.partner_id or False
+                if not partner:
+                    raise ValidationError(
+                        _("Please set the field service worker."))
+                fpos = partner.property_account_position_id
+                tmpl = line.product_id.product_tmpl_id
+                if line.product_id:
+                    accounts = tmpl.get_product_accounts()
+                    supinfo = self.env['product.supplierinfo'].search(
+                        [('name', '=', partner.id),
+                         ('product_tmpl_id', '=', tmpl.id),
+                         ('min_qty', '<=', line.quantity)],
+                        order='min_qty DESC')
+                    line.price_unit = \
+                        supinfo and supinfo[0].price or tmpl.standard_price
+                    line.account_id = accounts.get('expense', False)
+                    line.invoice_line_tax_ids = fpos.\
+                        map_tax(tmpl.supplier_taxes_id)
+                    line.name = line.product_id.name
diff --git a/fieldservice_isp_account/models/fsm_order.py b/fieldservice_isp_account/models/fsm_order.py
new file mode 100644
index 0000000000..9cd3454bb3
--- /dev/null
+++ b/fieldservice_isp_account/models/fsm_order.py
@@ -0,0 +1,184 @@
+# Copyright (C) 2018 - TODAY, 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
+
+
+ACCOUNT_STAGES = [('draft', 'Draft'),
+                  ('review', 'Needs Review'),
+                  ('confirmed', 'Confirmed'),
+                  ('invoiced', 'Fully Invoiced'),
+                  ('no', 'Nothing Invoiced')]
+
+
+class FSMOrder(models.Model):
+    _inherit = 'fsm.order'
+
+    contractor_cost_ids = fields.One2many('account.invoice.line',
+                                          'fsm_order_id',
+                                          string='Contractor Costs')
+    employee_timesheet_ids = fields.One2many('account.analytic.line',
+                                             "fsm_order_id",
+                                             string='Employee Timesheets')
+    employee = fields.Boolean(compute='_compute_employee')
+    contractor_total = fields.Float(compute='_compute_contractor_cost',
+                                    string='Contractor Cost Estimate')
+    employee_time_total = fields.Float(compute='_compute_employee_hours',
+                                       string='Total Employee Hours')
+    account_stage = fields.Selection(ACCOUNT_STAGES, string='Accounting Stage',
+                                     default='draft')
+
+    def _compute_employee(self):
+        user = self.env['res.users'].browse(self.env.uid)
+        for order in self:
+            if user.employee_ids:
+                order.employee = True
+
+    @api.depends('employee_timesheet_ids', 'contractor_cost_ids')
+    def _compute_total_cost(self):
+        super(self)._compute_total_cost()
+        for order in self:
+            order.total_cost = 0.0
+            rate = 0
+            for line in order.employee_timesheet_ids:
+                rate = line.employee_id.timesheet_cost
+                order.total_cost += line.unit_amount * rate
+            for cost in order.contractor_cost_ids:
+                order.total_cost += cost.price_unit * cost.quantity
+
+    @api.depends('employee_timesheet_ids')
+    def _compute_employee_hours(self):
+        for order in self:
+            order.employee_time_total = 0.0
+            for line in order.employee_timesheet_ids:
+                order.employee_time_total += line.unit_amount
+
+    @api.depends('contractor_cost_ids')
+    def _compute_contractor_cost(self):
+        for order in self:
+            order.contractor_total = 0.0
+            for cost in order.contractor_cost_ids:
+                order.contractor_total += cost.price_unit * cost.quantity
+
+    def action_complete(self):
+        for order in self:
+            order.account_stage = 'review'
+        if self.person_id.supplier and not self.contractor_cost_ids:
+            raise ValidationError(_("Cannot move to Complete " +
+                                    "until 'Contractor Costs' is filled in"))
+        if not self.person_id.supplier and not self.employee_timesheet_ids:
+            raise ValidationError(_("Cannot move to Complete until " +
+                                    "'Employee Timesheets' is filled in"))
+        return super(FSMOrder, self).action_complete()
+
+    def create_bills(self):
+        jrnl = self.env['account.journal'].search([
+            ('company_id', '=', self.env.user.company_id.id),
+            ('type', '=', 'purchase'),
+            ('active', '=', True)],
+            limit=1)
+        fpos = self.customer_id.property_account_position_id
+        vals = {
+            'partner_id': self.person_id.partner_id.id,
+            'type': 'in_invoice',
+            'journal_id': jrnl.id or False,
+            'fiscal_position_id': fpos.id or False,
+            'fsm_order_id': self.id
+        }
+        bill = self.env['account.invoice'].sudo().create(vals)
+        for line in self.contractor_cost_ids:
+            line.invoice_id = bill
+        bill.compute_taxes()
+
+    def account_confirm(self):
+        for order in self:
+            contractor = order.person_id.partner_id.supplier
+            if order.contractor_cost_ids:
+                if contractor:
+                    order.create_bills()
+                    order.account_stage = 'confirmed'
+                else:
+                    raise ValidationError(_("The worker assigned to this order"
+                                            " is not a supplier"))
+            if order.employee_timesheet_ids:
+                order.account_stage = 'confirmed'
+
+    def account_create_invoice(self):
+        jrnl = self.env['account.journal'].search([
+            ('company_id', '=', self.env.user.company_id.id),
+            ('type', '=', 'sale'),
+            ('active', '=', True)],
+            limit=1)
+        if self.bill_to == 'contact':
+            if not self.customer_id:
+                raise ValidationError(_("Contact empty"))
+            fpos = self.customer_id.property_account_position_id
+            vals = {
+                'partner_id': self.customer_id.id,
+                'type': 'out_invoice',
+                'journal_id': jrnl.id or False,
+                'fiscal_position_id': fpos.id or False,
+                'fsm_order_id': self.id
+            }
+            invoice = self.env['account.invoice'].sudo().create(vals)
+            price_list = invoice.partner_id.property_product_pricelist
+        else:
+            fpos = self.location_id.customer_id.property_account_position_id
+            vals = {
+                'partner_id': self.location_id.customer_id.id,
+                'type': 'out_invoice',
+                'journal_id': jrnl.id or False,
+                'fiscal_position_id': fpos.id or False,
+                'fsm_order_id': self.id
+            }
+            invoice = self.env['account.invoice'].sudo().create(vals)
+            price_list = invoice.partner_id.property_product_pricelist
+        for line in self.employee_timesheet_ids:
+            price = price_list.get_product_price(product=line.product_id,
+                                                 quantity=line.unit_amount,
+                                                 partner=invoice.partner_id,
+                                                 date=False,
+                                                 uom_id=False)
+            template = line.product_id.product_tmpl_id
+            accounts = template.get_product_accounts()
+            account = accounts['income']
+            vals = {
+                'product_id': line.product_id.id,
+                'account_analytic_id': line.account_id.id,
+                'quantity': line.unit_amount,
+                'name': line.name,
+                'price_unit': price,
+                'account_id': account.id,
+                'invoice_id': invoice.id
+            }
+            time_cost = self.env['account.invoice.line'].create(vals)
+            taxes = template.taxes_id
+            time_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
+        for cost in self.contractor_cost_ids:
+            price = price_list.get_product_price(product=cost.product_id,
+                                                 quantity=cost.quantity,
+                                                 partner=invoice.partner_id,
+                                                 date=False,
+                                                 uom_id=False)
+            template = cost.product_id.product_tmpl_id
+            accounts = template.get_product_accounts()
+            account = accounts['income']
+            vals = {
+                'product_id': cost.product_id.id,
+                'account_analytic_id': cost.account_analytic_id.id,
+                'quantity': cost.quantity,
+                'name': cost.name,
+                'price_unit': price,
+                'account_id': account.id,
+                'invoice_id': invoice.id
+            }
+            con_cost = self.env['account.invoice.line'].create(vals)
+            taxes = template.taxes_id
+            con_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
+        invoice.compute_taxes()
+        self.account_stage = 'invoiced'
+        return invoice
+
+    def account_no_invoice(self):
+        self.account_stage = 'no'
diff --git a/fieldservice_isp_account/models/fsm_person.py b/fieldservice_isp_account/models/fsm_person.py
new file mode 100644
index 0000000000..1b75acfaa6
--- /dev/null
+++ b/fieldservice_isp_account/models/fsm_person.py
@@ -0,0 +1,29 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMPerson(models.Model):
+    _inherit = 'fsm.person'
+
+    bill_count = fields.Integer(string='Vendor Bills',
+                                compute='_compute_vendor_bills')
+
+    def _compute_vendor_bills(self):
+        self.bill_count = self.env['account.invoice'].search_count([
+            ('partner_id', '=', self.partner_id.id)])
+
+    @api.multi
+    def action_view_bills(self):
+        for bill in self:
+            action = self.env.ref('account.action_invoice_tree1').read()[0]
+            vendor_bills = self.env['account.invoice'].search(
+                [('partner_id', '=', bill.partner_id.id)])
+            if len(vendor_bills) == 1:
+                action['views'] = [
+                    (self.env.ref('account.invoice_form').id, 'form')]
+                action['res_id'] = vendor_bills.id
+            else:
+                action['domain'] = [('id', 'in', vendor_bills.ids)]
+            return action
diff --git a/fieldservice_isp_account/readme/CONFIGURE.rst b/fieldservice_isp_account/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..89a40f9121
--- /dev/null
+++ b/fieldservice_isp_account/readme/CONFIGURE.rst
@@ -0,0 +1 @@
+No special configuration instructions.
diff --git a/fieldservice_isp_account/readme/CONTRIBUTORS.rst b/fieldservice_isp_account/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..e9143c46f2
--- /dev/null
+++ b/fieldservice_isp_account/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* Michael Allen <mallen@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_isp_account/readme/CREDITS.rst b/fieldservice_isp_account/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_isp_account/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_isp_account/readme/DESCRIPTION.rst b/fieldservice_isp_account/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..127d578738
--- /dev/null
+++ b/fieldservice_isp_account/readme/DESCRIPTION.rst
@@ -0,0 +1,4 @@
+This module adds the ability to track employee time and contractor
+costs for Field Service Orders. It also adds functionality to create
+a customer invoice and a vendor bill when a Field Service Order is
+completed.
diff --git a/fieldservice_isp_account/readme/INSTALL.rst b/fieldservice_isp_account/readme/INSTALL.rst
new file mode 100644
index 0000000000..54fea7becb
--- /dev/null
+++ b/fieldservice_isp_account/readme/INSTALL.rst
@@ -0,0 +1 @@
+No special installation instructions
diff --git a/fieldservice_isp_account/readme/USAGE.rst b/fieldservice_isp_account/readme/USAGE.rst
new file mode 100644
index 0000000000..c730bb37dd
--- /dev/null
+++ b/fieldservice_isp_account/readme/USAGE.rst
@@ -0,0 +1,12 @@
+To use the module:
+
+On a field service order, open the "Accounting" tab. Depending on
+whether the logged in user or an employee or not, they will see
+either a place to enter timesheet records or contractor costs.
+
+The total cost of the order is calculated based on the entries in
+the employee timesheet entries and contractor costs.
+
+When an order is completed, a customer invoice will be generated for
+the employee time and the contractor costs. A vendor bill will be
+created for the contractor costs.
diff --git a/fieldservice_isp_account/static/description/icon.png b/fieldservice_isp_account/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_isp_account/static/description/index.html b/fieldservice_isp_account/static/description/index.html
new file mode 100644
index 0000000000..be45db7518
--- /dev/null
+++ b/fieldservice_isp_account/static/description/index.html
@@ -0,0 +1,460 @@
+<?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 - Accounting</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-accounting">
+<h1 class="title">Field Service - Accounting</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_account"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_account"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" 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>This module adds the ability to track employee time and contractor
+costs for Field Service Orders. It also adds functionality to create
+a customer invoice and a vendor bill when a Field Service Order is
+completed.</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="#bug-tracker" id="id4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id8">Other credits</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>No special installation instructions</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; Master Data &gt; Locations</li>
+<li>Create or select a location and set their analytic account</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id3">Usage</a></h1>
+<p>To use the module:</p>
+<p>On a field service order, open the “Accounting” tab. Depending on
+whether the logged in user or an employee or not, they will see
+either a place to enter timesheet records or contractor costs.</p>
+<p>The total cost of the order is calculated based on the entries in
+the employee timesheet entries and contractor costs.</p>
+<p>When an order is completed, a customer invoice will be generated for
+the employee time and the contractor costs. A vendor bill will be
+created for the contractor costs.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id4">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_account%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="#id5">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id6">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
+<ul class="simple">
+<li>Michael Allen &lt;<a class="reference external" href="mailto:mallen&#64;opensourceintegrators.com">mallen&#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">
+<h2><a class="toc-backref" href="#id8">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="#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">maintainer</a>:</p>
+<p><a class="reference external" href="https://github.com/osimallen"><img alt="osimallen" src="https://github.com/osimallen.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_account">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_isp_account/tests/__init__.py b/fieldservice_isp_account/tests/__init__.py
new file mode 100644
index 0000000000..6446a7a2b2
--- /dev/null
+++ b/fieldservice_isp_account/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright 2019 Ecosoft Co., Ltd (http://ecosoft.co.th/)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from . import test_isp_account
diff --git a/fieldservice_isp_account/tests/test_isp_account.py b/fieldservice_isp_account/tests/test_isp_account.py
new file mode 100644
index 0000000000..60dd8b1de2
--- /dev/null
+++ b/fieldservice_isp_account/tests/test_isp_account.py
@@ -0,0 +1,178 @@
+# Copyright 2019 Ecosoft Co., Ltd (http://ecosoft.co.th/)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from odoo import fields
+from odoo.addons.fieldservice_sale.tests.test_fsm_account import (
+    FSMAccountCase
+)
+from odoo.exceptions import ValidationError
+
+
+class FSMAccountCase(FSMAccountCase):
+
+    def setUp(self):
+        super(FSMAccountCase, self).setUp()
+        self.test_person = self.env['fsm.person'].create({'name': 'Worker-1'})
+        self.test_analytic = self.env.ref('analytic.analytic_administratif')
+        self.account_id = self.env['account.account'].create({
+            'code': 'NC1110',
+            'name': 'Test Payable Account',
+            'user_type_id':
+                self.env.ref('account.data_account_type_payable').id,
+            'reconcile': True
+        })
+
+    def _create_workorder(self, bill_to, contractors, timesheets):
+        # Create a new work order
+        contractors = self.env['account.invoice.line'].create(contractors)
+        timesheets = self.env['account.analytic.line'].create(timesheets)
+
+        order = self.env['fsm.order'].\
+            create({
+                'location_id': self.test_location.id,
+                'bill_to': bill_to,
+                'person_id': self.test_person.id,
+                'contractor_cost_ids': [(6, 0, contractors.ids)],
+                'employee_timesheet_ids': [(6, 0, timesheets.ids)]
+            })
+        order.person_ids += self.test_person
+        return order
+
+    def _process_order_to_invoices(self, order):
+        # Change states
+        order.date_start = fields.Datetime.today()
+        order.date_end = fields.Datetime.today()
+        order.resolution = 'Done something!'
+        order.action_complete()
+        self.assertEqual(order.account_stage, 'review')
+        # Create vendor bill
+        # Vendor bill created from order's contractor
+        if not order.person_id.partner_id.supplier:
+            with self.assertRaises(ValidationError) as e:
+                order.account_confirm()
+            self.assertEqual(
+                e.exception.name,
+                "The worker assigned to this order is not a supplier")
+            order.person_id.partner_id.supplier = True
+        order.account_confirm()
+        self.assertEqual(order.account_stage, 'confirmed')
+        bill = self.AccountInvoice.search([('type', '=', 'in_invoice'),
+                                           ('fsm_order_id', '=', order.id)])
+        self.assertEqual(len(bill), 1)
+        self.assertEqual(len(order.contractor_cost_ids),
+                         len(bill.invoice_line_ids))
+        # Customer invoice created from order's contractor and timehsheet
+        if order.bill_to == 'contact' and not order.customer_id:
+            with self.assertRaises(ValidationError):
+                order.account_create_invoice()
+            order.customer_id = self.test_loc_partner  # Assign some partner
+        order.account_create_invoice()
+        self.assertEqual(order.account_stage, 'invoiced')
+        invoice = self.AccountInvoice.search([('type', '=', 'out_invoice'),
+                                              ('fsm_order_id', '=', order.id)])
+        self.assertEqual(len(invoice), 1)
+        self.assertEqual(
+            len(order.contractor_cost_ids) + len(order.employee_timesheet_ids),
+            len(invoice.invoice_line_ids))
+        return (bill, invoice)
+
+    def test_fsm_order_exception(self):
+        """Create a new work order, error raised when
+        - If person_is is not set, but user try to add new contractor_cost_ids
+        - If analytic account is not set in location,
+          and user create contractor_cost_ids (account.move.line)
+        """
+        # Test if the person_id is not selected, error when add contractor line
+        # Setup required data
+        self.test_location.analytic_account_id = self.test_analytic
+        # Create a new work order with contract = 500 and timesheet = 300
+        self.env.ref('hr.employee_qdp').timesheet_cost = 20.0
+        order = self.env['fsm.order'].\
+            create({
+                'location_id': self.test_location.id,
+                'person_id': self.test_person.id,
+            })
+        order.person_id = self.test_person
+
+        order.person_ids += self.test_person
+        order.date_start = fields.Datetime.today()
+        order.date_end = fields.Datetime.today()
+        order.resolution = 'Done something!'
+        with self.assertRaises(ValidationError) as e:
+            order.action_complete()
+        self.assertEqual(e.exception.name,
+                         "Cannot move to Complete until "
+                         "'Employee Timesheets' is filled in")
+
+    def test_fsm_order_bill_to_location(self):
+        """Bill To Location,
+        invoice created is based on this order's location's partner
+        """
+        # Setup required data
+        self.test_location.analytic_account_id = self.test_analytic
+        contractors = [{'name': 'contractor_line_1',
+                        'product_id': self.env.ref('product.expense_hotel').id,
+                        'account_id': self.account_id.id,
+                        'quantity': 2,
+                        'price_unit': 200}, ]
+        self.env.ref('hr.employee_qdp').timesheet_cost = 100
+        timesheets = [{'name': 'timesheet_line_1',
+                       'employee_id': self.env.ref('hr.employee_qdp').id,
+                       'account_id': self.test_analytic.id,
+                       'product_id': self.env.ref('product.expense_hotel').id,
+                       'unit_amount': 6},
+                      {'name': 'timesheet_line_2',
+                       'employee_id': self.env.ref('hr.employee_qdp').id,
+                       'account_id': self.test_analytic.id,
+                       'product_id': self.env.ref('product.expense_hotel').id,
+                       'unit_amount': 4}, ]
+        order = self._create_workorder(bill_to='location',
+                                       contractors=contractors,
+                                       timesheets=timesheets)
+        order._compute_contractor_cost()
+        order._compute_employee_hours()
+        order._compute_total_cost()
+        self.assertEqual(order.contractor_total, 400)
+        self.assertEqual(order.employee_time_total, 10)  # Hrs
+        self.assertEqual(order.total_cost, 1400)
+        # Testing not working "Need to Configure Chart of Accounts"
+        # bill, invoice = self._process_order_to_invoices(order)
+        # self.assertEqual(bill.partner_id, order.person_id.partner_id)
+        # self.assertEqual(invoice.partner_id, order.location_id.customer_id)
+
+    def test_fsm_order_bill_to_contact(self):
+        """Bill To Contact,
+        invoice created is based on this order's contact
+        """
+        # Setup required data
+        self.test_location.analytic_account_id = self.test_analytic
+        # Create a new work order with contract = 500 and timesheet = 300
+        contractors = [{'name': 'contractor_line_2',
+                        'product_id': self.env.ref('product.expense_hotel').id,
+                        'account_id': self.account_id.id,
+                        'quantity': 2,
+                        'price_unit': 100},
+                       {'name': 'contractor_line_3',
+                        'product_id': self.env.ref('product.expense_hotel').id,
+                        'account_id': self.account_id.id,
+                        'quantity': 1,
+                        'price_unit': 300}, ]
+        self.env.ref('hr.employee_qdp').timesheet_cost = 20.0
+        timesheets = [{'name': 'timesheet_line_3',
+                       'employee_id': self.env.ref('hr.employee_qdp').id,
+                       'account_id': self.test_analytic.id,
+                       'product_id': self.env.ref('product.expense_hotel').id,
+                       'unit_amount': 10}, ]
+        order = self._create_workorder(bill_to='contact',
+                                       contractors=contractors,
+                                       timesheets=timesheets)
+        order._compute_contractor_cost()
+        order._compute_employee_hours()
+        order._compute_total_cost()
+        self.assertEqual(order.contractor_total, 500)
+        self.assertEqual(order.employee_time_total, 10)  # Hrs
+        self.assertEqual(order.total_cost, 700)
+        # Testing not working "Need to Configure Chart of Accounts"
+        # bill, invoice = self._process_order_to_invoices(order)
+        # self.assertEqual(bill.partner_id, order.person_id.partner_id)
+        # self.assertEqual(invoice.partner_id, order.customer_id)
diff --git a/fieldservice_isp_account/views/account.xml b/fieldservice_isp_account/views/account.xml
new file mode 100644
index 0000000000..3e7aeb49e5
--- /dev/null
+++ b/fieldservice_isp_account/views/account.xml
@@ -0,0 +1,29 @@
+<odoo>
+
+    <!-- Show confirmed FSM Orders in Accounting -->
+    <record id="action_account_fsm_order" model="ir.actions.act_window">
+        <field name="name">Service Orders</field>
+        <field name="res_model">fsm.order</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain"
+               eval="[('account_stage', '=', 'confirmed')]"/>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                No Field Service Orders to review.
+            </p>
+        </field>
+    </record>
+
+    <menuitem id="menu_account_operations"
+              name="Operations"
+              parent="account.menu_finance_receivables"
+              sequence="20"/>
+
+    <menuitem id="menu_account_fsm_order"
+              name="Service Orders"
+              action="action_account_fsm_order"
+              parent="menu_account_operations"
+              sequence="10"/>
+
+</odoo>
diff --git a/fieldservice_isp_account/views/fsm_order.xml b/fieldservice_isp_account/views/fsm_order.xml
new file mode 100644
index 0000000000..4540901734
--- /dev/null
+++ b/fieldservice_isp_account/views/fsm_order.xml
@@ -0,0 +1,89 @@
+<odoo>
+
+    <record id="fsm_order_form_isp_account" model="ir.ui.view">
+        <field name="name">fsm.order.form.isp.account</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form_account"/>
+        <field name="arch" type="xml">
+            <page name="accounting" position="inside">
+                <header>
+                    <button id="account_confirm"
+                            name="account_confirm" string="Confirm"
+                            class="oe_highlight"
+                            type="object"
+                            groups="fieldservice.group_fsm_dispatcher"
+                            attrs="{'invisible': [('account_stage', '!=', 'review')]}"/>
+                    <button id="account_create_invoice"
+                            name="account_create_invoice"
+                            string="Create Invoice"
+                            class="oe_highlight"
+                            type="object"
+                            groups="account.group_account_invoice"
+                            attrs="{'invisible': [('account_stage', '!=', 'confirmed')]}"/>
+                    <button id="account_no_invoice"
+                            name="account_no_invoice" string="No Invoice"
+                            type="object"
+                            groups="account.group_account_invoice"
+                            attrs="{'invisible': [('account_stage', '!=', 'confirmed')]}"/>
+                    <field name="account_stage" widget="statusbar"/>
+                </header>
+            </page>
+            <group name="bill_to" position="after">
+                <group string="Contractor Costs">
+                    <field name="contractor_cost_ids" nolabel="1">
+                        <tree editable="bottom">
+                            <field name="product_id" required="1"/>
+                            <field name="name"/>
+                            <field name="quantity" required="1"/>
+                            <field name="account_id" required="1"
+                                    invisible="1"/>
+                            <field name="account_analytic_id"
+                                    invisible="1"/>
+                            <field name="invoice_line_tax_ids"
+                                    widget="many2many_tags" invisible="1"/>
+                            <field name="price_unit" groups="fieldservice.group_fsm_manager"/>
+                        </tree>
+                    </field>
+                </group>
+                <group>
+                    <field name="contractor_total" readonly="1"/>
+                </group>
+                <group string="Employee Timesheets">
+                    <field name="employee_timesheet_ids" nolabel="1">
+                        <tree editable="bottom"
+                                string="Timesheet Activities"
+                                default_order="date">
+                            <field name="date"/>
+                            <field name="user_id" invisible="1"/>
+                            <field name="employee_id" required="1"/>
+                            <field name="product_id" required="1"
+                                    domain="[('type','=','service')]"/>
+                            <field name="account_id" invisible="1"/>
+                            <field name="name"/>
+                            <field name="unit_amount" string="Duration"
+                                    widget="float_time"/>
+                        </tree>
+                    </field>
+                </group>
+                <group col="4">
+                    <field name="employee_time_total" readonly="1"/>
+                    <field name="employee" invisible="1"/>
+                </group>
+            </group>
+        </field>
+    </record>
+
+    <record id="fsm_order_search_view" model="ir.ui.view">
+        <field name="name">fsm.order.search</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_search_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="/search/filter[4]" position="after">
+                <filter string="Needs Review"
+                        domain="[('account_stage', '=', 'review')]"
+                        name="needs_review"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_isp_account/views/fsm_person.xml b/fieldservice_isp_account/views/fsm_person.xml
new file mode 100644
index 0000000000..0f2a42a1a5
--- /dev/null
+++ b/fieldservice_isp_account/views/fsm_person.xml
@@ -0,0 +1,21 @@
+<odoo>
+
+    <record id="fsm_person_form_isp_account" model="ir.ui.view">
+        <field name="name">fsm.person.form.isp.account</field>
+        <field name="model">fsm.person</field>
+        <field name="inherit_id" ref="fieldservice.fsm_person_form"/>
+        <field name="arch" type="xml">
+            <div name="button_box" position="inside">
+                <button type="object"
+                        name="action_view_bills"
+                        class="oe_stat_button"
+                        icon="fa-credit-card"
+                        groups="base.group_user">
+                    <field name="bill_count" widget="statinfo"
+                           string="Vendor Bills"/>
+                </button>
+            </div>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_isp_account/views/hr_timesheet.xml b/fieldservice_isp_account/views/hr_timesheet.xml
new file mode 100644
index 0000000000..25ebf8b849
--- /dev/null
+++ b/fieldservice_isp_account/views/hr_timesheet.xml
@@ -0,0 +1,36 @@
+<odoo>
+
+    <record id="hr_timesheet.act_hr_timesheet_line" model="ir.actions.act_window">
+            <field name="name">My Timesheets</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id', '=', uid)]</field>
+            <field name="context">{
+                "search_default_week":1,
+            }</field>
+            <field name="search_view_id" ref="hr_timesheet.hr_timesheet_line_search"/>
+            <field name="help" type="html">
+              <p class="o_view_nocontent_smiling_face">
+                Record a new activity
+              </p><p>
+                You can register and track your workings hours by project every
+                day. Every time spent on a project will become a cost and can be re-invoiced to
+                customers if required.
+              </p>
+            </field>
+        </record>
+
+        <!-- Overwrite User Record Rule-->
+        <record id="hr_timesheet.timesheet_line_rule_user" model="ir.rule">
+            <field name="name">account.analytic.line.timesheet.user</field>
+            <field name="active" eval="0"/>
+            <field name="model_id" ref="analytic.model_account_analytic_line"/>
+            <field name="domain_force">[('user_id', '=', user.id), ('project_id', '!=', False)]</field>
+            <field name="groups" eval="[(4, ref('hr_timesheet.group_hr_timesheet_user'))]"/>
+            <field name="perm_create" eval="1"/>
+            <field name="perm_write" eval="1"/>
+            <field name="perm_unlink" eval="1"/>
+            <field name="perm_read" eval="0"/>
+        </record>
+
+</odoo>

From b9516f8317df801b952cbb07472a6f2313dee9e0 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 2 Dec 2019 17:32:47 -0500
Subject: [PATCH 335/631] [FIX] fieldservice_account: tests and travis

---
 fieldservice_isp_account/models/__init__.py        | 7 +++++++
 fieldservice_isp_account/models/fsm_order.py       | 2 +-
 fieldservice_isp_account/tests/test_isp_account.py | 2 +-
 fieldservice_isp_account/views/fsm_order.xml       | 3 ++-
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 fieldservice_isp_account/models/__init__.py

diff --git a/fieldservice_isp_account/models/__init__.py b/fieldservice_isp_account/models/__init__.py
new file mode 100644
index 0000000000..19e859522b
--- /dev/null
+++ b/fieldservice_isp_account/models/__init__.py
@@ -0,0 +1,7 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import (
+    account_invoice_line,
+    fsm_order,
+    fsm_person,
+)
diff --git a/fieldservice_isp_account/models/fsm_order.py b/fieldservice_isp_account/models/fsm_order.py
index 9cd3454bb3..4b0637fd24 100644
--- a/fieldservice_isp_account/models/fsm_order.py
+++ b/fieldservice_isp_account/models/fsm_order.py
@@ -37,7 +37,7 @@ def _compute_employee(self):
 
     @api.depends('employee_timesheet_ids', 'contractor_cost_ids')
     def _compute_total_cost(self):
-        super(self)._compute_total_cost()
+        super()._compute_total_cost()
         for order in self:
             order.total_cost = 0.0
             rate = 0
diff --git a/fieldservice_isp_account/tests/test_isp_account.py b/fieldservice_isp_account/tests/test_isp_account.py
index 60dd8b1de2..a12cc2de8d 100644
--- a/fieldservice_isp_account/tests/test_isp_account.py
+++ b/fieldservice_isp_account/tests/test_isp_account.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 
 from odoo import fields
-from odoo.addons.fieldservice_sale.tests.test_fsm_account import (
+from odoo.addons.fieldservice_account.tests.test_fsm_account import (
     FSMAccountCase
 )
 from odoo.exceptions import ValidationError
diff --git a/fieldservice_isp_account/views/fsm_order.xml b/fieldservice_isp_account/views/fsm_order.xml
index 4540901734..469e19c4c4 100644
--- a/fieldservice_isp_account/views/fsm_order.xml
+++ b/fieldservice_isp_account/views/fsm_order.xml
@@ -3,7 +3,8 @@
     <record id="fsm_order_form_isp_account" model="ir.ui.view">
         <field name="name">fsm.order.form.isp.account</field>
         <field name="model">fsm.order</field>
-        <field name="inherit_id" ref="fieldservice.fsm_order_form_account"/>
+        <field name="inherit_id" 
+               ref="fieldservice_account_analytic.fsm_order_form_analytic"/>
         <field name="arch" type="xml">
             <page name="accounting" position="inside">
                 <header>

From c3f62416c295cc52e7d87fbe4bc6e99fc8e7c6db Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Thu, 5 Dec 2019 13:28:31 -0500
Subject: [PATCH 336/631] [IMP] fieldservice_account: Update maintainers

---
 fieldservice_isp_account/README.rst           |  38 ++--
 fieldservice_isp_account/__manifest__.py      |   6 +-
 .../i18n/fieldservice_isp_account.pot         | 214 ++++++++++++++++++
 .../static/description/index.html             |  23 +-
 4 files changed, 250 insertions(+), 31 deletions(-)
 create mode 100644 fieldservice_isp_account/i18n/fieldservice_isp_account.pot

diff --git a/fieldservice_isp_account/README.rst b/fieldservice_isp_account/README.rst
index 278e295c55..cb1c58ed6b 100644
--- a/fieldservice_isp_account/README.rst
+++ b/fieldservice_isp_account/README.rst
@@ -1,6 +1,6 @@
-==========================
-Field Service - Accounting
-==========================
+==============================
+Field Service - ISP Accounting
+==============================
 
 .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
@@ -14,10 +14,10 @@ Field Service - Accounting
     :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_account
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_isp_account
     :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_account
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_isp_account
     :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
@@ -43,25 +43,22 @@ No special installation instructions
 Configuration
 =============
 
-To configure this module, you need to:
-
-* Go to Field Service > Master Data > Locations
-* Create or select a location and set their analytic account
+No special configuration instructions.
 
 Usage
 =====
 
 To use the module:
 
-On a field service order, open the "Accounting" tab. Depending on 
-whether the logged in user or an employee or not, they will see 
+On a field service order, open the "Accounting" tab. Depending on
+whether the logged in user or an employee or not, they will see
 either a place to enter timesheet records or contractor costs.
 
-The total cost of the order is calculated based on the entries in 
+The total cost of the order is calculated based on the entries in
 the employee timesheet entries and contractor costs.
 
 When an order is completed, a customer invoice will be generated for
-the employee time and the contractor costs. A vendor bill will be 
+the employee time and the contractor costs. A vendor bill will be
 created for the contractor costs.
 
 Bug Tracker
@@ -70,7 +67,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_account%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_isp_account%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.
 
@@ -87,6 +84,7 @@ Contributors
 
 * Michael Allen <mallen@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Brian McMaster <brian@mcmpest.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -111,11 +109,17 @@ promote its widespread use.
 .. |maintainer-osimallen| image:: https://github.com/osimallen.png?size=40px
     :target: https://github.com/osimallen
     :alt: osimallen
+.. |maintainer-brian10048| image:: https://github.com/brian10048.png?size=40px
+    :target: https://github.com/brian10048
+    :alt: brian10048
+.. |maintainer-bodedra| image:: https://github.com/bodedra.png?size=40px
+    :target: https://github.com/bodedra
+    :alt: bodedra
 
-Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-osimallen| 
+|maintainer-osimallen| |maintainer-brian10048| |maintainer-bodedra| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_account>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_isp_account>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index cd184a7c82..5e18a8cd60 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -22,5 +22,9 @@
     ],
     'license': 'AGPL-3',
     'development_status': 'Beta',
-    'maintainers': ['osimallen'],
+    'maintainers': [
+        'osimallen',
+        'brian10048',
+        'bodedra',
+    ],
 }
diff --git a/fieldservice_isp_account/i18n/fieldservice_isp_account.pot b/fieldservice_isp_account/i18n/fieldservice_isp_account.pot
new file mode 100644
index 0000000000..8777744e96
--- /dev/null
+++ b/fieldservice_isp_account/i18n/fieldservice_isp_account.pot
@@ -0,0 +1,214 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_isp_account
+#
+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_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__account_stage
+msgid "Accounting Stage"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:68
+#, python-format
+msgid "Cannot move to Complete until 'Contractor Costs' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:71
+#, python-format
+msgid "Cannot move to Complete until 'Employee Timesheets' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Confirm"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:115
+#, python-format
+msgid "Contact empty"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__contractor_total
+msgid "Contractor Cost Estimate"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__contractor_cost_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Contractor Costs"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Create Invoice"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Draft"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Duration"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee
+msgid "Employee"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee_timesheet_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Employee Timesheets"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_overtime
+msgid "FSM Overtime"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_regular_time
+msgid "FSM Regular Time"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_travel_time
+msgid "FSM Travel Time"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_fsm_person
+msgid "Field Service Worker"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Fully Invoiced"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_overtime
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_regular_time
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_travel_time
+msgid "Hour(s)"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_search_view
+msgid "Needs Review"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.actions.act_window,help:fieldservice_isp_account.action_account_fsm_order
+msgid "No Field Service Orders to review."
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "No Invoice"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Nothing Invoiced"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.ui.menu,name:fieldservice_isp_account.menu_account_operations
+msgid "Operations"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_overtime
+msgid "Overtime for Field Service Employees\n"
+"        "
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/account_invoice_line.py:19
+#, python-format
+msgid "Please set the field service worker."
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_regular_time
+msgid "Regular time for Field Service\n"
+"            Employees\n"
+"        "
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.actions.act_window,name:fieldservice_isp_account.action_account_fsm_order
+#: model:ir.ui.menu,name:fieldservice_isp_account.menu_account_fsm_order
+msgid "Service Orders"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:102
+#, python-format
+msgid "The worker assigned to this order is not a supplier"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Timesheet Activities"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee_time_total
+msgid "Total Employee Hours"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_travel_time
+msgid "Travel time for Field Service\n"
+"            Employees\n"
+"        "
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_person__bill_count
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_person_form_isp_account
+msgid "Vendor Bills"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_overtime
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_regular_time
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_travel_time
+msgid "kg"
+msgstr ""
+
diff --git a/fieldservice_isp_account/static/description/index.html b/fieldservice_isp_account/static/description/index.html
index be45db7518..04cc1226d9 100644
--- a/fieldservice_isp_account/static/description/index.html
+++ b/fieldservice_isp_account/static/description/index.html
@@ -4,7 +4,7 @@
 <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 - Accounting</title>
+<title>Field Service - ISP Accounting</title>
 <style type="text/css">
 
 /*
@@ -360,14 +360,14 @@
 </style>
 </head>
 <body>
-<div class="document" id="field-service-accounting">
-<h1 class="title">Field Service - Accounting</h1>
+<div class="document" id="field-service-isp-accounting">
+<h1 class="title">Field Service - ISP Accounting</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_account"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_account"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" 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><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_isp_account"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_isp_account"><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>This module adds the ability to track employee time and contractor
 costs for Field Service Orders. It also adds functionality to create
 a customer invoice and a vendor bill when a Field Service Order is
@@ -394,11 +394,7 @@ <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 configure 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 and set their analytic account</li>
-</ul>
+<p>No special configuration instructions.</p>
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#id3">Usage</a></h1>
@@ -417,7 +413,7 @@ <h1><a class="toc-backref" href="#id4">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_account%0Aversion:%2012.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_isp_account%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">
@@ -433,6 +429,7 @@ <h2><a class="toc-backref" href="#id7">Contributors</a></h2>
 <ul class="simple">
 <li>Michael Allen &lt;<a class="reference external" href="mailto:mallen&#64;opensourceintegrators.com">mallen&#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">
@@ -449,9 +446,9 @@ <h2><a class="toc-backref" href="#id9">Maintainers</a></h2>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
-<p><a class="reference external" href="https://github.com/osimallen"><img alt="osimallen" src="https://github.com/osimallen.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_account">OCA/field-service</a> project on GitHub.</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/osimallen"><img alt="osimallen" src="https://github.com/osimallen.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> <a class="reference external" href="https://github.com/bodedra"><img alt="bodedra" src="https://github.com/bodedra.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_isp_account">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 c37673712bbab91b2a6e0e3452941f4cb6a6d467 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 5 Dec 2019 19:10:27 +0000
Subject: [PATCH 337/631] fieldservice_isp_account 12.0.2.0.2

---
 fieldservice_isp_account/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index 5e18a8cd60..e527f23850 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - ISP Accounting',
     'summary': """Invoice Field Service orders based on employee time
                   or contractor costs""",
-    'version': '12.0.2.0.1',
+    'version': '12.0.2.0.2',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',

From a7d63465e01c04f3f18e2d7ac572b9ffbb6a365d Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 11 Dec 2019 15:17:47 -0800
Subject: [PATCH 338/631] [IMP] Search Company ID

---
 fieldservice_isp_account/i18n/fieldservice_isp_account.pot | 4 ++--
 fieldservice_isp_account/models/fsm_order.py               | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fieldservice_isp_account/i18n/fieldservice_isp_account.pot b/fieldservice_isp_account/i18n/fieldservice_isp_account.pot
index 8777744e96..c633f9becc 100644
--- a/fieldservice_isp_account/i18n/fieldservice_isp_account.pot
+++ b/fieldservice_isp_account/i18n/fieldservice_isp_account.pot
@@ -41,7 +41,7 @@ msgid "Confirmed"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: code:addons/fieldservice_isp_account/models/fsm_order.py:115
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:116
 #, python-format
 msgid "Contact empty"
 msgstr ""
@@ -177,7 +177,7 @@ msgid "Service Orders"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: code:addons/fieldservice_isp_account/models/fsm_order.py:102
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:103
 #, python-format
 msgid "The worker assigned to this order is not a supplier"
 msgstr ""
diff --git a/fieldservice_isp_account/models/fsm_order.py b/fieldservice_isp_account/models/fsm_order.py
index 4b0637fd24..a203ac7d83 100644
--- a/fieldservice_isp_account/models/fsm_order.py
+++ b/fieldservice_isp_account/models/fsm_order.py
@@ -84,7 +84,8 @@ def create_bills(self):
             'type': 'in_invoice',
             'journal_id': jrnl.id or False,
             'fiscal_position_id': fpos.id or False,
-            'fsm_order_id': self.id
+            'fsm_order_id': self.id,
+            'company_id': self.env.user.company_id.id
         }
         bill = self.env['account.invoice'].sudo().create(vals)
         for line in self.contractor_cost_ids:
@@ -130,7 +131,8 @@ def account_create_invoice(self):
                 'type': 'out_invoice',
                 'journal_id': jrnl.id or False,
                 'fiscal_position_id': fpos.id or False,
-                'fsm_order_id': self.id
+                'fsm_order_id': self.id,
+                'company_id': self.env.user.company_id.id
             }
             invoice = self.env['account.invoice'].sudo().create(vals)
             price_list = invoice.partner_id.property_product_pricelist

From f36653ac2207153d121a2acc7247ba478ff4fddc Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 13 Dec 2019 16:11:49 -0600
Subject: [PATCH 339/631] [FIX] fieldservice_isp_account: Show the header at
 the top

---
 fieldservice_isp_account/views/fsm_order.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fieldservice_isp_account/views/fsm_order.xml b/fieldservice_isp_account/views/fsm_order.xml
index 469e19c4c4..1565e1b6fd 100644
--- a/fieldservice_isp_account/views/fsm_order.xml
+++ b/fieldservice_isp_account/views/fsm_order.xml
@@ -3,10 +3,10 @@
     <record id="fsm_order_form_isp_account" model="ir.ui.view">
         <field name="name">fsm.order.form.isp.account</field>
         <field name="model">fsm.order</field>
-        <field name="inherit_id" 
+        <field name="inherit_id"
                ref="fieldservice_account_analytic.fsm_order_form_analytic"/>
         <field name="arch" type="xml">
-            <page name="accounting" position="inside">
+            <group name="bill_to" position="before">
                 <header>
                     <button id="account_confirm"
                             name="account_confirm" string="Confirm"
@@ -28,7 +28,7 @@
                             attrs="{'invisible': [('account_stage', '!=', 'confirmed')]}"/>
                     <field name="account_stage" widget="statusbar"/>
                 </header>
-            </page>
+            </group>
             <group name="bill_to" position="after">
                 <group string="Contractor Costs">
                     <field name="contractor_cost_ids" nolabel="1">

From c5fecd8b9dfe6202487f2ff460cff01bcf148072 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 16 Dec 2019 18:42:45 +0000
Subject: [PATCH 340/631] fieldservice_isp_account 12.0.2.1.0

---
 fieldservice_isp_account/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index e527f23850..1084f8ee4f 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - ISP Accounting',
     'summary': """Invoice Field Service orders based on employee time
                   or contractor costs""",
-    'version': '12.0.2.0.2',
+    'version': '12.0.2.1.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',

From eba54e0dd235778febb652ddd993e82700337ec4 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 26 Dec 2019 14:39:09 -0600
Subject: [PATCH 341/631] [IMP] fieldservice_isp_account: m2m between fsm.order
 and invoice

---
 fieldservice_isp_account/i18n/es_CL.po       | 220 +++++++++++++++++++
 fieldservice_isp_account/i18n/pt_BR.po       | 214 ++++++++++++++++++
 fieldservice_isp_account/models/fsm_order.py |  12 +-
 3 files changed, 441 insertions(+), 5 deletions(-)
 create mode 100644 fieldservice_isp_account/i18n/es_CL.po
 create mode 100644 fieldservice_isp_account/i18n/pt_BR.po

diff --git a/fieldservice_isp_account/i18n/es_CL.po b/fieldservice_isp_account/i18n/es_CL.po
new file mode 100644
index 0000000000..8c1be242e8
--- /dev/null
+++ b/fieldservice_isp_account/i18n/es_CL.po
@@ -0,0 +1,220 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_isp_account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-01-16 22:38+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.10\n"
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__account_stage
+msgid "Accounting Stage"
+msgstr "Etapa Contable"
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:68
+#, python-format
+msgid "Cannot move to Complete until 'Contractor Costs' is filled in"
+msgstr ""
+"No se puede pasar a Completado hasta que se completen los 'Costos del "
+"contratista'"
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:71
+#, python-format
+msgid "Cannot move to Complete until 'Employee Timesheets' is filled in"
+msgstr ""
+"No se puede mover a Completado hasta que se completen las 'Hojas de tiempo "
+"de empleado'"
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:116
+#, python-format
+msgid "Contact empty"
+msgstr "Contacto Vacío"
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__contractor_total
+msgid "Contractor Cost Estimate"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__contractor_cost_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Contractor Costs"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Create Invoice"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Draft"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Duration"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee
+msgid "Employee"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee_timesheet_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Employee Timesheets"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_overtime
+msgid "FSM Overtime"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_regular_time
+msgid "FSM Regular Time"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_travel_time
+msgid "FSM Travel Time"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_fsm_person
+msgid "Field Service Worker"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Fully Invoiced"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_overtime
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_regular_time
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_travel_time
+msgid "Hour(s)"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_search_view
+msgid "Needs Review"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.actions.act_window,help:fieldservice_isp_account.action_account_fsm_order
+msgid "No Field Service Orders to review."
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "No Invoice"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Nothing Invoiced"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.ui.menu,name:fieldservice_isp_account.menu_account_operations
+msgid "Operations"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_overtime
+msgid "Overtime for Field Service Employees\n"
+"        "
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/account_invoice_line.py:19
+#, python-format
+msgid "Please set the field service worker."
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_regular_time
+msgid "Regular time for Field Service\n"
+"            Employees\n"
+"        "
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.actions.act_window,name:fieldservice_isp_account.action_account_fsm_order
+#: model:ir.ui.menu,name:fieldservice_isp_account.menu_account_fsm_order
+msgid "Service Orders"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:103
+#, python-format
+msgid "The worker assigned to this order is not a supplier"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Timesheet Activities"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee_time_total
+msgid "Total Employee Hours"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_travel_time
+msgid "Travel time for Field Service\n"
+"            Employees\n"
+"        "
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_person__bill_count
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_person_form_isp_account
+msgid "Vendor Bills"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_overtime
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_regular_time
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_travel_time
+msgid "kg"
+msgstr ""
diff --git a/fieldservice_isp_account/i18n/pt_BR.po b/fieldservice_isp_account/i18n/pt_BR.po
new file mode 100644
index 0000000000..799dc78b97
--- /dev/null
+++ b/fieldservice_isp_account/i18n/pt_BR.po
@@ -0,0 +1,214 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_isp_account
+#
+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_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__account_stage
+msgid "Accounting Stage"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:68
+#, python-format
+msgid "Cannot move to Complete until 'Contractor Costs' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:71
+#, python-format
+msgid "Cannot move to Complete until 'Employee Timesheets' is filled in"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Confirm"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:116
+#, python-format
+msgid "Contact empty"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__contractor_total
+msgid "Contractor Cost Estimate"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__contractor_cost_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Contractor Costs"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Create Invoice"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Draft"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Duration"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee
+msgid "Employee"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee_timesheet_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Employee Timesheets"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_overtime
+msgid "FSM Overtime"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_regular_time
+msgid "FSM Regular Time"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_travel_time
+msgid "FSM Travel Time"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_fsm_person
+msgid "Field Service Worker"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Fully Invoiced"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_overtime
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_regular_time
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_travel_time
+msgid "Hour(s)"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_search_view
+msgid "Needs Review"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.actions.act_window,help:fieldservice_isp_account.action_account_fsm_order
+msgid "No Field Service Orders to review."
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "No Invoice"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Nothing Invoiced"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.ui.menu,name:fieldservice_isp_account.menu_account_operations
+msgid "Operations"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_overtime
+msgid "Overtime for Field Service Employees\n"
+"        "
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/account_invoice_line.py:19
+#, python-format
+msgid "Please set the field service worker."
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_regular_time
+msgid "Regular time for Field Service\n"
+"            Employees\n"
+"        "
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.actions.act_window,name:fieldservice_isp_account.action_account_fsm_order
+#: model:ir.ui.menu,name:fieldservice_isp_account.menu_account_fsm_order
+msgid "Service Orders"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:103
+#, python-format
+msgid "The worker assigned to this order is not a supplier"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Timesheet Activities"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee_time_total
+msgid "Total Employee Hours"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_travel_time
+msgid "Travel time for Field Service\n"
+"            Employees\n"
+"        "
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_person__bill_count
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_person_form_isp_account
+msgid "Vendor Bills"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_overtime
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_regular_time
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_travel_time
+msgid "kg"
+msgstr ""
diff --git a/fieldservice_isp_account/models/fsm_order.py b/fieldservice_isp_account/models/fsm_order.py
index a203ac7d83..6afa1cb878 100644
--- a/fieldservice_isp_account/models/fsm_order.py
+++ b/fieldservice_isp_account/models/fsm_order.py
@@ -84,7 +84,7 @@ def create_bills(self):
             'type': 'in_invoice',
             'journal_id': jrnl.id or False,
             'fiscal_position_id': fpos.id or False,
-            'fsm_order_id': self.id,
+            'fsm_order_ids': [(4, self.id)],
             'company_id': self.env.user.company_id.id
         }
         bill = self.env['account.invoice'].sudo().create(vals)
@@ -120,7 +120,7 @@ def account_create_invoice(self):
                 'type': 'out_invoice',
                 'journal_id': jrnl.id or False,
                 'fiscal_position_id': fpos.id or False,
-                'fsm_order_id': self.id
+                'fsm_order_ids': [(4, self.id)],
             }
             invoice = self.env['account.invoice'].sudo().create(vals)
             price_list = invoice.partner_id.property_product_pricelist
@@ -131,7 +131,7 @@ def account_create_invoice(self):
                 'type': 'out_invoice',
                 'journal_id': jrnl.id or False,
                 'fiscal_position_id': fpos.id or False,
-                'fsm_order_id': self.id,
+                'fsm_order_ids': [(4, self.id)],
                 'company_id': self.env.user.company_id.id
             }
             invoice = self.env['account.invoice'].sudo().create(vals)
@@ -152,7 +152,8 @@ def account_create_invoice(self):
                 'name': line.name,
                 'price_unit': price,
                 'account_id': account.id,
-                'invoice_id': invoice.id
+                'invoice_id': invoice.id,
+                'fsm_order_id': self.id,
             }
             time_cost = self.env['account.invoice.line'].create(vals)
             taxes = template.taxes_id
@@ -173,7 +174,8 @@ def account_create_invoice(self):
                 'name': cost.name,
                 'price_unit': price,
                 'account_id': account.id,
-                'invoice_id': invoice.id
+                'invoice_id': invoice.id,
+                'fsm_order_id': self.id,
             }
             con_cost = self.env['account.invoice.line'].create(vals)
             taxes = template.taxes_id

From 5875282656855ee011f223244c1156a211a7c774 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 17 Jan 2020 01:02:50 +0000
Subject: [PATCH 342/631] fieldservice_isp_account 12.0.2.1.1

---
 fieldservice_isp_account/__manifest__.py |  2 +-
 fieldservice_isp_account/i18n/pt_BR.po   | 58 ++++++++++++------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index 1084f8ee4f..36f7423042 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - ISP Accounting',
     'summary': """Invoice Field Service orders based on employee time
                   or contractor costs""",
-    'version': '12.0.2.1.0',
+    'version': '12.0.2.1.1',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_isp_account/i18n/pt_BR.po b/fieldservice_isp_account/i18n/pt_BR.po
index 799dc78b97..ec32197ce9 100644
--- a/fieldservice_isp_account/i18n/pt_BR.po
+++ b/fieldservice_isp_account/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-10 15:33+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_isp_account
 #: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__account_stage
 msgid "Accounting Stage"
-msgstr ""
+msgstr "Etapa Contábil"
 
 #. module: fieldservice_isp_account
 #: code:addons/fieldservice_isp_account/models/fsm_order.py:68
@@ -34,49 +36,49 @@ msgstr ""
 #. module: fieldservice_isp_account
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmar"
 
 #. module: fieldservice_isp_account
 #: selection:fsm.order,account_stage:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmado"
 
 #. module: fieldservice_isp_account
 #: code:addons/fieldservice_isp_account/models/fsm_order.py:116
 #, python-format
 msgid "Contact empty"
-msgstr ""
+msgstr "Contato Vazio"
 
 #. module: fieldservice_isp_account
 #: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__contractor_total
 msgid "Contractor Cost Estimate"
-msgstr ""
+msgstr "Estimativa de Custos do Contratante"
 
 #. module: fieldservice_isp_account
 #: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__contractor_cost_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
 msgid "Contractor Costs"
-msgstr ""
+msgstr "Custos do Contratante"
 
 #. module: fieldservice_isp_account
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
 msgid "Create Invoice"
-msgstr ""
+msgstr "Criar Fatura"
 
 #. module: fieldservice_isp_account
 #: selection:fsm.order,account_stage:0
 msgid "Draft"
-msgstr ""
+msgstr "Provisório"
 
 #. module: fieldservice_isp_account
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
 msgid "Duration"
-msgstr ""
+msgstr "Duração"
 
 #. module: fieldservice_isp_account
 #: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee
 msgid "Employee"
-msgstr ""
+msgstr "Funcionario"
 
 #. module: fieldservice_isp_account
 #: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee_timesheet_ids
@@ -102,55 +104,55 @@ msgstr ""
 #. module: fieldservice_isp_account
 #: model:ir.model,name:fieldservice_isp_account.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Ordem de Serviço de Campo"
 
 #. module: fieldservice_isp_account
 #: model:ir.model,name:fieldservice_isp_account.model_fsm_person
 msgid "Field Service Worker"
-msgstr ""
+msgstr "Trabalhador do Serviço de Campo"
 
 #. module: fieldservice_isp_account
 #: selection:fsm.order,account_stage:0
 msgid "Fully Invoiced"
-msgstr ""
+msgstr "Totalmente Faturado"
 
 #. module: fieldservice_isp_account
 #: model:product.template,uom_name:fieldservice_isp_account.field_service_overtime
 #: model:product.template,uom_name:fieldservice_isp_account.field_service_regular_time
 #: model:product.template,uom_name:fieldservice_isp_account.field_service_travel_time
 msgid "Hour(s)"
-msgstr ""
+msgstr "Hora(s)"
 
 #. module: fieldservice_isp_account
 #: model:ir.model,name:fieldservice_isp_account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Linha de Fatura"
 
 #. module: fieldservice_isp_account
 #: selection:fsm.order,account_stage:0
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_search_view
 msgid "Needs Review"
-msgstr ""
+msgstr "Necessita de Revisão"
 
 #. module: fieldservice_isp_account
 #: model_terms:ir.actions.act_window,help:fieldservice_isp_account.action_account_fsm_order
 msgid "No Field Service Orders to review."
-msgstr ""
+msgstr "Sem Ordens de Serviço de Campo para revisar."
 
 #. module: fieldservice_isp_account
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
 msgid "No Invoice"
-msgstr ""
+msgstr "Sem Fatura"
 
 #. module: fieldservice_isp_account
 #: selection:fsm.order,account_stage:0
 msgid "Nothing Invoiced"
-msgstr ""
+msgstr "Nada Faturado"
 
 #. module: fieldservice_isp_account
 #: model:ir.ui.menu,name:fieldservice_isp_account.menu_account_operations
 msgid "Operations"
-msgstr ""
+msgstr "Operações"
 
 #. module: fieldservice_isp_account
 #: model:product.template,description_sale:fieldservice_isp_account.field_service_overtime
@@ -162,7 +164,7 @@ msgstr ""
 #: code:addons/fieldservice_isp_account/models/account_invoice_line.py:19
 #, python-format
 msgid "Please set the field service worker."
-msgstr ""
+msgstr "Por favor, selecione o trabalhador do serviço de campo."
 
 #. module: fieldservice_isp_account
 #: model:product.template,description_sale:fieldservice_isp_account.field_service_regular_time
@@ -175,23 +177,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:fieldservice_isp_account.action_account_fsm_order
 #: model:ir.ui.menu,name:fieldservice_isp_account.menu_account_fsm_order
 msgid "Service Orders"
-msgstr ""
+msgstr "Ordens de Serviço"
 
 #. module: fieldservice_isp_account
 #: code:addons/fieldservice_isp_account/models/fsm_order.py:103
 #, python-format
 msgid "The worker assigned to this order is not a supplier"
-msgstr ""
+msgstr "O trabalhador designado para esta ordem não é um fornecedor"
 
 #. module: fieldservice_isp_account
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
 msgid "Timesheet Activities"
-msgstr ""
+msgstr "Atividades da Planilha de Tempo"
 
 #. module: fieldservice_isp_account
 #: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee_time_total
 msgid "Total Employee Hours"
-msgstr ""
+msgstr "Carga Horária Total do Empregado"
 
 #. module: fieldservice_isp_account
 #: model:product.template,description_sale:fieldservice_isp_account.field_service_travel_time
@@ -204,11 +206,11 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_person__bill_count
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_person_form_isp_account
 msgid "Vendor Bills"
-msgstr ""
+msgstr "# Contas de Fornecedores"
 
 #. module: fieldservice_isp_account
 #: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_overtime
 #: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_regular_time
 #: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_travel_time
 msgid "kg"
-msgstr ""
+msgstr "kg"

From 29f1bab935a057af66b501b10de7969a62d8d8de Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 2 Apr 2020 09:18:09 -0700
Subject: [PATCH 343/631] [IMP] Default Set Project and Task

[IMP] Add Project + Task to View for Context
---
 fieldservice_isp_account/__manifest__.py     | 1 +
 fieldservice_isp_account/views/fsm_order.xml | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index 36f7423042..5a511cf3d8 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -11,6 +11,7 @@
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice_account_analytic',
+        'fieldservice_project',
         'hr_timesheet',
     ],
     'data': [
diff --git a/fieldservice_isp_account/views/fsm_order.xml b/fieldservice_isp_account/views/fsm_order.xml
index 1565e1b6fd..fb57aa3643 100644
--- a/fieldservice_isp_account/views/fsm_order.xml
+++ b/fieldservice_isp_account/views/fsm_order.xml
@@ -50,7 +50,7 @@
                     <field name="contractor_total" readonly="1"/>
                 </group>
                 <group string="Employee Timesheets">
-                    <field name="employee_timesheet_ids" nolabel="1">
+                    <field name="employee_timesheet_ids" nolabel="1" context="{'default_project_id': project_id, 'default_task_id': project_task_id}">
                         <tree editable="bottom"
                                 string="Timesheet Activities"
                                 default_order="date">
@@ -63,6 +63,8 @@
                             <field name="name"/>
                             <field name="unit_amount" string="Duration"
                                     widget="float_time"/>
+                            <field name="project_id" invisible="1"/>
+                            <field name="task_id" invisible="1"/>
                         </tree>
                     </field>
                 </group>

From 1cbc7dd884252fcc6d63e694d9f12d4ffa4642b7 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 3 Apr 2020 07:16:05 +0000
Subject: [PATCH 344/631] fieldservice_isp_account 12.0.2.2.0

---
 fieldservice_isp_account/__manifest__.py |   2 +-
 fieldservice_isp_account/i18n/es_AR.po   | 228 +++++++++++++++++++++++
 fieldservice_isp_account/i18n/pt_BR.po   |  22 ++-
 3 files changed, 245 insertions(+), 7 deletions(-)
 create mode 100644 fieldservice_isp_account/i18n/es_AR.po

diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index 5a511cf3d8..9d92829615 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - ISP Accounting',
     'summary': """Invoice Field Service orders based on employee time
                   or contractor costs""",
-    'version': '12.0.2.1.1',
+    'version': '12.0.2.2.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_isp_account/i18n/es_AR.po b/fieldservice_isp_account/i18n/es_AR.po
new file mode 100644
index 0000000000..2c5c799966
--- /dev/null
+++ b/fieldservice_isp_account/i18n/es_AR.po
@@ -0,0 +1,228 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_isp_account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-07-21 05:19+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 3.10\n"
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__account_stage
+msgid "Accounting Stage"
+msgstr "Etapa de Contabilidad"
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:68
+#, python-format
+msgid "Cannot move to Complete until 'Contractor Costs' is filled in"
+msgstr ""
+"No se puede pasar a Completo hasta que se completen los 'Costos del "
+"Contratista'"
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:71
+#, python-format
+msgid "Cannot move to Complete until 'Employee Timesheets' is filled in"
+msgstr ""
+"No se puede mover a Completado hasta que se completen el 'Parte de Horas del "
+"Empleado'"
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:116
+#, python-format
+msgid "Contact empty"
+msgstr "Contacto vacío"
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__contractor_total
+msgid "Contractor Cost Estimate"
+msgstr "Estimación de Costos del Contratistas"
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__contractor_cost_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Contractor Costs"
+msgstr "Costos del Contratistas"
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Create Invoice"
+msgstr "Crear Factura"
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Duration"
+msgstr "Duración"
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee_timesheet_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Employee Timesheets"
+msgstr "Parte de Horas del Empleado"
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_overtime
+msgid "FSM Overtime"
+msgstr "Horas Extra FSM"
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_regular_time
+msgid "FSM Regular Time"
+msgstr "Tiempo Regular FSM"
+
+#. module: fieldservice_isp_account
+#: model:product.template,name:fieldservice_isp_account.field_service_travel_time
+msgid "FSM Travel Time"
+msgstr "Tiempo de Viaje FSM"
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_fsm_order
+msgid "Field Service Order"
+msgstr "Pedido de Servicio de Campo"
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabajador de Servicio de Campo"
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Fully Invoiced"
+msgstr "Completamente Facturado"
+
+#. module: fieldservice_isp_account
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_overtime
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_regular_time
+#: model:product.template,uom_name:fieldservice_isp_account.field_service_travel_time
+msgid "Hour(s)"
+msgstr "Hora(s)"
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de Factura"
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_search_view
+msgid "Needs Review"
+msgstr "Necesita Revisión"
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.actions.act_window,help:fieldservice_isp_account.action_account_fsm_order
+msgid "No Field Service Orders to review."
+msgstr "No hay Pedidos de Servicio de Campo para revisar."
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "No Invoice"
+msgstr "No hay Factura"
+
+#. module: fieldservice_isp_account
+#: selection:fsm.order,account_stage:0
+msgid "Nothing Invoiced"
+msgstr "Nada que Facturar"
+
+#. module: fieldservice_isp_account
+#: model:ir.ui.menu,name:fieldservice_isp_account.menu_account_operations
+msgid "Operations"
+msgstr "Operaciones"
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_overtime
+msgid "Overtime for Field Service Employees\n"
+"        "
+msgstr ""
+"Horas Extra para los Empleados de Servicio de Campo\n"
+"        "
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/account_invoice_line.py:19
+#, python-format
+msgid "Please set the field service worker."
+msgstr "Por favor configure el trabajador de servicio de campo."
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_regular_time
+msgid "Regular time for Field Service\n"
+"            Employees\n"
+"        "
+msgstr ""
+"Tiempo regular para Empleados de Servicio de\n"
+"                Campo\n"
+"        "
+
+#. module: fieldservice_isp_account
+#: model:ir.actions.act_window,name:fieldservice_isp_account.action_account_fsm_order
+#: model:ir.ui.menu,name:fieldservice_isp_account.menu_account_fsm_order
+msgid "Service Orders"
+msgstr "Pedidos de Servicio"
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:103
+#, python-format
+msgid "The worker assigned to this order is not a supplier"
+msgstr "El trabajador asignado a este pedido no es un proveedor"
+
+#. module: fieldservice_isp_account
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
+msgid "Timesheet Activities"
+msgstr "Actividades de Parte de Horas"
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee_time_total
+msgid "Total Employee Hours"
+msgstr "Total de Horas de Empleados"
+
+#. module: fieldservice_isp_account
+#: model:product.template,description_sale:fieldservice_isp_account.field_service_travel_time
+msgid "Travel time for Field Service\n"
+"            Employees\n"
+"        "
+msgstr ""
+"Tiempo de viaje para Empleados de Servicio de\n"
+"               Campo\n"
+"        "
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_person__bill_count
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_person_form_isp_account
+msgid "Vendor Bills"
+msgstr "Cuentas de Vendedor"
+
+#. module: fieldservice_isp_account
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_overtime
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_regular_time
+#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_travel_time
+msgid "kg"
+msgstr "kg"
diff --git a/fieldservice_isp_account/i18n/pt_BR.po b/fieldservice_isp_account/i18n/pt_BR.po
index ec32197ce9..bcf8c1ad34 100644
--- a/fieldservice_isp_account/i18n/pt_BR.po
+++ b/fieldservice_isp_account/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-10 15:33+0000\n"
-"Last-Translator: Marcel Savegnago <marcel.savegnago@gmail.com>\n"
+"PO-Revision-Date: 2020-06-17 16:19+0000\n"
+"Last-Translator: Fernando Colus <fcolus1@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -26,12 +26,16 @@ msgstr "Etapa Contábil"
 #, python-format
 msgid "Cannot move to Complete until 'Contractor Costs' is filled in"
 msgstr ""
+"Não é possível mover para \"Concluído\" até que \"Custos do contratante\" "
+"seja preenchido"
 
 #. module: fieldservice_isp_account
 #: code:addons/fieldservice_isp_account/models/fsm_order.py:71
 #, python-format
 msgid "Cannot move to Complete until 'Employee Timesheets' is filled in"
 msgstr ""
+"Não é possível mover para \"Concluído\" até que o \"Quadro de horários dos "
+"funcionários\" seja preenchido"
 
 #. module: fieldservice_isp_account
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
@@ -84,22 +88,22 @@ msgstr "Funcionario"
 #: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__employee_timesheet_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_form_isp_account
 msgid "Employee Timesheets"
-msgstr ""
+msgstr "Quadro de horários dos funcionários"
 
 #. module: fieldservice_isp_account
 #: model:product.template,name:fieldservice_isp_account.field_service_overtime
 msgid "FSM Overtime"
-msgstr ""
+msgstr "Horas Extras do FSM (Field Service Management)"
 
 #. module: fieldservice_isp_account
 #: model:product.template,name:fieldservice_isp_account.field_service_regular_time
 msgid "FSM Regular Time"
-msgstr ""
+msgstr "Horário Regular do FSM (Field Service Management)"
 
 #. module: fieldservice_isp_account
 #: model:product.template,name:fieldservice_isp_account.field_service_travel_time
 msgid "FSM Travel Time"
-msgstr ""
+msgstr "Tempo de Viagem do FSM (Field Service Management)"
 
 #. module: fieldservice_isp_account
 #: model:ir.model,name:fieldservice_isp_account.model_fsm_order
@@ -159,6 +163,8 @@ msgstr "Operações"
 msgid "Overtime for Field Service Employees\n"
 "        "
 msgstr ""
+"Horas extras para funcionários de serviço de campo\n"
+"        "
 
 #. module: fieldservice_isp_account
 #: code:addons/fieldservice_isp_account/models/account_invoice_line.py:19
@@ -172,6 +178,8 @@ msgid "Regular time for Field Service\n"
 "            Employees\n"
 "        "
 msgstr ""
+"Horário regular para funcionários do serviço de campo\n"
+"        "
 
 #. module: fieldservice_isp_account
 #: model:ir.actions.act_window,name:fieldservice_isp_account.action_account_fsm_order
@@ -201,6 +209,8 @@ msgid "Travel time for Field Service\n"
 "            Employees\n"
 "        "
 msgstr ""
+"Horário regular para funcionários do serviço de campo\n"
+"        "
 
 #. module: fieldservice_isp_account
 #: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_person__bill_count

From bc377aa2a6f295d29def583f8187b7c18a04d601 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Mon, 24 Aug 2020 23:02:23 +0530
Subject: [PATCH 345/631] [IMP] Gave Access to portal user.

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

diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index 9d92829615..f870512525 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -15,6 +15,7 @@
         'hr_timesheet',
     ],
     'data': [
+        'security/ir.model.access.csv',
         'data/time_products.xml',
         'views/account.xml',
         'views/fsm_order.xml',
diff --git a/fieldservice_isp_account/security/ir.model.access.csv b/fieldservice_isp_account/security/ir.model.access.csv
new file mode 100644
index 0000000000..8da6f134f1
--- /dev/null
+++ b/fieldservice_isp_account/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_hr_employee_portal,access.hr.employee.portal,hr.model_hr_employee,base.group_portal,1,0,0,0

From a174d5e0a3cbd90f494a6d20184bd853d9418762 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 24 Aug 2020 18:26:20 +0000
Subject: [PATCH 346/631] fieldservice_isp_account 12.0.2.3.0

---
 fieldservice_isp_account/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index f870512525..d03e863709 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - ISP Accounting',
     'summary': """Invoice Field Service orders based on employee time
                   or contractor costs""",
-    'version': '12.0.2.2.0',
+    'version': '12.0.2.3.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',

From 1a7b71a371c694b9a97b2fd3f2b6b3f37abe33e0 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 10 Sep 2020 16:15:12 -0700
Subject: [PATCH 347/631] [FIX] FSM Invoice Double Timesheet Entry

---
 fieldservice_isp_account/models/fsm_order.py | 40 ++++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/fieldservice_isp_account/models/fsm_order.py b/fieldservice_isp_account/models/fsm_order.py
index 6afa1cb878..8c30f292b5 100644
--- a/fieldservice_isp_account/models/fsm_order.py
+++ b/fieldservice_isp_account/models/fsm_order.py
@@ -136,50 +136,50 @@ def account_create_invoice(self):
             }
             invoice = self.env['account.invoice'].sudo().create(vals)
             price_list = invoice.partner_id.property_product_pricelist
-        for line in self.employee_timesheet_ids:
-            price = price_list.get_product_price(product=line.product_id,
-                                                 quantity=line.unit_amount,
+        for cost in self.contractor_cost_ids:
+            price = price_list.get_product_price(product=cost.product_id,
+                                                 quantity=cost.quantity,
                                                  partner=invoice.partner_id,
                                                  date=False,
                                                  uom_id=False)
-            template = line.product_id.product_tmpl_id
+            template = cost.product_id.product_tmpl_id
             accounts = template.get_product_accounts()
             account = accounts['income']
             vals = {
-                'product_id': line.product_id.id,
-                'account_analytic_id': line.account_id.id,
-                'quantity': line.unit_amount,
-                'name': line.name,
+                'product_id': cost.product_id.id,
+                'account_analytic_id': cost.account_analytic_id.id,
+                'quantity': cost.quantity,
+                'name': cost.name,
                 'price_unit': price,
                 'account_id': account.id,
                 'invoice_id': invoice.id,
                 'fsm_order_id': self.id,
             }
-            time_cost = self.env['account.invoice.line'].create(vals)
+            con_cost = self.env['account.invoice.line'].create(vals)
             taxes = template.taxes_id
-            time_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
-        for cost in self.contractor_cost_ids:
-            price = price_list.get_product_price(product=cost.product_id,
-                                                 quantity=cost.quantity,
+            con_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
+        for line in self.employee_timesheet_ids:
+            price = price_list.get_product_price(product=line.product_id,
+                                                 quantity=line.unit_amount,
                                                  partner=invoice.partner_id,
                                                  date=False,
                                                  uom_id=False)
-            template = cost.product_id.product_tmpl_id
+            template = line.product_id.product_tmpl_id
             accounts = template.get_product_accounts()
             account = accounts['income']
             vals = {
-                'product_id': cost.product_id.id,
-                'account_analytic_id': cost.account_analytic_id.id,
-                'quantity': cost.quantity,
-                'name': cost.name,
+                'product_id': line.product_id.id,
+                'account_analytic_id': line.account_id.id,
+                'quantity': line.unit_amount,
+                'name': line.name,
                 'price_unit': price,
                 'account_id': account.id,
                 'invoice_id': invoice.id,
                 'fsm_order_id': self.id,
             }
-            con_cost = self.env['account.invoice.line'].create(vals)
+            time_cost = self.env['account.invoice.line'].create(vals)
             taxes = template.taxes_id
-            con_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
+            time_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
         invoice.compute_taxes()
         self.account_stage = 'invoiced'
         return invoice

From 8f7a01a5929992dbe46e77a786b5c6fbb7b486b9 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 21 Sep 2020 18:13:18 +0000
Subject: [PATCH 348/631] fieldservice_isp_account 12.0.2.3.1

---
 fieldservice_isp_account/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index d03e863709..c9cb774058 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - ISP Accounting',
     'summary': """Invoice Field Service orders based on employee time
                   or contractor costs""",
-    'version': '12.0.2.3.0',
+    'version': '12.0.2.3.1',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',

From ddf41e97dafd7eb6476e89c17ea13f6d704b1a19 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Mon, 5 Oct 2020 11:04:28 -0700
Subject: [PATCH 349/631] [IMP] No Update Data .xml

---
 fieldservice_isp_account/data/time_products.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_isp_account/data/time_products.xml b/fieldservice_isp_account/data/time_products.xml
index 96a1a4bee3..1ae004dc90 100644
--- a/fieldservice_isp_account/data/time_products.xml
+++ b/fieldservice_isp_account/data/time_products.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
 
     <record id="field_service_travel_time" model="product.template">
         <field name="name">FSM Travel Time</field>

From e614bab024f17e9a09dfa212d37f1c6de98f043a Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 5 Oct 2020 18:58:10 +0000
Subject: [PATCH 350/631] fieldservice_isp_account 12.0.2.3.2

---
 fieldservice_isp_account/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index c9cb774058..16e18a2c70 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Field Service - ISP Accounting',
     'summary': """Invoice Field Service orders based on employee time
                   or contractor costs""",
-    'version': '12.0.2.3.1',
+    'version': '12.0.2.3.2',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',

From bec759e888e3d01c8c1e662a0dc1e1fa705736c7 Mon Sep 17 00:00:00 2001
From: Benoit Aimont <benoit.aimont@acsone.eu>
Date: Wed, 28 Apr 2021 09:41:22 +0200
Subject: [PATCH 351/631] [IMP] fieldservice_isp_account: black, isort,
 prettier

---
 fieldservice_isp_account/__manifest__.py      |  44 ++--
 .../data/time_products.xml                    |  24 +-
 .../models/account_invoice_line.py            |  35 +--
 fieldservice_isp_account/models/fsm_order.py  | 214 ++++++++++--------
 fieldservice_isp_account/models/fsm_person.py |  24 +-
 .../tests/test_isp_account.py                 | 191 +++++++++-------
 fieldservice_isp_account/views/account.xml    |  29 ++-
 fieldservice_isp_account/views/fsm_order.xml  | 137 ++++++-----
 fieldservice_isp_account/views/fsm_person.xml |  19 +-
 .../views/hr_timesheet.xml                    |  55 ++---
 10 files changed, 418 insertions(+), 354 deletions(-)

diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index 16e18a2c70..55cc326f83 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -2,31 +2,27 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - ISP Accounting',
-    'summary': """Invoice Field Service orders based on employee time
+    "name": "Field Service - ISP Accounting",
+    "summary": """Invoice Field Service orders based on employee time
                   or contractor costs""",
-    'version': '12.0.2.3.2',
-    'category': 'Field Service',
-    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice_account_analytic',
-        'fieldservice_project',
-        'hr_timesheet',
+    "version": "12.0.2.3.2",
+    "category": "Field Service",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": [
+        "fieldservice_account_analytic",
+        "fieldservice_project",
+        "hr_timesheet",
     ],
-    'data': [
-        'security/ir.model.access.csv',
-        'data/time_products.xml',
-        'views/account.xml',
-        'views/fsm_order.xml',
-        'views/fsm_person.xml',
-        'views/hr_timesheet.xml',
-    ],
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'osimallen',
-        'brian10048',
-        'bodedra',
+    "data": [
+        "security/ir.model.access.csv",
+        "data/time_products.xml",
+        "views/account.xml",
+        "views/fsm_order.xml",
+        "views/fsm_person.xml",
+        "views/hr_timesheet.xml",
     ],
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": ["osimallen", "brian10048", "bodedra"],
 }
diff --git a/fieldservice_isp_account/data/time_products.xml b/fieldservice_isp_account/data/time_products.xml
index 1ae004dc90..27fb994a25 100644
--- a/fieldservice_isp_account/data/time_products.xml
+++ b/fieldservice_isp_account/data/time_products.xml
@@ -1,36 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
     <record id="field_service_travel_time" model="product.template">
         <field name="name">FSM Travel Time</field>
-        <field name="categ_id" ref="product.product_category_all"/>
+        <field name="categ_id" ref="product.product_category_all" />
         <field name="type">service</field>
-        <field name="uom_id" ref="uom.product_uom_hour"/>
-        <field name="uom_po_id" ref="uom.product_uom_hour"/>
+        <field name="uom_id" ref="uom.product_uom_hour" />
+        <field name="uom_po_id" ref="uom.product_uom_hour" />
         <field name="description_sale">Travel time for Field Service
             Employees
         </field>
     </record>
-
     <record id="field_service_regular_time" model="product.template">
         <field name="name">FSM Regular Time</field>
-        <field name="categ_id" ref="product.product_category_all"/>
+        <field name="categ_id" ref="product.product_category_all" />
         <field name="type">service</field>
-        <field name="uom_id" ref="uom.product_uom_hour"/>
-        <field name="uom_po_id" ref="uom.product_uom_hour"/>
+        <field name="uom_id" ref="uom.product_uom_hour" />
+        <field name="uom_po_id" ref="uom.product_uom_hour" />
         <field name="description_sale">Regular time for Field Service
             Employees
         </field>
     </record>
-
     <record id="field_service_overtime" model="product.template">
         <field name="name">FSM Overtime</field>
-        <field name="categ_id" ref="product.product_category_all"/>
+        <field name="categ_id" ref="product.product_category_all" />
         <field name="type">service</field>
-        <field name="uom_id" ref="uom.product_uom_hour"/>
-        <field name="uom_po_id" ref="uom.product_uom_hour"/>
+        <field name="uom_id" ref="uom.product_uom_hour" />
+        <field name="uom_po_id" ref="uom.product_uom_hour" />
         <field name="description_sale">Overtime for Field Service Employees
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_isp_account/models/account_invoice_line.py b/fieldservice_isp_account/models/account_invoice_line.py
index 1f64c10bcb..9a59be9fc0 100644
--- a/fieldservice_isp_account/models/account_invoice_line.py
+++ b/fieldservice_isp_account/models/account_invoice_line.py
@@ -1,34 +1,39 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, models, _
+from odoo import _, api, models
 from odoo.exceptions import ValidationError
 
 
 class AccountInvoiceLine(models.Model):
     _inherit = "account.invoice.line"
 
-    @api.onchange('product_id', 'quantity')
+    @api.onchange("product_id", "quantity")
     def onchange_product_id(self):
         for line in self:
             if line.fsm_order_id:
-                partner = line.fsm_order_id.person_id and\
-                    line.fsm_order_id.person_id.partner_id or False
+                partner = (
+                    line.fsm_order_id.person_id
+                    and line.fsm_order_id.person_id.partner_id
+                    or False
+                )
                 if not partner:
-                    raise ValidationError(
-                        _("Please set the field service worker."))
+                    raise ValidationError(_("Please set the field service worker."))
                 fpos = partner.property_account_position_id
                 tmpl = line.product_id.product_tmpl_id
                 if line.product_id:
                     accounts = tmpl.get_product_accounts()
-                    supinfo = self.env['product.supplierinfo'].search(
-                        [('name', '=', partner.id),
-                         ('product_tmpl_id', '=', tmpl.id),
-                         ('min_qty', '<=', line.quantity)],
-                        order='min_qty DESC')
-                    line.price_unit = \
+                    supinfo = self.env["product.supplierinfo"].search(
+                        [
+                            ("name", "=", partner.id),
+                            ("product_tmpl_id", "=", tmpl.id),
+                            ("min_qty", "<=", line.quantity),
+                        ],
+                        order="min_qty DESC",
+                    )
+                    line.price_unit = (
                         supinfo and supinfo[0].price or tmpl.standard_price
-                    line.account_id = accounts.get('expense', False)
-                    line.invoice_line_tax_ids = fpos.\
-                        map_tax(tmpl.supplier_taxes_id)
+                    )
+                    line.account_id = accounts.get("expense", False)
+                    line.invoice_line_tax_ids = fpos.map_tax(tmpl.supplier_taxes_id)
                     line.name = line.product_id.name
diff --git a/fieldservice_isp_account/models/fsm_order.py b/fieldservice_isp_account/models/fsm_order.py
index 8c30f292b5..81c3af3aa1 100644
--- a/fieldservice_isp_account/models/fsm_order.py
+++ b/fieldservice_isp_account/models/fsm_order.py
@@ -1,41 +1,45 @@
 # Copyright (C) 2018 - TODAY, 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
 
-
-ACCOUNT_STAGES = [('draft', 'Draft'),
-                  ('review', 'Needs Review'),
-                  ('confirmed', 'Confirmed'),
-                  ('invoiced', 'Fully Invoiced'),
-                  ('no', 'Nothing Invoiced')]
+ACCOUNT_STAGES = [
+    ("draft", "Draft"),
+    ("review", "Needs Review"),
+    ("confirmed", "Confirmed"),
+    ("invoiced", "Fully Invoiced"),
+    ("no", "Nothing Invoiced"),
+]
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
-    contractor_cost_ids = fields.One2many('account.invoice.line',
-                                          'fsm_order_id',
-                                          string='Contractor Costs')
-    employee_timesheet_ids = fields.One2many('account.analytic.line',
-                                             "fsm_order_id",
-                                             string='Employee Timesheets')
-    employee = fields.Boolean(compute='_compute_employee')
-    contractor_total = fields.Float(compute='_compute_contractor_cost',
-                                    string='Contractor Cost Estimate')
-    employee_time_total = fields.Float(compute='_compute_employee_hours',
-                                       string='Total Employee Hours')
-    account_stage = fields.Selection(ACCOUNT_STAGES, string='Accounting Stage',
-                                     default='draft')
+    contractor_cost_ids = fields.One2many(
+        "account.invoice.line", "fsm_order_id", string="Contractor Costs"
+    )
+    employee_timesheet_ids = fields.One2many(
+        "account.analytic.line", "fsm_order_id", string="Employee Timesheets"
+    )
+    employee = fields.Boolean(compute="_compute_employee")
+    contractor_total = fields.Float(
+        compute="_compute_contractor_cost", string="Contractor Cost Estimate"
+    )
+    employee_time_total = fields.Float(
+        compute="_compute_employee_hours", string="Total Employee Hours"
+    )
+    account_stage = fields.Selection(
+        ACCOUNT_STAGES, string="Accounting Stage", default="draft"
+    )
 
     def _compute_employee(self):
-        user = self.env['res.users'].browse(self.env.uid)
+        user = self.env["res.users"].browse(self.env.uid)
         for order in self:
             if user.employee_ids:
                 order.employee = True
 
-    @api.depends('employee_timesheet_ids', 'contractor_cost_ids')
+    @api.depends("employee_timesheet_ids", "contractor_cost_ids")
     def _compute_total_cost(self):
         super()._compute_total_cost()
         for order in self:
@@ -47,14 +51,14 @@ def _compute_total_cost(self):
             for cost in order.contractor_cost_ids:
                 order.total_cost += cost.price_unit * cost.quantity
 
-    @api.depends('employee_timesheet_ids')
+    @api.depends("employee_timesheet_ids")
     def _compute_employee_hours(self):
         for order in self:
             order.employee_time_total = 0.0
             for line in order.employee_timesheet_ids:
                 order.employee_time_total += line.unit_amount
 
-    @api.depends('contractor_cost_ids')
+    @api.depends("contractor_cost_ids")
     def _compute_contractor_cost(self):
         for order in self:
             order.contractor_total = 0.0
@@ -63,31 +67,39 @@ def _compute_contractor_cost(self):
 
     def action_complete(self):
         for order in self:
-            order.account_stage = 'review'
+            order.account_stage = "review"
         if self.person_id.supplier and not self.contractor_cost_ids:
-            raise ValidationError(_("Cannot move to Complete " +
-                                    "until 'Contractor Costs' is filled in"))
+            raise ValidationError(
+                _("Cannot move to Complete " + "until 'Contractor Costs' is filled in")
+            )
         if not self.person_id.supplier and not self.employee_timesheet_ids:
-            raise ValidationError(_("Cannot move to Complete until " +
-                                    "'Employee Timesheets' is filled in"))
+            raise ValidationError(
+                _(
+                    "Cannot move to Complete until "
+                    + "'Employee Timesheets' is filled in"
+                )
+            )
         return super(FSMOrder, self).action_complete()
 
     def create_bills(self):
-        jrnl = self.env['account.journal'].search([
-            ('company_id', '=', self.env.user.company_id.id),
-            ('type', '=', 'purchase'),
-            ('active', '=', True)],
-            limit=1)
+        jrnl = self.env["account.journal"].search(
+            [
+                ("company_id", "=", self.env.user.company_id.id),
+                ("type", "=", "purchase"),
+                ("active", "=", True),
+            ],
+            limit=1,
+        )
         fpos = self.customer_id.property_account_position_id
         vals = {
-            'partner_id': self.person_id.partner_id.id,
-            'type': 'in_invoice',
-            'journal_id': jrnl.id or False,
-            'fiscal_position_id': fpos.id or False,
-            'fsm_order_ids': [(4, self.id)],
-            'company_id': self.env.user.company_id.id
+            "partner_id": self.person_id.partner_id.id,
+            "type": "in_invoice",
+            "journal_id": jrnl.id or False,
+            "fiscal_position_id": fpos.id or False,
+            "fsm_order_ids": [(4, self.id)],
+            "company_id": self.env.user.company_id.id,
         }
-        bill = self.env['account.invoice'].sudo().create(vals)
+        bill = self.env["account.invoice"].sudo().create(vals)
         for line in self.contractor_cost_ids:
             line.invoice_id = bill
         bill.compute_taxes()
@@ -98,91 +110,99 @@ def account_confirm(self):
             if order.contractor_cost_ids:
                 if contractor:
                     order.create_bills()
-                    order.account_stage = 'confirmed'
+                    order.account_stage = "confirmed"
                 else:
-                    raise ValidationError(_("The worker assigned to this order"
-                                            " is not a supplier"))
+                    raise ValidationError(
+                        _("The worker assigned to this order" " is not a supplier")
+                    )
             if order.employee_timesheet_ids:
-                order.account_stage = 'confirmed'
+                order.account_stage = "confirmed"
 
     def account_create_invoice(self):
-        jrnl = self.env['account.journal'].search([
-            ('company_id', '=', self.env.user.company_id.id),
-            ('type', '=', 'sale'),
-            ('active', '=', True)],
-            limit=1)
-        if self.bill_to == 'contact':
+        jrnl = self.env["account.journal"].search(
+            [
+                ("company_id", "=", self.env.user.company_id.id),
+                ("type", "=", "sale"),
+                ("active", "=", True),
+            ],
+            limit=1,
+        )
+        if self.bill_to == "contact":
             if not self.customer_id:
                 raise ValidationError(_("Contact empty"))
             fpos = self.customer_id.property_account_position_id
             vals = {
-                'partner_id': self.customer_id.id,
-                'type': 'out_invoice',
-                'journal_id': jrnl.id or False,
-                'fiscal_position_id': fpos.id or False,
-                'fsm_order_ids': [(4, self.id)],
+                "partner_id": self.customer_id.id,
+                "type": "out_invoice",
+                "journal_id": jrnl.id or False,
+                "fiscal_position_id": fpos.id or False,
+                "fsm_order_ids": [(4, self.id)],
             }
-            invoice = self.env['account.invoice'].sudo().create(vals)
+            invoice = self.env["account.invoice"].sudo().create(vals)
             price_list = invoice.partner_id.property_product_pricelist
         else:
             fpos = self.location_id.customer_id.property_account_position_id
             vals = {
-                'partner_id': self.location_id.customer_id.id,
-                'type': 'out_invoice',
-                'journal_id': jrnl.id or False,
-                'fiscal_position_id': fpos.id or False,
-                'fsm_order_ids': [(4, self.id)],
-                'company_id': self.env.user.company_id.id
+                "partner_id": self.location_id.customer_id.id,
+                "type": "out_invoice",
+                "journal_id": jrnl.id or False,
+                "fiscal_position_id": fpos.id or False,
+                "fsm_order_ids": [(4, self.id)],
+                "company_id": self.env.user.company_id.id,
             }
-            invoice = self.env['account.invoice'].sudo().create(vals)
+            invoice = self.env["account.invoice"].sudo().create(vals)
             price_list = invoice.partner_id.property_product_pricelist
         for cost in self.contractor_cost_ids:
-            price = price_list.get_product_price(product=cost.product_id,
-                                                 quantity=cost.quantity,
-                                                 partner=invoice.partner_id,
-                                                 date=False,
-                                                 uom_id=False)
+            price = price_list.get_product_price(
+                product=cost.product_id,
+                quantity=cost.quantity,
+                partner=invoice.partner_id,
+                date=False,
+                uom_id=False,
+            )
             template = cost.product_id.product_tmpl_id
             accounts = template.get_product_accounts()
-            account = accounts['income']
+            account = accounts["income"]
             vals = {
-                'product_id': cost.product_id.id,
-                'account_analytic_id': cost.account_analytic_id.id,
-                'quantity': cost.quantity,
-                'name': cost.name,
-                'price_unit': price,
-                'account_id': account.id,
-                'invoice_id': invoice.id,
-                'fsm_order_id': self.id,
+                "product_id": cost.product_id.id,
+                "account_analytic_id": cost.account_analytic_id.id,
+                "quantity": cost.quantity,
+                "name": cost.name,
+                "price_unit": price,
+                "account_id": account.id,
+                "invoice_id": invoice.id,
+                "fsm_order_id": self.id,
             }
-            con_cost = self.env['account.invoice.line'].create(vals)
+            con_cost = self.env["account.invoice.line"].create(vals)
             taxes = template.taxes_id
             con_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
         for line in self.employee_timesheet_ids:
-            price = price_list.get_product_price(product=line.product_id,
-                                                 quantity=line.unit_amount,
-                                                 partner=invoice.partner_id,
-                                                 date=False,
-                                                 uom_id=False)
+            price = price_list.get_product_price(
+                product=line.product_id,
+                quantity=line.unit_amount,
+                partner=invoice.partner_id,
+                date=False,
+                uom_id=False,
+            )
             template = line.product_id.product_tmpl_id
             accounts = template.get_product_accounts()
-            account = accounts['income']
+            account = accounts["income"]
             vals = {
-                'product_id': line.product_id.id,
-                'account_analytic_id': line.account_id.id,
-                'quantity': line.unit_amount,
-                'name': line.name,
-                'price_unit': price,
-                'account_id': account.id,
-                'invoice_id': invoice.id,
-                'fsm_order_id': self.id,
+                "product_id": line.product_id.id,
+                "account_analytic_id": line.account_id.id,
+                "quantity": line.unit_amount,
+                "name": line.name,
+                "price_unit": price,
+                "account_id": account.id,
+                "invoice_id": invoice.id,
+                "fsm_order_id": self.id,
             }
-            time_cost = self.env['account.invoice.line'].create(vals)
+            time_cost = self.env["account.invoice.line"].create(vals)
             taxes = template.taxes_id
             time_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
         invoice.compute_taxes()
-        self.account_stage = 'invoiced'
+        self.account_stage = "invoiced"
         return invoice
 
     def account_no_invoice(self):
-        self.account_stage = 'no'
+        self.account_stage = "no"
diff --git a/fieldservice_isp_account/models/fsm_person.py b/fieldservice_isp_account/models/fsm_person.py
index 1b75acfaa6..49ea2a9cc7 100644
--- a/fieldservice_isp_account/models/fsm_person.py
+++ b/fieldservice_isp_account/models/fsm_person.py
@@ -5,25 +5,25 @@
 
 
 class FSMPerson(models.Model):
-    _inherit = 'fsm.person'
+    _inherit = "fsm.person"
 
-    bill_count = fields.Integer(string='Vendor Bills',
-                                compute='_compute_vendor_bills')
+    bill_count = fields.Integer(string="Vendor Bills", compute="_compute_vendor_bills")
 
     def _compute_vendor_bills(self):
-        self.bill_count = self.env['account.invoice'].search_count([
-            ('partner_id', '=', self.partner_id.id)])
+        self.bill_count = self.env["account.invoice"].search_count(
+            [("partner_id", "=", self.partner_id.id)]
+        )
 
     @api.multi
     def action_view_bills(self):
         for bill in self:
-            action = self.env.ref('account.action_invoice_tree1').read()[0]
-            vendor_bills = self.env['account.invoice'].search(
-                [('partner_id', '=', bill.partner_id.id)])
+            action = self.env.ref("account.action_invoice_tree1").read()[0]
+            vendor_bills = self.env["account.invoice"].search(
+                [("partner_id", "=", bill.partner_id.id)]
+            )
             if len(vendor_bills) == 1:
-                action['views'] = [
-                    (self.env.ref('account.invoice_form').id, 'form')]
-                action['res_id'] = vendor_bills.id
+                action["views"] = [(self.env.ref("account.invoice_form").id, "form")]
+                action["res_id"] = vendor_bills.id
             else:
-                action['domain'] = [('id', 'in', vendor_bills.ids)]
+                action["domain"] = [("id", "in", vendor_bills.ids)]
             return action
diff --git a/fieldservice_isp_account/tests/test_isp_account.py b/fieldservice_isp_account/tests/test_isp_account.py
index a12cc2de8d..8347ca24a8 100644
--- a/fieldservice_isp_account/tests/test_isp_account.py
+++ b/fieldservice_isp_account/tests/test_isp_account.py
@@ -2,39 +2,39 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 
 from odoo import fields
-from odoo.addons.fieldservice_account.tests.test_fsm_account import (
-    FSMAccountCase
-)
 from odoo.exceptions import ValidationError
 
+from odoo.addons.fieldservice_account.tests.test_fsm_account import FSMAccountCase
 
-class FSMAccountCase(FSMAccountCase):
 
+class FSMAccountCase(FSMAccountCase):
     def setUp(self):
         super(FSMAccountCase, self).setUp()
-        self.test_person = self.env['fsm.person'].create({'name': 'Worker-1'})
-        self.test_analytic = self.env.ref('analytic.analytic_administratif')
-        self.account_id = self.env['account.account'].create({
-            'code': 'NC1110',
-            'name': 'Test Payable Account',
-            'user_type_id':
-                self.env.ref('account.data_account_type_payable').id,
-            'reconcile': True
-        })
+        self.test_person = self.env["fsm.person"].create({"name": "Worker-1"})
+        self.test_analytic = self.env.ref("analytic.analytic_administratif")
+        self.account_id = self.env["account.account"].create(
+            {
+                "code": "NC1110",
+                "name": "Test Payable Account",
+                "user_type_id": self.env.ref("account.data_account_type_payable").id,
+                "reconcile": True,
+            }
+        )
 
     def _create_workorder(self, bill_to, contractors, timesheets):
         # Create a new work order
-        contractors = self.env['account.invoice.line'].create(contractors)
-        timesheets = self.env['account.analytic.line'].create(timesheets)
+        contractors = self.env["account.invoice.line"].create(contractors)
+        timesheets = self.env["account.analytic.line"].create(timesheets)
 
-        order = self.env['fsm.order'].\
-            create({
-                'location_id': self.test_location.id,
-                'bill_to': bill_to,
-                'person_id': self.test_person.id,
-                'contractor_cost_ids': [(6, 0, contractors.ids)],
-                'employee_timesheet_ids': [(6, 0, timesheets.ids)]
-            })
+        order = self.env["fsm.order"].create(
+            {
+                "location_id": self.test_location.id,
+                "bill_to": bill_to,
+                "person_id": self.test_person.id,
+                "contractor_cost_ids": [(6, 0, contractors.ids)],
+                "employee_timesheet_ids": [(6, 0, timesheets.ids)],
+            }
+        )
         order.person_ids += self.test_person
         return order
 
@@ -42,38 +42,40 @@ def _process_order_to_invoices(self, order):
         # Change states
         order.date_start = fields.Datetime.today()
         order.date_end = fields.Datetime.today()
-        order.resolution = 'Done something!'
+        order.resolution = "Done something!"
         order.action_complete()
-        self.assertEqual(order.account_stage, 'review')
+        self.assertEqual(order.account_stage, "review")
         # Create vendor bill
         # Vendor bill created from order's contractor
         if not order.person_id.partner_id.supplier:
             with self.assertRaises(ValidationError) as e:
                 order.account_confirm()
             self.assertEqual(
-                e.exception.name,
-                "The worker assigned to this order is not a supplier")
+                e.exception.name, "The worker assigned to this order is not a supplier"
+            )
             order.person_id.partner_id.supplier = True
         order.account_confirm()
-        self.assertEqual(order.account_stage, 'confirmed')
-        bill = self.AccountInvoice.search([('type', '=', 'in_invoice'),
-                                           ('fsm_order_id', '=', order.id)])
+        self.assertEqual(order.account_stage, "confirmed")
+        bill = self.AccountInvoice.search(
+            [("type", "=", "in_invoice"), ("fsm_order_id", "=", order.id)]
+        )
         self.assertEqual(len(bill), 1)
-        self.assertEqual(len(order.contractor_cost_ids),
-                         len(bill.invoice_line_ids))
+        self.assertEqual(len(order.contractor_cost_ids), len(bill.invoice_line_ids))
         # Customer invoice created from order's contractor and timehsheet
-        if order.bill_to == 'contact' and not order.customer_id:
+        if order.bill_to == "contact" and not order.customer_id:
             with self.assertRaises(ValidationError):
                 order.account_create_invoice()
             order.customer_id = self.test_loc_partner  # Assign some partner
         order.account_create_invoice()
-        self.assertEqual(order.account_stage, 'invoiced')
-        invoice = self.AccountInvoice.search([('type', '=', 'out_invoice'),
-                                              ('fsm_order_id', '=', order.id)])
+        self.assertEqual(order.account_stage, "invoiced")
+        invoice = self.AccountInvoice.search(
+            [("type", "=", "out_invoice"), ("fsm_order_id", "=", order.id)]
+        )
         self.assertEqual(len(invoice), 1)
         self.assertEqual(
             len(order.contractor_cost_ids) + len(order.employee_timesheet_ids),
-            len(invoice.invoice_line_ids))
+            len(invoice.invoice_line_ids),
+        )
         return (bill, invoice)
 
     def test_fsm_order_exception(self):
@@ -86,23 +88,22 @@ def test_fsm_order_exception(self):
         # Setup required data
         self.test_location.analytic_account_id = self.test_analytic
         # Create a new work order with contract = 500 and timesheet = 300
-        self.env.ref('hr.employee_qdp').timesheet_cost = 20.0
-        order = self.env['fsm.order'].\
-            create({
-                'location_id': self.test_location.id,
-                'person_id': self.test_person.id,
-            })
+        self.env.ref("hr.employee_qdp").timesheet_cost = 20.0
+        order = self.env["fsm.order"].create(
+            {"location_id": self.test_location.id, "person_id": self.test_person.id}
+        )
         order.person_id = self.test_person
 
         order.person_ids += self.test_person
         order.date_start = fields.Datetime.today()
         order.date_end = fields.Datetime.today()
-        order.resolution = 'Done something!'
+        order.resolution = "Done something!"
         with self.assertRaises(ValidationError) as e:
             order.action_complete()
-        self.assertEqual(e.exception.name,
-                         "Cannot move to Complete until "
-                         "'Employee Timesheets' is filled in")
+        self.assertEqual(
+            e.exception.name,
+            "Cannot move to Complete until " "'Employee Timesheets' is filled in",
+        )
 
     def test_fsm_order_bill_to_location(self):
         """Bill To Location,
@@ -110,25 +111,35 @@ def test_fsm_order_bill_to_location(self):
         """
         # Setup required data
         self.test_location.analytic_account_id = self.test_analytic
-        contractors = [{'name': 'contractor_line_1',
-                        'product_id': self.env.ref('product.expense_hotel').id,
-                        'account_id': self.account_id.id,
-                        'quantity': 2,
-                        'price_unit': 200}, ]
-        self.env.ref('hr.employee_qdp').timesheet_cost = 100
-        timesheets = [{'name': 'timesheet_line_1',
-                       'employee_id': self.env.ref('hr.employee_qdp').id,
-                       'account_id': self.test_analytic.id,
-                       'product_id': self.env.ref('product.expense_hotel').id,
-                       'unit_amount': 6},
-                      {'name': 'timesheet_line_2',
-                       'employee_id': self.env.ref('hr.employee_qdp').id,
-                       'account_id': self.test_analytic.id,
-                       'product_id': self.env.ref('product.expense_hotel').id,
-                       'unit_amount': 4}, ]
-        order = self._create_workorder(bill_to='location',
-                                       contractors=contractors,
-                                       timesheets=timesheets)
+        contractors = [
+            {
+                "name": "contractor_line_1",
+                "product_id": self.env.ref("product.expense_hotel").id,
+                "account_id": self.account_id.id,
+                "quantity": 2,
+                "price_unit": 200,
+            },
+        ]
+        self.env.ref("hr.employee_qdp").timesheet_cost = 100
+        timesheets = [
+            {
+                "name": "timesheet_line_1",
+                "employee_id": self.env.ref("hr.employee_qdp").id,
+                "account_id": self.test_analytic.id,
+                "product_id": self.env.ref("product.expense_hotel").id,
+                "unit_amount": 6,
+            },
+            {
+                "name": "timesheet_line_2",
+                "employee_id": self.env.ref("hr.employee_qdp").id,
+                "account_id": self.test_analytic.id,
+                "product_id": self.env.ref("product.expense_hotel").id,
+                "unit_amount": 4,
+            },
+        ]
+        order = self._create_workorder(
+            bill_to="location", contractors=contractors, timesheets=timesheets
+        )
         order._compute_contractor_cost()
         order._compute_employee_hours()
         order._compute_total_cost()
@@ -147,25 +158,35 @@ def test_fsm_order_bill_to_contact(self):
         # Setup required data
         self.test_location.analytic_account_id = self.test_analytic
         # Create a new work order with contract = 500 and timesheet = 300
-        contractors = [{'name': 'contractor_line_2',
-                        'product_id': self.env.ref('product.expense_hotel').id,
-                        'account_id': self.account_id.id,
-                        'quantity': 2,
-                        'price_unit': 100},
-                       {'name': 'contractor_line_3',
-                        'product_id': self.env.ref('product.expense_hotel').id,
-                        'account_id': self.account_id.id,
-                        'quantity': 1,
-                        'price_unit': 300}, ]
-        self.env.ref('hr.employee_qdp').timesheet_cost = 20.0
-        timesheets = [{'name': 'timesheet_line_3',
-                       'employee_id': self.env.ref('hr.employee_qdp').id,
-                       'account_id': self.test_analytic.id,
-                       'product_id': self.env.ref('product.expense_hotel').id,
-                       'unit_amount': 10}, ]
-        order = self._create_workorder(bill_to='contact',
-                                       contractors=contractors,
-                                       timesheets=timesheets)
+        contractors = [
+            {
+                "name": "contractor_line_2",
+                "product_id": self.env.ref("product.expense_hotel").id,
+                "account_id": self.account_id.id,
+                "quantity": 2,
+                "price_unit": 100,
+            },
+            {
+                "name": "contractor_line_3",
+                "product_id": self.env.ref("product.expense_hotel").id,
+                "account_id": self.account_id.id,
+                "quantity": 1,
+                "price_unit": 300,
+            },
+        ]
+        self.env.ref("hr.employee_qdp").timesheet_cost = 20.0
+        timesheets = [
+            {
+                "name": "timesheet_line_3",
+                "employee_id": self.env.ref("hr.employee_qdp").id,
+                "account_id": self.test_analytic.id,
+                "product_id": self.env.ref("product.expense_hotel").id,
+                "unit_amount": 10,
+            },
+        ]
+        order = self._create_workorder(
+            bill_to="contact", contractors=contractors, timesheets=timesheets
+        )
         order._compute_contractor_cost()
         order._compute_employee_hours()
         order._compute_total_cost()
diff --git a/fieldservice_isp_account/views/account.xml b/fieldservice_isp_account/views/account.xml
index 3e7aeb49e5..20ab239899 100644
--- a/fieldservice_isp_account/views/account.xml
+++ b/fieldservice_isp_account/views/account.xml
@@ -1,29 +1,28 @@
 <odoo>
-
     <!-- Show confirmed FSM Orders in Accounting -->
     <record id="action_account_fsm_order" model="ir.actions.act_window">
         <field name="name">Service Orders</field>
         <field name="res_model">fsm.order</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain"
-               eval="[('account_stage', '=', 'confirmed')]"/>
+        <field name="domain" eval="[('account_stage', '=', 'confirmed')]" />
         <field name="help" type="html">
             <p class="oe_view_nocontent_create">
                 No Field Service Orders to review.
             </p>
         </field>
     </record>
-
-    <menuitem id="menu_account_operations"
-              name="Operations"
-              parent="account.menu_finance_receivables"
-              sequence="20"/>
-
-    <menuitem id="menu_account_fsm_order"
-              name="Service Orders"
-              action="action_account_fsm_order"
-              parent="menu_account_operations"
-              sequence="10"/>
-
+    <menuitem
+        id="menu_account_operations"
+        name="Operations"
+        parent="account.menu_finance_receivables"
+        sequence="20"
+    />
+    <menuitem
+        id="menu_account_fsm_order"
+        name="Service Orders"
+        action="action_account_fsm_order"
+        parent="menu_account_operations"
+        sequence="10"
+    />
 </odoo>
diff --git a/fieldservice_isp_account/views/fsm_order.xml b/fieldservice_isp_account/views/fsm_order.xml
index fb57aa3643..2563e4e60c 100644
--- a/fieldservice_isp_account/views/fsm_order.xml
+++ b/fieldservice_isp_account/views/fsm_order.xml
@@ -1,92 +1,117 @@
 <odoo>
-
     <record id="fsm_order_form_isp_account" model="ir.ui.view">
         <field name="name">fsm.order.form.isp.account</field>
         <field name="model">fsm.order</field>
-        <field name="inherit_id"
-               ref="fieldservice_account_analytic.fsm_order_form_analytic"/>
+        <field
+            name="inherit_id"
+            ref="fieldservice_account_analytic.fsm_order_form_analytic"
+        />
         <field name="arch" type="xml">
             <group name="bill_to" position="before">
                 <header>
-                    <button id="account_confirm"
-                            name="account_confirm" string="Confirm"
-                            class="oe_highlight"
-                            type="object"
-                            groups="fieldservice.group_fsm_dispatcher"
-                            attrs="{'invisible': [('account_stage', '!=', 'review')]}"/>
-                    <button id="account_create_invoice"
-                            name="account_create_invoice"
-                            string="Create Invoice"
-                            class="oe_highlight"
-                            type="object"
-                            groups="account.group_account_invoice"
-                            attrs="{'invisible': [('account_stage', '!=', 'confirmed')]}"/>
-                    <button id="account_no_invoice"
-                            name="account_no_invoice" string="No Invoice"
-                            type="object"
-                            groups="account.group_account_invoice"
-                            attrs="{'invisible': [('account_stage', '!=', 'confirmed')]}"/>
-                    <field name="account_stage" widget="statusbar"/>
+                    <button
+                        id="account_confirm"
+                        name="account_confirm"
+                        string="Confirm"
+                        class="oe_highlight"
+                        type="object"
+                        groups="fieldservice.group_fsm_dispatcher"
+                        attrs="{'invisible': [('account_stage', '!=', 'review')]}"
+                    />
+                    <button
+                        id="account_create_invoice"
+                        name="account_create_invoice"
+                        string="Create Invoice"
+                        class="oe_highlight"
+                        type="object"
+                        groups="account.group_account_invoice"
+                        attrs="{'invisible': [('account_stage', '!=', 'confirmed')]}"
+                    />
+                    <button
+                        id="account_no_invoice"
+                        name="account_no_invoice"
+                        string="No Invoice"
+                        type="object"
+                        groups="account.group_account_invoice"
+                        attrs="{'invisible': [('account_stage', '!=', 'confirmed')]}"
+                    />
+                    <field name="account_stage" widget="statusbar" />
                 </header>
             </group>
             <group name="bill_to" position="after">
                 <group string="Contractor Costs">
                     <field name="contractor_cost_ids" nolabel="1">
                         <tree editable="bottom">
-                            <field name="product_id" required="1"/>
-                            <field name="name"/>
-                            <field name="quantity" required="1"/>
-                            <field name="account_id" required="1"
-                                    invisible="1"/>
-                            <field name="account_analytic_id"
-                                    invisible="1"/>
-                            <field name="invoice_line_tax_ids"
-                                    widget="many2many_tags" invisible="1"/>
-                            <field name="price_unit" groups="fieldservice.group_fsm_manager"/>
+                            <field name="product_id" required="1" />
+                            <field name="name" />
+                            <field name="quantity" required="1" />
+                            <field name="account_id" required="1" invisible="1" />
+                            <field name="account_analytic_id" invisible="1" />
+                            <field
+                                name="invoice_line_tax_ids"
+                                widget="many2many_tags"
+                                invisible="1"
+                            />
+                            <field
+                                name="price_unit"
+                                groups="fieldservice.group_fsm_manager"
+                            />
                         </tree>
                     </field>
                 </group>
                 <group>
-                    <field name="contractor_total" readonly="1"/>
+                    <field name="contractor_total" readonly="1" />
                 </group>
                 <group string="Employee Timesheets">
-                    <field name="employee_timesheet_ids" nolabel="1" context="{'default_project_id': project_id, 'default_task_id': project_task_id}">
-                        <tree editable="bottom"
-                                string="Timesheet Activities"
-                                default_order="date">
-                            <field name="date"/>
-                            <field name="user_id" invisible="1"/>
-                            <field name="employee_id" required="1"/>
-                            <field name="product_id" required="1"
-                                    domain="[('type','=','service')]"/>
-                            <field name="account_id" invisible="1"/>
-                            <field name="name"/>
-                            <field name="unit_amount" string="Duration"
-                                    widget="float_time"/>
-                            <field name="project_id" invisible="1"/>
-                            <field name="task_id" invisible="1"/>
+                    <field
+                        name="employee_timesheet_ids"
+                        nolabel="1"
+                        context="{'default_project_id': project_id, 'default_task_id': project_task_id}"
+                    >
+                        <tree
+                            editable="bottom"
+                            string="Timesheet Activities"
+                            default_order="date"
+                        >
+                            <field name="date" />
+                            <field name="user_id" invisible="1" />
+                            <field name="employee_id" required="1" />
+                            <field
+                                name="product_id"
+                                required="1"
+                                domain="[('type','=','service')]"
+                            />
+                            <field name="account_id" invisible="1" />
+                            <field name="name" />
+                            <field
+                                name="unit_amount"
+                                string="Duration"
+                                widget="float_time"
+                            />
+                            <field name="project_id" invisible="1" />
+                            <field name="task_id" invisible="1" />
                         </tree>
                     </field>
                 </group>
                 <group col="4">
-                    <field name="employee_time_total" readonly="1"/>
-                    <field name="employee" invisible="1"/>
+                    <field name="employee_time_total" readonly="1" />
+                    <field name="employee" invisible="1" />
                 </group>
             </group>
         </field>
     </record>
-
     <record id="fsm_order_search_view" model="ir.ui.view">
         <field name="name">fsm.order.search</field>
         <field name="model">fsm.order</field>
-        <field name="inherit_id" ref="fieldservice.fsm_order_search_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_order_search_view" />
         <field name="arch" type="xml">
             <xpath expr="/search/filter[4]" position="after">
-                <filter string="Needs Review"
-                        domain="[('account_stage', '=', 'review')]"
-                        name="needs_review"/>
+                <filter
+                    string="Needs Review"
+                    domain="[('account_stage', '=', 'review')]"
+                    name="needs_review"
+                />
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_isp_account/views/fsm_person.xml b/fieldservice_isp_account/views/fsm_person.xml
index 0f2a42a1a5..37f0116cae 100644
--- a/fieldservice_isp_account/views/fsm_person.xml
+++ b/fieldservice_isp_account/views/fsm_person.xml
@@ -1,21 +1,20 @@
 <odoo>
-
     <record id="fsm_person_form_isp_account" model="ir.ui.view">
         <field name="name">fsm.person.form.isp.account</field>
         <field name="model">fsm.person</field>
-        <field name="inherit_id" ref="fieldservice.fsm_person_form"/>
+        <field name="inherit_id" ref="fieldservice.fsm_person_form" />
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <button type="object"
-                        name="action_view_bills"
-                        class="oe_stat_button"
-                        icon="fa-credit-card"
-                        groups="base.group_user">
-                    <field name="bill_count" widget="statinfo"
-                           string="Vendor Bills"/>
+                <button
+                    type="object"
+                    name="action_view_bills"
+                    class="oe_stat_button"
+                    icon="fa-credit-card"
+                    groups="base.group_user"
+                >
+                    <field name="bill_count" widget="statinfo" string="Vendor Bills" />
                 </button>
             </div>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_isp_account/views/hr_timesheet.xml b/fieldservice_isp_account/views/hr_timesheet.xml
index 25ebf8b849..e49a277dae 100644
--- a/fieldservice_isp_account/views/hr_timesheet.xml
+++ b/fieldservice_isp_account/views/hr_timesheet.xml
@@ -1,36 +1,39 @@
 <odoo>
-
     <record id="hr_timesheet.act_hr_timesheet_line" model="ir.actions.act_window">
-            <field name="name">My Timesheets</field>
-            <field name="res_model">account.analytic.line</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id', '=', uid)]</field>
-            <field name="context">{
+        <field name="name">My Timesheets</field>
+        <field name="res_model">account.analytic.line</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('user_id', '=', uid)]</field>
+        <field name="context">{
                 "search_default_week":1,
             }</field>
-            <field name="search_view_id" ref="hr_timesheet.hr_timesheet_line_search"/>
-            <field name="help" type="html">
-              <p class="o_view_nocontent_smiling_face">
+        <field name="search_view_id" ref="hr_timesheet.hr_timesheet_line_search" />
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
                 Record a new activity
-              </p><p>
+              </p>
+            <p>
                 You can register and track your workings hours by project every
                 day. Every time spent on a project will become a cost and can be re-invoiced to
                 customers if required.
               </p>
-            </field>
-        </record>
-
-        <!-- Overwrite User Record Rule-->
-        <record id="hr_timesheet.timesheet_line_rule_user" model="ir.rule">
-            <field name="name">account.analytic.line.timesheet.user</field>
-            <field name="active" eval="0"/>
-            <field name="model_id" ref="analytic.model_account_analytic_line"/>
-            <field name="domain_force">[('user_id', '=', user.id), ('project_id', '!=', False)]</field>
-            <field name="groups" eval="[(4, ref('hr_timesheet.group_hr_timesheet_user'))]"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
-            <field name="perm_read" eval="0"/>
-        </record>
-
+        </field>
+    </record>
+    <!-- Overwrite User Record Rule-->
+    <record id="hr_timesheet.timesheet_line_rule_user" model="ir.rule">
+        <field name="name">account.analytic.line.timesheet.user</field>
+        <field name="active" eval="0" />
+        <field name="model_id" ref="analytic.model_account_analytic_line" />
+        <field
+            name="domain_force"
+        >[('user_id', '=', user.id), ('project_id', '!=', False)]</field>
+        <field
+            name="groups"
+            eval="[(4, ref('hr_timesheet.group_hr_timesheet_user'))]"
+        />
+        <field name="perm_create" eval="1" />
+        <field name="perm_write" eval="1" />
+        <field name="perm_unlink" eval="1" />
+        <field name="perm_read" eval="0" />
+    </record>
 </odoo>

From 00e86234195412a41000ffed28e775f5574f9803 Mon Sep 17 00:00:00 2001
From: Benoit Aimont <benoit.aimont@acsone.eu>
Date: Wed, 28 Apr 2021 09:57:44 +0200
Subject: [PATCH 352/631] [MIG] fieldservice_isp_account: Migration to 13.0

---
 fieldservice_isp_account/README.rst           |  14 +-
 fieldservice_isp_account/__manifest__.py      |   3 +-
 fieldservice_isp_account/i18n/es_AR.po        |   6 +-
 fieldservice_isp_account/i18n/es_CL.po        |   6 +-
 .../i18n/fieldservice_isp_account.pot         |   6 +-
 fieldservice_isp_account/i18n/pt_BR.po        |   6 +-
 fieldservice_isp_account/models/__init__.py   |   2 +-
 .../models/account_invoice_line.py            |  39 ------
 fieldservice_isp_account/models/fsm_order.py  | 131 ++++++++++++------
 .../models/fsm_order_cost.py                  |  24 ++++
 fieldservice_isp_account/models/fsm_person.py |   9 +-
 .../security/fsm_order_cost.xml               |  23 +++
 .../static/description/index.html             |   6 +-
 .../tests/test_isp_account.py                 |  69 +++++----
 fieldservice_isp_account/views/account.xml    |   1 -
 fieldservice_isp_account/views/fsm_order.xml  |  22 ++-
 16 files changed, 209 insertions(+), 158 deletions(-)
 delete mode 100644 fieldservice_isp_account/models/account_invoice_line.py
 create mode 100644 fieldservice_isp_account/models/fsm_order_cost.py
 create mode 100644 fieldservice_isp_account/security/fsm_order_cost.xml

diff --git a/fieldservice_isp_account/README.rst b/fieldservice_isp_account/README.rst
index cb1c58ed6b..5b7501afeb 100644
--- a/fieldservice_isp_account/README.rst
+++ b/fieldservice_isp_account/README.rst
@@ -14,16 +14,16 @@ Field Service - ISP Accounting
     :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_isp_account
+    :target: https://github.com/OCA/field-service/tree/13.0/fieldservice_isp_account
     :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_isp_account
+    :target: https://translation.odoo-community.org/projects/field-service-13-0/field-service-13-0-fieldservice_isp_account
     :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/13.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 This module adds the ability to track employee time and contractor
 costs for Field Service Orders. It also adds functionality to create
@@ -67,7 +67,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_isp_account%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_isp_account%0Aversion:%2013.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.
 
@@ -118,8 +118,8 @@ promote its widespread use.
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-osimallen| |maintainer-brian10048| |maintainer-bodedra| 
+|maintainer-osimallen| |maintainer-brian10048| |maintainer-bodedra|
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_isp_account>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/13.0/fieldservice_isp_account>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index 55cc326f83..3c0f211449 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Field Service - ISP Accounting",
     "summary": """Invoice Field Service orders based on employee time
                   or contractor costs""",
-    "version": "12.0.2.3.2",
+    "version": "13.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",
@@ -15,6 +15,7 @@
         "hr_timesheet",
     ],
     "data": [
+        "security/fsm_order_cost.xml",
         "security/ir.model.access.csv",
         "data/time_products.xml",
         "views/account.xml",
diff --git a/fieldservice_isp_account/i18n/es_AR.po b/fieldservice_isp_account/i18n/es_AR.po
index 2c5c799966..32b7a899ee 100644
--- a/fieldservice_isp_account/i18n/es_AR.po
+++ b/fieldservice_isp_account/i18n/es_AR.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-07-21 05:19+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
@@ -128,7 +128,7 @@ msgid "Hour(s)"
 msgstr "Hora(s)"
 
 #. module: fieldservice_isp_account
-#: model:ir.model,name:fieldservice_isp_account.model_account_invoice_line
+#: model:ir.model,name:fieldservice_isp_account.model_account_move_line
 msgid "Invoice Line"
 msgstr "Línea de Factura"
 
@@ -167,7 +167,7 @@ msgstr ""
 "        "
 
 #. module: fieldservice_isp_account
-#: code:addons/fieldservice_isp_account/models/account_invoice_line.py:19
+#: code:addons/fieldservice_isp_account/models/account_move_line.py:19
 #, python-format
 msgid "Please set the field service worker."
 msgstr "Por favor configure el trabajador de servicio de campo."
diff --git a/fieldservice_isp_account/i18n/es_CL.po b/fieldservice_isp_account/i18n/es_CL.po
index 8c1be242e8..25b3c15534 100644
--- a/fieldservice_isp_account/i18n/es_CL.po
+++ b/fieldservice_isp_account/i18n/es_CL.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-01-16 22:38+0000\n"
 "Last-Translator: Nelson Ramírez Sánchez <info@konos.cl>\n"
@@ -128,7 +128,7 @@ msgid "Hour(s)"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: model:ir.model,name:fieldservice_isp_account.model_account_invoice_line
+#: model:ir.model,name:fieldservice_isp_account.model_account_move_line
 msgid "Invoice Line"
 msgstr ""
 
@@ -165,7 +165,7 @@ msgid "Overtime for Field Service Employees\n"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: code:addons/fieldservice_isp_account/models/account_invoice_line.py:19
+#: code:addons/fieldservice_isp_account/models/account_move_line.py:19
 #, python-format
 msgid "Please set the field service worker."
 msgstr ""
diff --git a/fieldservice_isp_account/i18n/fieldservice_isp_account.pot b/fieldservice_isp_account/i18n/fieldservice_isp_account.pot
index c633f9becc..8c87b45cf6 100644
--- a/fieldservice_isp_account/i18n/fieldservice_isp_account.pot
+++ b/fieldservice_isp_account/i18n/fieldservice_isp_account.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -121,7 +121,7 @@ msgid "Hour(s)"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: model:ir.model,name:fieldservice_isp_account.model_account_invoice_line
+#: model:ir.model,name:fieldservice_isp_account.model_account_move_line
 msgid "Invoice Line"
 msgstr ""
 
@@ -158,7 +158,7 @@ msgid "Overtime for Field Service Employees\n"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: code:addons/fieldservice_isp_account/models/account_invoice_line.py:19
+#: code:addons/fieldservice_isp_account/models/account_move_line.py:19
 #, python-format
 msgid "Please set the field service worker."
 msgstr ""
diff --git a/fieldservice_isp_account/i18n/pt_BR.po b/fieldservice_isp_account/i18n/pt_BR.po
index bcf8c1ad34..907151e7dc 100644
--- a/fieldservice_isp_account/i18n/pt_BR.po
+++ b/fieldservice_isp_account/i18n/pt_BR.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-06-17 16:19+0000\n"
 "Last-Translator: Fernando Colus <fcolus1@gmail.com>\n"
@@ -128,7 +128,7 @@ msgid "Hour(s)"
 msgstr "Hora(s)"
 
 #. module: fieldservice_isp_account
-#: model:ir.model,name:fieldservice_isp_account.model_account_invoice_line
+#: model:ir.model,name:fieldservice_isp_account.model_account_move_line
 msgid "Invoice Line"
 msgstr "Linha de Fatura"
 
@@ -167,7 +167,7 @@ msgstr ""
 "        "
 
 #. module: fieldservice_isp_account
-#: code:addons/fieldservice_isp_account/models/account_invoice_line.py:19
+#: code:addons/fieldservice_isp_account/models/account_move_line.py:19
 #, python-format
 msgid "Please set the field service worker."
 msgstr "Por favor, selecione o trabalhador do serviço de campo."
diff --git a/fieldservice_isp_account/models/__init__.py b/fieldservice_isp_account/models/__init__.py
index 19e859522b..a2be44257e 100644
--- a/fieldservice_isp_account/models/__init__.py
+++ b/fieldservice_isp_account/models/__init__.py
@@ -1,7 +1,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
-    account_invoice_line,
     fsm_order,
     fsm_person,
 )
+from . import fsm_order_cost
diff --git a/fieldservice_isp_account/models/account_invoice_line.py b/fieldservice_isp_account/models/account_invoice_line.py
deleted file mode 100644
index 9a59be9fc0..0000000000
--- a/fieldservice_isp_account/models/account_invoice_line.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import _, api, models
-from odoo.exceptions import ValidationError
-
-
-class AccountInvoiceLine(models.Model):
-    _inherit = "account.invoice.line"
-
-    @api.onchange("product_id", "quantity")
-    def onchange_product_id(self):
-        for line in self:
-            if line.fsm_order_id:
-                partner = (
-                    line.fsm_order_id.person_id
-                    and line.fsm_order_id.person_id.partner_id
-                    or False
-                )
-                if not partner:
-                    raise ValidationError(_("Please set the field service worker."))
-                fpos = partner.property_account_position_id
-                tmpl = line.product_id.product_tmpl_id
-                if line.product_id:
-                    accounts = tmpl.get_product_accounts()
-                    supinfo = self.env["product.supplierinfo"].search(
-                        [
-                            ("name", "=", partner.id),
-                            ("product_tmpl_id", "=", tmpl.id),
-                            ("min_qty", "<=", line.quantity),
-                        ],
-                        order="min_qty DESC",
-                    )
-                    line.price_unit = (
-                        supinfo and supinfo[0].price or tmpl.standard_price
-                    )
-                    line.account_id = accounts.get("expense", False)
-                    line.invoice_line_tax_ids = fpos.map_tax(tmpl.supplier_taxes_id)
-                    line.name = line.product_id.name
diff --git a/fieldservice_isp_account/models/fsm_order.py b/fieldservice_isp_account/models/fsm_order.py
index 81c3af3aa1..68762b024e 100644
--- a/fieldservice_isp_account/models/fsm_order.py
+++ b/fieldservice_isp_account/models/fsm_order.py
@@ -17,7 +17,7 @@ class FSMOrder(models.Model):
     _inherit = "fsm.order"
 
     contractor_cost_ids = fields.One2many(
-        "account.invoice.line", "fsm_order_id", string="Contractor Costs"
+        "fsm.order.cost", "fsm_order_id", string="Contractor Costs"
     )
     employee_timesheet_ids = fields.One2many(
         "account.analytic.line", "fsm_order_id", string="Employee Timesheets"
@@ -38,6 +38,8 @@ def _compute_employee(self):
         for order in self:
             if user.employee_ids:
                 order.employee = True
+            else:
+                order.employee = False
 
     @api.depends("employee_timesheet_ids", "contractor_cost_ids")
     def _compute_total_cost(self):
@@ -68,11 +70,11 @@ def _compute_contractor_cost(self):
     def action_complete(self):
         for order in self:
             order.account_stage = "review"
-        if self.person_id.supplier and not self.contractor_cost_ids:
+        if self.person_id.supplier_rank and not self.contractor_cost_ids:
             raise ValidationError(
                 _("Cannot move to Complete " + "until 'Contractor Costs' is filled in")
             )
-        if not self.person_id.supplier and not self.employee_timesheet_ids:
+        if not self.person_id.supplier_rank and not self.employee_timesheet_ids:
             raise ValidationError(
                 _(
                     "Cannot move to Complete until "
@@ -84,29 +86,51 @@ def action_complete(self):
     def create_bills(self):
         jrnl = self.env["account.journal"].search(
             [
-                ("company_id", "=", self.env.user.company_id.id),
+                ("company_id", "=", self.env.company.id),
                 ("type", "=", "purchase"),
                 ("active", "=", True),
             ],
             limit=1,
         )
-        fpos = self.customer_id.property_account_position_id
+        fpos = self.person_id.partner_id.property_account_position_id
+        invoice_line_vals = []
+        for cost in self.contractor_cost_ids:
+            template = cost.product_id.product_tmpl_id
+            accounts = template.get_product_accounts()
+            account = accounts["expense"]
+            taxes = template.supplier_taxes_id
+            tax_ids = fpos.map_tax(taxes)
+            invoice_line_vals.append(
+                (
+                    0,
+                    0,
+                    {
+                        "analytic_account_id": self.location_id.analytic_account_id.id,
+                        "product_id": cost.product_id.id,
+                        "quantity": cost.quantity,
+                        "name": cost.product_id.display_name,
+                        "price_unit": cost.price_unit,
+                        "account_id": account.id,
+                        "fsm_order_ids": [(4, self.id)],
+                        "tax_ids": [(6, 0, tax_ids.ids)],
+                    },
+                )
+            )
         vals = {
             "partner_id": self.person_id.partner_id.id,
             "type": "in_invoice",
             "journal_id": jrnl.id or False,
             "fiscal_position_id": fpos.id or False,
             "fsm_order_ids": [(4, self.id)],
-            "company_id": self.env.user.company_id.id,
+            "company_id": self.env.company.id,
+            "invoice_line_ids": invoice_line_vals,
         }
-        bill = self.env["account.invoice"].sudo().create(vals)
-        for line in self.contractor_cost_ids:
-            line.invoice_id = bill
-        bill.compute_taxes()
+        bill = self.env["account.move"].sudo().create(vals)
+        bill._recompute_tax_lines()
 
     def account_confirm(self):
         for order in self:
-            contractor = order.person_id.partner_id.supplier
+            contractor = order.person_id.partner_id.supplier_rank
             if order.contractor_cost_ids:
                 if contractor:
                     order.create_bills()
@@ -121,7 +145,7 @@ def account_confirm(self):
     def account_create_invoice(self):
         jrnl = self.env["account.journal"].search(
             [
-                ("company_id", "=", self.env.user.company_id.id),
+                ("company_id", "=", self.env.company.id),
                 ("type", "=", "sale"),
                 ("active", "=", True),
             ],
@@ -131,76 +155,91 @@ def account_create_invoice(self):
             if not self.customer_id:
                 raise ValidationError(_("Contact empty"))
             fpos = self.customer_id.property_account_position_id
-            vals = {
+            invoice_vals = {
                 "partner_id": self.customer_id.id,
                 "type": "out_invoice",
                 "journal_id": jrnl.id or False,
                 "fiscal_position_id": fpos.id or False,
                 "fsm_order_ids": [(4, self.id)],
             }
-            invoice = self.env["account.invoice"].sudo().create(vals)
-            price_list = invoice.partner_id.property_product_pricelist
+            price_list = self.customer_id.property_product_pricelist
+
         else:
             fpos = self.location_id.customer_id.property_account_position_id
-            vals = {
+            invoice_vals = {
                 "partner_id": self.location_id.customer_id.id,
                 "type": "out_invoice",
                 "journal_id": jrnl.id or False,
                 "fiscal_position_id": fpos.id or False,
                 "fsm_order_ids": [(4, self.id)],
-                "company_id": self.env.user.company_id.id,
+                "company_id": self.env.company.id,
             }
-            invoice = self.env["account.invoice"].sudo().create(vals)
-            price_list = invoice.partner_id.property_product_pricelist
+            price_list = self.location_id.customer_id.property_product_pricelist
+
+        invoice_line_vals = []
         for cost in self.contractor_cost_ids:
             price = price_list.get_product_price(
                 product=cost.product_id,
                 quantity=cost.quantity,
-                partner=invoice.partner_id,
+                partner=invoice_vals.get("partner_id"),
                 date=False,
                 uom_id=False,
             )
             template = cost.product_id.product_tmpl_id
             accounts = template.get_product_accounts()
             account = accounts["income"]
-            vals = {
-                "product_id": cost.product_id.id,
-                "account_analytic_id": cost.account_analytic_id.id,
-                "quantity": cost.quantity,
-                "name": cost.name,
-                "price_unit": price,
-                "account_id": account.id,
-                "invoice_id": invoice.id,
-                "fsm_order_id": self.id,
-            }
-            con_cost = self.env["account.invoice.line"].create(vals)
             taxes = template.taxes_id
-            con_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
+            tax_ids = fpos.map_tax(taxes)
+            invoice_line_vals.append(
+                (
+                    0,
+                    0,
+                    {
+                        "product_id": cost.product_id.id,
+                        "analytic_account_id": self.location_id.analytic_account_id.id,
+                        "quantity": cost.quantity,
+                        "name": cost.product_id.display_name,
+                        "price_unit": price,
+                        "account_id": account.id,
+                        "fsm_order_ids": [(4, self.id)],
+                        "tax_ids": [(6, 0, tax_ids.ids)],
+                    },
+                )
+            )
         for line in self.employee_timesheet_ids:
             price = price_list.get_product_price(
                 product=line.product_id,
                 quantity=line.unit_amount,
-                partner=invoice.partner_id,
+                partner=invoice_vals.get("partner_id"),
                 date=False,
                 uom_id=False,
             )
             template = line.product_id.product_tmpl_id
             accounts = template.get_product_accounts()
             account = accounts["income"]
-            vals = {
-                "product_id": line.product_id.id,
-                "account_analytic_id": line.account_id.id,
-                "quantity": line.unit_amount,
-                "name": line.name,
-                "price_unit": price,
-                "account_id": account.id,
-                "invoice_id": invoice.id,
-                "fsm_order_id": self.id,
-            }
-            time_cost = self.env["account.invoice.line"].create(vals)
             taxes = template.taxes_id
-            time_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
-        invoice.compute_taxes()
+            tax_ids = fpos.map_tax(taxes)
+            invoice_line_vals.append(
+                (
+                    0,
+                    0,
+                    {
+                        "product_id": line.product_id.id,
+                        "analytic_account_id": line.account_id.id,
+                        "quantity": line.unit_amount,
+                        "name": line.name,
+                        "price_unit": price,
+                        "account_id": account.id,
+                        "fsm_order_ids": [(4, self.id)],
+                        "tax_ids": [(6, 0, tax_ids.ids)],
+                    },
+                )
+            )
+
+        invoice_vals.update({"invoice_line_ids": invoice_line_vals})
+        invoice = self.env["account.move"].sudo().create(invoice_vals)
+
+        invoice._recompute_tax_lines()
         self.account_stage = "invoiced"
         return invoice
 
diff --git a/fieldservice_isp_account/models/fsm_order_cost.py b/fieldservice_isp_account/models/fsm_order_cost.py
new file mode 100644
index 0000000000..1eff39731e
--- /dev/null
+++ b/fieldservice_isp_account/models/fsm_order_cost.py
@@ -0,0 +1,24 @@
+# Copyright 2021 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FsmOrderCost(models.Model):
+
+    _name = "fsm.order.cost"
+    _description = "Fsm Order Cost"
+
+    fsm_order_id = fields.Many2one(comodel_name="fsm.order", required=True,)
+    price_unit = fields.Float(string="Unit Price", required=True,)
+    quantity = fields.Float(string="Quantity", required=True, default=1,)
+    product_id = fields.Many2one(
+        comodel_name="product.product", string="Product", required=True,
+    )
+
+    @api.onchange("product_id")
+    def onchange_product_id(self):
+        for cost in self:
+            if not cost.product_id:
+                continue
+            cost.price_unit = cost.product_id.standard_price
diff --git a/fieldservice_isp_account/models/fsm_person.py b/fieldservice_isp_account/models/fsm_person.py
index 49ea2a9cc7..d88787a80a 100644
--- a/fieldservice_isp_account/models/fsm_person.py
+++ b/fieldservice_isp_account/models/fsm_person.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, 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 FSMPerson(models.Model):
@@ -10,19 +10,18 @@ class FSMPerson(models.Model):
     bill_count = fields.Integer(string="Vendor Bills", compute="_compute_vendor_bills")
 
     def _compute_vendor_bills(self):
-        self.bill_count = self.env["account.invoice"].search_count(
+        self.bill_count = self.env["account.move"].search_count(
             [("partner_id", "=", self.partner_id.id)]
         )
 
-    @api.multi
     def action_view_bills(self):
         for bill in self:
             action = self.env.ref("account.action_invoice_tree1").read()[0]
-            vendor_bills = self.env["account.invoice"].search(
+            vendor_bills = self.env["account.move"].search(
                 [("partner_id", "=", bill.partner_id.id)]
             )
             if len(vendor_bills) == 1:
-                action["views"] = [(self.env.ref("account.invoice_form").id, "form")]
+                action["views"] = [(self.env.ref("account.view_move_form").id, "form")]
                 action["res_id"] = vendor_bills.id
             else:
                 action["domain"] = [("id", "in", vendor_bills.ids)]
diff --git a/fieldservice_isp_account/security/fsm_order_cost.xml b/fieldservice_isp_account/security/fsm_order_cost.xml
new file mode 100644
index 0000000000..e8d0ef7fcb
--- /dev/null
+++ b/fieldservice_isp_account/security/fsm_order_cost.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2021 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record model="ir.model.access" id="fsm_order_cost_access_base_user">
+        <field name="name">fsm.order.cost access base user</field>
+        <field name="model_id" ref="model_fsm_order_cost" />
+        <field name="group_id" ref="base.group_user" />
+        <field name="perm_read" eval="1" />
+        <field name="perm_create" eval="0" />
+        <field name="perm_write" eval="0" />
+        <field name="perm_unlink" eval="0" />
+    </record>
+    <record model="ir.model.access" id="fsm_order_cost_access_fieldservice_user">
+        <field name="name">fsm.order.cost access fieldservice user</field>
+        <field name="model_id" ref="model_fsm_order_cost" />
+        <field name="group_id" ref="fieldservice.group_fsm_user" />
+        <field name="perm_read" eval="1" />
+        <field name="perm_create" eval="1" />
+        <field name="perm_write" eval="1" />
+        <field name="perm_unlink" eval="1" />
+    </record>
+</odoo>
diff --git a/fieldservice_isp_account/static/description/index.html b/fieldservice_isp_account/static/description/index.html
index 04cc1226d9..1dab785e80 100644
--- a/fieldservice_isp_account/static/description/index.html
+++ b/fieldservice_isp_account/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - ISP Accounting</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_isp_account"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_isp_account"><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><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/13.0/fieldservice_isp_account"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-13-0/field-service-13-0-fieldservice_isp_account"><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/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module adds the ability to track employee time and contractor
 costs for Field Service Orders. It also adds functionality to create
 a customer invoice and a vendor bill when a Field Service Order is
@@ -413,7 +413,7 @@ <h1><a class="toc-backref" href="#id4">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_isp_account%0Aversion:%2012.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_isp_account%0Aversion:%2013.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">
@@ -448,7 +448,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/osimallen"><img alt="osimallen" src="https://github.com/osimallen.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> <a class="reference external" href="https://github.com/bodedra"><img alt="bodedra" src="https://github.com/bodedra.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_isp_account">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/13.0/fieldservice_isp_account">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_isp_account/tests/test_isp_account.py b/fieldservice_isp_account/tests/test_isp_account.py
index 8347ca24a8..cf600c26ac 100644
--- a/fieldservice_isp_account/tests/test_isp_account.py
+++ b/fieldservice_isp_account/tests/test_isp_account.py
@@ -3,27 +3,42 @@
 
 from odoo import fields
 from odoo.exceptions import ValidationError
+from odoo.tests import SavepointCase
 
-from odoo.addons.fieldservice_account.tests.test_fsm_account import FSMAccountCase
 
-
-class FSMAccountCase(FSMAccountCase):
-    def setUp(self):
-        super(FSMAccountCase, self).setUp()
-        self.test_person = self.env["fsm.person"].create({"name": "Worker-1"})
-        self.test_analytic = self.env.ref("analytic.analytic_administratif")
-        self.account_id = self.env["account.account"].create(
+class FSMISPAccountCase(SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(FSMISPAccountCase, cls).setUpClass()
+        cls.AccountMoveLine = cls.env["account.move.line"]
+        cls.test_person = cls.env["fsm.person"].create({"name": "Worker-1"})
+        cls.test_analytic = cls.env.ref("analytic.analytic_administratif")
+        cls.account_id = cls.env["account.account"].create(
             {
                 "code": "NC1110",
                 "name": "Test Payable Account",
-                "user_type_id": self.env.ref("account.data_account_type_payable").id,
+                "user_type_id": cls.env.ref("account.data_account_type_payable").id,
                 "reconcile": True,
             }
         )
+        # create a Res Partner to be converted to FSM Location/Person
+        cls.test_loc_partner = cls.env["res.partner"].create(
+            {"name": "Test Loc Partner", "phone": "ABC", "email": "tlp@email.com"}
+        )
+        # create expected FSM Location to compare to converted FSM Location
+        cls.test_location = cls.env["fsm.location"].create(
+            {
+                "name": "Test Location",
+                "phone": "123",
+                "email": "tp@email.com",
+                "partner_id": cls.test_loc_partner.id,
+                "owner_id": cls.test_loc_partner.id,
+                "customer_id": cls.test_loc_partner.id,
+            }
+        )
 
     def _create_workorder(self, bill_to, contractors, timesheets):
         # Create a new work order
-        contractors = self.env["account.invoice.line"].create(contractors)
         timesheets = self.env["account.analytic.line"].create(timesheets)
 
         order = self.env["fsm.order"].create(
@@ -31,10 +46,13 @@ def _create_workorder(self, bill_to, contractors, timesheets):
                 "location_id": self.test_location.id,
                 "bill_to": bill_to,
                 "person_id": self.test_person.id,
-                "contractor_cost_ids": [(6, 0, contractors.ids)],
                 "employee_timesheet_ids": [(6, 0, timesheets.ids)],
             }
         )
+        for contractor in contractors:
+            contractor.update({"fsm_order_id": order.id})
+        contractors = self.env["fsm.order.cost"].create(contractors)
+        order.write({"contractor_cost_ids": [(6, 0, contractors.ids)]})
         order.person_ids += self.test_person
         return order
 
@@ -47,18 +65,18 @@ def _process_order_to_invoices(self, order):
         self.assertEqual(order.account_stage, "review")
         # Create vendor bill
         # Vendor bill created from order's contractor
-        if not order.person_id.partner_id.supplier:
+        if not order.person_id.partner_id.supplier_rank:
             with self.assertRaises(ValidationError) as e:
                 order.account_confirm()
             self.assertEqual(
                 e.exception.name, "The worker assigned to this order is not a supplier"
             )
-            order.person_id.partner_id.supplier = True
+            order.person_id.partner_id.supplier_rank = True
         order.account_confirm()
         self.assertEqual(order.account_stage, "confirmed")
-        bill = self.AccountInvoice.search(
-            [("type", "=", "in_invoice"), ("fsm_order_id", "=", order.id)]
-        )
+        bill = self.AccountMoveLine.search(
+            [("fsm_order_ids", "in", order.id)]
+        ).move_id.filtered(lambda i: i.type == "in_invoice")
         self.assertEqual(len(bill), 1)
         self.assertEqual(len(order.contractor_cost_ids), len(bill.invoice_line_ids))
         # Customer invoice created from order's contractor and timehsheet
@@ -68,9 +86,9 @@ def _process_order_to_invoices(self, order):
             order.customer_id = self.test_loc_partner  # Assign some partner
         order.account_create_invoice()
         self.assertEqual(order.account_stage, "invoiced")
-        invoice = self.AccountInvoice.search(
-            [("type", "=", "out_invoice"), ("fsm_order_id", "=", order.id)]
-        )
+        invoice = self.AccountMoveLine.search(
+            [("fsm_order_ids", "in", order.id)]
+        ).move_id.filtered(lambda i: i.type == "out_invoice")
         self.assertEqual(len(invoice), 1)
         self.assertEqual(
             len(order.contractor_cost_ids) + len(order.employee_timesheet_ids),
@@ -113,9 +131,7 @@ def test_fsm_order_bill_to_location(self):
         self.test_location.analytic_account_id = self.test_analytic
         contractors = [
             {
-                "name": "contractor_line_1",
                 "product_id": self.env.ref("product.expense_hotel").id,
-                "account_id": self.account_id.id,
                 "quantity": 2,
                 "price_unit": 200,
             },
@@ -146,10 +162,9 @@ def test_fsm_order_bill_to_location(self):
         self.assertEqual(order.contractor_total, 400)
         self.assertEqual(order.employee_time_total, 10)  # Hrs
         self.assertEqual(order.total_cost, 1400)
-        # Testing not working "Need to Configure Chart of Accounts"
-        # bill, invoice = self._process_order_to_invoices(order)
-        # self.assertEqual(bill.partner_id, order.person_id.partner_id)
-        # self.assertEqual(invoice.partner_id, order.location_id.customer_id)
+        bill, invoice = self._process_order_to_invoices(order)
+        self.assertEqual(bill.partner_id, order.person_id.partner_id)
+        self.assertEqual(invoice.partner_id, order.location_id.customer_id)
 
     def test_fsm_order_bill_to_contact(self):
         """Bill To Contact,
@@ -160,16 +175,12 @@ def test_fsm_order_bill_to_contact(self):
         # Create a new work order with contract = 500 and timesheet = 300
         contractors = [
             {
-                "name": "contractor_line_2",
                 "product_id": self.env.ref("product.expense_hotel").id,
-                "account_id": self.account_id.id,
                 "quantity": 2,
                 "price_unit": 100,
             },
             {
-                "name": "contractor_line_3",
                 "product_id": self.env.ref("product.expense_hotel").id,
-                "account_id": self.account_id.id,
                 "quantity": 1,
                 "price_unit": 300,
             },
diff --git a/fieldservice_isp_account/views/account.xml b/fieldservice_isp_account/views/account.xml
index 20ab239899..d9fd69d762 100644
--- a/fieldservice_isp_account/views/account.xml
+++ b/fieldservice_isp_account/views/account.xml
@@ -3,7 +3,6 @@
     <record id="action_account_fsm_order" model="ir.actions.act_window">
         <field name="name">Service Orders</field>
         <field name="res_model">fsm.order</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain" eval="[('account_stage', '=', 'confirmed')]" />
         <field name="help" type="html">
diff --git a/fieldservice_isp_account/views/fsm_order.xml b/fieldservice_isp_account/views/fsm_order.xml
index 2563e4e60c..1625294076 100644
--- a/fieldservice_isp_account/views/fsm_order.xml
+++ b/fieldservice_isp_account/views/fsm_order.xml
@@ -42,20 +42,9 @@
                 <group string="Contractor Costs">
                     <field name="contractor_cost_ids" nolabel="1">
                         <tree editable="bottom">
-                            <field name="product_id" required="1" />
-                            <field name="name" />
-                            <field name="quantity" required="1" />
-                            <field name="account_id" required="1" invisible="1" />
-                            <field name="account_analytic_id" invisible="1" />
-                            <field
-                                name="invoice_line_tax_ids"
-                                widget="many2many_tags"
-                                invisible="1"
-                            />
-                            <field
-                                name="price_unit"
-                                groups="fieldservice.group_fsm_manager"
-                            />
+                            <field name="product_id" />
+                            <field name="quantity" />
+                            <field name="price_unit" />
                         </tree>
                     </field>
                 </group>
@@ -90,6 +79,11 @@
                             />
                             <field name="project_id" invisible="1" />
                             <field name="task_id" invisible="1" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                                invisible="1"
+                            />
                         </tree>
                     </field>
                 </group>

From d7e4a5ed41d5ee92142db2866fdd8f503ef28710 Mon Sep 17 00:00:00 2001
From: Benoit Aimont <benoit.aimont@acsone.eu>
Date: Mon, 7 Jun 2021 16:47:05 +0200
Subject: [PATCH 353/631] [IMP] a field name customer_id in
 fieldservice_account_analytic should have a string Customer

---
 fieldservice_isp_account/models/fsm_order.py       | 4 ++--
 fieldservice_isp_account/tests/test_isp_account.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fieldservice_isp_account/models/fsm_order.py b/fieldservice_isp_account/models/fsm_order.py
index 68762b024e..0e954dd9f9 100644
--- a/fieldservice_isp_account/models/fsm_order.py
+++ b/fieldservice_isp_account/models/fsm_order.py
@@ -151,9 +151,9 @@ def account_create_invoice(self):
             ],
             limit=1,
         )
-        if self.bill_to == "contact":
+        if self.bill_to == "customer":
             if not self.customer_id:
-                raise ValidationError(_("Contact empty"))
+                raise ValidationError(_("Customer empty"))
             fpos = self.customer_id.property_account_position_id
             invoice_vals = {
                 "partner_id": self.customer_id.id,
diff --git a/fieldservice_isp_account/tests/test_isp_account.py b/fieldservice_isp_account/tests/test_isp_account.py
index cf600c26ac..4e5b7ec76e 100644
--- a/fieldservice_isp_account/tests/test_isp_account.py
+++ b/fieldservice_isp_account/tests/test_isp_account.py
@@ -80,7 +80,7 @@ def _process_order_to_invoices(self, order):
         self.assertEqual(len(bill), 1)
         self.assertEqual(len(order.contractor_cost_ids), len(bill.invoice_line_ids))
         # Customer invoice created from order's contractor and timehsheet
-        if order.bill_to == "contact" and not order.customer_id:
+        if order.bill_to == "customer" and not order.customer_id:
             with self.assertRaises(ValidationError):
                 order.account_create_invoice()
             order.customer_id = self.test_loc_partner  # Assign some partner
@@ -196,7 +196,7 @@ def test_fsm_order_bill_to_contact(self):
             },
         ]
         order = self._create_workorder(
-            bill_to="contact", contractors=contractors, timesheets=timesheets
+            bill_to="customer", contractors=contractors, timesheets=timesheets
         )
         order._compute_contractor_cost()
         order._compute_employee_hours()

From 793e2a2dbeed4c0611f634233bb145090c65581b Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Wed, 9 Jun 2021 16:46:22 +0530
Subject: [PATCH 354/631] [14.0][FIX] Travis

---
 fieldservice_isp_account/__manifest__.py      |  2 +-
 .../models/fsm_order_cost.py                  | 20 +++++++++++++++----
 .../odoo/addons/fieldservice_isp_account      |  1 +
 setup/fieldservice_isp_account/setup.py       |  6 ++++++
 4 files changed, 24 insertions(+), 5 deletions(-)
 create mode 120000 setup/fieldservice_isp_account/odoo/addons/fieldservice_isp_account
 create mode 100644 setup/fieldservice_isp_account/setup.py

diff --git a/fieldservice_isp_account/__manifest__.py b/fieldservice_isp_account/__manifest__.py
index 3c0f211449..8eeee3e01d 100644
--- a/fieldservice_isp_account/__manifest__.py
+++ b/fieldservice_isp_account/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Field Service - ISP Accounting",
     "summary": """Invoice Field Service orders based on employee time
                   or contractor costs""",
-    "version": "13.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",
diff --git a/fieldservice_isp_account/models/fsm_order_cost.py b/fieldservice_isp_account/models/fsm_order_cost.py
index 1eff39731e..9dca40a230 100644
--- a/fieldservice_isp_account/models/fsm_order_cost.py
+++ b/fieldservice_isp_account/models/fsm_order_cost.py
@@ -9,11 +9,23 @@ class FsmOrderCost(models.Model):
     _name = "fsm.order.cost"
     _description = "Fsm Order Cost"
 
-    fsm_order_id = fields.Many2one(comodel_name="fsm.order", required=True,)
-    price_unit = fields.Float(string="Unit Price", required=True,)
-    quantity = fields.Float(string="Quantity", required=True, default=1,)
+    fsm_order_id = fields.Many2one(
+        comodel_name="fsm.order",
+        required=True,
+    )
+    price_unit = fields.Float(
+        string="Unit Price",
+        required=True,
+    )
+    quantity = fields.Float(
+        string="Quantity",
+        required=True,
+        default=1,
+    )
     product_id = fields.Many2one(
-        comodel_name="product.product", string="Product", required=True,
+        comodel_name="product.product",
+        string="Product",
+        required=True,
     )
 
     @api.onchange("product_id")
diff --git a/setup/fieldservice_isp_account/odoo/addons/fieldservice_isp_account b/setup/fieldservice_isp_account/odoo/addons/fieldservice_isp_account
new file mode 120000
index 0000000000..9914338c7c
--- /dev/null
+++ b/setup/fieldservice_isp_account/odoo/addons/fieldservice_isp_account
@@ -0,0 +1 @@
+../../../../fieldservice_isp_account
\ No newline at end of file
diff --git a/setup/fieldservice_isp_account/setup.py b/setup/fieldservice_isp_account/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_isp_account/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From d0701917c46025e48b14e4bfa8884ac3ef4b06b3 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Mon, 12 Jul 2021 12:16:41 +0000
Subject: [PATCH 355/631] [UPD] Update fieldservice.pot

---
 fieldservice/i18n/fieldservice.pot | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/fieldservice/i18n/fieldservice.pot b/fieldservice/i18n/fieldservice.pot
index 8d29a912f9..7287fb2f4f 100644
--- a/fieldservice/i18n/fieldservice.pot
+++ b/fieldservice/i18n/fieldservice.pot
@@ -2066,6 +2066,12 @@ msgstr ""
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
@@ -2651,12 +2657,30 @@ msgstr ""
 msgid "SMS Delivery error"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_count
+msgid "Sale Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_ids
+msgid "Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
 msgid "Sales Team"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn
+msgid "Sales Warnings"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
@@ -2737,8 +2761,10 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "

From c732f172415faba730d878e385e7c1fff5fd2175 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Mon, 12 Jul 2021 12:16:46 +0000
Subject: [PATCH 356/631] [UPD] Update fieldservice_sale.pot

---
 fieldservice_sale/i18n/fieldservice_sale.pot | 131 +++++++------------
 1 file changed, 50 insertions(+), 81 deletions(-)

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 ""
-

From 3545ce79b1a42a7296b67ec2f3fb18556ecec788 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 12:21:47 +0000
Subject: [PATCH 357/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e2be8b7d51..26bb07afbf 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ addon | version | summary
 [fieldservice_partner_multi_relation](fieldservice_partner_multi_relation/) | 14.0.1.0.0 | Manage relations between contacts, companies and locations
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
 [fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
+[fieldservice_sale](fieldservice_sale/) | 14.0.1.0.0 | Sell field services.
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills
 [fieldservice_stock](fieldservice_stock/) | 14.0.1.0.0 | Integrate the logistics operations with Field Service
 [fieldservice_timeline](fieldservice_timeline/) | 14.0.1.1.1 | This module is a display timeline view of the Field Service order in Odoo.

From 589d2cc49569084f3eafb48171300cd059f3387e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 12:21:50 +0000
Subject: [PATCH 358/631] [UPD] README.rst

---
 fieldservice_sale/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_sale/static/description/index.html b/fieldservice_sale/static/description/index.html
index 3f0825c3a6..b04fdf957f 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: 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">
 

From 6a90512ad362f4d9364715c8f9608a4dd767d6e7 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 12:21:50 +0000
Subject: [PATCH 359/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 2f7433d44f..864336dcb5 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210710.0
\ No newline at end of file
+14.0.20210712.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index a1352aa983..b3a99f7a69 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -18,6 +18,7 @@
         'odoo14-addon-fieldservice_partner_multi_relation',
         'odoo14-addon-fieldservice_project',
         'odoo14-addon-fieldservice_route',
+        'odoo14-addon-fieldservice_sale',
         'odoo14-addon-fieldservice_skill',
         'odoo14-addon-fieldservice_stock',
         'odoo14-addon-fieldservice_timeline',

From d28705d527a561efa9b0094903aa7f1add0b6f88 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Mon, 12 Jul 2021 12:22:01 +0000
Subject: [PATCH 360/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-14.0/field-service-14.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice/
---
 fieldservice/i18n/de.po    | 26 ++++++++++++++++++++++++++
 fieldservice/i18n/es.po    | 38 ++++++++++++++++++++++++++------------
 fieldservice/i18n/es_AR.po | 26 ++++++++++++++++++++++++++
 fieldservice/i18n/es_CL.po | 38 ++++++++++++++++++++++++++------------
 fieldservice/i18n/fr.po    | 26 ++++++++++++++++++++++++++
 fieldservice/i18n/fr_FR.po | 26 ++++++++++++++++++++++++++
 fieldservice/i18n/pt_BR.po | 38 ++++++++++++++++++++++++++------------
 fieldservice/i18n/tr.po    | 26 ++++++++++++++++++++++++++
 8 files changed, 208 insertions(+), 36 deletions(-)

diff --git a/fieldservice/i18n/de.po b/fieldservice/i18n/de.po
index 006bc9c3af..962690ac4c 100644
--- a/fieldservice/i18n/de.po
+++ b/fieldservice/i18n/de.po
@@ -2079,6 +2079,12 @@ msgstr ""
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
@@ -2663,12 +2669,30 @@ msgstr ""
 msgid "SMS Delivery error"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_count
+msgid "Sale Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_ids
+msgid "Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
 msgid "Sales Team"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn
+msgid "Sales Warnings"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
@@ -2749,8 +2773,10 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
diff --git a/fieldservice/i18n/es.po b/fieldservice/i18n/es.po
index 2071b26aeb..d9a6847a73 100644
--- a/fieldservice/i18n/es.po
+++ b/fieldservice/i18n/es.po
@@ -2110,6 +2110,12 @@ msgstr "Error de Mensaje de Entrega"
 msgid "Message for Invoice"
 msgstr "Mensaje para factura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
+msgid "Message for Sales Order"
+msgstr "Mensaje para Pedido de Venta"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
@@ -2697,12 +2703,30 @@ msgstr "Rutas"
 msgid "SMS Delivery error"
 msgstr "Error de Mensaje de Entrega"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_count
+msgid "Sale Order Count"
+msgstr "Recuento de Orden de Venta"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_ids
+msgid "Sales Order"
+msgstr "Pedidos de Venta"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
 msgid "Sales Team"
 msgstr "Equipos de Venta"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn
+msgid "Sales Warnings"
+msgstr "Advertencias de Ventas"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
@@ -2785,8 +2809,10 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -3638,9 +3664,6 @@ msgstr "plantillas"
 #~ msgid "Message for Purchase Order"
 #~ msgstr "Mensaje para Orden de Compra"
 
-#~ msgid "Message for Sales Order"
-#~ msgstr "Mensaje para Pedido de Venta"
-
 #~ msgid "Overdue"
 #~ msgstr "Atrasado"
 
@@ -3662,15 +3685,6 @@ msgstr "plantillas"
 #~ msgid "Route"
 #~ msgstr "Ruta"
 
-#~ msgid "Sale Order Count"
-#~ msgstr "Recuento de Orden de Venta"
-
-#~ msgid "Sales Order"
-#~ msgstr "Pedidos de Venta"
-
-#~ msgid "Sales Warnings"
-#~ msgstr "Advertencias de Ventas"
-
 #~ msgid "Schedules"
 #~ msgstr "Horarios"
 
diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index 68df09df3d..f8c3d94cbe 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -2118,6 +2118,12 @@ msgstr "Error de Mensaje de Entrega"
 msgid "Message for Invoice"
 msgstr "Mensaje para Factura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
@@ -2704,12 +2710,30 @@ msgstr "Rutas"
 msgid "SMS Delivery error"
 msgstr "Error de entrega de SMS"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_count
+msgid "Sale Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_ids
+msgid "Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
 msgid "Sales Team"
 msgstr "Equipo de Ventas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn
+msgid "Sales Warnings"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
@@ -2792,8 +2816,10 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
diff --git a/fieldservice/i18n/es_CL.po b/fieldservice/i18n/es_CL.po
index 0cc44bb07e..d570e7bb10 100644
--- a/fieldservice/i18n/es_CL.po
+++ b/fieldservice/i18n/es_CL.po
@@ -2110,6 +2110,12 @@ msgstr "Error de Mensaje de Entrega"
 msgid "Message for Invoice"
 msgstr "Mensaje para factura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
+msgid "Message for Sales Order"
+msgstr "Mensaje para Pedido de Venta"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
@@ -2697,12 +2703,30 @@ msgstr "Rutas"
 msgid "SMS Delivery error"
 msgstr "Error de Mensaje de Entrega"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_count
+msgid "Sale Order Count"
+msgstr "Recuento de Orden de Venta"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_ids
+msgid "Sales Order"
+msgstr "Pedidos de Venta"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
 msgid "Sales Team"
 msgstr "Equipos de Venta"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn
+msgid "Sales Warnings"
+msgstr "Advertencias de Ventas"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
@@ -2785,8 +2809,10 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -3638,9 +3664,6 @@ msgstr "plantillas"
 #~ msgid "Message for Purchase Order"
 #~ msgstr "Mensaje para Orden de Compra"
 
-#~ msgid "Message for Sales Order"
-#~ msgstr "Mensaje para Pedido de Venta"
-
 #~ msgid "Overdue"
 #~ msgstr "Atrasado"
 
@@ -3662,15 +3685,6 @@ msgstr "plantillas"
 #~ msgid "Route"
 #~ msgstr "Ruta"
 
-#~ msgid "Sale Order Count"
-#~ msgstr "Recuento de Orden de Venta"
-
-#~ msgid "Sales Order"
-#~ msgstr "Pedidos de Venta"
-
-#~ msgid "Sales Warnings"
-#~ msgstr "Advertencias de Ventas"
-
 #~ msgid "Schedules"
 #~ msgstr "Horarios"
 
diff --git a/fieldservice/i18n/fr.po b/fieldservice/i18n/fr.po
index ebcdf05189..715eee48a7 100644
--- a/fieldservice/i18n/fr.po
+++ b/fieldservice/i18n/fr.po
@@ -2130,6 +2130,12 @@ msgstr "Erreur de livraison du message"
 msgid "Message for Invoice"
 msgstr "Message pour la facturation"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
@@ -2712,12 +2718,30 @@ msgstr "Itinéraires"
 msgid "SMS Delivery error"
 msgstr "Erreur d'envoi de SMS"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_count
+msgid "Sale Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_ids
+msgid "Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
 msgid "Sales Team"
 msgstr "Equipe des ventes"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn
+msgid "Sales Warnings"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
@@ -2801,8 +2825,10 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
diff --git a/fieldservice/i18n/fr_FR.po b/fieldservice/i18n/fr_FR.po
index 1cec7ffae0..021280f4ae 100644
--- a/fieldservice/i18n/fr_FR.po
+++ b/fieldservice/i18n/fr_FR.po
@@ -2127,6 +2127,12 @@ msgstr "Erreur de livraison du message"
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
@@ -2709,12 +2715,30 @@ msgstr "Itinéraires"
 msgid "SMS Delivery error"
 msgstr "Erreur d'envoi de SMS"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_count
+msgid "Sale Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_ids
+msgid "Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
 msgid "Sales Team"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn
+msgid "Sales Warnings"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
@@ -2798,8 +2822,10 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
diff --git a/fieldservice/i18n/pt_BR.po b/fieldservice/i18n/pt_BR.po
index 3444150b2c..3160edf894 100644
--- a/fieldservice/i18n/pt_BR.po
+++ b/fieldservice/i18n/pt_BR.po
@@ -2112,6 +2112,12 @@ msgstr "Erro de entrega de Mensagem"
 msgid "Message for Invoice"
 msgstr "Mensagem para Fatura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
+msgid "Message for Sales Order"
+msgstr "Mensagem para Pedido de Vendas"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
@@ -2698,12 +2704,30 @@ msgstr "Rotas"
 msgid "SMS Delivery error"
 msgstr "Erro de entrega de SMS"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_count
+msgid "Sale Order Count"
+msgstr "Contagem de Pedidos de Venda"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_ids
+msgid "Sales Order"
+msgstr "Pedidos de Venda"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
 msgid "Sales Team"
 msgstr "Equipe de Vendas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn
+msgid "Sales Warnings"
+msgstr "Avisos de Vendas"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
@@ -2786,8 +2810,10 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "
@@ -3637,9 +3663,6 @@ msgstr "modelos"
 #~ msgid "Message for Purchase Order"
 #~ msgstr "Mensagem para Ordem de Compra"
 
-#~ msgid "Message for Sales Order"
-#~ msgstr "Mensagem para Pedido de Vendas"
-
 #~ msgid "Overdue"
 #~ msgstr "Vencido"
 
@@ -3661,15 +3684,6 @@ msgstr "modelos"
 #~ msgid "Route"
 #~ msgstr "Rota"
 
-#~ msgid "Sale Order Count"
-#~ msgstr "Contagem de Pedidos de Venda"
-
-#~ msgid "Sales Order"
-#~ msgstr "Pedidos de Venda"
-
-#~ msgid "Sales Warnings"
-#~ msgstr "Avisos de Vendas"
-
 #~ msgid "Schedules"
 #~ msgstr "Horários"
 
diff --git a/fieldservice/i18n/tr.po b/fieldservice/i18n/tr.po
index a134544c80..77cc5deed6 100644
--- a/fieldservice/i18n/tr.po
+++ b/fieldservice/i18n/tr.po
@@ -2076,6 +2076,12 @@ msgstr ""
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
+msgid "Message for Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
@@ -2658,12 +2664,30 @@ msgstr "Rotalar"
 msgid "SMS Delivery error"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_count
+msgid "Sale Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_ids
+msgid "Sales Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
 msgid "Sales Team"
 msgstr "Satış Ekibi"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn
+msgid "Sales Warnings"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
@@ -2746,8 +2770,10 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
 "Selecting \"Blocking Message\" will throw an exception with the message and "

From 36487794ba127c7a0a4b5bb0071e5ce7f9edf8d5 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Wed, 9 Jun 2021 17:15:59 +0530
Subject: [PATCH 361/631] [14.0][MIG] fieldservice_isp_account

---
 fieldservice_isp_account/README.rst           | 15 ++++---
 fieldservice_isp_account/models/fsm_order.py  |  8 ++--
 fieldservice_isp_account/models/fsm_person.py |  2 +-
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../static/description/index.html             |  9 ++--
 .../tests/test_isp_account.py                 | 45 ++++++++++---------
 6 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/fieldservice_isp_account/README.rst b/fieldservice_isp_account/README.rst
index 5b7501afeb..786902190e 100644
--- a/fieldservice_isp_account/README.rst
+++ b/fieldservice_isp_account/README.rst
@@ -14,16 +14,16 @@ Field Service - ISP Accounting
     :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/13.0/fieldservice_isp_account
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_isp_account
     :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-13-0/field-service-13-0-fieldservice_isp_account
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_isp_account
     :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/13.0
+    :target: https://runbot.odoo-community.org/runbot/264/14.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5|
+|badge1| |badge2| |badge3| |badge4| |badge5| 
 
 This module adds the ability to track employee time and contractor
 costs for Field Service Orders. It also adds functionality to create
@@ -67,7 +67,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_isp_account%0Aversion:%2013.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_isp_account%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.
 
@@ -85,6 +85,7 @@ Contributors
 * Michael Allen <mallen@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
+* Freni Patel <fpatel@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -118,8 +119,8 @@ promote its widespread use.
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-osimallen| |maintainer-brian10048| |maintainer-bodedra|
+|maintainer-osimallen| |maintainer-brian10048| |maintainer-bodedra| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/13.0/fieldservice_isp_account>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_isp_account>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_isp_account/models/fsm_order.py b/fieldservice_isp_account/models/fsm_order.py
index 0e954dd9f9..b12a442cae 100644
--- a/fieldservice_isp_account/models/fsm_order.py
+++ b/fieldservice_isp_account/models/fsm_order.py
@@ -118,7 +118,7 @@ def create_bills(self):
             )
         vals = {
             "partner_id": self.person_id.partner_id.id,
-            "type": "in_invoice",
+            "move_type": "in_invoice",
             "journal_id": jrnl.id or False,
             "fiscal_position_id": fpos.id or False,
             "fsm_order_ids": [(4, self.id)],
@@ -151,13 +151,13 @@ def account_create_invoice(self):
             ],
             limit=1,
         )
-        if self.bill_to == "customer":
+        if self.bill_to == "contact":
             if not self.customer_id:
                 raise ValidationError(_("Customer empty"))
             fpos = self.customer_id.property_account_position_id
             invoice_vals = {
                 "partner_id": self.customer_id.id,
-                "type": "out_invoice",
+                "move_type": "out_invoice",
                 "journal_id": jrnl.id or False,
                 "fiscal_position_id": fpos.id or False,
                 "fsm_order_ids": [(4, self.id)],
@@ -168,7 +168,7 @@ def account_create_invoice(self):
             fpos = self.location_id.customer_id.property_account_position_id
             invoice_vals = {
                 "partner_id": self.location_id.customer_id.id,
-                "type": "out_invoice",
+                "move_type": "out_invoice",
                 "journal_id": jrnl.id or False,
                 "fiscal_position_id": fpos.id or False,
                 "fsm_order_ids": [(4, self.id)],
diff --git a/fieldservice_isp_account/models/fsm_person.py b/fieldservice_isp_account/models/fsm_person.py
index d88787a80a..96683b5fe8 100644
--- a/fieldservice_isp_account/models/fsm_person.py
+++ b/fieldservice_isp_account/models/fsm_person.py
@@ -16,7 +16,7 @@ def _compute_vendor_bills(self):
 
     def action_view_bills(self):
         for bill in self:
-            action = self.env.ref("account.action_invoice_tree1").read()[0]
+            action = self.env.ref("account.action_move_out_invoice_type").read()[0]
             vendor_bills = self.env["account.move"].search(
                 [("partner_id", "=", bill.partner_id.id)]
             )
diff --git a/fieldservice_isp_account/readme/CONTRIBUTORS.rst b/fieldservice_isp_account/readme/CONTRIBUTORS.rst
index e9143c46f2..3ad2246d88 100644
--- a/fieldservice_isp_account/readme/CONTRIBUTORS.rst
+++ b/fieldservice_isp_account/readme/CONTRIBUTORS.rst
@@ -1,3 +1,4 @@
 * Michael Allen <mallen@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Brian McMaster <brian@mcmpest.com>
+* Freni Patel <fpatel@opensourceintegrators.com>
diff --git a/fieldservice_isp_account/static/description/index.html b/fieldservice_isp_account/static/description/index.html
index 1dab785e80..64c1bc8af0 100644
--- a/fieldservice_isp_account/static/description/index.html
+++ b/fieldservice_isp_account/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 - ISP Accounting</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - ISP Accounting</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/13.0/fieldservice_isp_account"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-13-0/field-service-13-0-fieldservice_isp_account"><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/13.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/14.0/fieldservice_isp_account"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_isp_account"><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>This module adds the ability to track employee time and contractor
 costs for Field Service Orders. It also adds functionality to create
 a customer invoice and a vendor bill when a Field Service Order is
@@ -413,7 +413,7 @@ <h1><a class="toc-backref" href="#id4">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_isp_account%0Aversion:%2013.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_isp_account%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">
@@ -430,6 +430,7 @@ <h2><a class="toc-backref" href="#id7">Contributors</a></h2>
 <li>Michael Allen &lt;<a class="reference external" href="mailto:mallen&#64;opensourceintegrators.com">mallen&#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>Freni Patel &lt;<a class="reference external" href="mailto:fpatel&#64;opensourceintegrators.com">fpatel&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -448,7 +449,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/osimallen"><img alt="osimallen" src="https://github.com/osimallen.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> <a class="reference external" href="https://github.com/bodedra"><img alt="bodedra" src="https://github.com/bodedra.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/13.0/fieldservice_isp_account">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/14.0/fieldservice_isp_account">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_isp_account/tests/test_isp_account.py b/fieldservice_isp_account/tests/test_isp_account.py
index 4e5b7ec76e..a432806b8a 100644
--- a/fieldservice_isp_account/tests/test_isp_account.py
+++ b/fieldservice_isp_account/tests/test_isp_account.py
@@ -49,11 +49,25 @@ def _create_workorder(self, bill_to, contractors, timesheets):
                 "employee_timesheet_ids": [(6, 0, timesheets.ids)],
             }
         )
+        order2 = self.env["fsm.order"].create(
+            {
+                "location_id": self.test_location.id,
+                "bill_to": bill_to,
+                "person_id": self.test_person.id,
+            }
+        )
+        order._compute_employee()
+        self.test_person._compute_vendor_bills()
+        self.test_person.action_view_bills()
+        with self.assertRaises(ValidationError):
+            order2.action_complete()
         for contractor in contractors:
             contractor.update({"fsm_order_id": order.id})
         contractors = self.env["fsm.order.cost"].create(contractors)
+        contractors.onchange_product_id()
         order.write({"contractor_cost_ids": [(6, 0, contractors.ids)]})
         order.person_ids += self.test_person
+        order.account_no_invoice()
         return order
 
     def _process_order_to_invoices(self, order):
@@ -66,21 +80,18 @@ def _process_order_to_invoices(self, order):
         # Create vendor bill
         # Vendor bill created from order's contractor
         if not order.person_id.partner_id.supplier_rank:
-            with self.assertRaises(ValidationError) as e:
+            with self.assertRaises(ValidationError):
                 order.account_confirm()
-            self.assertEqual(
-                e.exception.name, "The worker assigned to this order is not a supplier"
-            )
             order.person_id.partner_id.supplier_rank = True
         order.account_confirm()
         self.assertEqual(order.account_stage, "confirmed")
         bill = self.AccountMoveLine.search(
             [("fsm_order_ids", "in", order.id)]
-        ).move_id.filtered(lambda i: i.type == "in_invoice")
+        ).move_id.filtered(lambda i: i.move_type == "in_invoice")
         self.assertEqual(len(bill), 1)
         self.assertEqual(len(order.contractor_cost_ids), len(bill.invoice_line_ids))
         # Customer invoice created from order's contractor and timehsheet
-        if order.bill_to == "customer" and not order.customer_id:
+        if order.bill_to == "contact" and not order.customer_id:
             with self.assertRaises(ValidationError):
                 order.account_create_invoice()
             order.customer_id = self.test_loc_partner  # Assign some partner
@@ -88,7 +99,7 @@ def _process_order_to_invoices(self, order):
         self.assertEqual(order.account_stage, "invoiced")
         invoice = self.AccountMoveLine.search(
             [("fsm_order_ids", "in", order.id)]
-        ).move_id.filtered(lambda i: i.type == "out_invoice")
+        ).move_id.filtered(lambda i: i.move_type == "out_invoice")
         self.assertEqual(len(invoice), 1)
         self.assertEqual(
             len(order.contractor_cost_ids) + len(order.employee_timesheet_ids),
@@ -116,12 +127,8 @@ def test_fsm_order_exception(self):
         order.date_start = fields.Datetime.today()
         order.date_end = fields.Datetime.today()
         order.resolution = "Done something!"
-        with self.assertRaises(ValidationError) as e:
+        with self.assertRaises(ValidationError):
             order.action_complete()
-        self.assertEqual(
-            e.exception.name,
-            "Cannot move to Complete until " "'Employee Timesheets' is filled in",
-        )
 
     def test_fsm_order_bill_to_location(self):
         """Bill To Location,
@@ -159,9 +166,9 @@ def test_fsm_order_bill_to_location(self):
         order._compute_contractor_cost()
         order._compute_employee_hours()
         order._compute_total_cost()
-        self.assertEqual(order.contractor_total, 400)
+        self.assertEqual(order.contractor_total, 800.0)
         self.assertEqual(order.employee_time_total, 10)  # Hrs
-        self.assertEqual(order.total_cost, 1400)
+        self.assertEqual(order.total_cost, 1800.0)
         bill, invoice = self._process_order_to_invoices(order)
         self.assertEqual(bill.partner_id, order.person_id.partner_id)
         self.assertEqual(invoice.partner_id, order.location_id.customer_id)
@@ -196,15 +203,11 @@ def test_fsm_order_bill_to_contact(self):
             },
         ]
         order = self._create_workorder(
-            bill_to="customer", contractors=contractors, timesheets=timesheets
+            bill_to="contact", contractors=contractors, timesheets=timesheets
         )
         order._compute_contractor_cost()
         order._compute_employee_hours()
         order._compute_total_cost()
-        self.assertEqual(order.contractor_total, 500)
+        self.assertEqual(order.contractor_total, 1200.0)
         self.assertEqual(order.employee_time_total, 10)  # Hrs
-        self.assertEqual(order.total_cost, 700)
-        # Testing not working "Need to Configure Chart of Accounts"
-        # bill, invoice = self._process_order_to_invoices(order)
-        # self.assertEqual(bill.partner_id, order.person_id.partner_id)
-        # self.assertEqual(invoice.partner_id, order.customer_id)
+        self.assertEqual(order.total_cost, 1400.0)

From dabd8d95e9b5fe421eabe4bcfd5b36c36b5d5e00 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 21 Nov 2020 13:05:46 -0500
Subject: [PATCH 362/631] [IMP] fieldservice_stock: Split equipment

Remove the equipment related functionality from the fieldservice_stock module and make into separate module
---
 fieldservice_equipment_stock/README.rst       | 138 +++++
 fieldservice_equipment_stock/__init__.py      |   4 +
 fieldservice_equipment_stock/__manifest__.py  |  31 ++
 .../i18n/fieldservice_equipment_stock.pot     |  81 +++
 .../migrations/12.0.1.0.0/post-migration.py   |  13 +
 .../models/__init__.py                        |   7 +
 .../models/fsm_equipment.py                   |  50 ++
 .../models/product_template.py                |  10 +
 .../models/stock_move.py                      |  30 ++
 .../models/stock_picking_type.py              |  13 +
 .../models/stock_production_lot.py            |  11 +
 .../readme/CONFIGURE.rst                      |  20 +
 .../readme/CONTRIBUTORS.rst                   |   4 +
 .../readme/CREDITS.rst                        |   3 +
 .../readme/DESCRIPTION.rst                    |   2 +
 .../readme/ROADMAP.rst                        |   2 +
 fieldservice_equipment_stock/readme/USAGE.rst |   2 +
 .../security/ir.model.access.csv              |   2 +
 .../static/description/index.html             | 470 ++++++++++++++++++
 .../tests/__init__.py                         |   4 +
 .../tests/test_fsm_equipment.py               |  44 ++
 .../views/fsm_equipment.xml                   |  33 ++
 .../views/product_template.xml                |  16 +
 .../views/stock_picking_type.xml              |  16 +
 .../views/stock_production_lot.xml            |  24 +
 25 files changed, 1030 insertions(+)
 create mode 100644 fieldservice_equipment_stock/README.rst
 create mode 100644 fieldservice_equipment_stock/__init__.py
 create mode 100644 fieldservice_equipment_stock/__manifest__.py
 create mode 100644 fieldservice_equipment_stock/i18n/fieldservice_equipment_stock.pot
 create mode 100644 fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py
 create mode 100644 fieldservice_equipment_stock/models/__init__.py
 create mode 100644 fieldservice_equipment_stock/models/fsm_equipment.py
 create mode 100644 fieldservice_equipment_stock/models/product_template.py
 create mode 100644 fieldservice_equipment_stock/models/stock_move.py
 create mode 100644 fieldservice_equipment_stock/models/stock_picking_type.py
 create mode 100644 fieldservice_equipment_stock/models/stock_production_lot.py
 create mode 100644 fieldservice_equipment_stock/readme/CONFIGURE.rst
 create mode 100644 fieldservice_equipment_stock/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_equipment_stock/readme/CREDITS.rst
 create mode 100644 fieldservice_equipment_stock/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_equipment_stock/readme/ROADMAP.rst
 create mode 100644 fieldservice_equipment_stock/readme/USAGE.rst
 create mode 100644 fieldservice_equipment_stock/security/ir.model.access.csv
 create mode 100644 fieldservice_equipment_stock/static/description/index.html
 create mode 100644 fieldservice_equipment_stock/tests/__init__.py
 create mode 100644 fieldservice_equipment_stock/tests/test_fsm_equipment.py
 create mode 100644 fieldservice_equipment_stock/views/fsm_equipment.xml
 create mode 100644 fieldservice_equipment_stock/views/product_template.xml
 create mode 100644 fieldservice_equipment_stock/views/stock_picking_type.xml
 create mode 100644 fieldservice_equipment_stock/views/stock_production_lot.xml

diff --git a/fieldservice_equipment_stock/README.rst b/fieldservice_equipment_stock/README.rst
new file mode 100644
index 0000000000..a28a09a020
--- /dev/null
+++ b/fieldservice_equipment_stock/README.rst
@@ -0,0 +1,138 @@
+===============================
+Field Service - Stock Equipment
+===============================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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/12.0/fieldservice_equipment_stock
+    :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_equipment_stock
+    :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
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module is an add-on for the Field Service application in Odoo.
+It allows you to track your FSM Equipments in stock moves.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+Products can be automatically converted into FSM Equipments.
+This is only available only for products tracked by serial number.
+This needs to be enabled both on Operation Types and Products.
+For example, we may want to create the FSM Equipment on Delivery,
+or on Receipts.
+
+To enable on Products:
+
+* Go to Inventory > Master Data > Products
+* Open the Product form, Inventory tab
+* On the "Traceability" section, make sure
+  "Tracking" is set to "By Unique Serial Number"
+* Enable the "Creates FSM Equipment" checkbox
+
+To enable on Operation Types:
+
+* Go to Inventory > Configuration > Operation Types
+* Select the intended Operation Type ("Receipts" for example)
+* On the "Traceability" section, enable the
+  "Create FSM Equipment" checkbox
+
+Usage
+=====
+
+A completed stock move for a properly configured Product on a configured
+stock Operation Type will automatically create a field service equipment.
+
+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_equipment_stock%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+* Brian McMaster
+
+Contributors
+~~~~~~~~~~~~
+
+* Brian McMaster <brian@mcmpest.com>
+* Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Marcel Savegnago <marcel.savegnago@escodoo.com.br>
+
+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-brian10048| image:: https://github.com/brian10048.png?size=40px
+    :target: https://github.com/brian10048
+    :alt: brian10048
+.. |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
+.. |maintainer-smangukiya| image:: https://github.com/smangukiya.png?size=40px
+    :target: https://github.com/smangukiya
+    :alt: smangukiya
+
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-brian10048| |maintainer-wolfhall| |maintainer-max3903| |maintainer-smangukiya| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_equipment_stock>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_equipment_stock/__init__.py b/fieldservice_equipment_stock/__init__.py
new file mode 100644
index 0000000000..e27a9c3831
--- /dev/null
+++ b/fieldservice_equipment_stock/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2020, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_equipment_stock/__manifest__.py b/fieldservice_equipment_stock/__manifest__.py
new file mode 100644
index 0000000000..97931b2d09
--- /dev/null
+++ b/fieldservice_equipment_stock/__manifest__.py
@@ -0,0 +1,31 @@
+# Copyright (C) 2020, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - Stock Equipment',
+    'summary': 'Integrate stock operations with your field service equipments',
+    'version': '12.0.1.0.0',
+    'category': 'Field Service',
+    'author': "Open Source Integrators, "
+              "Brian McMaster, "
+              "Odoo Community Association (OCA)",
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice_stock',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/fsm_equipment.xml',
+        'views/product_template.xml',
+        'views/stock_picking_type.xml',
+        'views/stock_production_lot.xml',
+    ],
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'brian10048',
+        'wolfhall',
+        'max3903',
+        'smangukiya',
+    ],
+}
diff --git a/fieldservice_equipment_stock/i18n/fieldservice_equipment_stock.pot b/fieldservice_equipment_stock/i18n/fieldservice_equipment_stock.pot
new file mode 100644
index 0000000000..99245a7fba
--- /dev/null
+++ b/fieldservice_equipment_stock/i18n/fieldservice_equipment_stock.pot
@@ -0,0 +1,81 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_equipment_stock
+#
+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_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_picking_type__create_fsm_equipment
+msgid "Create Fsm Equipment"
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_product_product__create_fsm_equipment
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_product_template__create_fsm_equipment
+msgid "Creates a FSM Equipment"
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_fsm_equipment__current_stock_location_id
+msgid "Current Inventory Location"
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_production_lot__fsm_equipment_id
+msgid "Equipment"
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model,name:fieldservice_equipment_stock.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_equipment_stock.fsm_equipment_form_view_stock
+msgid "Inventory"
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model,name:fieldservice_equipment_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model,name:fieldservice_equipment_stock.model_stock_picking_type
+msgid "Picking Type"
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_fsm_equipment__product_id
+msgid "Product"
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model,name:fieldservice_equipment_stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,help:fieldservice_equipment_stock.field_stock_picking_type__create_fsm_equipment
+msgid "Products with the 'Creates a FSM Equipment' flag will automatically be converted to an FSM Equipment."
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_fsm_equipment__lot_id
+msgid "Serial #"
+msgstr ""
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model,name:fieldservice_equipment_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
diff --git a/fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py b/fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py
new file mode 100644
index 0000000000..2855328b90
--- /dev/null
+++ b/fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py
@@ -0,0 +1,13 @@
+# Copyright (C) 2020, 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 stock_picking_type
+        SET create_fsm_equipment = 'true'
+        WHERE code = 'outgoing';
+    """)
diff --git a/fieldservice_equipment_stock/models/__init__.py b/fieldservice_equipment_stock/models/__init__.py
new file mode 100644
index 0000000000..3f2717ba38
--- /dev/null
+++ b/fieldservice_equipment_stock/models/__init__.py
@@ -0,0 +1,7 @@
+from . import (
+    stock_move,
+    stock_picking_type,
+    fsm_equipment,
+    product_template,
+    stock_production_lot,
+)
diff --git a/fieldservice_equipment_stock/models/fsm_equipment.py b/fieldservice_equipment_stock/models/fsm_equipment.py
new file mode 100644
index 0000000000..0093df66c6
--- /dev/null
+++ b/fieldservice_equipment_stock/models/fsm_equipment.py
@@ -0,0 +1,50 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMEquipment(models.Model):
+    _inherit = 'fsm.equipment'
+
+    product_id = fields.Many2one(
+        'product.product', string='Product', required=True)
+    lot_id = fields.Many2one(
+        'stock.production.lot', string='Serial #', required=True)
+    current_stock_location_id = fields.Many2one(
+        'stock.location', string='Current Inventory Location',
+        compute='_compute_current_stock_loc_id')
+
+    @api.depends('product_id', 'lot_id')
+    def _compute_current_stock_loc_id(self):
+        for equipment in self:
+            quants = self.env['stock.quant'].search(
+                [('lot_id', '=', equipment.lot_id.id)], order="id desc",
+                limit=1)
+            if quants and quants.location_id:
+                equipment.current_stock_location_id = \
+                    quants.location_id.id
+            else:
+                equipment.current_stock_location_id = False
+
+    @api.onchange('product_id')
+    def _onchange_product(self):
+        for equipment in self:
+            self.current_stock_location_id = False
+
+    @api.model
+    def create(self, vals):
+        res = super(FSMEquipment, self).create(vals)
+        if 'lot_id' in vals:
+            res.lot_id.fsm_equipment_id = res.id
+        return res
+
+    @api.multi
+    def write(self, vals):
+        for equipment in self:
+            prev_lot = equipment.lot_id
+            res = super(FSMEquipment, equipment).write(vals)
+            if 'lot_id' in vals:
+                prev_lot.fsm_equipment_id = False
+                equipment.lot_id.fsm_equipment_id = equipment.id
+        return res
diff --git a/fieldservice_equipment_stock/models/product_template.py b/fieldservice_equipment_stock/models/product_template.py
new file mode 100644
index 0000000000..54195f55d7
--- /dev/null
+++ b/fieldservice_equipment_stock/models/product_template.py
@@ -0,0 +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, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    create_fsm_equipment = fields.Boolean(string='Creates a FSM Equipment')
diff --git a/fieldservice_equipment_stock/models/stock_move.py b/fieldservice_equipment_stock/models/stock_move.py
new file mode 100644
index 0000000000..e3e3133794
--- /dev/null
+++ b/fieldservice_equipment_stock/models/stock_move.py
@@ -0,0 +1,30 @@
+# Copyright (C) 2018 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import models
+
+
+class StockMove(models.Model):
+    _inherit = "stock.move"
+
+    def prepare_equipment_values(self, move_line):
+        return {'name': '%s (%s)' % (
+            move_line.product_id.name, move_line.lot_id.name),
+            'product_id': move_line.product_id.id,
+            'lot_id': move_line.lot_id.id,
+            'location_id':
+            move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
+            'current_location_id':
+            move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
+            'current_stock_location_id': move_line.location_dest_id.id}
+
+    def _action_done(self):
+        res = super()._action_done()
+        for rec in self:
+            if (rec.state == 'done'
+                    and rec.picking_type_id.create_fsm_equipment
+                    and rec.product_tmpl_id.create_fsm_equipment):
+                for line in rec.move_line_ids:
+                    vals = self.prepare_equipment_values(line)
+                    line.lot_id.fsm_equipment_id = \
+                        rec.env['fsm.equipment'].create(vals)
+        return res
diff --git a/fieldservice_equipment_stock/models/stock_picking_type.py b/fieldservice_equipment_stock/models/stock_picking_type.py
new file mode 100644
index 0000000000..5fe0671881
--- /dev/null
+++ b/fieldservice_equipment_stock/models/stock_picking_type.py
@@ -0,0 +1,13 @@
+# Copyright (C) 2020 Open Source Integrators, Daniel Reis
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class StockPickingType(models.Model):
+    _inherit = 'stock.picking.type'
+
+    create_fsm_equipment = fields.Boolean(
+        name="Create FSM Equipment",
+        help="Products with the 'Creates a FSM Equipment' flag "
+        "will automatically be converted to an FSM Equipment."
+    )
diff --git a/fieldservice_equipment_stock/models/stock_production_lot.py b/fieldservice_equipment_stock/models/stock_production_lot.py
new file mode 100644
index 0000000000..5e52651e3e
--- /dev/null
+++ b/fieldservice_equipment_stock/models/stock_production_lot.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class StockProductionLot(models.Model):
+    _inherit = 'stock.production.lot'
+
+    fsm_equipment_id = fields.Many2one('fsm.equipment',
+                                       string='Equipment', readonly=True)
diff --git a/fieldservice_equipment_stock/readme/CONFIGURE.rst b/fieldservice_equipment_stock/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..863d148ca1
--- /dev/null
+++ b/fieldservice_equipment_stock/readme/CONFIGURE.rst
@@ -0,0 +1,20 @@
+Products can be automatically converted into FSM Equipments.
+This is only available only for products tracked by serial number.
+This needs to be enabled both on Operation Types and Products.
+For example, we may want to create the FSM Equipment on Delivery,
+or on Receipts.
+
+To enable on Products:
+
+* Go to Inventory > Master Data > Products
+* Open the Product form, Inventory tab
+* On the "Traceability" section, make sure
+  "Tracking" is set to "By Unique Serial Number"
+* Enable the "Creates FSM Equipment" checkbox
+
+To enable on Operation Types:
+
+* Go to Inventory > Configuration > Operation Types
+* Select the intended Operation Type ("Receipts" for example)
+* On the "Traceability" section, enable the
+  "Create FSM Equipment" checkbox
diff --git a/fieldservice_equipment_stock/readme/CONTRIBUTORS.rst b/fieldservice_equipment_stock/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..5db5c162c6
--- /dev/null
+++ b/fieldservice_equipment_stock/readme/CONTRIBUTORS.rst
@@ -0,0 +1,4 @@
+* Brian McMaster <brian@mcmpest.com>
+* Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Marcel Savegnago <marcel.savegnago@escodoo.com.br>
diff --git a/fieldservice_equipment_stock/readme/CREDITS.rst b/fieldservice_equipment_stock/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_equipment_stock/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_equipment_stock/readme/DESCRIPTION.rst b/fieldservice_equipment_stock/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..bb3d99466c
--- /dev/null
+++ b/fieldservice_equipment_stock/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module is an add-on for the Field Service application in Odoo.
+It allows you to track your FSM Equipments in stock moves.
diff --git a/fieldservice_equipment_stock/readme/ROADMAP.rst b/fieldservice_equipment_stock/readme/ROADMAP.rst
new file mode 100644
index 0000000000..f607015959
--- /dev/null
+++ b/fieldservice_equipment_stock/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_equipment_stock/readme/USAGE.rst b/fieldservice_equipment_stock/readme/USAGE.rst
new file mode 100644
index 0000000000..09534067ba
--- /dev/null
+++ b/fieldservice_equipment_stock/readme/USAGE.rst
@@ -0,0 +1,2 @@
+A completed stock move for a properly configured Product on a configured
+stock Operation Type will automatically create a field service equipment.
diff --git a/fieldservice_equipment_stock/security/ir.model.access.csv b/fieldservice_equipment_stock/security/ir.model.access.csv
new file mode 100644
index 0000000000..431ba34601
--- /dev/null
+++ b/fieldservice_equipment_stock/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_stock_picking_type_portal,access.stock.picking.type.portal,stock.model_stock_picking_type,base.group_portal,1,0,0,0
diff --git a/fieldservice_equipment_stock/static/description/index.html b/fieldservice_equipment_stock/static/description/index.html
new file mode 100644
index 0000000000..24708b961b
--- /dev/null
+++ b/fieldservice_equipment_stock/static/description/index.html
@@ -0,0 +1,470 @@
+<?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 - Stock Equipment</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-stock-equipment">
+<h1 class="title">Field Service - Stock Equipment</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_equipment_stock"><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_equipment_stock"><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>This module is an add-on for the Field Service application in Odoo.
+It allows you to track your FSM Equipments in stock moves.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id3">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id8">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id9">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<p>Products can be automatically converted into FSM Equipments.
+This is only available only for products tracked by serial number.
+This needs to be enabled both on Operation Types and Products.
+For example, we may want to create the FSM Equipment on Delivery,
+or on Receipts.</p>
+<p>To enable on Products:</p>
+<ul class="simple">
+<li>Go to Inventory &gt; Master Data &gt; Products</li>
+<li>Open the Product form, Inventory tab</li>
+<li>On the “Traceability” section, make sure
+“Tracking” is set to “By Unique Serial Number”</li>
+<li>Enable the “Creates FSM Equipment” checkbox</li>
+</ul>
+<p>To enable on Operation Types:</p>
+<ul class="simple">
+<li>Go to Inventory &gt; Configuration &gt; Operation Types</li>
+<li>Select the intended Operation Type (“Receipts” for example)</li>
+<li>On the “Traceability” section, enable the
+“Create FSM Equipment” checkbox</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<p>A completed stock move for a properly configured Product on a configured
+stock Operation Type will automatically create a field service equipment.</p>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id3">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="#id4">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_equipment_stock%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="#id5">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id6">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+<li>Brian McMaster</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
+<ul class="simple">
+<li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
+<li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#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>Marcel Savegnago &lt;<a class="reference external" href="mailto:marcel.savegnago&#64;escodoo.com.br">marcel.savegnago&#64;escodoo.com.br</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id8">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="#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/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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_equipment_stock">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_equipment_stock/tests/__init__.py b/fieldservice_equipment_stock/tests/__init__.py
new file mode 100644
index 0000000000..50a5826fe6
--- /dev/null
+++ b/fieldservice_equipment_stock/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2020 - TODAY, Marcel Savegnago (Escodoo)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from . import test_fsm_equipment
diff --git a/fieldservice_equipment_stock/tests/test_fsm_equipment.py b/fieldservice_equipment_stock/tests/test_fsm_equipment.py
new file mode 100644
index 0000000000..c6488b2598
--- /dev/null
+++ b/fieldservice_equipment_stock/tests/test_fsm_equipment.py
@@ -0,0 +1,44 @@
+# Copyright (C) 2020 - TODAY, Marcel Savegnago (Escodoo)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo.tests.common import TransactionCase
+
+
+class TestFSMEquipment(TransactionCase):
+
+    def setUp(self):
+        super(TestFSMEquipment, self).setUp()
+        self.Equipment = self.env['fsm.equipment']
+        self.stock_location = self.env.ref('stock.stock_location_customers')
+
+        product1 = self.env['product.product'].create({
+            'name': 'Product A',
+            'type': 'product',
+            'tracking': 'serial',
+        })
+        lot1 = self.env['stock.production.lot'].create({
+            'name': 'serial1',
+            'product_id': product1.id,
+        })
+        self.env['stock.quant'].create({
+            'product_id': product1.id,
+            'location_id': self.stock_location.id,
+            'quantity': 1.0,
+            'lot_id': lot1.id,
+        })
+
+        self.equipment = self.Equipment.create({
+            'name': 'Equipment 1',
+            'product_id': product1.id,
+            'lot_id': lot1.id,
+            'current_stock_location_id': self.stock_location.id,
+        })
+
+    def test_onchange_product(self):
+        equipment = self.equipment
+        equipment._onchange_product()
+        self.assertFalse(equipment.current_stock_location_id)
+
+    def test_compute_current_stock_loc_id(self):
+        equipment = self.equipment
+        equipment._compute_current_stock_loc_id()
+        self.assertTrue(equipment.current_stock_location_id == self.stock_location)
diff --git a/fieldservice_equipment_stock/views/fsm_equipment.xml b/fieldservice_equipment_stock/views/fsm_equipment.xml
new file mode 100644
index 0000000000..1ce8ae287f
--- /dev/null
+++ b/fieldservice_equipment_stock/views/fsm_equipment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="fsm_equipment_form_view_stock" model="ir.ui.view">
+        <field name="name">fsm.equipment.form.stock</field>
+        <field name="model">fsm.equipment</field>
+        <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view"/>
+        <field name="arch" type="xml">
+            <group id="secondary" position="inside">
+                <group string="Inventory"
+                       groups="stock.group_stock_user">
+                    <field name="product_id"/>
+                    <field name="lot_id"
+                           domain="[('product_id', '=', product_id)]"
+                           context="{'default_product_id': product_id}"/>
+                    <field name="current_stock_location_id"/>
+                </group>
+            </group>
+        </field>
+    </record>
+
+    <record id="fsm_equipment_tree_view_model" model="ir.ui.view">
+        <field name="name">fsm.equipment.model</field>
+        <field name="model">fsm.equipment</field>
+        <field name="inherit_id"
+               ref="fieldservice.fsm_equipment_tree_view"/>
+        <field name="arch" type="xml">
+            <field name="person_id" position="before">
+                <field name="product_id"/>
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_equipment_stock/views/product_template.xml b/fieldservice_equipment_stock/views/product_template.xml
new file mode 100644
index 0000000000..6b9d6f36e3
--- /dev/null
+++ b/fieldservice_equipment_stock/views/product_template.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="product_template_form_create_fsm_equipment" model="ir.ui.view">
+        <field name="model">product.template</field>
+        <field name="inherit_id"
+               ref="product.product_template_only_form_view"/>
+        <field name="arch" type="xml">
+            <field name="tracking" position="after">
+                <field name="create_fsm_equipment"
+                       attrs="{'invisible': [('tracking', '!=', 'serial')]}"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_equipment_stock/views/stock_picking_type.xml b/fieldservice_equipment_stock/views/stock_picking_type.xml
new file mode 100644
index 0000000000..d197e10f6a
--- /dev/null
+++ b/fieldservice_equipment_stock/views/stock_picking_type.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="stock_picking_type_form_create_fsm" model="ir.ui.view">
+        <field name="model">stock.picking.type</field>
+        <field name="inherit_id" ref="stock.view_picking_type_form"/>
+        <field name="arch" type="xml">
+
+            <field name="use_existing_lots" position="after">
+                <field name="create_fsm_equipment"/>
+            </field>
+
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_equipment_stock/views/stock_production_lot.xml b/fieldservice_equipment_stock/views/stock_production_lot.xml
new file mode 100644
index 0000000000..4f23b37cad
--- /dev/null
+++ b/fieldservice_equipment_stock/views/stock_production_lot.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="stock_production_lot_extend_equipment" model="ir.ui.view">
+        <field name="model">stock.production.lot</field>
+        <field name="inherit_id" ref="stock.view_production_lot_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='main_group']/group[1]" position="after"
+                   sequence="0">
+                <group>
+                    <field name="fsm_equipment_id"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="stock.action_production_lot_form"
+            model="ir.actions.act_window">
+        <field name="context">{'search_default_group_by_product': 1,
+            'default_product_id': context.get('product_id', False)}
+        </field>
+    </record>
+
+</odoo>

From a651b6f13074f412a46022a116c0134f221eaf20 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 9 Mar 2021 22:53:52 +0000
Subject: [PATCH 363/631] [ADD] icon.png

---
 .../static/description/icon.png                  | Bin 0 -> 9455 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 fieldservice_equipment_stock/static/description/icon.png

diff --git a/fieldservice_equipment_stock/static/description/icon.png b/fieldservice_equipment_stock/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
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
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001


From f90caeb24fbeeaa30961269f3f54866a0285a645 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Mon, 12 Jul 2021 17:06:16 +0000
Subject: [PATCH 364/631] [UPD] Update fieldservice_isp_account.pot

---
 .../i18n/fieldservice_isp_account.pot         | 122 +++++++++++++-----
 1 file changed, 88 insertions(+), 34 deletions(-)

diff --git a/fieldservice_isp_account/i18n/fieldservice_isp_account.pot b/fieldservice_isp_account/i18n/fieldservice_isp_account.pot
index 8c87b45cf6..65cd0f0391 100644
--- a/fieldservice_isp_account/i18n/fieldservice_isp_account.pot
+++ b/fieldservice_isp_account/i18n/fieldservice_isp_account.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_isp_account
+# 	* fieldservice_isp_account
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 13.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"
@@ -19,13 +19,13 @@ msgid "Accounting Stage"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: code:addons/fieldservice_isp_account/models/fsm_order.py:68
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:0
 #, python-format
 msgid "Cannot move to Complete until 'Contractor Costs' is filled in"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: code:addons/fieldservice_isp_account/models/fsm_order.py:71
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:0
 #, python-format
 msgid "Cannot move to Complete until 'Employee Timesheets' is filled in"
 msgstr ""
@@ -36,16 +36,10 @@ msgid "Confirm"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: selection:fsm.order,account_stage:0
+#: model:ir.model.fields.selection,name:fieldservice_isp_account.selection__fsm_order__account_stage__confirmed
 msgid "Confirmed"
 msgstr ""
 
-#. module: fieldservice_isp_account
-#: code:addons/fieldservice_isp_account/models/fsm_order.py:116
-#, python-format
-msgid "Contact empty"
-msgstr ""
-
 #. module: fieldservice_isp_account
 #: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__contractor_total
 msgid "Contractor Cost Estimate"
@@ -63,7 +57,29 @@ msgid "Create Invoice"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: selection:fsm.order,account_stage:0
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order_cost__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order_cost__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:0
+#, python-format
+msgid "Customer empty"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order_cost__display_name
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_person__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields.selection,name:fieldservice_isp_account.selection__fsm_order__account_stage__draft
 msgid "Draft"
 msgstr ""
 
@@ -109,7 +125,17 @@ msgid "Field Service Worker"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: selection:fsm.order,account_stage:0
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order_cost__fsm_order_id
+msgid "Fsm Order"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model,name:fieldservice_isp_account.model_fsm_order_cost
+msgid "Fsm Order Cost"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields.selection,name:fieldservice_isp_account.selection__fsm_order__account_stage__invoiced
 msgid "Fully Invoiced"
 msgstr ""
 
@@ -117,16 +143,35 @@ msgstr ""
 #: model:product.template,uom_name:fieldservice_isp_account.field_service_overtime
 #: model:product.template,uom_name:fieldservice_isp_account.field_service_regular_time
 #: model:product.template,uom_name:fieldservice_isp_account.field_service_travel_time
-msgid "Hour(s)"
+msgid "Hours"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: model:ir.model,name:fieldservice_isp_account.model_account_move_line
-msgid "Invoice Line"
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order_cost__id
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_person__id
+msgid "ID"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: selection:fsm.order,account_stage:0
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order_cost____last_update
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_person____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order_cost__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order_cost__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields.selection,name:fieldservice_isp_account.selection__fsm_order__account_stage__review
 #: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_order_search_view
 msgid "Needs Review"
 msgstr ""
@@ -142,7 +187,7 @@ msgid "No Invoice"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: selection:fsm.order,account_stage:0
+#: model:ir.model.fields.selection,name:fieldservice_isp_account.selection__fsm_order__account_stage__no
 msgid "Nothing Invoiced"
 msgstr ""
 
@@ -151,21 +196,32 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_isp_account
 #: model:product.template,description_sale:fieldservice_isp_account.field_service_overtime
-msgid "Overtime for Field Service Employees\n"
+msgid ""
+"Overtime for Field Service Employees\n"
 "        "
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: code:addons/fieldservice_isp_account/models/account_move_line.py:19
-#, python-format
-msgid "Please set the field service worker."
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order_cost__product_id
+msgid "Product"
+msgstr ""
+
+#. module: fieldservice_isp_account
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order_cost__quantity
+msgid "Quantity"
 msgstr ""
 
 #. module: fieldservice_isp_account
 #: model:product.template,description_sale:fieldservice_isp_account.field_service_regular_time
-msgid "Regular time for Field Service\n"
+msgid ""
+"Regular time for Field Service\n"
 "            Employees\n"
 "        "
 msgstr ""
@@ -177,7 +233,7 @@ msgid "Service Orders"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: code:addons/fieldservice_isp_account/models/fsm_order.py:103
+#: code:addons/fieldservice_isp_account/models/fsm_order.py:0
 #, python-format
 msgid "The worker assigned to this order is not a supplier"
 msgstr ""
@@ -194,21 +250,19 @@ msgstr ""
 
 #. module: fieldservice_isp_account
 #: model:product.template,description_sale:fieldservice_isp_account.field_service_travel_time
-msgid "Travel time for Field Service\n"
+msgid ""
+"Travel time for Field Service\n"
 "            Employees\n"
 "        "
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_person__bill_count
-#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_person_form_isp_account
-msgid "Vendor Bills"
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_order_cost__price_unit
+msgid "Unit Price"
 msgstr ""
 
 #. module: fieldservice_isp_account
-#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_overtime
-#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_regular_time
-#: model:product.template,weight_uom_name:fieldservice_isp_account.field_service_travel_time
-msgid "kg"
+#: model:ir.model.fields,field_description:fieldservice_isp_account.field_fsm_person__bill_count
+#: model_terms:ir.ui.view,arch_db:fieldservice_isp_account.fsm_person_form_isp_account
+msgid "Vendor Bills"
 msgstr ""
-

From 176f0e59ca582aa856a99346c5e4381aaff6632b Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 17:11:45 +0000
Subject: [PATCH 365/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 26bb07afbf..16d18b9422 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ addon | version | summary
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
 [fieldservice_distribution](fieldservice_distribution/) | 14.0.1.0.0 | Manage your distribution structure
+[fieldservice_isp_account](fieldservice_isp_account/) | 14.0.1.0.0 | Invoice Field Service orders based on employee time or contractor costs
 [fieldservice_isp_flow](fieldservice_isp_flow/) | 14.0.1.0.0 | Field Service workflow for Internet Service Providers
 [fieldservice_partner_multi_relation](fieldservice_partner_multi_relation/) | 14.0.1.0.0 | Manage relations between contacts, companies and locations
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task

From 1c70755de0e27a55d7846ac0d37d92f3475ede8d Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 17:11:47 +0000
Subject: [PATCH 366/631] [UPD] README.rst

---
 fieldservice_isp_account/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_isp_account/static/description/index.html b/fieldservice_isp_account/static/description/index.html
index 64c1bc8af0..c29ed6e229 100644
--- a/fieldservice_isp_account/static/description/index.html
+++ b/fieldservice_isp_account/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: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Field Service - ISP Accounting</title>
 <style type="text/css">
 

From cc03b602a51be69e53118b056c91ca43fa533fbd Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 17:11:48 +0000
Subject: [PATCH 367/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 864336dcb5..11120ec712 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210712.0
\ No newline at end of file
+14.0.20210712.1
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index b3a99f7a69..21754618f7 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -14,6 +14,7 @@
         'odoo14-addon-fieldservice_account_analytic',
         'odoo14-addon-fieldservice_crm',
         'odoo14-addon-fieldservice_distribution',
+        'odoo14-addon-fieldservice_isp_account',
         'odoo14-addon-fieldservice_isp_flow',
         'odoo14-addon-fieldservice_partner_multi_relation',
         'odoo14-addon-fieldservice_project',

From 63aefd828c5f2247ae49e6c201fe8fbdefb68c79 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Mon, 12 Jul 2021 17:46:03 +0000
Subject: [PATCH 368/631] [UPD] Update fieldservice.pot

---
 fieldservice/i18n/fieldservice.pot | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fieldservice/i18n/fieldservice.pot b/fieldservice/i18n/fieldservice.pot
index 7287fb2f4f..e386039b06 100644
--- a/fieldservice/i18n/fieldservice.pot
+++ b/fieldservice/i18n/fieldservice.pot
@@ -241,6 +241,12 @@ msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__agreement_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__agreement_ids
+msgid "Agreements"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "All"

From 986a2a21ea477a5a81b3d0b24776d743a48cf7d6 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Mon, 12 Jul 2021 17:46:05 +0000
Subject: [PATCH 369/631] [UPD] Update fieldservice_agreement.pot

---
 .../i18n/fieldservice_agreement.pot           | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/fieldservice_agreement/i18n/fieldservice_agreement.pot b/fieldservice_agreement/i18n/fieldservice_agreement.pot
index dad94cfd58..157d6ad890 100644
--- a/fieldservice_agreement/i18n/fieldservice_agreement.pot
+++ b/fieldservice_agreement/i18n/fieldservice_agreement.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_agreement
+# 	* fieldservice_agreement
 #
 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"
@@ -46,6 +46,14 @@ msgstr ""
 msgid "Agreements"
 msgstr ""
 
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__display_name
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__display_name
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_person__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_agreement
 #: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__fsm_location_id
 msgid "FSM Location"
@@ -76,6 +84,29 @@ msgstr ""
 msgid "Field Service Worker"
 msgstr ""
 
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement__id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment__id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_person__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_agreement____last_update
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_equipment____last_update
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_person____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_agreement
+#: model:ir.model.fields,field_description:fieldservice_agreement.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_agreement
 #: model_terms:ir.ui.view,arch_db:fieldservice_agreement.agreement_fsm_order_form_view
 msgid "Service Orders"
@@ -94,4 +125,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice_agreement.fsm_location_agreement_serviceprofile
 msgid "Service Profiles"
 msgstr ""
-

From 6e86bc7fd65a6803cb75a09af96dcc026c181573 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 17:54:32 +0000
Subject: [PATCH 370/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 16d18b9422..22a7d1cc04 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ addon | version | summary
 [fieldservice](fieldservice/) | 14.0.1.1.1 | Manage Field Service Locations, Workers and Orders
 [fieldservice_account](fieldservice_account/) | 14.0.1.0.0 | Track invoices linked to Field Service orders
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
+[fieldservice_agreement](fieldservice_agreement/) | 14.0.1.0.0 | Manage Field Service agreements and contracts
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
 [fieldservice_distribution](fieldservice_distribution/) | 14.0.1.0.0 | Manage your distribution structure
 [fieldservice_isp_account](fieldservice_isp_account/) | 14.0.1.0.0 | Invoice Field Service orders based on employee time or contractor costs

From b9e0b7d87417766509a83119585307fc2362073a Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 17:54:34 +0000
Subject: [PATCH 371/631] [UPD] README.rst

---
 fieldservice_agreement/README.rst                | 16 ++++++++++------
 .../static/description/index.html                |  9 +++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/fieldservice_agreement/README.rst b/fieldservice_agreement/README.rst
index e1658d88b9..43687afb4c 100644
--- a/fieldservice_agreement/README.rst
+++ b/fieldservice_agreement/README.rst
@@ -14,13 +14,13 @@ Field Service - Agreements
     :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_agreement
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_agreement
     :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_agreement
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_agreement
     :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| 
@@ -55,7 +55,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_agreement%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_agreement%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.
 
@@ -73,6 +73,7 @@ Contributors
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Patrick Wilson <pwilson@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -106,11 +107,14 @@ promote its widespread use.
 .. |maintainer-osi-scampbell| image:: https://github.com/osi-scampbell.png?size=40px
     :target: https://github.com/osi-scampbell
     :alt: osi-scampbell
+.. |maintainer-patrickrwilson| image:: https://github.com/patrickrwilson.png?size=40px
+    :target: https://github.com/patrickrwilson
+    :alt: patrickrwilson
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-max3903| |maintainer-bodedra| |maintainer-smangukiya| |maintainer-osi-scampbell| 
+|maintainer-max3903| |maintainer-bodedra| |maintainer-smangukiya| |maintainer-osi-scampbell| |maintainer-patrickrwilson| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_agreement>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_agreement>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_agreement/static/description/index.html b/fieldservice_agreement/static/description/index.html
index 0debdbe71e..4e77223f62 100644
--- a/fieldservice_agreement/static/description/index.html
+++ b/fieldservice_agreement/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Agreements</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_agreement"><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_agreement"><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><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_agreement"><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_agreement"><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>Odoo Agreement App does not provide an easy way to access field service orders
 related to an agreement. Some organizations needs to have a quick access to
 field service orders to track the performance of an agreement.</p>
@@ -404,7 +404,7 @@ <h1><a class="toc-backref" href="#id2">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_agreement%0Aversion:%2012.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_agreement%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">
@@ -421,6 +421,7 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 <li>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#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>Patrick Wilson &lt;<a class="reference external" href="mailto:pwilson&#64;opensourceintegrators.com">pwilson&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -438,8 +439,8 @@ <h2><a class="toc-backref" href="#id7">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>
-<p><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/bodedra"><img alt="bodedra" src="https://github.com/bodedra.png?size=40px" /></a> <a class="reference external" href="https://github.com/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.png?size=40px" /></a> <a class="reference external" href="https://github.com/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.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_agreement">OCA/field-service</a> project on GitHub.</p>
+<p><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/bodedra"><img alt="bodedra" src="https://github.com/bodedra.png?size=40px" /></a> <a class="reference external" href="https://github.com/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.png?size=40px" /></a> <a class="reference external" href="https://github.com/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.png?size=40px" /></a> <a class="reference external" href="https://github.com/patrickrwilson"><img alt="patrickrwilson" src="https://github.com/patrickrwilson.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_agreement">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 0cb05a3ece0db02ebacdb3734dd6db450bafc30d Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 17:54:35 +0000
Subject: [PATCH 372/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt                              | 2 +-
 setup/_metapackage/setup.py                                 | 1 +
 .../odoo/addons/fieldservice_agreement                      | 1 +
 setup/fieldservice_agreement/setup.py                       | 6 ++++++
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 120000 setup/fieldservice_agreement/odoo/addons/fieldservice_agreement
 create mode 100644 setup/fieldservice_agreement/setup.py

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 11120ec712..c31bcc3db6 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210712.1
\ No newline at end of file
+14.0.20210712.2
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 21754618f7..e60275ef98 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -12,6 +12,7 @@
         'odoo14-addon-fieldservice',
         'odoo14-addon-fieldservice_account',
         'odoo14-addon-fieldservice_account_analytic',
+        'odoo14-addon-fieldservice_agreement',
         'odoo14-addon-fieldservice_crm',
         'odoo14-addon-fieldservice_distribution',
         'odoo14-addon-fieldservice_isp_account',
diff --git a/setup/fieldservice_agreement/odoo/addons/fieldservice_agreement b/setup/fieldservice_agreement/odoo/addons/fieldservice_agreement
new file mode 120000
index 0000000000..87a4c0c5e1
--- /dev/null
+++ b/setup/fieldservice_agreement/odoo/addons/fieldservice_agreement
@@ -0,0 +1 @@
+../../../../fieldservice_agreement
\ No newline at end of file
diff --git a/setup/fieldservice_agreement/setup.py b/setup/fieldservice_agreement/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_agreement/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 40a8a4cdbabb4a5b004428de9129c4550af9208d Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Mon, 12 Jul 2021 17:54:44 +0000
Subject: [PATCH 373/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-14.0/field-service-14.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice/
---
 fieldservice/i18n/de.po    | 9 ++++++---
 fieldservice/i18n/es.po    | 9 ++++++---
 fieldservice/i18n/es_AR.po | 6 ++++++
 fieldservice/i18n/es_CL.po | 9 ++++++---
 fieldservice/i18n/fr.po    | 6 ++++++
 fieldservice/i18n/fr_FR.po | 6 ++++++
 fieldservice/i18n/pt_BR.po | 9 ++++++---
 fieldservice/i18n/tr.po    | 6 ++++++
 8 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/fieldservice/i18n/de.po b/fieldservice/i18n/de.po
index 962690ac4c..e4cb93028a 100644
--- a/fieldservice/i18n/de.po
+++ b/fieldservice/i18n/de.po
@@ -245,6 +245,12 @@ msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__agreement_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__agreement_ids
+msgid "Agreements"
+msgstr "Vereinbarungen"
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "All"
@@ -3505,9 +3511,6 @@ msgstr ""
 #~ msgid "# Vendor Bills"
 #~ msgstr "# Eingangsrechnungen"
 
-#~ msgid "Agreements"
-#~ msgstr "Vereinbarungen"
-
 #~ msgid "Apply"
 #~ msgstr "Anwenden"
 
diff --git a/fieldservice/i18n/es.po b/fieldservice/i18n/es.po
index d9a6847a73..e353b3123a 100644
--- a/fieldservice/i18n/es.po
+++ b/fieldservice/i18n/es.po
@@ -247,6 +247,12 @@ msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
 msgstr "Divisiones administrativas de un país. P.ej. Región, Comuna, Barrio"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__agreement_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__agreement_ids
+msgid "Agreements"
+msgstr "Acuerdos"
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "All"
@@ -3593,9 +3599,6 @@ msgstr "plantillas"
 #~ msgid "# Vendor Bills"
 #~ msgstr "# Facturas de Proveedor"
 
-#~ msgid "Agreements"
-#~ msgstr "Acuerdos"
-
 #~ msgid "Apply"
 #~ msgstr "Aplicar"
 
diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index f8c3d94cbe..9e58480b1d 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -247,6 +247,12 @@ msgid ""
 msgstr ""
 "Divisiones administrativas de un país. P.ej. Provincia, Municipio, Ciudad"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__agreement_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__agreement_ids
+msgid "Agreements"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "All"
diff --git a/fieldservice/i18n/es_CL.po b/fieldservice/i18n/es_CL.po
index d570e7bb10..ffb4e62742 100644
--- a/fieldservice/i18n/es_CL.po
+++ b/fieldservice/i18n/es_CL.po
@@ -247,6 +247,12 @@ msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
 msgstr "Divisiones administrativas de un país. P.ej. Región, Comuna, Barrio"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__agreement_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__agreement_ids
+msgid "Agreements"
+msgstr "Acuerdos"
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "All"
@@ -3593,9 +3599,6 @@ msgstr "plantillas"
 #~ msgid "# Vendor Bills"
 #~ msgstr "# Facturas de Proveedor"
 
-#~ msgid "Agreements"
-#~ msgstr "Acuerdos"
-
 #~ msgid "Apply"
 #~ msgstr "Aplicar"
 
diff --git a/fieldservice/i18n/fr.po b/fieldservice/i18n/fr.po
index 715eee48a7..ee47cf591e 100644
--- a/fieldservice/i18n/fr.po
+++ b/fieldservice/i18n/fr.po
@@ -246,6 +246,12 @@ msgstr ""
 "Divisions administratives d'un pays. Par exemple, Fed. État, département, "
 "canton"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__agreement_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__agreement_ids
+msgid "Agreements"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "All"
diff --git a/fieldservice/i18n/fr_FR.po b/fieldservice/i18n/fr_FR.po
index 021280f4ae..20e896a00b 100644
--- a/fieldservice/i18n/fr_FR.po
+++ b/fieldservice/i18n/fr_FR.po
@@ -246,6 +246,12 @@ msgstr ""
 "Divisions administratives d'un pays. Par exemple, Fed. État, département, "
 "canton"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__agreement_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__agreement_ids
+msgid "Agreements"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "All"
diff --git a/fieldservice/i18n/pt_BR.po b/fieldservice/i18n/pt_BR.po
index 3160edf894..a39371e601 100644
--- a/fieldservice/i18n/pt_BR.po
+++ b/fieldservice/i18n/pt_BR.po
@@ -246,6 +246,12 @@ msgstr ""
 "Divisões administrativas de um país. Por exemplo, Estado, Departamento, "
 "Cantão"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__agreement_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__agreement_ids
+msgid "Agreements"
+msgstr "Contratos"
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "All"
@@ -3601,9 +3607,6 @@ msgstr "modelos"
 #~ msgid "# Vendor Bills"
 #~ msgstr "# Contas de Fornecedores"
 
-#~ msgid "Agreements"
-#~ msgstr "Contratos"
-
 #~ msgid "Apply"
 #~ msgstr "Aplicar"
 
diff --git a/fieldservice/i18n/tr.po b/fieldservice/i18n/tr.po
index 77cc5deed6..79228138e8 100644
--- a/fieldservice/i18n/tr.po
+++ b/fieldservice/i18n/tr.po
@@ -244,6 +244,12 @@ msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__agreement_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__agreement_ids
+msgid "Agreements"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
 msgid "All"

From 47e169e3d6842a2fb8e308419f8519a3c8c6e4e6 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Mon, 12 Jul 2021 18:16:24 +0000
Subject: [PATCH 374/631] [UPD] Update fieldservice_calendar.pot

---
 .../i18n/fieldservice_calendar.pot            | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 fieldservice_calendar/i18n/fieldservice_calendar.pot

diff --git a/fieldservice_calendar/i18n/fieldservice_calendar.pot b/fieldservice_calendar/i18n/fieldservice_calendar.pot
new file mode 100644
index 0000000000..98c29a78ce
--- /dev/null
+++ b/fieldservice_calendar/i18n/fieldservice_calendar.pot
@@ -0,0 +1,74 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_calendar
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.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_calendar
+#: model:ir.model,name:fieldservice_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: fieldservice_calendar
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_calendar_event__display_name
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_fsm_team__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_calendar
+#: model:ir.model,name:fieldservice_calendar.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_calendar
+#: model:ir.model,name:fieldservice_calendar.model_fsm_team
+msgid "Field Service Team"
+msgstr ""
+
+#. module: fieldservice_calendar
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_calendar_event__id
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_fsm_team__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_calendar
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_calendar_event____last_update
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_fsm_team____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_calendar
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_fsm_order__calendar_event_id
+msgid "Meeting"
+msgstr ""
+
+#. module: fieldservice_calendar
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice_calendar
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_calendar_event__fsm_order_id
+msgid "Order id"
+msgstr ""
+
+#. module: fieldservice_calendar
+#: model:ir.model.fields,help:fieldservice_calendar.field_fsm_team__calendar_user_id
+msgid "Responsible for orders's calendar"
+msgstr ""
+
+#. module: fieldservice_calendar
+#: model:ir.model.fields,field_description:fieldservice_calendar.field_fsm_team__calendar_user_id
+msgid "Team's calendar"
+msgstr ""

From bebd7e8354a9e0285a0af48dcc2e5378fc6e8908 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 18:23:46 +0000
Subject: [PATCH 375/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 22a7d1cc04..39d3c79afb 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ addon | version | summary
 [fieldservice_account](fieldservice_account/) | 14.0.1.0.0 | Track invoices linked to Field Service orders
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
 [fieldservice_agreement](fieldservice_agreement/) | 14.0.1.0.0 | Manage Field Service agreements and contracts
+[fieldservice_calendar](fieldservice_calendar/) | 14.0.1.0.0 | Add calendar to FSM Orders
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
 [fieldservice_distribution](fieldservice_distribution/) | 14.0.1.0.0 | Manage your distribution structure
 [fieldservice_isp_account](fieldservice_isp_account/) | 14.0.1.0.0 | Invoice Field Service orders based on employee time or contractor costs

From 60123c8f8293ba115faa8fbe73ed72448846fb80 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 18:23:48 +0000
Subject: [PATCH 376/631] [UPD] README.rst

---
 fieldservice_calendar/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_calendar/static/description/index.html b/fieldservice_calendar/static/description/index.html
index 90a439b14c..d0b2f0f380 100644
--- a/fieldservice_calendar/static/description/index.html
+++ b/fieldservice_calendar/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: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Field Service - Calendar</title>
 <style type="text/css">
 

From 72b0823b1aabbe32fe9c1ca89d68ee8dca3414b9 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 18:23:49 +0000
Subject: [PATCH 377/631] [ADD] icon.png

---
 .../static/description/icon.png                  | Bin 0 -> 9455 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 fieldservice_calendar/static/description/icon.png

diff --git a/fieldservice_calendar/static/description/icon.png b/fieldservice_calendar/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
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
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001


From d98c66cd50a6ba9134d9b5c757533240b8a5847f Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 12 Jul 2021 18:23:49 +0000
Subject: [PATCH 378/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index c31bcc3db6..dbefdb29f8 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210712.2
\ No newline at end of file
+14.0.20210712.3
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index e60275ef98..39b7a42612 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -13,6 +13,7 @@
         'odoo14-addon-fieldservice_account',
         'odoo14-addon-fieldservice_account_analytic',
         'odoo14-addon-fieldservice_agreement',
+        'odoo14-addon-fieldservice_calendar',
         'odoo14-addon-fieldservice_crm',
         'odoo14-addon-fieldservice_distribution',
         'odoo14-addon-fieldservice_isp_account',

From eb57e137b68266b265874087bfc1cba887be3ce7 Mon Sep 17 00:00:00 2001
From: hparfr <raph@hpar.fr>
Date: Tue, 16 Mar 2021 16:01:44 +0100
Subject: [PATCH 379/631] fieldservice: remove dead code

---
 README.md                                  |   1 +
 fieldservice/README.rst                    |  10 +-
 fieldservice/i18n/fieldservice.pot         | 441 +++++----------------
 fieldservice/models/fsm_person.py          |   8 -
 fieldservice/static/description/index.html |   6 +-
 5 files changed, 111 insertions(+), 355 deletions(-)

diff --git a/README.md b/README.md
index b2f8db81aa..47e984cdae 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ Available addons
 addon | version | summary
 --- | --- | ---
 [base_territory](base_territory/) | 14.0.1.0.0 | This module allows you to define territories, branches, districts and regions to be used for Field Service operations or Sales.
+[fieldservice](fieldservice/) | 14.0.1.0.0 | Manage Field Service Locations, Workers and Orders
 
 [//]: # (end addons)
 
diff --git a/fieldservice/README.rst b/fieldservice/README.rst
index 4f998d73ec..63ea2ee4c3 100644
--- a/fieldservice/README.rst
+++ b/fieldservice/README.rst
@@ -14,13 +14,13 @@ Field Service
     :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/13.0/fieldservice
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice
     :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-13-0/field-service-13-0-fieldservice
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice
     :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/13.0
+    :target: https://runbot.odoo-community.org/runbot/264/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -181,7 +181,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%0Aversion:%2013.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%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.
 
@@ -237,6 +237,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/13.0/fieldservice>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice/i18n/fieldservice.pot b/fieldservice/i18n/fieldservice.pot
index 7dc609593e..eeefd26d4a 100644
--- a/fieldservice/i18n/fieldservice.pot
+++ b/fieldservice/i18n/fieldservice.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 13.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -13,17 +13,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__meeting_count
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__meeting_count
-msgid "# Meetings"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__opportunity_count
-msgid "# Opportunities"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
@@ -43,6 +32,11 @@ msgstr ""
 msgid "'Service Order - %s' % (object.name)"
 msgstr ""
 
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "<i class=\"fa fa-ellipsis-v\" title=\"Manager\"/>"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
 msgid "<span class=\"oe_inline\"> ( On  </span>"
@@ -95,18 +89,6 @@ msgstr ""
 msgid "A Field Service Worker related to that partner already exists."
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_payable_id
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_payable_id
-msgid "Account Payable"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_receivable_id
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_receivable_id
-msgid "Account Receivable"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_needaction
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_needaction
@@ -156,6 +138,15 @@ msgstr ""
 msgid "Activity State"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__date_end
 msgid "Actual End"
@@ -319,24 +310,36 @@ msgid ""
 "Automatically creates a day route when an order is assigned and scheduled"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
-msgid "Bank"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_ids
 msgid "Banks"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__barcode
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__barcode
+msgid "Barcode"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__is_blacklisted
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__is_blacklisted
 msgid "Blacklist"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__mobile_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__mobile_blacklisted
+msgid "Blacklisted Phone Is Mobile"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone_blacklisted
+msgid "Blacklisted Phone is Phone"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_bounce
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_bounce
@@ -513,12 +516,6 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__ref_company_ids
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__ref_company_ids
-msgid "Companies that refers to partner"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__company_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__company_id
@@ -645,12 +642,6 @@ msgstr ""
 msgid "Convert to a Field Service Worker or Location"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__payment_token_count
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__payment_token_count
-msgid "Count Payment Token"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__message_bounce
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__message_bounce
@@ -764,12 +755,6 @@ msgstr ""
 msgid "Credit Limit"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__currency_id
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__currency_id
-msgid "Currency"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__current_date
 msgid "Current Date"
@@ -780,18 +765,6 @@ msgstr ""
 msgid "Current Location"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
-msgid "Customer Payment Terms"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__customer_rank
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__customer_rank
-msgid "Customer Rank"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.actions.act_window,name:fieldservice.action_fsm_customer
 #: model:ir.ui.menu,name:fieldservice.menu_fsm_customer
@@ -810,9 +783,13 @@ msgid "Date"
 msgstr ""
 
 #. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__trust
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__trust
-msgid "Degree of trust you have in this debtor"
+#: model:fsm.team,name:fieldservice.fsm_team_default
+msgid "Default Team"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
+msgid "Default duration in hours"
 msgstr ""
 
 #. module: fieldservice
@@ -856,6 +833,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__display_name
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_template__display_name
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -900,6 +881,11 @@ msgstr ""
 msgid "Due Within 7 Days"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__duration
+msgid "Duration"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__request_early
 msgid "Earliest Request Date"
@@ -1030,12 +1016,6 @@ msgstr ""
 msgid "FSM Worker"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fax
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__fax
-msgid "Fax"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.module.category,name:fieldservice.fsm
 #: model:ir.ui.menu,name:fieldservice.root
@@ -1124,12 +1104,6 @@ msgid ""
 "comparisons."
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_position_id
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_position_id
-msgid "Fiscal Position"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__fold
 msgid "Folded in Kanban"
@@ -1162,6 +1136,15 @@ msgstr ""
 msgid "Followers (Partners)"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_formatted
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_formatted
@@ -1231,12 +1214,6 @@ msgstr ""
 msgid "Group By"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__has_unreconciled_entries
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__has_unreconciled_entries
-msgid "Has Unreconciled Entries"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
@@ -1249,11 +1226,6 @@ msgstr ""
 msgid "High"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__hours
-msgid "Hours"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__id
@@ -1268,6 +1240,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team__id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_template__id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory__id
 msgid "ID"
 msgstr ""
 
@@ -1323,24 +1299,22 @@ msgstr ""
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__team_id
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__team_id
-msgid ""
-"If set, this Sales Team will be used for sales and assignations related to "
-"this partner"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__is_blacklisted
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_blacklisted
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__is_blacklisted
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__phone_blacklisted
 msgid ""
 "If the email address is on the blacklist, the contact won't receive mass "
 "mailing anymore, from any list"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_sanitized_blacklisted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__phone_sanitized_blacklisted
+msgid ""
+"If the sanitized phone number is on the blacklist, the contact won't receive"
+" mass mailing sms anymore, from any list"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_1920
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_1920
@@ -1371,6 +1345,24 @@ msgstr ""
 msgid "Image 512"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__mobile_blacklisted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__mobile_blacklisted
+msgid ""
+"Indicates if a blacklisted sanitized phone number is a mobile number. Helps "
+"distinguish which number is blacklisted             when there is both a "
+"mobile and phone field in a model."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_blacklisted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__phone_blacklisted
+msgid ""
+"Indicates if a blacklisted sanitized phone number is a phone number. Helps "
+"distinguish which number is blacklisted             when there is both a "
+"mobile and phone field in a model."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__industry_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__industry_id
@@ -1397,12 +1389,6 @@ msgstr ""
 msgid "Internal Type"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_warn
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_warn
-msgid "Invoice"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__type
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__type
@@ -1421,12 +1407,6 @@ msgstr ""
 msgid "Invoice your Service Orders"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_ids
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_ids
-msgid "Invoices"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__is_button
 msgid "Is Button"
@@ -1479,12 +1459,6 @@ msgstr ""
 msgid "Job Position"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__journal_item_count
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__journal_item_count
-msgid "Journal Items"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__lang
@@ -1505,6 +1479,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_team____last_update
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_template____last_update
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_company____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -1542,27 +1520,6 @@ msgstr ""
 msgid "Last Updated on"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__calendar_last_notif_ack
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__calendar_last_notif_ack
-msgid "Last notification marked as read from base Calendar"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__last_time_entries_checked
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__last_time_entries_checked
-msgid ""
-"Last time the invoices & payments matching was performed for this partner. "
-"It is set either if there's not at least an unreconciled debit and an "
-"unreconciled credit or if you click the \"Done\" button."
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__last_time_entries_checked
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__last_time_entries_checked
-msgid "Latest Invoices & Payments Matching Date"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__request_late
 msgid "Latest Request Date"
@@ -1864,7 +1821,7 @@ msgstr ""
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
-msgid "Manage routes of yoru workers"
+msgid "Manage routes of your workers"
 msgstr ""
 
 #. module: fieldservice
@@ -1933,12 +1890,6 @@ msgstr ""
 msgid "Me"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__meeting_ids
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__meeting_ids
-msgid "Meetings"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error
@@ -1948,12 +1899,6 @@ msgstr ""
 msgid "Message Delivery error"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_warn_msg
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_warn_msg
-msgid "Message for Invoice"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
@@ -2003,6 +1948,7 @@ msgstr ""
 #: code:addons/fieldservice/models/fsm_order.py:0
 #: code:addons/fieldservice/models/fsm_order.py:0
 #: code:addons/fieldservice/models/fsm_order.py:0
+#: code:addons/fieldservice/models/fsm_order.py:0
 #, python-format
 msgid "New"
 msgstr ""
@@ -2115,23 +2061,6 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__opportunity_ids
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__opportunity_ids
-msgid "Opportunities"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__opportunity_count_ids
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__opportunity_count_ids
-msgid "Opportunities Count"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__opportunity_count
-msgid "Opportunity"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__display_name
 #: model:ir.model.fields.selection,name:fieldservice.selection__fsm_stage__stage_type__order
@@ -2312,30 +2241,12 @@ msgstr ""
 msgid "Parent name"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contract_ids
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__contract_ids
-msgid "Partner Contracts"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__same_vat_partner_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__same_vat_partner_id
 msgid "Partner with same Tax ID"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__debit_limit
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__debit_limit
-msgid "Payable Limit"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__payment_token_ids
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__payment_token_ids
-msgid "Payment Tokens"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__phone
@@ -2344,17 +2255,11 @@ msgid "Phone"
 msgstr ""
 
 #. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone_blacklisted
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone_sanitized_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone_sanitized_blacklisted
 msgid "Phone Blacklisted"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__plan_to_change_car
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__plan_to_change_car
-msgid "Plan To Change Car"
-msgstr ""
-
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
 msgid "Planning"
@@ -2372,12 +2277,6 @@ msgstr ""
 msgid "Previous Stage"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_product_pricelist
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_product_pricelist
-msgid "Pricelist"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__territory_manager_id
 #: model:ir.model.fields,field_description:fieldservice.field_res_territory__person_id
@@ -2507,12 +2406,6 @@ msgstr ""
 msgid "SMS Delivery error"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
-msgid "Sales Team"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
@@ -2590,15 +2483,6 @@ msgid ""
 "                    Service Worker or Location."
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
-msgid ""
-"Selecting the \"Warning\" option will notify user with the message, "
-"Selecting \"Blocking Message\" will throw an exception with the message and "
-"block the flow. The Message has to be written in the next field."
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__self
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__self
@@ -2778,12 +2662,6 @@ msgstr ""
 msgid "Sub-Locations"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
-msgid "Supplier Rank"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_tag_name_uniq
 msgid "Tag name already exists!"
@@ -2829,12 +2707,6 @@ msgstr ""
 msgid "Teams"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__opportunity_count_ids
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__opportunity_count_ids
-msgid "Technical field used for stat button"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__template_id
 msgid "Template"
@@ -2870,13 +2742,6 @@ msgid ""
 "government taxes. Used in some legal statements."
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_account_position_id
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_account_position_id
-msgid ""
-"The fiscal position determines the taxes/accounts used for this contact."
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_order__country_name
 msgid "The full name of the country."
@@ -2888,35 +2753,11 @@ msgstr ""
 msgid "The internal user in charge of this contact."
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__has_unreconciled_entries
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__has_unreconciled_entries
-msgid ""
-"The partner has at least one unreconciled debit and credit since last time "
-"the invoices & payments matching was performed."
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
 msgid "The worker is already linked to this location."
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_account_payable_id
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_account_payable_id
-msgid ""
-"This account will be used instead of the default one as the payable account "
-"for the current partner"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_account_receivable_id
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_account_receivable_id
-msgid ""
-"This account will be used instead of the default one as the receivable "
-"account for the current partner"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
@@ -2930,30 +2771,6 @@ msgstr ""
 msgid "This internal reference already exists!"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_supplier_payment_term_id
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_supplier_payment_term_id
-msgid ""
-"This payment term will be used instead of the default one for purchase "
-"orders and vendor bills"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_payment_term_id
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_payment_term_id
-msgid ""
-"This payment term will be used instead of the default one for sales orders "
-"and customer invoices"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_product_pricelist
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_product_pricelist
-msgid ""
-"This pricelist will be used, instead of the default one, for sales to the "
-"current partner"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_stage__fold
 msgid ""
@@ -3000,36 +2817,6 @@ msgstr ""
 msgid "Today Orders"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__total_invoiced
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__total_invoiced
-msgid "Total Invoiced"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__debit
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__debit
-msgid "Total Payable"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__credit
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__credit
-msgid "Total Receivable"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__credit
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__credit
-msgid "Total amount this customer owes you."
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__debit
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__debit
-msgid "Total amount you have to pay to this vendor."
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__type
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__stage_type
@@ -3117,6 +2904,12 @@ msgstr ""
 msgid "Use Odoo Stock Logistics"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__barcode
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__barcode
+msgid "Use a barcode to identify this contact."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_stage__is_default
 msgid "Used a default stage"
@@ -3143,47 +2936,17 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__currency_id
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__currency_id
-msgid "Utility field to express amount currency"
-msgstr ""
-
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "Vehicles"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id
-msgid "Vendor Payment Terms"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__website
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__website
 msgid "Website Link"
 msgstr ""
 
-#. module: fieldservice
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__website_message_ids
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__website_message_ids
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__website_message_ids
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__website_message_ids
-#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: fieldservice
-#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__website_message_ids
-#: model:ir.model.fields,help:fieldservice.field_fsm_location__website_message_ids
-#: model:ir.model.fields,help:fieldservice.field_fsm_order__website_message_ids
-#: model:ir.model.fields,help:fieldservice.field_fsm_person__website_message_ids
-#: model:ir.model.fields,help:fieldservice.field_fsm_team__website_message_ids
-msgid "Website communication history"
-msgstr ""
-
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__tz
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__tz
diff --git a/fieldservice/models/fsm_person.py b/fieldservice/models/fsm_person.py
index 4b4d17a2ef..d1ea7205aa 100644
--- a/fieldservice/models/fsm_person.py
+++ b/fieldservice/models/fsm_person.py
@@ -89,14 +89,6 @@ def create(self, vals):
         vals.update({"fsm_person": True})
         return super(FSMPerson, self).create(vals)
 
-    def get_person_information(self, vals):
-        # get person ids
-        person_ids = self.search([("id", "!=", 0), ("active", "=", True)])
-        person_information_dict = []
-        for person in person_ids:
-            person_information_dict.append({"id": person.id, "name": person.name})
-        return person_information_dict
-
     @api.model
     def _read_group_stage_ids(self, stages, domain, order):
         stage_ids = self.env["fsm.stage"].search([("stage_type", "=", "worker")])
diff --git a/fieldservice/static/description/index.html b/fieldservice/static/description/index.html
index f8f3cfde34..b3604f729c 100644
--- a/fieldservice/static/description/index.html
+++ b/fieldservice/static/description/index.html
@@ -367,7 +367,7 @@ <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/13.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-13-0/field-service-13-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/13.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/14.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-14-0/field-service-14-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/14.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">
@@ -549,7 +549,7 @@ <h1><a class="toc-backref" href="#id16">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:%2013.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%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">
@@ -590,7 +590,7 @@ <h2><a class="toc-backref" href="#id21">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/13.0/fieldservice">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/14.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>

From 443b5f36276483fe1525e9cb34830d6e9cbe2ab9 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 17 Mar 2021 18:04:24 +0000
Subject: [PATCH 380/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index dbddac7ec0..226d4195aa 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210118.0
\ No newline at end of file
+14.0.20210317.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 087cff8f7e..7293656278 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -9,6 +9,7 @@
     version=version,
     install_requires=[
         'odoo14-addon-base_territory',
+        'odoo14-addon-fieldservice',
     ],
     classifiers=[
         'Programming Language :: Python',

From 703543d244fd92d42abb75247964b9bbc9cc8a1e Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Wed, 31 Mar 2021 02:27:51 +0000
Subject: [PATCH 381/631] Added translation using Weblate (Spanish (Argentina))

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

diff --git a/base_territory/i18n/es_AR.po b/base_territory/i18n/es_AR.po
new file mode 100644
index 0000000000..5a58dad851
--- /dev/null
+++ b/base_territory/i18n/es_AR.po
@@ -0,0 +1,204 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* base_territory
+#
+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: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__branch_id
+#: model_terms:ir.ui.view,arch_db:base_territory.res_branch_form_view
+msgid "Branch"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__partner_id
+msgid "Branch Manager"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.actions.act_window,name:base_territory.action_res_branch
+#: model:ir.ui.menu,name:base_territory.menu_res_branch
+#: model_terms:ir.ui.view,arch_db:base_territory.res_branch_tree_view
+msgid "Branches"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model,name:base_territory.model_res_country
+#: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__country
+msgid "Country"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__country_ids
+msgid "Country Names"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__create_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_district__create_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_region__create_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__create_date
+#: model:ir.model.fields,field_description:base_territory.field_res_district__create_date
+#: model:ir.model.fields,field_description:base_territory.field_res_region__create_date
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: base_territory
+#: model_terms:ir.ui.view,arch_db:base_territory.res_territory_form_view
+msgid "Definition"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__description
+#: model:ir.model.fields,field_description:base_territory.field_res_district__description
+#: model:ir.model.fields,field_description:base_territory.field_res_region__description
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__description
+msgid "Description"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__display_name
+#: model:ir.model.fields,field_description:base_territory.field_res_country__display_name
+#: model:ir.model.fields,field_description:base_territory.field_res_district__display_name
+#: model:ir.model.fields,field_description:base_territory.field_res_region__display_name
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model,name:base_territory.model_res_district
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__district_id
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__district_id
+#: model_terms:ir.ui.view,arch_db:base_territory.res_district_form_view
+msgid "District"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_district__partner_id
+msgid "District Manager"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.actions.act_window,name:base_territory.action_res_district
+#: model:ir.ui.menu,name:base_territory.menu_res_district
+#: model_terms:ir.ui.view,arch_db:base_territory.res_district_tree_view
+msgid "Districts"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__id
+#: model:ir.model.fields,field_description:base_territory.field_res_country__id
+#: model:ir.model.fields,field_description:base_territory.field_res_district__id
+#: model:ir.model.fields,field_description:base_territory.field_res_region__id
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__id
+msgid "ID"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch____last_update
+#: model:ir.model.fields,field_description:base_territory.field_res_country____last_update
+#: model:ir.model.fields,field_description:base_territory.field_res_district____last_update
+#: model:ir.model.fields,field_description:base_territory.field_res_region____last_update
+#: model:ir.model.fields,field_description:base_territory.field_res_territory____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__write_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_district__write_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_region__write_uid
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__write_date
+#: model:ir.model.fields,field_description:base_territory.field_res_district__write_date
+#: model:ir.model.fields,field_description:base_territory.field_res_region__write_date
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_branch__name
+#: model:ir.model.fields,field_description:base_territory.field_res_district__name
+#: model:ir.model.fields,field_description:base_territory.field_res_region__name
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__name
+msgid "Name"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model,name:base_territory.model_res_region
+#: model:ir.model.fields,field_description:base_territory.field_res_district__region_id
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__region_id
+#: model_terms:ir.ui.view,arch_db:base_territory.res_region_form_view
+msgid "Region"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_region__partner_id
+msgid "Region Manager"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.actions.act_window,name:base_territory.action_res_region
+#: model:ir.model.fields,field_description:base_territory.field_res_country__region_ids
+#: model:ir.ui.menu,name:base_territory.menu_res_region
+#: model_terms:ir.ui.view,arch_db:base_territory.res_region_tree_view
+msgid "Regions"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__state
+msgid "State"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.actions.act_window,name:base_territory.action_res_territory
+#: model:ir.ui.menu,name:base_territory.menu_res_territory
+#: model_terms:ir.ui.view,arch_db:base_territory.res_territory_tree_view
+msgid "Territories"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model,name:base_territory.model_res_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_country__territory_id
+#: model_terms:ir.ui.view,arch_db:base_territory.res_territory_form_view
+msgid "Territory"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__type
+msgid "Type"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields,field_description:base_territory.field_res_territory__zip_codes
+msgid "ZIP Codes"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__zip
+msgid "Zip"
+msgstr ""
+
+#. module: base_territory
+#: model:ir.model,name:base_territory.model_res_branch
+msgid "branch"
+msgstr ""

From a1ce07158bb340e6bb5c670d1cee129f28045212 Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Wed, 31 Mar 2021 02:30:57 +0000
Subject: [PATCH 382/631] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (28 of 28 strings)

Translation: field-service-14.0/field-service-14.0-base_territory
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-base_territory/es_AR/
---
 base_territory/i18n/es_AR.po | 60 +++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/base_territory/i18n/es_AR.po b/base_territory/i18n/es_AR.po
index 5a58dad851..76bb928288 100644
--- a/base_territory/i18n/es_AR.po
+++ b/base_territory/i18n/es_AR.po
@@ -6,42 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2021-03-31 04:46+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: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__branch_id
 #: model_terms:ir.ui.view,arch_db:base_territory.res_branch_form_view
 msgid "Branch"
-msgstr ""
+msgstr "Sucursal"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__partner_id
 msgid "Branch Manager"
-msgstr ""
+msgstr "Gerente de Sucursal"
 
 #. module: base_territory
 #: model:ir.actions.act_window,name:base_territory.action_res_branch
 #: model:ir.ui.menu,name:base_territory.menu_res_branch
 #: model_terms:ir.ui.view,arch_db:base_territory.res_branch_tree_view
 msgid "Branches"
-msgstr ""
+msgstr "Sucursales"
 
 #. module: base_territory
 #: model:ir.model,name:base_territory.model_res_country
 #: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__country
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__country_ids
 msgid "Country Names"
-msgstr ""
+msgstr "Nombres del Pais"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__create_uid
@@ -49,7 +51,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__create_uid
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Creado por"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__create_date
@@ -57,12 +59,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__create_date
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Creado el"
 
 #. module: base_territory
 #: model_terms:ir.ui.view,arch_db:base_territory.res_territory_form_view
 msgid "Definition"
-msgstr ""
+msgstr "Definición"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__description
@@ -70,7 +72,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__description
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__description
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__display_name
@@ -79,7 +81,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__display_name
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Mostrar Nombre"
 
 #. module: base_territory
 #: model:ir.model,name:base_territory.model_res_district
@@ -87,19 +89,19 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__district_id
 #: model_terms:ir.ui.view,arch_db:base_territory.res_district_form_view
 msgid "District"
-msgstr ""
+msgstr "Distrito"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_district__partner_id
 msgid "District Manager"
-msgstr ""
+msgstr "Gerente de Distrito"
 
 #. module: base_territory
 #: model:ir.actions.act_window,name:base_territory.action_res_district
 #: model:ir.ui.menu,name:base_territory.menu_res_district
 #: model_terms:ir.ui.view,arch_db:base_territory.res_district_tree_view
 msgid "Districts"
-msgstr ""
+msgstr "Distritos"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__id
@@ -108,7 +110,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__id
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch____last_update
@@ -117,7 +119,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region____last_update
 #: model:ir.model.fields,field_description:base_territory.field_res_territory____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Última Modificación el"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__write_uid
@@ -125,7 +127,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__write_uid
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "Última Actualización por"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__write_date
@@ -133,7 +135,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__write_date
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "Última Actualización en"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_branch__name
@@ -141,7 +143,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_region__name
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__name
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: base_territory
 #: model:ir.model,name:base_territory.model_res_region
@@ -149,12 +151,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__region_id
 #: model_terms:ir.ui.view,arch_db:base_territory.res_region_form_view
 msgid "Region"
-msgstr ""
+msgstr "Región"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_region__partner_id
 msgid "Region Manager"
-msgstr ""
+msgstr "Gerente de Región"
 
 #. module: base_territory
 #: model:ir.actions.act_window,name:base_territory.action_res_region
@@ -162,43 +164,43 @@ msgstr ""
 #: model:ir.ui.menu,name:base_territory.menu_res_region
 #: model_terms:ir.ui.view,arch_db:base_territory.res_region_tree_view
 msgid "Regions"
-msgstr ""
+msgstr "Regiones"
 
 #. module: base_territory
 #: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__state
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: base_territory
 #: model:ir.actions.act_window,name:base_territory.action_res_territory
 #: model:ir.ui.menu,name:base_territory.menu_res_territory
 #: model_terms:ir.ui.view,arch_db:base_territory.res_territory_tree_view
 msgid "Territories"
-msgstr ""
+msgstr "Territorios"
 
 #. module: base_territory
 #: model:ir.model,name:base_territory.model_res_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_country__territory_id
 #: model_terms:ir.ui.view,arch_db:base_territory.res_territory_form_view
 msgid "Territory"
-msgstr ""
+msgstr "Territorio"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__type
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: base_territory
 #: model:ir.model.fields,field_description:base_territory.field_res_territory__zip_codes
 msgid "ZIP Codes"
-msgstr ""
+msgstr "Códigos Postales"
 
 #. module: base_territory
 #: model:ir.model.fields.selection,name:base_territory.selection__res_territory__type__zip
 msgid "Zip"
-msgstr ""
+msgstr "Código Postal"
 
 #. module: base_territory
 #: model:ir.model,name:base_territory.model_res_branch
 msgid "branch"
-msgstr ""
+msgstr "sucursal"

From 8a93b4d0d49aebf5dd890e78d5b91773bde01468 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Tue, 31 Dec 2019 09:32:09 -0800
Subject: [PATCH 383/631] [ADD] fieldservice_activity

[IMP] Typo

[IMP] Form/Template Change

[IMP] Show/Hide Buttons

[IMP] PyLint

[IMP] Remove Commented Code

[IMP] Lint
---
 fieldservice_activity/README.rst              | 112 +++++
 fieldservice_activity/__init__.py             |   4 +
 fieldservice_activity/__manifest__.py         |  26 +
 .../i18n/fieldservice_activity.pot            | 156 ++++++
 fieldservice_activity/models/__init__.py      |   6 +
 fieldservice_activity/models/fsm_activity.py  |  40 ++
 fieldservice_activity/models/fsm_order.py     |  34 ++
 fieldservice_activity/models/fsm_template.py  |  11 +
 fieldservice_activity/readme/CONFIGURE.rst    |   3 +
 fieldservice_activity/readme/CONTRIBUTORS.rst |   2 +
 fieldservice_activity/readme/CREDITS.rst      |   3 +
 fieldservice_activity/readme/DESCRIPTION.rst  |   3 +
 fieldservice_activity/readme/USAGE.rst        |   7 +
 .../security/ir.model.access.csv              |   3 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 451 ++++++++++++++++++
 fieldservice_activity/tests/__init__.py       |   4 +
 .../tests/test_fsm_activity.py                |  69 +++
 fieldservice_activity/views/fsm_order.xml     |  30 ++
 fieldservice_activity/views/fsm_template.xml  |  30 ++
 20 files changed, 994 insertions(+)
 create mode 100644 fieldservice_activity/README.rst
 create mode 100644 fieldservice_activity/__init__.py
 create mode 100644 fieldservice_activity/__manifest__.py
 create mode 100644 fieldservice_activity/i18n/fieldservice_activity.pot
 create mode 100644 fieldservice_activity/models/__init__.py
 create mode 100644 fieldservice_activity/models/fsm_activity.py
 create mode 100644 fieldservice_activity/models/fsm_order.py
 create mode 100644 fieldservice_activity/models/fsm_template.py
 create mode 100644 fieldservice_activity/readme/CONFIGURE.rst
 create mode 100644 fieldservice_activity/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_activity/readme/CREDITS.rst
 create mode 100644 fieldservice_activity/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_activity/readme/USAGE.rst
 create mode 100644 fieldservice_activity/security/ir.model.access.csv
 create mode 100644 fieldservice_activity/static/description/icon.png
 create mode 100644 fieldservice_activity/static/description/index.html
 create mode 100644 fieldservice_activity/tests/__init__.py
 create mode 100644 fieldservice_activity/tests/test_fsm_activity.py
 create mode 100644 fieldservice_activity/views/fsm_order.xml
 create mode 100644 fieldservice_activity/views/fsm_template.xml

diff --git a/fieldservice_activity/README.rst b/fieldservice_activity/README.rst
new file mode 100644
index 0000000000..d36250a192
--- /dev/null
+++ b/fieldservice_activity/README.rst
@@ -0,0 +1,112 @@
+======================
+Field Service Activity
+======================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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/12.0/fieldservice_activity
+    :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_activity
+    :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
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+A Field Service Activity gives the user the ability to define a list of tasks/activities on a service order
+
+The user can add tasks/activities to the FSM order to the ones created from the template.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+To use this module, you need to:
+
+* Go to Field Service > Settings > Manage Activites
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go to Field Service
+* Create or select an FSM Order
+* Add as many Activites as needed
+* Alternatively, add Activites to a Template
+* Add Template to FSM Order, Activites will be copied over
+
+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_activity%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+
+Contributors
+~~~~~~~~~~~~
+
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Steve Campbell <scampbells@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-max3903| image:: https://github.com/max3903.png?size=40px
+    :target: https://github.com/max3903
+    :alt: max3903
+.. |maintainer-osi-scampbell| image:: https://github.com/osi-scampbell.png?size=40px
+    :target: https://github.com/osi-scampbell
+    :alt: osi-scampbell
+
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-max3903| |maintainer-osi-scampbell| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_activity>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_activity/__init__.py b/fieldservice_activity/__init__.py
new file mode 100644
index 0000000000..511e838b63
--- /dev/null
+++ b/fieldservice_activity/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/fieldservice_activity/__manifest__.py b/fieldservice_activity/__manifest__.py
new file mode 100644
index 0000000000..3866fcfa31
--- /dev/null
+++ b/fieldservice_activity/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    'name': 'Field Service Activity',
+    'summary': '''Field Service Activities are a set of actions
+     that need to be performed on a service order''',
+    'version': '12.0.1.0.0',
+    'category': 'Field Service',
+    'license': 'AGPL-3',
+    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice'
+    ],
+    'data': [
+        'views/fsm_order.xml',
+        'views/fsm_template.xml',
+        'security/ir.model.access.csv'
+    ],
+    'development_status': 'Beta',
+    'maintainers': [
+        'max3903',
+        'osi-scampbell'
+    ],
+}
diff --git a/fieldservice_activity/i18n/fieldservice_activity.pot b/fieldservice_activity/i18n/fieldservice_activity.pot
new file mode 100644
index 0000000000..5dbf42f7d9
--- /dev/null
+++ b/fieldservice_activity/i18n/fieldservice_activity.pot
@@ -0,0 +1,156 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_activity
+#
+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_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order__order_activity_ids
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template__temp_activity_ids
+msgid "Activites"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Activities"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Cancel"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Complete"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
+msgid "Completed"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_by
+msgid "Completed By"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_on
+msgid "Completed On"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_order_id
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_template_id
+msgid "FSM Template"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_activity
+msgid "Field Service Activity"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_template
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__ref
+msgid "Reference"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__required
+msgid "Requireid"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__state
+msgid "State"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: fieldservice_activity
+#: code:addons/fieldservice_activity/models/fsm_order.py:29
+#, python-format
+msgid "You must complete activity '%s' before                     completing this order."
+msgstr ""
+
diff --git a/fieldservice_activity/models/__init__.py b/fieldservice_activity/models/__init__.py
new file mode 100644
index 0000000000..24f1162b2d
--- /dev/null
+++ b/fieldservice_activity/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import fsm_activity
+from . import fsm_order
+from . import fsm_template
diff --git a/fieldservice_activity/models/fsm_activity.py b/fieldservice_activity/models/fsm_activity.py
new file mode 100644
index 0000000000..c1af0e92ce
--- /dev/null
+++ b/fieldservice_activity/models/fsm_activity.py
@@ -0,0 +1,40 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+from datetime import datetime
+
+
+class FSMActiity(models.Model):
+    _name = 'fsm.activity'
+    _description = 'Field Service Activity'
+
+    name = fields.Char('Name', required=True,
+                       readonly=True, states={'todo': [('readonly', False)]})
+    required = fields.Boolean('Requireid', default=False,
+                              readonly=True,
+                              states={'todo': [('readonly', False)]})
+    sequence = fields.Integer('Sequence')
+    completed = fields.Boolean('Completed', default=False)
+    completed_on = fields.Datetime('Completed On', readonly=True)
+    completed_by = fields.Many2one('res.users',
+                                   'Completed By', readonly=True,)
+    ref = fields.Char('Reference', readonly=True,
+                      states={'todo': [('readonly', False)]})
+    fsm_order_id = fields.Many2one('fsm.order', 'FSM Order')
+    fsm_template_id = fields.Many2one('fsm.template', 'FSM Template')
+    state = fields.Selection([('todo', 'To Do'),
+                              ('done', 'Completed'),
+                              ('cancel', 'Cancelled')], 'State',
+                             readonly=True, default='todo')
+
+    @api.multi
+    def action_done(self):
+        self.completed = True
+        self.completed_on = datetime.now()
+        self.completed_by = self.env.user
+        self.state = 'done'
+
+    @api.multi
+    def action_cancel(self):
+        self.state = 'cancel'
diff --git a/fieldservice_activity/models/fsm_order.py b/fieldservice_activity/models/fsm_order.py
new file mode 100644
index 0000000000..eb92f39143
--- /dev/null
+++ b/fieldservice_activity/models/fsm_order.py
@@ -0,0 +1,34 @@
+# 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
+
+
+class FSMOrder(models.Model):
+    _inherit = 'fsm.order'
+
+    order_activity_ids = fields.One2many('fsm.activity', 'fsm_order_id',
+                                         'Activites')
+
+    @api.onchange('template_id')
+    def _onchange_template_id(self):
+        res = super()._onchange_template_id()
+        if self.template_id:
+            for temp_activity_id in self.template_id.temp_activity_ids:
+                activity_id = temp_activity_id
+                activity_id.fsm_template_id = False
+                activity_id.fsm_order_id = self
+        return res
+
+    @api.multi
+    def action_complete(self):
+        res = super().action_complete()
+        for activity_id in self.order_activity_ids:
+            if activity_id.required and activity_id.state == 'todo':
+                raise ValidationError(_(
+                    "You must complete activity '%s' before \
+                    completing this order.") % activity_id.name)
+        for activity_id in self.activity_ids:
+            activity_id.done = True
+        return res
diff --git a/fieldservice_activity/models/fsm_template.py b/fieldservice_activity/models/fsm_template.py
new file mode 100644
index 0000000000..09c18bfb58
--- /dev/null
+++ b/fieldservice_activity/models/fsm_template.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2019, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class FSMTemplate(models.Model):
+    _inherit = 'fsm.template'
+
+    temp_activity_ids = fields.One2many('fsm.activity', 'fsm_template_id',
+                                        'Activites')
diff --git a/fieldservice_activity/readme/CONFIGURE.rst b/fieldservice_activity/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..c896865935
--- /dev/null
+++ b/fieldservice_activity/readme/CONFIGURE.rst
@@ -0,0 +1,3 @@
+To use this module, you need to:
+
+* Go to Field Service > Settings > Manage Activites
diff --git a/fieldservice_activity/readme/CONTRIBUTORS.rst b/fieldservice_activity/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..7fd2e60761
--- /dev/null
+++ b/fieldservice_activity/readme/CONTRIBUTORS.rst
@@ -0,0 +1,2 @@
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Steve Campbell <scampbells@opensourceintegrators.com>
diff --git a/fieldservice_activity/readme/CREDITS.rst b/fieldservice_activity/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_activity/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_activity/readme/DESCRIPTION.rst b/fieldservice_activity/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..1cb342f11c
--- /dev/null
+++ b/fieldservice_activity/readme/DESCRIPTION.rst
@@ -0,0 +1,3 @@
+A Field Service Activity gives the user the ability to define a list of tasks/activities on a service order
+
+The user can add tasks/activities to the FSM order to the ones created from the template.
diff --git a/fieldservice_activity/readme/USAGE.rst b/fieldservice_activity/readme/USAGE.rst
new file mode 100644
index 0000000000..d58feb7f2e
--- /dev/null
+++ b/fieldservice_activity/readme/USAGE.rst
@@ -0,0 +1,7 @@
+To use this module, you need to:
+
+* Go to Field Service
+* Create or select an FSM Order
+* Add as many Activites as needed
+* Alternatively, add Activites to a Template
+* Add Template to FSM Order, Activites will be copied over
diff --git a/fieldservice_activity/security/ir.model.access.csv b/fieldservice_activity/security/ir.model.access.csv
new file mode 100644
index 0000000000..e1c99c1928
--- /dev/null
+++ b/fieldservice_activity/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_fsm_activity_fsm_user,fsm.activity.user,model_fsm_activity,fieldservice.group_fsm_user,1,1,0,0
+access_fsm_activity_fsm_manager,fsm.activity.manager,model_fsm_activity,fieldservice.group_fsm_manager,1,1,1,1
diff --git a/fieldservice_activity/static/description/icon.png b/fieldservice_activity/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_activity/static/description/index.html b/fieldservice_activity/static/description/index.html
new file mode 100644
index 0000000000..a7a101e440
--- /dev/null
+++ b/fieldservice_activity/static/description/index.html
@@ -0,0 +1,451 @@
+<?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 Activity</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-activity">
+<h1 class="title">Field Service Activity</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_activity"><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_activity"><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>A Field Service Activity gives the user the ability to define a list of tasks/activities on a service order</p>
+<p>The user can add tasks/activities to the FSM order to the ones created from the template.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id7">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<p>To use this module, you need to:</p>
+<ul class="simple">
+<li>Go to Field Service &gt; Settings &gt; Manage Activites</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">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 FSM Order</li>
+<li>Add as many Activites as needed</li>
+<li>Alternatively, add Activites to a Template</li>
+<li>Add Template to FSM Order, Activites will be copied over</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id3">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_activity%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="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<ul class="simple">
+<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:scampbells&#64;opensourceintegrators.com">scampbells&#64;opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id7">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="#id8">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/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.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_activity">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_activity/tests/__init__.py b/fieldservice_activity/tests/__init__.py
new file mode 100644
index 0000000000..f3db523154
--- /dev/null
+++ b/fieldservice_activity/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2019, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_fsm_activity
diff --git a/fieldservice_activity/tests/test_fsm_activity.py b/fieldservice_activity/tests/test_fsm_activity.py
new file mode 100644
index 0000000000..2b24b31076
--- /dev/null
+++ b/fieldservice_activity/tests/test_fsm_activity.py
@@ -0,0 +1,69 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from datetime import datetime
+from odoo.tests.common import TransactionCase, Form
+from odoo.exceptions import ValidationError
+
+
+class TestFSMActivity(TransactionCase):
+
+    def setUp(self):
+        super().setUp()
+        self.Order = self.env['fsm.order']
+        self.test_location = self.env.ref('fieldservice.test_location')
+        self.Activity = self.env['fsm.activity']
+
+    def test_fsm_activity(self):
+        """ Test creating new activites, and moving them along thier stages,
+            - Don't move FSM Order to complete if Required Activity in 'To Do'
+            - Check completed_by is saved
+            - Check completed_on is saved
+        """
+        # Create an Orders
+        view_id = ('fieldservice.fsm_order_form')
+        with Form(self.Order, view=view_id) as f:
+            f.location_id = self.test_location
+        order = f.save()
+        order_id = order.id
+        self.Activity.create(self.get_activity_vals('Activity 1',
+                                                    False,
+                                                    'Ref 1',
+                                                    order_id))
+        self.Activity.create(self.get_activity_vals('Activity 2',
+                                                    False,
+                                                    'Ref 2',
+                                                    order_id))
+        self.Activity.create(self.get_activity_vals('Activity 3',
+                                                    True,
+                                                    'Ref 3',
+                                                    order_id))
+        # Test action_done()
+        order.order_activity_ids[0].action_done()
+        self.assertEqual(order.order_activity_ids[0].
+                         completed_on.replace(microsecond=0),
+                         datetime.now().replace(microsecond=0))
+        self.assertEqual(order.order_activity_ids[0].completed_by,
+                         self.env.user)
+        self.assertEqual(order.order_activity_ids[0].state,
+                         'done')
+        # Test action_cancel()
+        order.order_activity_ids[1].action_cancel()
+        self.assertEqual(order.order_activity_ids[1].state,
+                         'cancel')
+
+        # Test Reqired Activity
+        with self.assertRaises(ValidationError):
+            order.action_complete()
+
+        order.order_activity_ids[2].action_done()
+        order.action_complete()
+        self.assertEqual(order.stage_id.id,
+                         self.env.ref('fieldservice.fsm_stage_completed').id)
+
+    def get_activity_vals(self, name, required, ref, order_id):
+        return {
+            'name': name,
+            'required': required,
+            'ref': ref,
+            'fsm_order_id': order_id
+        }
diff --git a/fieldservice_activity/views/fsm_order.xml b/fieldservice_activity/views/fsm_order.xml
new file mode 100644
index 0000000000..fa5142146e
--- /dev/null
+++ b/fieldservice_activity/views/fsm_order.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_fsm_order_form_add_activity" model="ir.ui.view">
+        <field name="name">fsm.order.form.activity</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//notebook/page[1]" position="after">
+                <page string="Activities">
+                    <field name="order_activity_ids" nolabel="1">
+                        <tree editable="bottom">
+                            <field name="sequence" widget="handle"/>
+                            <field name="name"/>
+                            <field name="required"/>
+                            <field name="ref"/>
+                            <field name="completed" invisible="1"/>
+                            <field name="completed_on"/>
+                            <field name="completed_by"/>
+                            <button name="action_done" string="Complete" type="object" class="oe_highlight" attrs="{'invisible': [('state', 'not in', ['todo'])]}"/>
+                            <button name="action_cancel" string="Cancel" type="object" attrs="{'invisible': [('state', 'not in', ['todo'])]}"/>
+                            <field name="state" readonly="1"/>
+                        </tree>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_activity/views/fsm_template.xml b/fieldservice_activity/views/fsm_template.xml
new file mode 100644
index 0000000000..8ecaeb5e6a
--- /dev/null
+++ b/fieldservice_activity/views/fsm_template.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_fsm_template_form_add_activity" model="ir.ui.view">
+        <field name="name">fsm.template.form.activity</field>
+        <field name="model">fsm.template</field>
+        <field name="inherit_id" ref="fieldservice.fsm_template_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//notebook/page[1]" position="after">
+                <page string="Activities">
+                    <field name="temp_activity_ids" nolabel="1">
+                        <tree editable="bottom">
+                            <field name="sequence" widget="handle"/>
+                            <field name="name"/>
+                            <field name="required"/>
+                            <field name="ref"/>
+                            <field name="completed" invisible="1"/>
+                            <field name="completed_on" invisible="1"/>
+                            <field name="completed_by" invisible="1"/>
+                            <button name="action_done" string="Complete" type="object" class="oe_highlight" invisible="1"/>
+                            <button name="action_cancel" string="Cancel" type="object" invisible="1"/>
+                            <field name="state" readonly="1"/>
+                        </tree>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

From ce535b2f380b254dd6c192f4db0865ae2efb0738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nelson=20Ram=C3=ADrez=20S=C3=A1nchez?= <info@konos.cl>
Date: Thu, 16 Jan 2020 20:35:00 +0000
Subject: [PATCH 384/631] Added translation using Weblate (Spanish (Chile))

---
 fieldservice_activity/i18n/es_CL.po | 156 ++++++++++++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 fieldservice_activity/i18n/es_CL.po

diff --git a/fieldservice_activity/i18n/es_CL.po b/fieldservice_activity/i18n/es_CL.po
new file mode 100644
index 0000000000..7f49b5e4b7
--- /dev/null
+++ b/fieldservice_activity/i18n/es_CL.po
@@ -0,0 +1,156 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_activity
+#
+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: 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"
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order__order_activity_ids
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template__temp_activity_ids
+msgid "Activites"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Activities"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Cancel"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Complete"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
+msgid "Completed"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_by
+msgid "Completed By"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_on
+msgid "Completed On"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_order_id
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_template_id
+msgid "FSM Template"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_activity
+msgid "Field Service Activity"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_template
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__ref
+msgid "Reference"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__required
+msgid "Requireid"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__state
+msgid "State"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: fieldservice_activity
+#: code:addons/fieldservice_activity/models/fsm_order.py:29
+#, python-format
+msgid "You must complete activity '%s' before                     completing this order."
+msgstr ""

From a5346d6ec6fb10430c2c37a1e9cc78b532f6984a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nelson=20Ram=C3=ADrez=20S=C3=A1nchez?= <info@konos.cl>
Date: Thu, 16 Jan 2020 20:37:49 +0000
Subject: [PATCH 385/631] Translated using Weblate (Spanish (Chile))

Currently translated at 96.3% (26 of 27 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_activity
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_activity/es_CL/
---
 fieldservice_activity/i18n/es_CL.po | 56 +++++++++++++++--------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/fieldservice_activity/i18n/es_CL.po b/fieldservice_activity/i18n/es_CL.po
index 7f49b5e4b7..21d9b7cadd 100644
--- a/fieldservice_activity/i18n/es_CL.po
+++ b/fieldservice_activity/i18n/es_CL.po
@@ -6,98 +6,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2020-01-16 22:38+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.10\n"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order__order_activity_ids
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template__temp_activity_ids
 msgid "Activites"
-msgstr ""
+msgstr "Actividades"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Activities"
-msgstr ""
+msgstr "Actividades"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelada"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Complete"
-msgstr ""
+msgstr "Completada"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
 msgid "Completed"
-msgstr ""
+msgstr "Completado"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_by
 msgid "Completed By"
-msgstr ""
+msgstr "Completado Por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_on
 msgid "Completed On"
-msgstr ""
+msgstr "Completado el"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Creado por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Creado en"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Nombre Mostrado"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_order_id
 msgid "FSM Order"
-msgstr ""
+msgstr "Pedido FSM"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_template_id
 msgid "FSM Template"
-msgstr ""
+msgstr "Plantilla FSM"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_activity
 msgid "Field Service Activity"
-msgstr ""
+msgstr "Actividad de Servicio de Campo"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Orden de Servicio de Campo"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_template
 msgid "Field Service Order Template"
-msgstr ""
+msgstr "Plantilla de Orden de Servicio de Campo"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__id
@@ -107,50 +109,50 @@ msgstr ""
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "??ltima modificaci??n el"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "??ltima modificaci??n por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "??ltima actualizaci??n en"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__name
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__ref
 msgid "Reference"
-msgstr ""
+msgstr "Referencia"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__required
 msgid "Requireid"
-msgstr ""
+msgstr "Requerido"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__sequence
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__state
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 msgid "To Do"
-msgstr ""
+msgstr "Por Hacer"
 
 #. module: fieldservice_activity
 #: code:addons/fieldservice_activity/models/fsm_order.py:29
 #, python-format
 msgid "You must complete activity '%s' before                     completing this order."
-msgstr ""
+msgstr "Debe completar la actividad '%s' antes de completar este pedido."

From 366ea4290268647fa7134429f198d299aba368a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nelson=20Ram=C3=ADrez=20S=C3=A1nchez?= <info@konos.cl>
Date: Fri, 27 Mar 2020 16:41:29 +0000
Subject: [PATCH 386/631] Translated using Weblate (Spanish (Chile))

Currently translated at 100.0% (27 of 27 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_activity
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_activity/es_CL/
---
 fieldservice_activity/i18n/es_CL.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_activity/i18n/es_CL.po b/fieldservice_activity/i18n/es_CL.po
index 21d9b7cadd..f2546d4253 100644
--- a/fieldservice_activity/i18n/es_CL.po
+++ b/fieldservice_activity/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-01-16 22:38+0000\n"
+"PO-Revision-Date: 2020-03-27 19:13+0000\n"
 "Last-Translator: Nelson Ram??rez S??nchez <info@konos.cl>\n"
 "Language-Team: none\n"
 "Language: es_CL\n"
@@ -104,7 +104,7 @@ msgstr "Plantilla de Orden de Servicio de Campo"
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update

From 731913e0e3b1cdd1b6620ecabfe6d8df4dc521a6 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Wed, 29 Apr 2020 00:53:34 +0530
Subject: [PATCH 387/631] [IMP] Improved code

---
 fieldservice_activity/models/fsm_order.py     | 18 +++++++++++-----
 .../tests/test_fsm_activity.py                | 21 +++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/fieldservice_activity/models/fsm_order.py b/fieldservice_activity/models/fsm_order.py
index eb92f39143..c56410002c 100644
--- a/fieldservice_activity/models/fsm_order.py
+++ b/fieldservice_activity/models/fsm_order.py
@@ -11,14 +11,22 @@ class FSMOrder(models.Model):
     order_activity_ids = fields.One2many('fsm.activity', 'fsm_order_id',
                                          'Activites')
 
+    @api.multi
     @api.onchange('template_id')
     def _onchange_template_id(self):
         res = super()._onchange_template_id()
-        if self.template_id:
-            for temp_activity_id in self.template_id.temp_activity_ids:
-                activity_id = temp_activity_id
-                activity_id.fsm_template_id = False
-                activity_id.fsm_order_id = self
+        for rec in self:
+            if rec.template_id:
+                activity_list = []
+                for temp_activity in rec.template_id.temp_activity_ids:
+                    activity_list.append((0, 0,
+                                          {'name': temp_activity.name,
+                                           'required': temp_activity.required,
+                                           'ref': temp_activity.ref,
+                                           'state': temp_activity.state}))
+                rec.order_activity_ids = activity_list
+                rec.template_id.temp_activity_ids.write(
+                    {'fsm_template_id': False})
         return res
 
     @api.multi
diff --git a/fieldservice_activity/tests/test_fsm_activity.py b/fieldservice_activity/tests/test_fsm_activity.py
index 2b24b31076..cd6021f5b2 100644
--- a/fieldservice_activity/tests/test_fsm_activity.py
+++ b/fieldservice_activity/tests/test_fsm_activity.py
@@ -12,6 +12,7 @@ def setUp(self):
         self.Order = self.env['fsm.order']
         self.test_location = self.env.ref('fieldservice.test_location')
         self.Activity = self.env['fsm.activity']
+        self.template_obj = self.env['fsm.template']
 
     def test_fsm_activity(self):
         """ Test creating new activites, and moving them along thier stages,
@@ -67,3 +68,23 @@ def get_activity_vals(self, name, required, ref, order_id):
             'ref': ref,
             'fsm_order_id': order_id
         }
+
+    def test_onchange_template_id(self):
+        # Create a Template
+        self.template = self.template_obj.create(
+            {'name': 'Demo template',
+             'temp_activity_ids': [(0, 0, {
+                 'name': "Activity new",
+                 'required': True,
+                 'ref': 'Ref new',
+                 'state': 'todo',
+             })]})
+        # Create an Order
+        self.fso = self.Order.create({
+            'location_id': self.test_location.id,
+            'template_id': self.template.id,
+        })
+        # Test _onchange_template_id()
+        self.fso._onchange_template_id()
+        self.assertNotEquals(self.fso.order_activity_ids.ids,
+                             self.fso.template_id.temp_activity_ids.ids)

From 82b42b1086f931c1ae2c6250037025c41036e3ea Mon Sep 17 00:00:00 2001
From: Marcel Savegnago <marcel.savegnago@gmail.com>
Date: Wed, 20 May 2020 07:37:36 +0000
Subject: [PATCH 388/631] Added translation using Weblate (Portuguese (Brazil))

---
 fieldservice_activity/i18n/pt_BR.po | 156 ++++++++++++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 fieldservice_activity/i18n/pt_BR.po

diff --git a/fieldservice_activity/i18n/pt_BR.po b/fieldservice_activity/i18n/pt_BR.po
new file mode 100644
index 0000000000..4bc9ec9b42
--- /dev/null
+++ b/fieldservice_activity/i18n/pt_BR.po
@@ -0,0 +1,156 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_activity
+#
+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_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order__order_activity_ids
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template__temp_activity_ids
+msgid "Activites"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Activities"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Cancel"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Complete"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
+msgid "Completed"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_by
+msgid "Completed By"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_on
+msgid "Completed On"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_order_id
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_template_id
+msgid "FSM Template"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_activity
+msgid "Field Service Activity"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_template
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__ref
+msgid "Reference"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__required
+msgid "Requireid"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__state
+msgid "State"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: fieldservice_activity
+#: code:addons/fieldservice_activity/models/fsm_order.py:29
+#, python-format
+msgid "You must complete activity '%s' before                     completing this order."
+msgstr ""

From dff6148ef3ce738db9c97d9d17aeefd3f4deea36 Mon Sep 17 00:00:00 2001
From: Fernando Colus <fcolus1@gmail.com>
Date: Tue, 16 Jun 2020 23:57:46 +0000
Subject: [PATCH 389/631] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (27 of 27 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_activity
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_activity/pt_BR/
---
 fieldservice_activity/i18n/es_CL.po           |  8 ++-
 .../i18n/fieldservice_activity.pot            |  2 +-
 fieldservice_activity/i18n/pt_BR.po           | 66 ++++++++++---------
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/fieldservice_activity/i18n/es_CL.po b/fieldservice_activity/i18n/es_CL.po
index f2546d4253..64b04d7f60 100644
--- a/fieldservice_activity/i18n/es_CL.po
+++ b/fieldservice_activity/i18n/es_CL.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_activity
+# 	* fieldservice_activity
 #
 msgid ""
 msgstr ""
@@ -152,7 +152,9 @@ msgid "To Do"
 msgstr "Por Hacer"
 
 #. module: fieldservice_activity
-#: code:addons/fieldservice_activity/models/fsm_order.py:29
+#: code:addons/fieldservice_activity/models/fsm_order.py:37
 #, python-format
-msgid "You must complete activity '%s' before                     completing this order."
+msgid ""
+"You must complete activity '%s' before                     completing this "
+"order."
 msgstr "Debe completar la actividad '%s' antes de completar este pedido."
diff --git a/fieldservice_activity/i18n/fieldservice_activity.pot b/fieldservice_activity/i18n/fieldservice_activity.pot
index 5dbf42f7d9..407800775f 100644
--- a/fieldservice_activity/i18n/fieldservice_activity.pot
+++ b/fieldservice_activity/i18n/fieldservice_activity.pot
@@ -149,7 +149,7 @@ msgid "To Do"
 msgstr ""
 
 #. module: fieldservice_activity
-#: code:addons/fieldservice_activity/models/fsm_order.py:29
+#: code:addons/fieldservice_activity/models/fsm_order.py:37
 #, python-format
 msgid "You must complete activity '%s' before                     completing this order."
 msgstr ""
diff --git a/fieldservice_activity/i18n/pt_BR.po b/fieldservice_activity/i18n/pt_BR.po
index 4bc9ec9b42..37b57e6f11 100644
--- a/fieldservice_activity/i18n/pt_BR.po
+++ b/fieldservice_activity/i18n/pt_BR.po
@@ -1,156 +1,160 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_activity
+# 	* fieldservice_activity
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2020-06-17 02:19+0000\n"
+"Last-Translator: Fernando Colus <fcolus1@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_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order__order_activity_ids
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template__temp_activity_ids
 msgid "Activites"
-msgstr ""
+msgstr "Atividades"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Activities"
-msgstr ""
+msgstr "Atividades"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelada"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Complete"
-msgstr ""
+msgstr "Completo"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
 msgid "Completed"
-msgstr ""
+msgstr "Completado"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_by
 msgid "Completed By"
-msgstr ""
+msgstr "Completado Por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_on
 msgid "Completed On"
-msgstr ""
+msgstr "Completado em"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Criado Por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Criado em"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Exibir Nome"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_order_id
 msgid "FSM Order"
-msgstr ""
+msgstr "Pedido do FSM (Field Services Management)"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_template_id
 msgid "FSM Template"
-msgstr ""
+msgstr "Modelo do FSM (Field Services Management)"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_activity
 msgid "Field Service Activity"
-msgstr ""
+msgstr "Atividade de Servi??o em Campo"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Pedido de Atividade em Campo"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_template
 msgid "Field Service Order Template"
-msgstr ""
+msgstr "Modelo de Pedido de Atividade em Campo"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "??ltima Modifica????o Feita em"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "??ltima Modifica????o Feita por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "??ltima Atualiza????o Feita em"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__name
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__ref
 msgid "Reference"
-msgstr ""
+msgstr "Refer??ncia"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__required
 msgid "Requireid"
-msgstr ""
+msgstr "Requer ID"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__sequence
 msgid "Sequence"
-msgstr ""
+msgstr "Sequ??ncia"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__state
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 msgid "To Do"
-msgstr ""
+msgstr "A Fazer"
 
 #. module: fieldservice_activity
-#: code:addons/fieldservice_activity/models/fsm_order.py:29
+#: code:addons/fieldservice_activity/models/fsm_order.py:37
 #, python-format
-msgid "You must complete activity '%s' before                     completing this order."
-msgstr ""
+msgid ""
+"You must complete activity '%s' before                     completing this "
+"order."
+msgstr "Voc?? deve concluir a atividade '%s' antes de concluir este pedido."

From a1cfdac0e011c6a9f9bdcb886ab35423584b8653 Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Mon, 20 Jul 2020 19:28:37 +0000
Subject: [PATCH 390/631] Added translation using Weblate (Spanish (Argentina))

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

diff --git a/fieldservice_activity/i18n/es_AR.po b/fieldservice_activity/i18n/es_AR.po
new file mode 100644
index 0000000000..bb6f544b1c
--- /dev/null
+++ b/fieldservice_activity/i18n/es_AR.po
@@ -0,0 +1,156 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_activity
+#
+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: 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_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order__order_activity_ids
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template__temp_activity_ids
+msgid "Activites"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Activities"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Cancel"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Complete"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
+msgid "Completed"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_by
+msgid "Completed By"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_on
+msgid "Completed On"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_order_id
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_template_id
+msgid "FSM Template"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_activity
+msgid "Field Service Activity"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_template
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__ref
+msgid "Reference"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__required
+msgid "Requireid"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__state
+msgid "State"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: fieldservice_activity
+#: code:addons/fieldservice_activity/models/fsm_order.py:37
+#, python-format
+msgid "You must complete activity '%s' before                     completing this order."
+msgstr ""

From 6d7f8572da123bffae39b25b154efde907e1a7ce Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Mon, 20 Jul 2020 19:28:51 +0000
Subject: [PATCH 391/631] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (27 of 27 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_activity
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_activity/es_AR/
---
 fieldservice_activity/i18n/es_AR.po | 58 +++++++++++++++--------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/fieldservice_activity/i18n/es_AR.po b/fieldservice_activity/i18n/es_AR.po
index bb6f544b1c..ee6b6d6a61 100644
--- a/fieldservice_activity/i18n/es_AR.po
+++ b/fieldservice_activity/i18n/es_AR.po
@@ -6,151 +6,155 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2020-07-20 22:19+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 3.10\n"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order__order_activity_ids
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template__temp_activity_ids
 msgid "Activites"
-msgstr ""
+msgstr "Actividades"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Activities"
-msgstr ""
+msgstr "Ocupaciones"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Complete"
-msgstr ""
+msgstr "Completar"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
 msgid "Completed"
-msgstr ""
+msgstr "Completado"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_by
 msgid "Completed By"
-msgstr ""
+msgstr "Completado Por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_on
 msgid "Completed On"
-msgstr ""
+msgstr "Completado el"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Creado por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Creado el"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Mostrar Nombre"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_order_id
 msgid "FSM Order"
-msgstr ""
+msgstr "Pedido FSM"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_template_id
 msgid "FSM Template"
-msgstr ""
+msgstr "Plantilla FSM"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_activity
 msgid "Field Service Activity"
-msgstr ""
+msgstr "Actividad de Servicio de Campo"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Pedido de Servicio de Campo"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_template
 msgid "Field Service Order Template"
-msgstr ""
+msgstr "Plantilla del Pedido de Servicio de Campo"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "??ltima Modificaci??n el"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "??ltima Actualizaci??n por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "??ltima Actualizaci??n el"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__name
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__ref
 msgid "Reference"
-msgstr ""
+msgstr "Referencia"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__required
 msgid "Requireid"
-msgstr ""
+msgstr "Requerido"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__sequence
 msgid "Sequence"
-msgstr ""
+msgstr "Sequencia"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__state
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 msgid "To Do"
-msgstr ""
+msgstr "Por Hacer"
 
 #. module: fieldservice_activity
 #: code:addons/fieldservice_activity/models/fsm_order.py:37
 #, python-format
 msgid "You must complete activity '%s' before                     completing this order."
 msgstr ""
+"Debe completar la actividad '%s' antes                          de completar "
+"este pedido."

From 9bda58cd6682f95f0c1386c7457674a0c3ff51aa Mon Sep 17 00:00:00 2001
From: Daniel Reis <dgreis@sapo.pt>
Date: Tue, 21 Jul 2020 08:18:17 +0000
Subject: [PATCH 392/631] Added translation using Weblate (Portuguese
 (Portugal))

---
 fieldservice_activity/i18n/pt_PT.po | 156 ++++++++++++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 fieldservice_activity/i18n/pt_PT.po

diff --git a/fieldservice_activity/i18n/pt_PT.po b/fieldservice_activity/i18n/pt_PT.po
new file mode 100644
index 0000000000..625523a11a
--- /dev/null
+++ b/fieldservice_activity/i18n/pt_PT.po
@@ -0,0 +1,156 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_activity
+#
+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_PT\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_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order__order_activity_ids
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template__temp_activity_ids
+msgid "Activites"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Activities"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Cancel"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
+#: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
+msgid "Complete"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
+msgid "Completed"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_by
+msgid "Completed By"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_on
+msgid "Completed On"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_order_id
+msgid "FSM Order"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_template_id
+msgid "FSM Template"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_activity
+msgid "Field Service Activity"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model,name:fieldservice_activity.model_fsm_template
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__ref
+msgid "Reference"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__required
+msgid "Requireid"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__state
+msgid "State"
+msgstr ""
+
+#. module: fieldservice_activity
+#: selection:fsm.activity,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: fieldservice_activity
+#: code:addons/fieldservice_activity/models/fsm_order.py:37
+#, python-format
+msgid "You must complete activity '%s' before                     completing this order."
+msgstr ""

From 0962821d2e0f20d8de14b65d7a4c8307a84231c9 Mon Sep 17 00:00:00 2001
From: Daniel Reis <dgreis@sapo.pt>
Date: Tue, 21 Jul 2020 08:18:42 +0000
Subject: [PATCH 393/631] Translated using Weblate (Portuguese (Portugal))

Currently translated at 100.0% (27 of 27 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_activity
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_activity/pt_PT/
---
 fieldservice_activity/i18n/pt_PT.po | 58 +++++++++++++++--------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/fieldservice_activity/i18n/pt_PT.po b/fieldservice_activity/i18n/pt_PT.po
index 625523a11a..5360d25c74 100644
--- a/fieldservice_activity/i18n/pt_PT.po
+++ b/fieldservice_activity/i18n/pt_PT.po
@@ -6,151 +6,153 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2020-07-21 10:19+0000\n"
+"Last-Translator: Daniel Reis <dgreis@sapo.pt>\n"
 "Language-Team: none\n"
 "Language: pt_PT\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_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order__order_activity_ids
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template__temp_activity_ids
 msgid "Activites"
-msgstr ""
+msgstr "Atividades"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Activities"
-msgstr ""
+msgstr "Atividades"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelada"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Complete"
-msgstr ""
+msgstr "Completo"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
 msgid "Completed"
-msgstr ""
+msgstr "Completado"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_by
 msgid "Completed By"
-msgstr ""
+msgstr "Completado Por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed_on
 msgid "Completed On"
-msgstr ""
+msgstr "Completado em"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Criado por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Criado em"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Nome Apresentado"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_order_id
 msgid "FSM Order"
-msgstr ""
+msgstr "Ordem FSM"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__fsm_template_id
 msgid "FSM Template"
-msgstr ""
+msgstr "Modelo FSM"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_activity
 msgid "Field Service Activity"
-msgstr ""
+msgstr "Atividade de Servi??o em Campo"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Ordem de Servi??o de Campo"
 
 #. module: fieldservice_activity
 #: model:ir.model,name:fieldservice_activity.model_fsm_template
 msgid "Field Service Order Template"
-msgstr ""
+msgstr "Modelo de Ordem de Servi??o"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "??ltima Modifica????o em"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "??ltima Atualiza????o por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "??ltima Atualiza????o em"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__name
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__ref
 msgid "Reference"
-msgstr ""
+msgstr "Refer??ncia"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__required
 msgid "Requireid"
-msgstr ""
+msgstr "Requer ID"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__sequence
 msgid "Sequence"
-msgstr ""
+msgstr "Sequ??ncia"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__state
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: fieldservice_activity
 #: selection:fsm.activity,state:0
 msgid "To Do"
-msgstr ""
+msgstr "A Fazer"
 
 #. module: fieldservice_activity
 #: code:addons/fieldservice_activity/models/fsm_order.py:37
 #, python-format
 msgid "You must complete activity '%s' before                     completing this order."
-msgstr ""
+msgstr "Voc?? deve concluir a atividade '%s' antes de concluir este pedido."

From c86980acff82a7c61cb79e9099fa61c8d2006450 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 21 Jul 2020 19:31:13 -0400
Subject: [PATCH 394/631] [IMP] fieldservice_activity: black, isort, prettier

---
 fieldservice_activity/__manifest__.py         |   35 +-
 fieldservice_activity/models/fsm_activity.py  |   53 +-
 fieldservice_activity/models/fsm_order.py     |   41 +-
 fieldservice_activity/models/fsm_template.py  |    5 +-
 .../static/description/index.html             | 1112 ++++++++++-------
 .../tests/test_fsm_activity.py                |  101 +-
 fieldservice_activity/views/fsm_order.xml     |   37 +-
 fieldservice_activity/views/fsm_template.xml  |   37 +-
 8 files changed, 863 insertions(+), 558 deletions(-)

diff --git a/fieldservice_activity/__manifest__.py b/fieldservice_activity/__manifest__.py
index 3866fcfa31..71ecfcbbcf 100644
--- a/fieldservice_activity/__manifest__.py
+++ b/fieldservice_activity/__manifest__.py
@@ -2,25 +2,20 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 {
-    'name': 'Field Service Activity',
-    'summary': '''Field Service Activities are a set of actions
-     that need to be performed on a service order''',
-    'version': '12.0.1.0.0',
-    'category': 'Field Service',
-    'license': 'AGPL-3',
-    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice'
-    ],
-    'data': [
-        'views/fsm_order.xml',
-        'views/fsm_template.xml',
-        'security/ir.model.access.csv'
-    ],
-    'development_status': 'Beta',
-    'maintainers': [
-        'max3903',
-        'osi-scampbell'
+    "name": "Field Service Activity",
+    "summary": """Field Service Activities are a set of actions
+     that need to be performed on a service order""",
+    "version": "12.0.1.0.0",
+    "category": "Field Service",
+    "license": "AGPL-3",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": ["fieldservice"],
+    "data": [
+        "views/fsm_order.xml",
+        "views/fsm_template.xml",
+        "security/ir.model.access.csv",
     ],
+    "development_status": "Beta",
+    "maintainers": ["max3903", "osi-scampbell"],
 }
diff --git a/fieldservice_activity/models/fsm_activity.py b/fieldservice_activity/models/fsm_activity.py
index c1af0e92ce..a7fee4914d 100644
--- a/fieldservice_activity/models/fsm_activity.py
+++ b/fieldservice_activity/models/fsm_activity.py
@@ -1,40 +1,47 @@
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-from odoo import api, fields, models
 from datetime import datetime
 
+from odoo import fields, models
+
 
 class FSMActiity(models.Model):
-    _name = 'fsm.activity'
-    _description = 'Field Service Activity'
+    _name = "fsm.activity"
+    _description = "Field Service Activity"
 
-    name = fields.Char('Name', required=True,
-                       readonly=True, states={'todo': [('readonly', False)]})
-    required = fields.Boolean('Requireid', default=False,
-                              readonly=True,
-                              states={'todo': [('readonly', False)]})
-    sequence = fields.Integer('Sequence')
-    completed = fields.Boolean('Completed', default=False)
-    completed_on = fields.Datetime('Completed On', readonly=True)
-    completed_by = fields.Many2one('res.users',
-                                   'Completed By', readonly=True,)
-    ref = fields.Char('Reference', readonly=True,
-                      states={'todo': [('readonly', False)]})
-    fsm_order_id = fields.Many2one('fsm.order', 'FSM Order')
-    fsm_template_id = fields.Many2one('fsm.template', 'FSM Template')
-    state = fields.Selection([('todo', 'To Do'),
-                              ('done', 'Completed'),
-                              ('cancel', 'Cancelled')], 'State',
-                             readonly=True, default='todo')
+    name = fields.Char(
+        "Name", required=True, readonly=True, states={"todo": [("readonly", False)]}
+    )
+    required = fields.Boolean(
+        "Requireid",
+        default=False,
+        readonly=True,
+        states={"todo": [("readonly", False)]},
+    )
+    sequence = fields.Integer("Sequence")
+    completed = fields.Boolean("Completed", default=False)
+    completed_on = fields.Datetime("Completed On", readonly=True)
+    completed_by = fields.Many2one("res.users", "Completed By", readonly=True)
+    ref = fields.Char(
+        "Reference", readonly=True, states={"todo": [("readonly", False)]}
+    )
+    fsm_order_id = fields.Many2one("fsm.order", "FSM Order")
+    fsm_template_id = fields.Many2one("fsm.template", "FSM Template")
+    state = fields.Selection(
+        [("todo", "To Do"), ("done", "Completed"), ("cancel", "Cancelled")],
+        "State",
+        readonly=True,
+        default="todo",
+    )
 
     @api.multi
     def action_done(self):
         self.completed = True
         self.completed_on = datetime.now()
         self.completed_by = self.env.user
-        self.state = 'done'
+        self.state = "done"
 
     @api.multi
     def action_cancel(self):
-        self.state = 'cancel'
+        self.state = "cancel"
diff --git a/fieldservice_activity/models/fsm_order.py b/fieldservice_activity/models/fsm_order.py
index c56410002c..e8d4389016 100644
--- a/fieldservice_activity/models/fsm_order.py
+++ b/fieldservice_activity/models/fsm_order.py
@@ -1,42 +1,51 @@
 # 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
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
-    order_activity_ids = fields.One2many('fsm.activity', 'fsm_order_id',
-                                         'Activites')
+    order_activity_ids = fields.One2many("fsm.activity", "fsm_order_id", "Activites")
 
     @api.multi
-    @api.onchange('template_id')
+    @api.onchange("template_id")
     def _onchange_template_id(self):
         res = super()._onchange_template_id()
         for rec in self:
             if rec.template_id:
                 activity_list = []
                 for temp_activity in rec.template_id.temp_activity_ids:
-                    activity_list.append((0, 0,
-                                          {'name': temp_activity.name,
-                                           'required': temp_activity.required,
-                                           'ref': temp_activity.ref,
-                                           'state': temp_activity.state}))
+                    activity_list.append(
+                        (
+                            0,
+                            0,
+                            {
+                                "name": temp_activity.name,
+                                "required": temp_activity.required,
+                                "ref": temp_activity.ref,
+                                "state": temp_activity.state,
+                            },
+                        )
+                    )
                 rec.order_activity_ids = activity_list
-                rec.template_id.temp_activity_ids.write(
-                    {'fsm_template_id': False})
+                rec.template_id.temp_activity_ids.write({"fsm_template_id": False})
         return res
 
     @api.multi
     def action_complete(self):
         res = super().action_complete()
         for activity_id in self.order_activity_ids:
-            if activity_id.required and activity_id.state == 'todo':
-                raise ValidationError(_(
-                    "You must complete activity '%s' before \
-                    completing this order.") % activity_id.name)
+            if activity_id.required and activity_id.state == "todo":
+                raise ValidationError(
+                    _(
+                        "You must complete activity '%s' before \
+                    completing this order."
+                    )
+                    % activity_id.name
+                )
         for activity_id in self.activity_ids:
             activity_id.done = True
         return res
diff --git a/fieldservice_activity/models/fsm_template.py b/fieldservice_activity/models/fsm_template.py
index 09c18bfb58..03e094d9f1 100644
--- a/fieldservice_activity/models/fsm_template.py
+++ b/fieldservice_activity/models/fsm_template.py
@@ -5,7 +5,6 @@
 
 
 class FSMTemplate(models.Model):
-    _inherit = 'fsm.template'
+    _inherit = "fsm.template"
 
-    temp_activity_ids = fields.One2many('fsm.activity', 'fsm_template_id',
-                                        'Activites')
+    temp_activity_ids = fields.One2many("fsm.activity", "fsm_template_id", "Activites")
diff --git a/fieldservice_activity/static/description/index.html b/fieldservice_activity/static/description/index.html
index a7a101e440..a004ed63e0 100644
--- a/fieldservice_activity/static/description/index.html
+++ b/fieldservice_activity/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 Activity</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 Activity</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,353 +134,590 @@
   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-activity">
-<h1 class="title">Field Service Activity</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-activity">
+      <h1 class="title">Field Service Activity</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_activity"><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_activity"><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>A Field Service Activity gives the user the ability to define a list of tasks/activities on a service order</p>
-<p>The user can add tasks/activities to the FSM order to the ones created from the template.</p>
-<p><strong>Table of contents</strong></p>
-<div class="contents local topic" id="contents">
-<ul class="simple">
-<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
-<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
-<li><a class="reference internal" href="#other-credits" id="id7">Other credits</a></li>
-<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="configuration">
-<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
-<p>To use this module, you need to:</p>
-<ul class="simple">
-<li>Go to Field Service &gt; Settings &gt; Manage Activites</li>
-</ul>
-</div>
-<div class="section" id="usage">
-<h1><a class="toc-backref" href="#id2">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 FSM Order</li>
-<li>Add as many Activites as needed</li>
-<li>Alternatively, add Activites to a Template</li>
-<li>Add Template to FSM Order, Activites will be copied over</li>
-</ul>
-</div>
-<div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id3">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_activity%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="#id4">Credits</a></h1>
-<div class="section" id="authors">
-<h2><a class="toc-backref" href="#id5">Authors</a></h2>
-<ul class="simple">
-<li>Open Source Integrators</li>
-</ul>
-</div>
-<div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
-<ul class="simple">
-<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:scampbells&#64;opensourceintegrators.com">scampbells&#64;opensourceintegrators.com</a>&gt;</li>
-</ul>
-</div>
-<div class="section" id="other-credits">
-<h2><a class="toc-backref" href="#id7">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="#id8">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/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.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_activity">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_activity"
+          ><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_activity"
+          ><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>
+        A Field Service Activity gives the user the ability to define a list of
+        tasks/activities on a service order
+      </p>
+      <p>
+        The user can add tasks/activities to the FSM order to the ones created from the
+        template.
+      </p>
+      <p><strong>Table of contents</strong></p>
+      <div class="contents local topic" id="contents">
+        <ul class="simple">
+          <li>
+            <a class="reference internal" href="#configuration" id="id1"
+              >Configuration</a
+            >
+          </li>
+          <li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+          <li>
+            <a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a>
+          </li>
+          <li>
+            <a class="reference internal" href="#credits" id="id4">Credits</a>
+            <ul>
+              <li>
+                <a class="reference internal" href="#authors" id="id5">Authors</a>
+              </li>
+              <li>
+                <a class="reference internal" href="#contributors" id="id6"
+                  >Contributors</a
+                >
+              </li>
+              <li>
+                <a class="reference internal" href="#other-credits" id="id7"
+                  >Other credits</a
+                >
+              </li>
+              <li>
+                <a class="reference internal" href="#maintainers" id="id8"
+                  >Maintainers</a
+                >
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+      <div class="section" id="configuration">
+        <h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+        <p>To use this module, you need to:</p>
+        <ul class="simple">
+          <li>Go to Field Service &gt; Settings &gt; Manage Activites</li>
+        </ul>
+      </div>
+      <div class="section" id="usage">
+        <h1><a class="toc-backref" href="#id2">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 FSM Order</li>
+          <li>Add as many Activites as needed</li>
+          <li>Alternatively, add Activites to a Template</li>
+          <li>Add Template to FSM Order, Activites will be copied over</li>
+        </ul>
+      </div>
+      <div class="section" id="bug-tracker">
+        <h1><a class="toc-backref" href="#id3">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_activity%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="#id4">Credits</a></h1>
+        <div class="section" id="authors">
+          <h2><a class="toc-backref" href="#id5">Authors</a></h2>
+          <ul class="simple">
+            <li>Open Source Integrators</li>
+          </ul>
+        </div>
+        <div class="section" id="contributors">
+          <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+          <ul class="simple">
+            <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:scampbells&#64;opensourceintegrators.com"
+                >scampbells&#64;opensourceintegrators.com</a
+              >&gt;
+            </li>
+          </ul>
+        </div>
+        <div class="section" id="other-credits">
+          <h2><a class="toc-backref" href="#id7">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="#id8">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/max3903"
+              ><img alt="max3903" src="https://github.com/max3903.png?size=40px"
+            /></a>
+            <a class="reference external" href="https://github.com/osi-scampbell"
+              ><img
+                alt="osi-scampbell"
+                src="https://github.com/osi-scampbell.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_activity"
+              >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_activity/tests/test_fsm_activity.py b/fieldservice_activity/tests/test_fsm_activity.py
index cd6021f5b2..9993182e85 100644
--- a/fieldservice_activity/tests/test_fsm_activity.py
+++ b/fieldservice_activity/tests/test_fsm_activity.py
@@ -1,18 +1,18 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators
+# Copyright (C) 2019, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from datetime import datetime
-from odoo.tests.common import TransactionCase, Form
+
 from odoo.exceptions import ValidationError
+from odoo.tests.common import Form, TransactionCase
 
 
 class TestFSMActivity(TransactionCase):
-
     def setUp(self):
         super().setUp()
-        self.Order = self.env['fsm.order']
-        self.test_location = self.env.ref('fieldservice.test_location')
-        self.Activity = self.env['fsm.activity']
-        self.template_obj = self.env['fsm.template']
+        self.Order = self.env["fsm.order"]
+        self.test_location = self.env.ref("fieldservice.test_location")
+        self.Activity = self.env["fsm.activity"]
+        self.template_obj = self.env["fsm.template"]
 
     def test_fsm_activity(self):
         """ Test creating new activites, and moving them along thier stages,
@@ -21,36 +21,31 @@ def test_fsm_activity(self):
             - Check completed_on is saved
         """
         # Create an Orders
-        view_id = ('fieldservice.fsm_order_form')
+        view_id = "fieldservice.fsm_order_form"
         with Form(self.Order, view=view_id) as f:
             f.location_id = self.test_location
         order = f.save()
         order_id = order.id
-        self.Activity.create(self.get_activity_vals('Activity 1',
-                                                    False,
-                                                    'Ref 1',
-                                                    order_id))
-        self.Activity.create(self.get_activity_vals('Activity 2',
-                                                    False,
-                                                    'Ref 2',
-                                                    order_id))
-        self.Activity.create(self.get_activity_vals('Activity 3',
-                                                    True,
-                                                    'Ref 3',
-                                                    order_id))
+        self.Activity.create(
+            self.get_activity_vals("Activity 1", False, "Ref 1", order_id)
+        )
+        self.Activity.create(
+            self.get_activity_vals("Activity 2", False, "Ref 2", order_id)
+        )
+        self.Activity.create(
+            self.get_activity_vals("Activity 3", True, "Ref 3", order_id)
+        )
         # Test action_done()
         order.order_activity_ids[0].action_done()
-        self.assertEqual(order.order_activity_ids[0].
-                         completed_on.replace(microsecond=0),
-                         datetime.now().replace(microsecond=0))
-        self.assertEqual(order.order_activity_ids[0].completed_by,
-                         self.env.user)
-        self.assertEqual(order.order_activity_ids[0].state,
-                         'done')
+        self.assertEqual(
+            order.order_activity_ids[0].completed_on.replace(microsecond=0),
+            datetime.now().replace(microsecond=0),
+        )
+        self.assertEqual(order.order_activity_ids[0].completed_by, self.env.user)
+        self.assertEqual(order.order_activity_ids[0].state, "done")
         # Test action_cancel()
         order.order_activity_ids[1].action_cancel()
-        self.assertEqual(order.order_activity_ids[1].state,
-                         'cancel')
+        self.assertEqual(order.order_activity_ids[1].state, "cancel")
 
         # Test Reqired Activity
         with self.assertRaises(ValidationError):
@@ -58,33 +53,43 @@ def test_fsm_activity(self):
 
         order.order_activity_ids[2].action_done()
         order.action_complete()
-        self.assertEqual(order.stage_id.id,
-                         self.env.ref('fieldservice.fsm_stage_completed').id)
+        self.assertEqual(
+            order.stage_id.id, self.env.ref("fieldservice.fsm_stage_completed").id
+        )
 
     def get_activity_vals(self, name, required, ref, order_id):
         return {
-            'name': name,
-            'required': required,
-            'ref': ref,
-            'fsm_order_id': order_id
+            "name": name,
+            "required": required,
+            "ref": ref,
+            "fsm_order_id": order_id,
         }
 
     def test_onchange_template_id(self):
         # Create a Template
         self.template = self.template_obj.create(
-            {'name': 'Demo template',
-             'temp_activity_ids': [(0, 0, {
-                 'name': "Activity new",
-                 'required': True,
-                 'ref': 'Ref new',
-                 'state': 'todo',
-             })]})
+            {
+                "name": "Demo template",
+                "temp_activity_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "name": "Activity new",
+                            "required": True,
+                            "ref": "Ref new",
+                            "state": "todo",
+                        },
+                    )
+                ],
+            }
+        )
         # Create an Order
-        self.fso = self.Order.create({
-            'location_id': self.test_location.id,
-            'template_id': self.template.id,
-        })
+        self.fso = self.Order.create(
+            {"location_id": self.test_location.id, "template_id": self.template.id}
+        )
         # Test _onchange_template_id()
         self.fso._onchange_template_id()
-        self.assertNotEquals(self.fso.order_activity_ids.ids,
-                             self.fso.template_id.temp_activity_ids.ids)
+        self.assertNotEquals(
+            self.fso.order_activity_ids.ids, self.fso.template_id.temp_activity_ids.ids
+        )
diff --git a/fieldservice_activity/views/fsm_order.xml b/fieldservice_activity/views/fsm_order.xml
index fa5142146e..83bc3529f4 100644
--- a/fieldservice_activity/views/fsm_order.xml
+++ b/fieldservice_activity/views/fsm_order.xml
@@ -1,30 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="view_fsm_order_form_add_activity" model="ir.ui.view">
         <field name="name">fsm.order.form.activity</field>
         <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="//notebook/page[1]" position="after">
                 <page string="Activities">
                     <field name="order_activity_ids" nolabel="1">
                         <tree editable="bottom">
-                            <field name="sequence" widget="handle"/>
-                            <field name="name"/>
-                            <field name="required"/>
-                            <field name="ref"/>
-                            <field name="completed" invisible="1"/>
-                            <field name="completed_on"/>
-                            <field name="completed_by"/>
-                            <button name="action_done" string="Complete" type="object" class="oe_highlight" attrs="{'invisible': [('state', 'not in', ['todo'])]}"/>
-                            <button name="action_cancel" string="Cancel" type="object" attrs="{'invisible': [('state', 'not in', ['todo'])]}"/>
-                            <field name="state" readonly="1"/>
+                            <field name="sequence" widget="handle" />
+                            <field name="name" />
+                            <field name="required" />
+                            <field name="ref" />
+                            <field name="completed" invisible="1" />
+                            <field name="completed_on" />
+                            <field name="completed_by" />
+                            <button
+                                name="action_done"
+                                string="Complete"
+                                type="object"
+                                class="oe_highlight"
+                                attrs="{'invisible': [('state', 'not in', ['todo'])]}"
+                            />
+                            <button
+                                name="action_cancel"
+                                string="Cancel"
+                                type="object"
+                                attrs="{'invisible': [('state', 'not in', ['todo'])]}"
+                            />
+                            <field name="state" readonly="1" />
                         </tree>
                     </field>
                 </page>
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_activity/views/fsm_template.xml b/fieldservice_activity/views/fsm_template.xml
index 8ecaeb5e6a..048a4c0215 100644
--- a/fieldservice_activity/views/fsm_template.xml
+++ b/fieldservice_activity/views/fsm_template.xml
@@ -1,30 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="view_fsm_template_form_add_activity" model="ir.ui.view">
         <field name="name">fsm.template.form.activity</field>
         <field name="model">fsm.template</field>
-        <field name="inherit_id" ref="fieldservice.fsm_template_form_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_template_form_view" />
         <field name="arch" type="xml">
             <xpath expr="//notebook/page[1]" position="after">
                 <page string="Activities">
                     <field name="temp_activity_ids" nolabel="1">
                         <tree editable="bottom">
-                            <field name="sequence" widget="handle"/>
-                            <field name="name"/>
-                            <field name="required"/>
-                            <field name="ref"/>
-                            <field name="completed" invisible="1"/>
-                            <field name="completed_on" invisible="1"/>
-                            <field name="completed_by" invisible="1"/>
-                            <button name="action_done" string="Complete" type="object" class="oe_highlight" invisible="1"/>
-                            <button name="action_cancel" string="Cancel" type="object" invisible="1"/>
-                            <field name="state" readonly="1"/>
+                            <field name="sequence" widget="handle" />
+                            <field name="name" />
+                            <field name="required" />
+                            <field name="ref" />
+                            <field name="completed" invisible="1" />
+                            <field name="completed_on" invisible="1" />
+                            <field name="completed_by" invisible="1" />
+                            <button
+                                name="action_done"
+                                string="Complete"
+                                type="object"
+                                class="oe_highlight"
+                                invisible="1"
+                            />
+                            <button
+                                name="action_cancel"
+                                string="Cancel"
+                                type="object"
+                                invisible="1"
+                            />
+                            <field name="state" readonly="1" />
                         </tree>
                     </field>
                 </page>
             </xpath>
         </field>
     </record>
-
 </odoo>

From b9d1ff00c88a26754c1df61693c52ab16d5a3200 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 21 Jul 2020 19:35:51 -0400
Subject: [PATCH 395/631] [MIG] fieldservice_activity: Migratation to 13.0

---
 fieldservice_activity/README.rst              |   12 +-
 fieldservice_activity/__manifest__.py         |    2 +-
 .../i18n/fieldservice_activity.pot            |   19 +-
 fieldservice_activity/models/fsm_activity.py  |    4 +-
 fieldservice_activity/models/fsm_order.py     |    2 -
 fieldservice_activity/readme/CONFIGURE.rst    |    2 +-
 .../static/description/index.html             | 1112 +++++++----------
 7 files changed, 439 insertions(+), 714 deletions(-)

diff --git a/fieldservice_activity/README.rst b/fieldservice_activity/README.rst
index d36250a192..0e50982485 100644
--- a/fieldservice_activity/README.rst
+++ b/fieldservice_activity/README.rst
@@ -14,13 +14,13 @@ Field Service Activity
     :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_activity
+    :target: https://github.com/OCA/field-service/tree/13.0/fieldservice_activity
     :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_activity
+    :target: https://translation.odoo-community.org/projects/field-service-13-0/field-service-13-0-fieldservice_activity
     :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/13.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -39,7 +39,7 @@ Configuration
 
 To use this module, you need to:
 
-* Go to Field Service > Settings > Manage Activites
+* Go to Field Service > Configuration > Manage Order Activities
 
 Usage
 =====
@@ -58,7 +58,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_activity%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_activity%0Aversion:%2013.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.
 
@@ -107,6 +107,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| |maintainer-osi-scampbell| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_activity>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/13.0/fieldservice_activity>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_activity/__manifest__.py b/fieldservice_activity/__manifest__.py
index 71ecfcbbcf..5deb64fb72 100644
--- a/fieldservice_activity/__manifest__.py
+++ b/fieldservice_activity/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Field Service Activity",
     "summary": """Field Service Activities are a set of actions
      that need to be performed on a service order""",
-    "version": "12.0.1.0.0",
+    "version": "13.0.1.0.0",
     "category": "Field Service",
     "license": "AGPL-3",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
diff --git a/fieldservice_activity/i18n/fieldservice_activity.pot b/fieldservice_activity/i18n/fieldservice_activity.pot
index 407800775f..64998311bf 100644
--- a/fieldservice_activity/i18n/fieldservice_activity.pot
+++ b/fieldservice_activity/i18n/fieldservice_activity.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_activity
+# 	* fieldservice_activity
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.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"
@@ -32,7 +32,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__cancel
 msgid "Cancelled"
 msgstr ""
 
@@ -43,8 +43,8 @@ msgid "Complete"
 msgstr ""
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__done
 msgid "Completed"
 msgstr ""
 
@@ -144,13 +144,14 @@ msgid "State"
 msgstr ""
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__todo
 msgid "To Do"
 msgstr ""
 
 #. module: fieldservice_activity
-#: code:addons/fieldservice_activity/models/fsm_order.py:37
+#: code:addons/fieldservice_activity/models/fsm_order.py:0
 #, python-format
-msgid "You must complete activity '%s' before                     completing this order."
+msgid ""
+"You must complete activity '%s' before                     completing this "
+"order."
 msgstr ""
-
diff --git a/fieldservice_activity/models/fsm_activity.py b/fieldservice_activity/models/fsm_activity.py
index a7fee4914d..52ebccd230 100644
--- a/fieldservice_activity/models/fsm_activity.py
+++ b/fieldservice_activity/models/fsm_activity.py
@@ -6,7 +6,7 @@
 from odoo import fields, models
 
 
-class FSMActiity(models.Model):
+class FSMActivity(models.Model):
     _name = "fsm.activity"
     _description = "Field Service Activity"
 
@@ -35,13 +35,11 @@ class FSMActiity(models.Model):
         default="todo",
     )
 
-    @api.multi
     def action_done(self):
         self.completed = True
         self.completed_on = datetime.now()
         self.completed_by = self.env.user
         self.state = "done"
 
-    @api.multi
     def action_cancel(self):
         self.state = "cancel"
diff --git a/fieldservice_activity/models/fsm_order.py b/fieldservice_activity/models/fsm_order.py
index e8d4389016..a642b58eac 100644
--- a/fieldservice_activity/models/fsm_order.py
+++ b/fieldservice_activity/models/fsm_order.py
@@ -10,7 +10,6 @@ class FSMOrder(models.Model):
 
     order_activity_ids = fields.One2many("fsm.activity", "fsm_order_id", "Activites")
 
-    @api.multi
     @api.onchange("template_id")
     def _onchange_template_id(self):
         res = super()._onchange_template_id()
@@ -34,7 +33,6 @@ def _onchange_template_id(self):
                 rec.template_id.temp_activity_ids.write({"fsm_template_id": False})
         return res
 
-    @api.multi
     def action_complete(self):
         res = super().action_complete()
         for activity_id in self.order_activity_ids:
diff --git a/fieldservice_activity/readme/CONFIGURE.rst b/fieldservice_activity/readme/CONFIGURE.rst
index c896865935..8c2f6d99fd 100644
--- a/fieldservice_activity/readme/CONFIGURE.rst
+++ b/fieldservice_activity/readme/CONFIGURE.rst
@@ -1,3 +1,3 @@
 To use this module, you need to:
 
-* Go to Field Service > Settings > Manage Activites
+* Go to Field Service > Configuration > Manage Order Activities
diff --git a/fieldservice_activity/static/description/index.html b/fieldservice_activity/static/description/index.html
index a004ed63e0..6b5d91e03f 100644
--- a/fieldservice_activity/static/description/index.html
+++ b/fieldservice_activity/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 Activity</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 Activity</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,590 +99,353 @@
   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-activity">
-      <h1 class="title">Field Service Activity</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-activity">
+<h1 class="title">Field Service Activity</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_activity"
-          ><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_activity"
-          ><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>
-        A Field Service Activity gives the user the ability to define a list of
-        tasks/activities on a service order
-      </p>
-      <p>
-        The user can add tasks/activities to the FSM order to the ones created from the
-        template.
-      </p>
-      <p><strong>Table of contents</strong></p>
-      <div class="contents local topic" id="contents">
-        <ul class="simple">
-          <li>
-            <a class="reference internal" href="#configuration" id="id1"
-              >Configuration</a
-            >
-          </li>
-          <li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
-          <li>
-            <a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a>
-          </li>
-          <li>
-            <a class="reference internal" href="#credits" id="id4">Credits</a>
-            <ul>
-              <li>
-                <a class="reference internal" href="#authors" id="id5">Authors</a>
-              </li>
-              <li>
-                <a class="reference internal" href="#contributors" id="id6"
-                  >Contributors</a
-                >
-              </li>
-              <li>
-                <a class="reference internal" href="#other-credits" id="id7"
-                  >Other credits</a
-                >
-              </li>
-              <li>
-                <a class="reference internal" href="#maintainers" id="id8"
-                  >Maintainers</a
-                >
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-      <div class="section" id="configuration">
-        <h1><a class="toc-backref" href="#id1">Configuration</a></h1>
-        <p>To use this module, you need to:</p>
-        <ul class="simple">
-          <li>Go to Field Service &gt; Settings &gt; Manage Activites</li>
-        </ul>
-      </div>
-      <div class="section" id="usage">
-        <h1><a class="toc-backref" href="#id2">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 FSM Order</li>
-          <li>Add as many Activites as needed</li>
-          <li>Alternatively, add Activites to a Template</li>
-          <li>Add Template to FSM Order, Activites will be copied over</li>
-        </ul>
-      </div>
-      <div class="section" id="bug-tracker">
-        <h1><a class="toc-backref" href="#id3">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_activity%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="#id4">Credits</a></h1>
-        <div class="section" id="authors">
-          <h2><a class="toc-backref" href="#id5">Authors</a></h2>
-          <ul class="simple">
-            <li>Open Source Integrators</li>
-          </ul>
-        </div>
-        <div class="section" id="contributors">
-          <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
-          <ul class="simple">
-            <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:scampbells&#64;opensourceintegrators.com"
-                >scampbells&#64;opensourceintegrators.com</a
-              >&gt;
-            </li>
-          </ul>
-        </div>
-        <div class="section" id="other-credits">
-          <h2><a class="toc-backref" href="#id7">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="#id8">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/max3903"
-              ><img alt="max3903" src="https://github.com/max3903.png?size=40px"
-            /></a>
-            <a class="reference external" href="https://github.com/osi-scampbell"
-              ><img
-                alt="osi-scampbell"
-                src="https://github.com/osi-scampbell.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_activity"
-              >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/13.0/fieldservice_activity"><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-13-0/field-service-13-0-fieldservice_activity"><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/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>A Field Service Activity gives the user the ability to define a list of tasks/activities on a service order</p>
+<p>The user can add tasks/activities to the FSM order to the ones created from the template.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id7">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<p>To use this module, you need to:</p>
+<ul class="simple">
+<li>Go to Field Service &gt; Configuration &gt; Manage Order Activities</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">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 FSM Order</li>
+<li>Add as many Activites as needed</li>
+<li>Alternatively, add Activites to a Template</li>
+<li>Add Template to FSM Order, Activites will be copied over</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id3">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_activity%0Aversion:%2013.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="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<ul class="simple">
+<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:scampbells&#64;opensourceintegrators.com">scampbells&#64;opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id7">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="#id8">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/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/13.0/fieldservice_activity">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 0b79cc54567cb6892781e1ba51514d62b29c4743 Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Sat, 24 Oct 2020 21:29:41 +0000
Subject: [PATCH 396/631] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (27 of 27 strings)

Translation: field-service-13.0/field-service-13.0-fieldservice_activity
Translate-URL: https://translation.odoo-community.org/projects/field-service-13-0/field-service-13-0-fieldservice_activity/es_AR/
---
 fieldservice_activity/i18n/es_AR.po | 26 ++++++++++++++------------
 fieldservice_activity/i18n/es_CL.po |  8 ++++----
 fieldservice_activity/i18n/pt_BR.po |  8 ++++----
 fieldservice_activity/i18n/pt_PT.po | 14 ++++++++------
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/fieldservice_activity/i18n/es_AR.po b/fieldservice_activity/i18n/es_AR.po
index ee6b6d6a61..7aa6236d4a 100644
--- a/fieldservice_activity/i18n/es_AR.po
+++ b/fieldservice_activity/i18n/es_AR.po
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_activity
+# 	* fieldservice_activity
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-07-20 22:19+0000\n"
+"PO-Revision-Date: 2020-10-25 00:08+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_AR\n"
@@ -26,7 +26,7 @@ msgstr "Actividades"
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_template_form_add_activity
 msgid "Activities"
-msgstr "Ocupaciones"
+msgstr "Actividades"
 
 #. module: fieldservice_activity
 #: model_terms:ir.ui.view,arch_db:fieldservice_activity.view_fsm_order_form_add_activity
@@ -35,7 +35,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__cancel
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -46,8 +46,8 @@ msgid "Complete"
 msgstr "Completar"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__done
 msgid "Completed"
 msgstr "Completado"
 
@@ -109,17 +109,17 @@ msgstr "ID"
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update
 msgid "Last Modified on"
-msgstr "??ltima Modificaci??n el"
+msgstr "Última Modificación el"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_uid
 msgid "Last Updated by"
-msgstr "??ltima Actualizaci??n por"
+msgstr "Última Actualización por"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__write_date
 msgid "Last Updated on"
-msgstr "??ltima Actualizaci??n el"
+msgstr "Última Actualización en"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__name
@@ -139,7 +139,7 @@ msgstr "Requerido"
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__sequence
 msgid "Sequence"
-msgstr "Sequencia"
+msgstr "Secuencia"
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__state
@@ -147,14 +147,16 @@ msgid "State"
 msgstr "Estado"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__todo
 msgid "To Do"
 msgstr "Por Hacer"
 
 #. module: fieldservice_activity
-#: code:addons/fieldservice_activity/models/fsm_order.py:37
+#: code:addons/fieldservice_activity/models/fsm_order.py:0
 #, python-format
-msgid "You must complete activity '%s' before                     completing this order."
+msgid ""
+"You must complete activity '%s' before                     completing this "
+"order."
 msgstr ""
 "Debe completar la actividad '%s' antes                          de completar "
 "este pedido."
diff --git a/fieldservice_activity/i18n/es_CL.po b/fieldservice_activity/i18n/es_CL.po
index 64b04d7f60..d11f16e4a9 100644
--- a/fieldservice_activity/i18n/es_CL.po
+++ b/fieldservice_activity/i18n/es_CL.po
@@ -35,7 +35,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__cancel
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -46,8 +46,8 @@ msgid "Complete"
 msgstr "Completada"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__done
 msgid "Completed"
 msgstr "Completado"
 
@@ -147,12 +147,12 @@ msgid "State"
 msgstr "Estado"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__todo
 msgid "To Do"
 msgstr "Por Hacer"
 
 #. module: fieldservice_activity
-#: code:addons/fieldservice_activity/models/fsm_order.py:37
+#: code:addons/fieldservice_activity/models/fsm_order.py:0
 #, python-format
 msgid ""
 "You must complete activity '%s' before                     completing this "
diff --git a/fieldservice_activity/i18n/pt_BR.po b/fieldservice_activity/i18n/pt_BR.po
index 37b57e6f11..852bdabfab 100644
--- a/fieldservice_activity/i18n/pt_BR.po
+++ b/fieldservice_activity/i18n/pt_BR.po
@@ -35,7 +35,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__cancel
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -46,8 +46,8 @@ msgid "Complete"
 msgstr "Completo"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__done
 msgid "Completed"
 msgstr "Completado"
 
@@ -147,12 +147,12 @@ msgid "State"
 msgstr "Estado"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__todo
 msgid "To Do"
 msgstr "A Fazer"
 
 #. module: fieldservice_activity
-#: code:addons/fieldservice_activity/models/fsm_order.py:37
+#: code:addons/fieldservice_activity/models/fsm_order.py:0
 #, python-format
 msgid ""
 "You must complete activity '%s' before                     completing this "
diff --git a/fieldservice_activity/i18n/pt_PT.po b/fieldservice_activity/i18n/pt_PT.po
index 5360d25c74..cdc12a4a24 100644
--- a/fieldservice_activity/i18n/pt_PT.po
+++ b/fieldservice_activity/i18n/pt_PT.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_activity
+# 	* fieldservice_activity
 #
 msgid ""
 msgstr ""
@@ -35,7 +35,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__cancel
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -46,8 +46,8 @@ msgid "Complete"
 msgstr "Completo"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__completed
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__done
 msgid "Completed"
 msgstr "Completado"
 
@@ -147,12 +147,14 @@ msgid "State"
 msgstr "Estado"
 
 #. module: fieldservice_activity
-#: selection:fsm.activity,state:0
+#: model:ir.model.fields.selection,name:fieldservice_activity.selection__fsm_activity__state__todo
 msgid "To Do"
 msgstr "A Fazer"
 
 #. module: fieldservice_activity
-#: code:addons/fieldservice_activity/models/fsm_order.py:37
+#: code:addons/fieldservice_activity/models/fsm_order.py:0
 #, python-format
-msgid "You must complete activity '%s' before                     completing this order."
+msgid ""
+"You must complete activity '%s' before                     completing this "
+"order."
 msgstr "Voc?? deve concluir a atividade '%s' antes de concluir este pedido."

From 14015afd2ec794313703ea941c5548b4105f309d Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@opensourceintegrators.com>
Date: Fri, 11 Dec 2020 13:33:35 -0700
Subject: [PATCH 397/631] [13.0][IMP] testcase

---
 fieldservice_activity/tests/test_fsm_activity.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fieldservice_activity/tests/test_fsm_activity.py b/fieldservice_activity/tests/test_fsm_activity.py
index 9993182e85..41f4682b0f 100644
--- a/fieldservice_activity/tests/test_fsm_activity.py
+++ b/fieldservice_activity/tests/test_fsm_activity.py
@@ -47,7 +47,12 @@ def test_fsm_activity(self):
         order.order_activity_ids[1].action_cancel()
         self.assertEqual(order.order_activity_ids[1].state, "cancel")
 
-        # Test Reqired Activity
+        # As per FSM order needs, end date may not be set
+        # stop tracking validation error
+        if not order.date_end:
+            order.date_end = datetime.now()
+
+        # Test required Activity
         with self.assertRaises(ValidationError):
             order.action_complete()
 

From f340eb27f3e5d8cc67f5c45225fa8611d4481ab6 Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@opensourceintegrators.com>
Date: Mon, 14 Dec 2020 10:29:58 -0700
Subject: [PATCH 398/631] [FIX] FSM Template Activities wipe out after assigned
 in FSM order

---
 fieldservice_activity/models/fsm_order.py     | 3 ++-
 fieldservice_activity/readme/CONTRIBUTORS.rst | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fieldservice_activity/models/fsm_order.py b/fieldservice_activity/models/fsm_order.py
index a642b58eac..9ed2887da1 100644
--- a/fieldservice_activity/models/fsm_order.py
+++ b/fieldservice_activity/models/fsm_order.py
@@ -14,6 +14,8 @@ class FSMOrder(models.Model):
     def _onchange_template_id(self):
         res = super()._onchange_template_id()
         for rec in self:
+            # Clear existing activities
+            rec.order_activity_ids = [(5, 0, 0)]
             if rec.template_id:
                 activity_list = []
                 for temp_activity in rec.template_id.temp_activity_ids:
@@ -30,7 +32,6 @@ def _onchange_template_id(self):
                         )
                     )
                 rec.order_activity_ids = activity_list
-                rec.template_id.temp_activity_ids.write({"fsm_template_id": False})
         return res
 
     def action_complete(self):
diff --git a/fieldservice_activity/readme/CONTRIBUTORS.rst b/fieldservice_activity/readme/CONTRIBUTORS.rst
index 7fd2e60761..c42c514e71 100644
--- a/fieldservice_activity/readme/CONTRIBUTORS.rst
+++ b/fieldservice_activity/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbells@opensourceintegrators.com>
+* Bhavesh Odedra <bodedra@opensourceintegrators.com>

From 88bd029f9b42c776d5a97f5902d410a3b6dee2ba Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@opensourceintegrators.com>
Date: Mon, 14 Dec 2020 11:01:10 -0700
Subject: [PATCH 399/631] [13.0][FIX] Update activities for FSM orders that are
 generate from SO

---
 fieldservice_activity/README.rst                    | 1 +
 fieldservice_activity/models/fsm_order.py           | 6 ++++++
 fieldservice_activity/static/description/index.html | 1 +
 3 files changed, 8 insertions(+)

diff --git a/fieldservice_activity/README.rst b/fieldservice_activity/README.rst
index 0e50982485..14cf27a1d9 100644
--- a/fieldservice_activity/README.rst
+++ b/fieldservice_activity/README.rst
@@ -75,6 +75,7 @@ Contributors
 
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbells@opensourceintegrators.com>
+* Bhavesh Odedra <bodedra@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
diff --git a/fieldservice_activity/models/fsm_order.py b/fieldservice_activity/models/fsm_order.py
index 9ed2887da1..5716cea8e4 100644
--- a/fieldservice_activity/models/fsm_order.py
+++ b/fieldservice_activity/models/fsm_order.py
@@ -34,6 +34,12 @@ def _onchange_template_id(self):
                 rec.order_activity_ids = activity_list
         return res
 
+    def create(self, vals):
+        """Update Activities for FSM orders that are generate from SO"""
+        order = super(FSMOrder, self).create(vals)
+        order._onchange_template_id()
+        return order
+
     def action_complete(self):
         res = super().action_complete()
         for activity_id in self.order_activity_ids:
diff --git a/fieldservice_activity/static/description/index.html b/fieldservice_activity/static/description/index.html
index 6b5d91e03f..4021e90be8 100644
--- a/fieldservice_activity/static/description/index.html
+++ b/fieldservice_activity/static/description/index.html
@@ -424,6 +424,7 @@ <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
 <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:scampbells&#64;opensourceintegrators.com">scampbells&#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>
 </ul>
 </div>
 <div class="section" id="other-credits">

From a38e8a386dfab05446dbff1178d68cdf50163a31 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 14 Dec 2020 22:07:52 +0000
Subject: [PATCH 400/631] fieldservice_activity 13.0.1.0.1

---
 fieldservice_activity/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_activity/__manifest__.py b/fieldservice_activity/__manifest__.py
index 5deb64fb72..4d9bff9178 100644
--- a/fieldservice_activity/__manifest__.py
+++ b/fieldservice_activity/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Field Service Activity",
     "summary": """Field Service Activities are a set of actions
      that need to be performed on a service order""",
-    "version": "13.0.1.0.0",
+    "version": "13.0.1.0.1",
     "category": "Field Service",
     "license": "AGPL-3",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",

From 80dc27cc90f6891f399fdc9846a38cccf168d1b0 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Mon, 19 Apr 2021 13:26:46 +0530
Subject: [PATCH 401/631] [14.0][MIG] fieldservice_activity

---
 fieldservice_activity/README.rst                          | 1 +
 fieldservice_activity/__manifest__.py                     | 2 +-
 fieldservice_activity/models/fsm_order.py                 | 1 +
 fieldservice_activity/tests/test_fsm_activity.py          | 8 ++++----
 .../odoo/addons/fieldservice_activity                     | 1 +
 setup/fieldservice_activity/setup.py                      | 6 ++++++
 6 files changed, 14 insertions(+), 5 deletions(-)
 create mode 120000 setup/fieldservice_activity/odoo/addons/fieldservice_activity
 create mode 100644 setup/fieldservice_activity/setup.py

diff --git a/fieldservice_activity/README.rst b/fieldservice_activity/README.rst
index 14cf27a1d9..abdd1f5635 100644
--- a/fieldservice_activity/README.rst
+++ b/fieldservice_activity/README.rst
@@ -76,6 +76,7 @@ Contributors
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbells@opensourceintegrators.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
+* Chanakya Soni <csoni@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
diff --git a/fieldservice_activity/__manifest__.py b/fieldservice_activity/__manifest__.py
index 4d9bff9178..3538a449b8 100644
--- a/fieldservice_activity/__manifest__.py
+++ b/fieldservice_activity/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Field Service Activity",
     "summary": """Field Service Activities are a set of actions
      that need to be performed on a service order""",
-    "version": "13.0.1.0.1",
+    "version": "14.0.1.0.0",
     "category": "Field Service",
     "license": "AGPL-3",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
diff --git a/fieldservice_activity/models/fsm_order.py b/fieldservice_activity/models/fsm_order.py
index 5716cea8e4..e98459ca1c 100644
--- a/fieldservice_activity/models/fsm_order.py
+++ b/fieldservice_activity/models/fsm_order.py
@@ -34,6 +34,7 @@ def _onchange_template_id(self):
                 rec.order_activity_ids = activity_list
         return res
 
+    @api.model
     def create(self, vals):
         """Update Activities for FSM orders that are generate from SO"""
         order = super(FSMOrder, self).create(vals)
diff --git a/fieldservice_activity/tests/test_fsm_activity.py b/fieldservice_activity/tests/test_fsm_activity.py
index 41f4682b0f..a5a89774c0 100644
--- a/fieldservice_activity/tests/test_fsm_activity.py
+++ b/fieldservice_activity/tests/test_fsm_activity.py
@@ -15,10 +15,10 @@ def setUp(self):
         self.template_obj = self.env["fsm.template"]
 
     def test_fsm_activity(self):
-        """ Test creating new activites, and moving them along thier stages,
-            - Don't move FSM Order to complete if Required Activity in 'To Do'
-            - Check completed_by is saved
-            - Check completed_on is saved
+        """Test creating new activites, and moving them along thier stages,
+        - Don't move FSM Order to complete if Required Activity in 'To Do'
+        - Check completed_by is saved
+        - Check completed_on is saved
         """
         # Create an Orders
         view_id = "fieldservice.fsm_order_form"
diff --git a/setup/fieldservice_activity/odoo/addons/fieldservice_activity b/setup/fieldservice_activity/odoo/addons/fieldservice_activity
new file mode 120000
index 0000000000..f8f646a1ac
--- /dev/null
+++ b/setup/fieldservice_activity/odoo/addons/fieldservice_activity
@@ -0,0 +1 @@
+../../../../fieldservice_activity
\ No newline at end of file
diff --git a/setup/fieldservice_activity/setup.py b/setup/fieldservice_activity/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_activity/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From f7cdb598aa655bf014fe68d6cf36c442e6ccbe97 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Mon, 29 Apr 2019 10:50:24 -0700
Subject: [PATCH 402/631] [ADD] fieldservice_purchase

[UPD] README.rst
---
 fieldservice_purchase/README.rst              | 106 +++++
 fieldservice_purchase/__init__.py             |   4 +
 fieldservice_purchase/__manifest__.py         |  24 +
 fieldservice_purchase/models/__init__.py      |   6 +
 fieldservice_purchase/models/fsm_person.py    |  35 ++
 fieldservice_purchase/readme/CONTRIBUTORS.rst |   2 +
 fieldservice_purchase/readme/CREDITS.rst      |   3 +
 fieldservice_purchase/readme/DESCRIPTION.rst  |   1 +
 fieldservice_purchase/readme/ROADMAP.rst      |   2 +
 fieldservice_purchase/readme/USAGE.rst        |   7 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 448 ++++++++++++++++++
 fieldservice_purchase/views/fsm_person.xml    |  28 ++
 13 files changed, 666 insertions(+)
 create mode 100644 fieldservice_purchase/README.rst
 create mode 100644 fieldservice_purchase/__init__.py
 create mode 100644 fieldservice_purchase/__manifest__.py
 create mode 100644 fieldservice_purchase/models/__init__.py
 create mode 100644 fieldservice_purchase/models/fsm_person.py
 create mode 100644 fieldservice_purchase/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_purchase/readme/CREDITS.rst
 create mode 100644 fieldservice_purchase/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_purchase/readme/ROADMAP.rst
 create mode 100644 fieldservice_purchase/readme/USAGE.rst
 create mode 100644 fieldservice_purchase/static/description/icon.png
 create mode 100644 fieldservice_purchase/static/description/index.html
 create mode 100644 fieldservice_purchase/views/fsm_person.xml

diff --git a/fieldservice_purchase/README.rst b/fieldservice_purchase/README.rst
new file mode 100644
index 0000000000..c19c92d196
--- /dev/null
+++ b/fieldservice_purchase/README.rst
@@ -0,0 +1,106 @@
+========================
+Field Service - Purchase
+========================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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/12.0/fieldservice_purchase
+    :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_purchase
+    :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
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module allows you to link the Field Service App to the Purchases App.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go to Purchases > Purchase > Vendor Pricelist
+* Select or create a Vendor Pricelist and set the Vendor to an FSM Worker
+* Go to Field Service > Master Data > Workers
+* Open the Worker that was selected on your Vendor Pricelist
+* Click on the smart button "Pricelists" to see the list of related Vendor Pricelists
+
+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_purchase%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+
+Contributors
+~~~~~~~~~~~~
+
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Steve Campbell <scampbell@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-osi-scampbell| image:: https://github.com/osi-scampbell.png?size=40px
+    :target: https://github.com/osi-scampbell
+    :alt: osi-scampbell
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-osi-scampbell| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_purchase>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_purchase/__init__.py b/fieldservice_purchase/__init__.py
new file mode 100644
index 0000000000..b634044c7c
--- /dev/null
+++ b/fieldservice_purchase/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_purchase/__manifest__.py b/fieldservice_purchase/__manifest__.py
new file mode 100644
index 0000000000..959667bb9b
--- /dev/null
+++ b/fieldservice_purchase/__manifest__.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - Purchase',
+    'summary': 'Manage FSM Purchases',
+    'author': 'Open Source Integrators, '
+              'Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'category': 'Field Service',
+    'license': 'AGPL-3',
+    'version': '12.0.1.0.0',
+    'depends': [
+        'fieldservice',
+        'purchase',
+    ],
+    'data': [
+        'views/fsm_person.xml',
+    ],
+    'development_status': 'Beta',
+    'maintainers': [
+        'osi-scampbell',
+    ],
+}
diff --git a/fieldservice_purchase/models/__init__.py b/fieldservice_purchase/models/__init__.py
new file mode 100644
index 0000000000..873177b3c0
--- /dev/null
+++ b/fieldservice_purchase/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import (
+    fsm_person
+)
diff --git a/fieldservice_purchase/models/fsm_person.py b/fieldservice_purchase/models/fsm_person.py
new file mode 100644
index 0000000000..d023142fad
--- /dev/null
+++ b/fieldservice_purchase/models/fsm_person.py
@@ -0,0 +1,35 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMPerson(models.Model):
+    _inherit = 'fsm.person'
+
+    pricelist_count = fields.Integer(
+        compute='_compute_pricelist_count',
+        string='# Pricelists'
+    )
+
+    @api.multi
+    def _compute_pricelist_count(self):
+        for worker in self:
+            worker.pricelist_count = self.env['product.supplierinfo'].\
+                search_count([('id', '=', worker.id)])
+
+    @api.multi
+    def action_view_pricelists(self):
+        for worker in self:
+            pricelist = self.env['product.supplierinfo'].search(
+                [('id', '=', worker.id)])
+            action = self.env.ref(
+                'product.product_supplierinfo_type_action').read()[0]
+            if len(pricelist) == 1:
+                action['views'] = [(
+                    self.env.ref('product.product_supplierinfo_form_view').id,
+                    'form')]
+                action['res_id'] = pricelist.ids[0]
+            else:
+                action['domain'] = [('id', 'in', pricelist.ids)]
+            return action
diff --git a/fieldservice_purchase/readme/CONTRIBUTORS.rst b/fieldservice_purchase/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..82f22db283
--- /dev/null
+++ b/fieldservice_purchase/readme/CONTRIBUTORS.rst
@@ -0,0 +1,2 @@
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Steve Campbell <scampbell@opensourceintegrators.com>
diff --git a/fieldservice_purchase/readme/CREDITS.rst b/fieldservice_purchase/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_purchase/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_purchase/readme/DESCRIPTION.rst b/fieldservice_purchase/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..4a2f1da511
--- /dev/null
+++ b/fieldservice_purchase/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module allows you to link the Field Service App to the Purchases App.
diff --git a/fieldservice_purchase/readme/ROADMAP.rst b/fieldservice_purchase/readme/ROADMAP.rst
new file mode 100644
index 0000000000..f607015959
--- /dev/null
+++ b/fieldservice_purchase/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_purchase/readme/USAGE.rst b/fieldservice_purchase/readme/USAGE.rst
new file mode 100644
index 0000000000..7a0e8fcb94
--- /dev/null
+++ b/fieldservice_purchase/readme/USAGE.rst
@@ -0,0 +1,7 @@
+To use this module, you need to:
+
+* Go to Purchases > Purchase > Vendor Pricelist
+* Select or create a Vendor Pricelist and set the Vendor to an FSM Worker
+* Go to Field Service > Master Data > Workers
+* Open the Worker that was selected on your Vendor Pricelist
+* Click on the smart button "Pricelists" to see the list of related Vendor Pricelists
diff --git a/fieldservice_purchase/static/description/icon.png b/fieldservice_purchase/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_purchase/static/description/index.html b/fieldservice_purchase/static/description/index.html
new file mode 100644
index 0000000000..2ca2ca129b
--- /dev/null
+++ b/fieldservice_purchase/static/description/index.html
@@ -0,0 +1,448 @@
+<?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 - Purchase</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-purchase">
+<h1 class="title">Field Service - Purchase</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_purchase"><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_purchase"><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>This module allows you to link the Field Service App to the Purchases App.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id2">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id7">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id1">Usage</a></h1>
+<p>To use this module, you need to:</p>
+<ul class="simple">
+<li>Go to Purchases &gt; Purchase &gt; Vendor Pricelist</li>
+<li>Select or create a Vendor Pricelist and set the Vendor to an FSM Worker</li>
+<li>Go to Field Service &gt; Master Data &gt; Workers</li>
+<li>Open the Worker that was selected on your Vendor Pricelist</li>
+<li>Click on the smart button “Pricelists” to see the list of related Vendor Pricelists</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id2">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="#id3">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_purchase%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="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<ul class="simple">
+<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>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id7">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="#id8">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">maintainer</a>:</p>
+<p><a class="reference external" href="https://github.com/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.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_purchase">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_purchase/views/fsm_person.xml b/fieldservice_purchase/views/fsm_person.xml
new file mode 100644
index 0000000000..96e294982e
--- /dev/null
+++ b/fieldservice_purchase/views/fsm_person.xml
@@ -0,0 +1,28 @@
+<!-- Copyright 2019 Open Source Integrators https://www.opensourceintegrators.com
+    License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+
+    <!-- Worker Form View -->
+    <record id="fsm_person_form_view_pricelists" model="ir.ui.view">
+        <field name="name">fsm.person.form.view.pricelists</field>
+        <field name="model">fsm.person</field>
+        <field name="inherit_id" ref="fieldservice.fsm_person_form"/>
+        <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <button name="action_view_pricelists"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-tags">
+                    <field name="pricelist_count"
+                           widget="statinfo"
+                           string="Pricelists"/>
+                </button>
+            </div>
+            <field name="calendar_id" position="after">
+                <field name="supplier"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>

From 7ae30b6af1b53d25c8e402835049ba29e4d93775 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 17 Jul 2019 16:53:55 -0700
Subject: [PATCH 403/631] [IMP] Bug #266 False ETA Error

[IMP] Bug #265 Linked Location Search Error

[IMP] Bug #272 Rate Not Declared

[IMP] Bug #263 equipment_count Wrong

[IMP] Bug #277 Worker Pricelists Computed Wrong

[IMP] Flake8 + Remove Debug
---
 fieldservice_purchase/models/fsm_person.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_purchase/models/fsm_person.py b/fieldservice_purchase/models/fsm_person.py
index d023142fad..0416bae480 100644
--- a/fieldservice_purchase/models/fsm_person.py
+++ b/fieldservice_purchase/models/fsm_person.py
@@ -16,13 +16,13 @@ class FSMPerson(models.Model):
     def _compute_pricelist_count(self):
         for worker in self:
             worker.pricelist_count = self.env['product.supplierinfo'].\
-                search_count([('id', '=', worker.id)])
+                search_count([('name', '=', worker.name)])
 
     @api.multi
     def action_view_pricelists(self):
         for worker in self:
             pricelist = self.env['product.supplierinfo'].search(
-                [('id', '=', worker.id)])
+                [('name', '=', worker.name)])
             action = self.env.ref(
                 'product.product_supplierinfo_type_action').read()[0]
             if len(pricelist) == 1:

From d3f18925bae9ed73dea01b947fe4fb4671e34e62 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 18 Jul 2019 12:16:54 -0500
Subject: [PATCH 404/631] Update fsm_person.py

[UPD] README.rst

[UPD] Update fieldservice_purchase.pot

Added translation using Weblate (German)

Translated using Weblate (German)

Currently translated at 100.0% (3 of 3 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_purchase
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_purchase/de/

Added translation using Weblate (Portuguese (Brazil))

Added translation using Weblate (Spanish (Chile))

Translated using Weblate (Spanish (Chile))

Currently translated at 100.0% (3 of 3 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_purchase
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_purchase/es_CL/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (3 of 3 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_purchase
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_purchase/pt_BR/
---
 fieldservice_purchase/i18n/de.po              | 32 +++++++++++++++++++
 fieldservice_purchase/i18n/es_CL.po           | 32 +++++++++++++++++++
 .../i18n/fieldservice_purchase.pot            | 30 +++++++++++++++++
 fieldservice_purchase/i18n/pt_BR.po           | 32 +++++++++++++++++++
 fieldservice_purchase/models/fsm_person.py    |  4 +--
 .../static/description/index.html             |  2 +-
 6 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 fieldservice_purchase/i18n/de.po
 create mode 100644 fieldservice_purchase/i18n/es_CL.po
 create mode 100644 fieldservice_purchase/i18n/fieldservice_purchase.pot
 create mode 100644 fieldservice_purchase/i18n/pt_BR.po

diff --git a/fieldservice_purchase/i18n/de.po b/fieldservice_purchase/i18n/de.po
new file mode 100644
index 0000000000..bd6e1f8409
--- /dev/null
+++ b/fieldservice_purchase/i18n/de.po
@@ -0,0 +1,32 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_purchase
+#
+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"
+"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_purchase
+#: model:ir.model.fields,field_description:fieldservice_purchase.field_fsm_person__pricelist_count
+msgid "# Pricelists"
+msgstr "# Preislisten"
+
+#. module: fieldservice_purchase
+#: model:ir.model,name:fieldservice_purchase.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Service-Mitarbeiter"
+
+#. module: fieldservice_purchase
+#: model_terms:ir.ui.view,arch_db:fieldservice_purchase.fsm_person_form_view_pricelists
+msgid "Pricelists"
+msgstr "Preislisten"
diff --git a/fieldservice_purchase/i18n/es_CL.po b/fieldservice_purchase/i18n/es_CL.po
new file mode 100644
index 0000000000..23aae602b3
--- /dev/null
+++ b/fieldservice_purchase/i18n/es_CL.po
@@ -0,0 +1,32 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-01-16 22:38+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.10\n"
+
+#. module: fieldservice_purchase
+#: model:ir.model.fields,field_description:fieldservice_purchase.field_fsm_person__pricelist_count
+msgid "# Pricelists"
+msgstr "# Lista de Precios"
+
+#. module: fieldservice_purchase
+#: model:ir.model,name:fieldservice_purchase.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabajador de Servicio de Campo"
+
+#. module: fieldservice_purchase
+#: model_terms:ir.ui.view,arch_db:fieldservice_purchase.fsm_person_form_view_pricelists
+msgid "Pricelists"
+msgstr "Lista de Precios"
diff --git a/fieldservice_purchase/i18n/fieldservice_purchase.pot b/fieldservice_purchase/i18n/fieldservice_purchase.pot
new file mode 100644
index 0000000000..523774d1e1
--- /dev/null
+++ b/fieldservice_purchase/i18n/fieldservice_purchase.pot
@@ -0,0 +1,30 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_purchase
+#
+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_purchase
+#: model:ir.model.fields,field_description:fieldservice_purchase.field_fsm_person__pricelist_count
+msgid "# Pricelists"
+msgstr ""
+
+#. module: fieldservice_purchase
+#: model:ir.model,name:fieldservice_purchase.model_fsm_person
+msgid "Field Service Worker"
+msgstr ""
+
+#. module: fieldservice_purchase
+#: model_terms:ir.ui.view,arch_db:fieldservice_purchase.fsm_person_form_view_pricelists
+msgid "Pricelists"
+msgstr ""
+
diff --git a/fieldservice_purchase/i18n/pt_BR.po b/fieldservice_purchase/i18n/pt_BR.po
new file mode 100644
index 0000000000..4a2b75f733
--- /dev/null
+++ b/fieldservice_purchase/i18n/pt_BR.po
@@ -0,0 +1,32 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-02-05 11: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_purchase
+#: model:ir.model.fields,field_description:fieldservice_purchase.field_fsm_person__pricelist_count
+msgid "# Pricelists"
+msgstr "# Listas de Preço"
+
+#. module: fieldservice_purchase
+#: model:ir.model,name:fieldservice_purchase.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabalhador de Serviço de Campo"
+
+#. module: fieldservice_purchase
+#: model_terms:ir.ui.view,arch_db:fieldservice_purchase.fsm_person_form_view_pricelists
+msgid "Pricelists"
+msgstr "Listas de Preço"
diff --git a/fieldservice_purchase/models/fsm_person.py b/fieldservice_purchase/models/fsm_person.py
index 0416bae480..d8fab2471d 100644
--- a/fieldservice_purchase/models/fsm_person.py
+++ b/fieldservice_purchase/models/fsm_person.py
@@ -16,13 +16,13 @@ class FSMPerson(models.Model):
     def _compute_pricelist_count(self):
         for worker in self:
             worker.pricelist_count = self.env['product.supplierinfo'].\
-                search_count([('name', '=', worker.name)])
+                search_count([('name', '=', worker.partner_id.id)])
 
     @api.multi
     def action_view_pricelists(self):
         for worker in self:
             pricelist = self.env['product.supplierinfo'].search(
-                [('name', '=', worker.name)])
+                [('name', '=', worker.partner_id.id)])
             action = self.env.ref(
                 'product.product_supplierinfo_type_action').read()[0]
             if len(pricelist) == 1:
diff --git a/fieldservice_purchase/static/description/index.html b/fieldservice_purchase/static/description/index.html
index 2ca2ca129b..5f8f6fb3f9 100644
--- a/fieldservice_purchase/static/description/index.html
+++ b/fieldservice_purchase/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 - Purchase</title>
 <style type="text/css">
 

From c8a8e42b0fdca82da934975d42a502ff00f1be0f Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 3 Apr 2020 17:39:00 -0600
Subject: [PATCH 405/631] [FIX] fieldservice_purchase: Access rights

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

diff --git a/fieldservice_purchase/__manifest__.py b/fieldservice_purchase/__manifest__.py
index 959667bb9b..31df65c156 100644
--- a/fieldservice_purchase/__manifest__.py
+++ b/fieldservice_purchase/__manifest__.py
@@ -15,6 +15,7 @@
         'purchase',
     ],
     'data': [
+        'security/ir.model.access.csv',
         'views/fsm_person.xml',
     ],
     'development_status': 'Beta',
diff --git a/fieldservice_purchase/security/ir.model.access.csv b/fieldservice_purchase/security/ir.model.access.csv
new file mode 100644
index 0000000000..9fa17efe31
--- /dev/null
+++ b/fieldservice_purchase/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_purchase_order_fsm_user,purchase.order.fsm.user,model_purchase_order,fieldservice.group_fsm_user,1,0,0,0

From 290103e4917bb010a0ff24dae490f16a5453d62e Mon Sep 17 00:00:00 2001
From: Daniel Reis <dreis@opensourceintegrators.com>
Date: Sat, 4 Apr 2020 10:24:48 +0100
Subject: [PATCH 406/631] [FIX] fieldservice_purchase: Access rights

---
 fieldservice_purchase/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_purchase/security/ir.model.access.csv b/fieldservice_purchase/security/ir.model.access.csv
index 9fa17efe31..65d99aac9e 100644
--- a/fieldservice_purchase/security/ir.model.access.csv
+++ b/fieldservice_purchase/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_purchase_order_fsm_user,purchase.order.fsm.user,model_purchase_order,fieldservice.group_fsm_user,1,0,0,0
+access_purchase_order_fsm_user,purchase.order.fsm.user,purchase.model_purchase_order,fieldservice.group_fsm_user,1,0,0,0

From 898e9d0292009a30eee6a512f06c689bc23c3955 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 8 Apr 2020 23:17:52 +0000
Subject: [PATCH 407/631] fieldservice_purchase 12.0.1.1.0

---
 fieldservice_purchase/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_purchase/__manifest__.py b/fieldservice_purchase/__manifest__.py
index 31df65c156..57a24d7349 100644
--- a/fieldservice_purchase/__manifest__.py
+++ b/fieldservice_purchase/__manifest__.py
@@ -9,7 +9,7 @@
     'website': 'https://github.com/OCA/field-service',
     'category': 'Field Service',
     'license': 'AGPL-3',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.1.0',
     'depends': [
         'fieldservice',
         'purchase',

From 26cf13b0bdfc50595cc3fc8d1a1da683761810bc Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Mon, 19 Apr 2021 17:34:06 +0530
Subject: [PATCH 408/631] [FIX] Travis

---
 fieldservice_purchase/__manifest__.py         | 33 +++++++++----------
 fieldservice_purchase/models/__init__.py      |  4 +--
 fieldservice_purchase/models/fsm_person.py    | 28 ++++++++--------
 fieldservice_purchase/views/fsm_person.xml    | 23 +++++++------
 .../odoo/addons/fieldservice_purchase         |  1 +
 setup/fieldservice_purchase/setup.py          |  6 ++++
 6 files changed, 51 insertions(+), 44 deletions(-)
 create mode 120000 setup/fieldservice_purchase/odoo/addons/fieldservice_purchase
 create mode 100644 setup/fieldservice_purchase/setup.py

diff --git a/fieldservice_purchase/__manifest__.py b/fieldservice_purchase/__manifest__.py
index 57a24d7349..3ebc1d68a7 100644
--- a/fieldservice_purchase/__manifest__.py
+++ b/fieldservice_purchase/__manifest__.py
@@ -2,24 +2,23 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - Purchase',
-    'summary': 'Manage FSM Purchases',
-    'author': 'Open Source Integrators, '
-              'Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'category': 'Field Service',
-    'license': 'AGPL-3',
-    'version': '12.0.1.1.0',
-    'depends': [
-        'fieldservice',
-        'purchase',
+    "name": "Field Service - Purchase",
+    "summary": "Manage FSM Purchases",
+    "author": "Open Source Integrators, " "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "category": "Field Service",
+    "license": "AGPL-3",
+    "version": "14.0.1.0.0",
+    "depends": [
+        "fieldservice",
+        "purchase",
     ],
-    'data': [
-        'security/ir.model.access.csv',
-        'views/fsm_person.xml',
+    "data": [
+        "security/ir.model.access.csv",
+        "views/fsm_person.xml",
     ],
-    'development_status': 'Beta',
-    'maintainers': [
-        'osi-scampbell',
+    "development_status": "Beta",
+    "maintainers": [
+        "osi-scampbell",
     ],
 }
diff --git a/fieldservice_purchase/models/__init__.py b/fieldservice_purchase/models/__init__.py
index 873177b3c0..1a88089c52 100644
--- a/fieldservice_purchase/models/__init__.py
+++ b/fieldservice_purchase/models/__init__.py
@@ -1,6 +1,4 @@
 # Copyright (C) 2019 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import (
-    fsm_person
-)
+from . import fsm_person
diff --git a/fieldservice_purchase/models/fsm_person.py b/fieldservice_purchase/models/fsm_person.py
index d8fab2471d..cd1b4f26b3 100644
--- a/fieldservice_purchase/models/fsm_person.py
+++ b/fieldservice_purchase/models/fsm_person.py
@@ -5,31 +5,31 @@
 
 
 class FSMPerson(models.Model):
-    _inherit = 'fsm.person'
+    _inherit = "fsm.person"
 
     pricelist_count = fields.Integer(
-        compute='_compute_pricelist_count',
-        string='# Pricelists'
+        compute="_compute_pricelist_count", string="# Pricelists"
     )
 
     @api.multi
     def _compute_pricelist_count(self):
         for worker in self:
-            worker.pricelist_count = self.env['product.supplierinfo'].\
-                search_count([('name', '=', worker.partner_id.id)])
+            worker.pricelist_count = self.env["product.supplierinfo"].search_count(
+                [("name", "=", worker.partner_id.id)]
+            )
 
     @api.multi
     def action_view_pricelists(self):
         for worker in self:
-            pricelist = self.env['product.supplierinfo'].search(
-                [('name', '=', worker.partner_id.id)])
-            action = self.env.ref(
-                'product.product_supplierinfo_type_action').read()[0]
+            pricelist = self.env["product.supplierinfo"].search(
+                [("name", "=", worker.partner_id.id)]
+            )
+            action = self.env.ref("product.product_supplierinfo_type_action").read()[0]
             if len(pricelist) == 1:
-                action['views'] = [(
-                    self.env.ref('product.product_supplierinfo_form_view').id,
-                    'form')]
-                action['res_id'] = pricelist.ids[0]
+                action["views"] = [
+                    (self.env.ref("product.product_supplierinfo_form_view").id, "form")
+                ]
+                action["res_id"] = pricelist.ids[0]
             else:
-                action['domain'] = [('id', 'in', pricelist.ids)]
+                action["domain"] = [("id", "in", pricelist.ids)]
             return action
diff --git a/fieldservice_purchase/views/fsm_person.xml b/fieldservice_purchase/views/fsm_person.xml
index 96e294982e..f4c6c34a09 100644
--- a/fieldservice_purchase/views/fsm_person.xml
+++ b/fieldservice_purchase/views/fsm_person.xml
@@ -1,26 +1,29 @@
 <!-- Copyright 2019 Open Source Integrators https://www.opensourceintegrators.com
     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-
 <odoo>
 
     <!-- Worker Form View -->
     <record id="fsm_person_form_view_pricelists" model="ir.ui.view">
         <field name="name">fsm.person.form.view.pricelists</field>
         <field name="model">fsm.person</field>
-        <field name="inherit_id" ref="fieldservice.fsm_person_form"/>
+        <field name="inherit_id" ref="fieldservice.fsm_person_form" />
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
-                <button name="action_view_pricelists"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-tags">
-                    <field name="pricelist_count"
-                           widget="statinfo"
-                           string="Pricelists"/>
+                <button
+                    name="action_view_pricelists"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-tags"
+                >
+                    <field
+                        name="pricelist_count"
+                        widget="statinfo"
+                        string="Pricelists"
+                    />
                 </button>
             </div>
             <field name="calendar_id" position="after">
-                <field name="supplier"/>
+                <field name="supplier" />
             </field>
         </field>
     </record>
diff --git a/setup/fieldservice_purchase/odoo/addons/fieldservice_purchase b/setup/fieldservice_purchase/odoo/addons/fieldservice_purchase
new file mode 120000
index 0000000000..3dfa957e18
--- /dev/null
+++ b/setup/fieldservice_purchase/odoo/addons/fieldservice_purchase
@@ -0,0 +1 @@
+../../../../fieldservice_purchase
\ No newline at end of file
diff --git a/setup/fieldservice_purchase/setup.py b/setup/fieldservice_purchase/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_purchase/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From dfd17df0a8f98eb07c8867f98642963030aa0db8 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Mon, 19 Apr 2021 17:37:56 +0530
Subject: [PATCH 409/631] [14.0][MIG] fieldservice_purchase

---
 fieldservice_purchase/README.rst              | 11 ++---
 fieldservice_purchase/__init__.py             |  2 +-
 fieldservice_purchase/__manifest__.py         |  2 +-
 fieldservice_purchase/models/__init__.py      |  2 +-
 fieldservice_purchase/models/fsm_person.py    |  6 +--
 fieldservice_purchase/readme/CONTRIBUTORS.rst |  1 +
 .../static/description/index.html             |  9 ++--
 fieldservice_purchase/tests/__init__.py       |  4 ++
 .../tests/test_fieldservice_purchase.py       | 43 +++++++++++++++++++
 fieldservice_purchase/views/fsm_person.xml    |  3 --
 10 files changed, 64 insertions(+), 19 deletions(-)
 create mode 100644 fieldservice_purchase/tests/__init__.py
 create mode 100644 fieldservice_purchase/tests/test_fieldservice_purchase.py

diff --git a/fieldservice_purchase/README.rst b/fieldservice_purchase/README.rst
index c19c92d196..176b6b28bc 100644
--- a/fieldservice_purchase/README.rst
+++ b/fieldservice_purchase/README.rst
@@ -14,13 +14,13 @@ Field Service - Purchase
     :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_purchase
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_purchase
     :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_purchase
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_purchase
     :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| 
@@ -55,7 +55,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_purchase%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_purchase%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.
 
@@ -72,6 +72,7 @@ Contributors
 
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbell@opensourceintegrators.com>
+* Mohammad Khalid <mkhalid@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -101,6 +102,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-osi-scampbell| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_purchase>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_purchase>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_purchase/__init__.py b/fieldservice_purchase/__init__.py
index b634044c7c..1ae95437af 100644
--- a/fieldservice_purchase/__init__.py
+++ b/fieldservice_purchase/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators
+# Copyright (C) 2021 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
diff --git a/fieldservice_purchase/__manifest__.py b/fieldservice_purchase/__manifest__.py
index 3ebc1d68a7..402c191f88 100644
--- a/fieldservice_purchase/__manifest__.py
+++ b/fieldservice_purchase/__manifest__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators
+# Copyright (C) 2021 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
diff --git a/fieldservice_purchase/models/__init__.py b/fieldservice_purchase/models/__init__.py
index 1a88089c52..78c8be385c 100644
--- a/fieldservice_purchase/models/__init__.py
+++ b/fieldservice_purchase/models/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators
+# Copyright (C) 2021 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import fsm_person
diff --git a/fieldservice_purchase/models/fsm_person.py b/fieldservice_purchase/models/fsm_person.py
index cd1b4f26b3..33dfced04e 100644
--- a/fieldservice_purchase/models/fsm_person.py
+++ b/fieldservice_purchase/models/fsm_person.py
@@ -1,7 +1,7 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators
+# Copyright (C) 2021 - TODAY, 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 FSMPerson(models.Model):
@@ -11,14 +11,12 @@ class FSMPerson(models.Model):
         compute="_compute_pricelist_count", string="# Pricelists"
     )
 
-    @api.multi
     def _compute_pricelist_count(self):
         for worker in self:
             worker.pricelist_count = self.env["product.supplierinfo"].search_count(
                 [("name", "=", worker.partner_id.id)]
             )
 
-    @api.multi
     def action_view_pricelists(self):
         for worker in self:
             pricelist = self.env["product.supplierinfo"].search(
diff --git a/fieldservice_purchase/readme/CONTRIBUTORS.rst b/fieldservice_purchase/readme/CONTRIBUTORS.rst
index 82f22db283..93b23b9aec 100644
--- a/fieldservice_purchase/readme/CONTRIBUTORS.rst
+++ b/fieldservice_purchase/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbell@opensourceintegrators.com>
+* Mohammad Khalid <mkhalid@opensourceintegrators.com>
diff --git a/fieldservice_purchase/static/description/index.html b/fieldservice_purchase/static/description/index.html
index 5f8f6fb3f9..faf80a479d 100644
--- a/fieldservice_purchase/static/description/index.html
+++ b/fieldservice_purchase/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 - Purchase</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Purchase</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_purchase"><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_purchase"><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><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_purchase"><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_purchase"><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>This module allows you to link the Field Service App to the Purchases App.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -405,7 +405,7 @@ <h1><a class="toc-backref" href="#id3">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_purchase%0Aversion:%2012.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_purchase%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">
@@ -421,6 +421,7 @@ <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
 <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>Mohammad Khalid &lt;<a class="reference external" href="mailto:mkhalid&#64;opensourceintegrators.com">mkhalid&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -439,7 +440,7 @@ <h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" href="https://github.com/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.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_purchase">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/14.0/fieldservice_purchase">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_purchase/tests/__init__.py b/fieldservice_purchase/tests/__init__.py
new file mode 100644
index 0000000000..2062b9e29d
--- /dev/null
+++ b/fieldservice_purchase/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_fieldservice_purchase
diff --git a/fieldservice_purchase/tests/test_fieldservice_purchase.py b/fieldservice_purchase/tests/test_fieldservice_purchase.py
new file mode 100644
index 0000000000..e8978e1141
--- /dev/null
+++ b/fieldservice_purchase/tests/test_fieldservice_purchase.py
@@ -0,0 +1,43 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import odoo.tests.common as common
+
+
+class TestFieldServicePurchase(common.TransactionCase):
+    def setUp(self):
+        super(TestFieldServicePurchase, self).setUp()
+
+        self.product_supplierinfo_obj = self.env["product.supplierinfo"]
+        self.fsm_person_obj = self.env["fsm.person"]
+
+    def test_fieldservice_purchase(self):
+
+        fsm_person = self.fsm_person_obj.create({"name": "Test FSM Person"})
+
+        # Test with 1 records Vendor Pricelist
+        product_supplierinfo_vals = {
+            "name": fsm_person.partner_id.id,
+            "min_qty": 1.0,
+            "price": 100,
+        }
+        self.product_supplierinfo_obj.create(product_supplierinfo_vals)
+
+        fsm_person._compute_pricelist_count()
+        self.assertEqual(
+            fsm_person.pricelist_count, 1, "Wrong no of vendors pricelist!"
+        )
+        fsm_person.action_view_pricelists()
+
+        # Test with 2 records Vendor Pricelist
+        product_supplierinfo_vals = {
+            "name": fsm_person.partner_id.id,
+            "min_qty": 2.0,
+            "price": 200,
+        }
+        self.product_supplierinfo_obj.create(product_supplierinfo_vals)
+        fsm_person._compute_pricelist_count()
+        self.assertEqual(
+            fsm_person.pricelist_count, 2, "Wrong no of vendors pricelist!"
+        )
+        fsm_person.action_view_pricelists()
diff --git a/fieldservice_purchase/views/fsm_person.xml b/fieldservice_purchase/views/fsm_person.xml
index f4c6c34a09..75be097a83 100644
--- a/fieldservice_purchase/views/fsm_person.xml
+++ b/fieldservice_purchase/views/fsm_person.xml
@@ -22,9 +22,6 @@
                     />
                 </button>
             </div>
-            <field name="calendar_id" position="after">
-                <field name="supplier" />
-            </field>
         </field>
     </record>
 

From a1f7681960d9f7b1b5857eab75433e75ee69fb1e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 9 Mar 2021 22:54:06 +0000
Subject: [PATCH 410/631] fieldservice_equipment_stock 12.0.2.0.0

Added translation using Weblate (Portuguese (Brazil))

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (13 of 13 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_equipment_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_equipment_stock/pt_BR/
---
 fieldservice_equipment_stock/__manifest__.py |  2 +-
 fieldservice_equipment_stock/i18n/pt_BR.po   | 85 ++++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_equipment_stock/i18n/pt_BR.po

diff --git a/fieldservice_equipment_stock/__manifest__.py b/fieldservice_equipment_stock/__manifest__.py
index 97931b2d09..136b66512d 100644
--- a/fieldservice_equipment_stock/__manifest__.py
+++ b/fieldservice_equipment_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Stock Equipment',
     'summary': 'Integrate stock operations with your field service equipments',
-    'version': '12.0.1.0.0',
+    'version': '12.0.2.0.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_equipment_stock/i18n/pt_BR.po b/fieldservice_equipment_stock/i18n/pt_BR.po
new file mode 100644
index 0000000000..8320a3aa66
--- /dev/null
+++ b/fieldservice_equipment_stock/i18n/pt_BR.po
@@ -0,0 +1,85 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_equipment_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2021-03-15 05:45+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 4.3.2\n"
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_picking_type__create_fsm_equipment
+msgid "Create Fsm Equipment"
+msgstr "Criar Equipamentos FSM"
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_product_product__create_fsm_equipment
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_product_template__create_fsm_equipment
+msgid "Creates a FSM Equipment"
+msgstr "Cria um Equipamento FSM"
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_fsm_equipment__current_stock_location_id
+msgid "Current Inventory Location"
+msgstr "Localização de Inventário Atual"
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_production_lot__fsm_equipment_id
+msgid "Equipment"
+msgstr "Equipamento"
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model,name:fieldservice_equipment_stock.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Equipamento de Serviço de Campo"
+
+#. module: fieldservice_equipment_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_equipment_stock.fsm_equipment_form_view_stock
+msgid "Inventory"
+msgstr "Inventário"
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model,name:fieldservice_equipment_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr "Lote/Serie"
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model,name:fieldservice_equipment_stock.model_stock_picking_type
+msgid "Picking Type"
+msgstr "Tipo de Separação"
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_fsm_equipment__product_id
+msgid "Product"
+msgstr "Produto"
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model,name:fieldservice_equipment_stock.model_product_template
+msgid "Product Template"
+msgstr "Modelo de Produto"
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,help:fieldservice_equipment_stock.field_stock_picking_type__create_fsm_equipment
+msgid "Products with the 'Creates a FSM Equipment' flag will automatically be converted to an FSM Equipment."
+msgstr ""
+"Produtos com o sinalizador ‘Cria um Equipamento FSM’ serão automaticamente "
+"convertidos em um Equipamento FSM."
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_fsm_equipment__lot_id
+msgid "Serial #"
+msgstr "Série #"
+
+#. module: fieldservice_equipment_stock
+#: model:ir.model,name:fieldservice_equipment_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Movimento de Estoque"

From 21148795545d5eadb0bffd2cb736623f20857ce1 Mon Sep 17 00:00:00 2001
From: Reed Hayashikawa <rhayashikawa@opensourceintegrators.com>
Date: Fri, 2 Jul 2021 09:23:57 -0700
Subject: [PATCH 411/631] [IMP] fieldservice_equipment_stock: black, isort,
 prettier

---
 fieldservice_equipment_stock/__manifest__.py  | 46 ++++++++--------
 .../migrations/12.0.1.0.0/post-migration.py   |  6 +-
 .../models/fsm_equipment.py                   | 31 +++++------
 .../models/product_template.py                |  4 +-
 .../models/stock_move.py                      | 28 +++++-----
 .../models/stock_picking_type.py              |  4 +-
 .../models/stock_production_lot.py            |  7 ++-
 .../tests/test_fsm_equipment.py               | 55 +++++++++++--------
 .../views/fsm_equipment.xml                   | 24 ++++----
 .../views/product_template.xml                | 11 ++--
 .../views/stock_picking_type.xml              |  6 +-
 .../views/stock_production_lot.xml            | 16 +++---
 .../odoo/addons/fieldservice_equipment_stock  |  1 +
 setup/fieldservice_equipment_stock/setup.py   |  6 ++
 14 files changed, 132 insertions(+), 113 deletions(-)
 create mode 120000 setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock
 create mode 100644 setup/fieldservice_equipment_stock/setup.py

diff --git a/fieldservice_equipment_stock/__manifest__.py b/fieldservice_equipment_stock/__manifest__.py
index 136b66512d..c8bb0f1607 100644
--- a/fieldservice_equipment_stock/__manifest__.py
+++ b/fieldservice_equipment_stock/__manifest__.py
@@ -2,30 +2,30 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - Stock Equipment',
-    'summary': 'Integrate stock operations with your field service equipments',
-    'version': '12.0.2.0.0',
-    'category': 'Field Service',
-    'author': "Open Source Integrators, "
-              "Brian McMaster, "
-              "Odoo Community Association (OCA)",
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice_stock',
+    "name": "Field Service - Stock Equipment",
+    "summary": "Integrate stock operations with your field service equipments",
+    "version": "12.0.2.0.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, "
+    "Brian McMaster, "
+    "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": [
+        "fieldservice_stock",
     ],
-    'data': [
-        'security/ir.model.access.csv',
-        'views/fsm_equipment.xml',
-        'views/product_template.xml',
-        'views/stock_picking_type.xml',
-        'views/stock_production_lot.xml',
+    "data": [
+        "security/ir.model.access.csv",
+        "views/fsm_equipment.xml",
+        "views/product_template.xml",
+        "views/stock_picking_type.xml",
+        "views/stock_production_lot.xml",
     ],
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'brian10048',
-        'wolfhall',
-        'max3903',
-        'smangukiya',
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": [
+        "brian10048",
+        "wolfhall",
+        "max3903",
+        "smangukiya",
     ],
 }
diff --git a/fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py b/fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py
index 2855328b90..c3221ab722 100644
--- a/fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py
+++ b/fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py
@@ -6,8 +6,10 @@ def migrate(env, version):
     if not version:
         return
 
-    env.execute("""
+    env.execute(
+        """
         UPDATE stock_picking_type
         SET create_fsm_equipment = 'true'
         WHERE code = 'outgoing';
-    """)
+    """
+    )
diff --git a/fieldservice_equipment_stock/models/fsm_equipment.py b/fieldservice_equipment_stock/models/fsm_equipment.py
index 0093df66c6..6a25ed3afe 100644
--- a/fieldservice_equipment_stock/models/fsm_equipment.py
+++ b/fieldservice_equipment_stock/models/fsm_equipment.py
@@ -5,29 +5,28 @@
 
 
 class FSMEquipment(models.Model):
-    _inherit = 'fsm.equipment'
+    _inherit = "fsm.equipment"
 
-    product_id = fields.Many2one(
-        'product.product', string='Product', required=True)
-    lot_id = fields.Many2one(
-        'stock.production.lot', string='Serial #', required=True)
+    product_id = fields.Many2one("product.product", string="Product", required=True)
+    lot_id = fields.Many2one("stock.production.lot", string="Serial #", required=True)
     current_stock_location_id = fields.Many2one(
-        'stock.location', string='Current Inventory Location',
-        compute='_compute_current_stock_loc_id')
+        "stock.location",
+        string="Current Inventory Location",
+        compute="_compute_current_stock_loc_id",
+    )
 
-    @api.depends('product_id', 'lot_id')
+    @api.depends("product_id", "lot_id")
     def _compute_current_stock_loc_id(self):
         for equipment in self:
-            quants = self.env['stock.quant'].search(
-                [('lot_id', '=', equipment.lot_id.id)], order="id desc",
-                limit=1)
+            quants = self.env["stock.quant"].search(
+                [("lot_id", "=", equipment.lot_id.id)], order="id desc", limit=1
+            )
             if quants and quants.location_id:
-                equipment.current_stock_location_id = \
-                    quants.location_id.id
+                equipment.current_stock_location_id = quants.location_id.id
             else:
                 equipment.current_stock_location_id = False
 
-    @api.onchange('product_id')
+    @api.onchange("product_id")
     def _onchange_product(self):
         for equipment in self:
             self.current_stock_location_id = False
@@ -35,7 +34,7 @@ def _onchange_product(self):
     @api.model
     def create(self, vals):
         res = super(FSMEquipment, self).create(vals)
-        if 'lot_id' in vals:
+        if "lot_id" in vals:
             res.lot_id.fsm_equipment_id = res.id
         return res
 
@@ -44,7 +43,7 @@ def write(self, vals):
         for equipment in self:
             prev_lot = equipment.lot_id
             res = super(FSMEquipment, equipment).write(vals)
-            if 'lot_id' in vals:
+            if "lot_id" in vals:
                 prev_lot.fsm_equipment_id = False
                 equipment.lot_id.fsm_equipment_id = equipment.id
         return res
diff --git a/fieldservice_equipment_stock/models/product_template.py b/fieldservice_equipment_stock/models/product_template.py
index 54195f55d7..d0bb3485db 100644
--- a/fieldservice_equipment_stock/models/product_template.py
+++ b/fieldservice_equipment_stock/models/product_template.py
@@ -5,6 +5,6 @@
 
 
 class ProductTemplate(models.Model):
-    _inherit = 'product.template'
+    _inherit = "product.template"
 
-    create_fsm_equipment = fields.Boolean(string='Creates a FSM Equipment')
+    create_fsm_equipment = fields.Boolean(string="Creates a FSM Equipment")
diff --git a/fieldservice_equipment_stock/models/stock_move.py b/fieldservice_equipment_stock/models/stock_move.py
index e3e3133794..0547419e32 100644
--- a/fieldservice_equipment_stock/models/stock_move.py
+++ b/fieldservice_equipment_stock/models/stock_move.py
@@ -7,24 +7,24 @@ class StockMove(models.Model):
     _inherit = "stock.move"
 
     def prepare_equipment_values(self, move_line):
-        return {'name': '%s (%s)' % (
-            move_line.product_id.name, move_line.lot_id.name),
-            'product_id': move_line.product_id.id,
-            'lot_id': move_line.lot_id.id,
-            'location_id':
-            move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
-            'current_location_id':
-            move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
-            'current_stock_location_id': move_line.location_dest_id.id}
+        return {
+            "name": "%s (%s)" % (move_line.product_id.name, move_line.lot_id.name),
+            "product_id": move_line.product_id.id,
+            "lot_id": move_line.lot_id.id,
+            "location_id": move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
+            "current_location_id": move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
+            "current_stock_location_id": move_line.location_dest_id.id,
+        }
 
     def _action_done(self):
         res = super()._action_done()
         for rec in self:
-            if (rec.state == 'done'
-                    and rec.picking_type_id.create_fsm_equipment
-                    and rec.product_tmpl_id.create_fsm_equipment):
+            if (
+                rec.state == "done"
+                and rec.picking_type_id.create_fsm_equipment
+                and rec.product_tmpl_id.create_fsm_equipment
+            ):
                 for line in rec.move_line_ids:
                     vals = self.prepare_equipment_values(line)
-                    line.lot_id.fsm_equipment_id = \
-                        rec.env['fsm.equipment'].create(vals)
+                    line.lot_id.fsm_equipment_id = rec.env["fsm.equipment"].create(vals)
         return res
diff --git a/fieldservice_equipment_stock/models/stock_picking_type.py b/fieldservice_equipment_stock/models/stock_picking_type.py
index 5fe0671881..f4001b609e 100644
--- a/fieldservice_equipment_stock/models/stock_picking_type.py
+++ b/fieldservice_equipment_stock/models/stock_picking_type.py
@@ -4,10 +4,10 @@
 
 
 class StockPickingType(models.Model):
-    _inherit = 'stock.picking.type'
+    _inherit = "stock.picking.type"
 
     create_fsm_equipment = fields.Boolean(
         name="Create FSM Equipment",
         help="Products with the 'Creates a FSM Equipment' flag "
-        "will automatically be converted to an FSM Equipment."
+        "will automatically be converted to an FSM Equipment.",
     )
diff --git a/fieldservice_equipment_stock/models/stock_production_lot.py b/fieldservice_equipment_stock/models/stock_production_lot.py
index 5e52651e3e..c8430c080e 100644
--- a/fieldservice_equipment_stock/models/stock_production_lot.py
+++ b/fieldservice_equipment_stock/models/stock_production_lot.py
@@ -5,7 +5,8 @@
 
 
 class StockProductionLot(models.Model):
-    _inherit = 'stock.production.lot'
+    _inherit = "stock.production.lot"
 
-    fsm_equipment_id = fields.Many2one('fsm.equipment',
-                                       string='Equipment', readonly=True)
+    fsm_equipment_id = fields.Many2one(
+        "fsm.equipment", string="Equipment", readonly=True
+    )
diff --git a/fieldservice_equipment_stock/tests/test_fsm_equipment.py b/fieldservice_equipment_stock/tests/test_fsm_equipment.py
index c6488b2598..dbbda29ffc 100644
--- a/fieldservice_equipment_stock/tests/test_fsm_equipment.py
+++ b/fieldservice_equipment_stock/tests/test_fsm_equipment.py
@@ -4,34 +4,41 @@
 
 
 class TestFSMEquipment(TransactionCase):
-
     def setUp(self):
         super(TestFSMEquipment, self).setUp()
-        self.Equipment = self.env['fsm.equipment']
-        self.stock_location = self.env.ref('stock.stock_location_customers')
+        self.Equipment = self.env["fsm.equipment"]
+        self.stock_location = self.env.ref("stock.stock_location_customers")
 
-        product1 = self.env['product.product'].create({
-            'name': 'Product A',
-            'type': 'product',
-            'tracking': 'serial',
-        })
-        lot1 = self.env['stock.production.lot'].create({
-            'name': 'serial1',
-            'product_id': product1.id,
-        })
-        self.env['stock.quant'].create({
-            'product_id': product1.id,
-            'location_id': self.stock_location.id,
-            'quantity': 1.0,
-            'lot_id': lot1.id,
-        })
+        product1 = self.env["product.product"].create(
+            {
+                "name": "Product A",
+                "type": "product",
+                "tracking": "serial",
+            }
+        )
+        lot1 = self.env["stock.production.lot"].create(
+            {
+                "name": "serial1",
+                "product_id": product1.id,
+            }
+        )
+        self.env["stock.quant"].create(
+            {
+                "product_id": product1.id,
+                "location_id": self.stock_location.id,
+                "quantity": 1.0,
+                "lot_id": lot1.id,
+            }
+        )
 
-        self.equipment = self.Equipment.create({
-            'name': 'Equipment 1',
-            'product_id': product1.id,
-            'lot_id': lot1.id,
-            'current_stock_location_id': self.stock_location.id,
-        })
+        self.equipment = self.Equipment.create(
+            {
+                "name": "Equipment 1",
+                "product_id": product1.id,
+                "lot_id": lot1.id,
+                "current_stock_location_id": self.stock_location.id,
+            }
+        )
 
     def test_onchange_product(self):
         equipment = self.equipment
diff --git a/fieldservice_equipment_stock/views/fsm_equipment.xml b/fieldservice_equipment_stock/views/fsm_equipment.xml
index 1ce8ae287f..ae9d0becdf 100644
--- a/fieldservice_equipment_stock/views/fsm_equipment.xml
+++ b/fieldservice_equipment_stock/views/fsm_equipment.xml
@@ -1,19 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="fsm_equipment_form_view_stock" model="ir.ui.view">
         <field name="name">fsm.equipment.form.stock</field>
         <field name="model">fsm.equipment</field>
-        <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view" />
         <field name="arch" type="xml">
             <group id="secondary" position="inside">
-                <group string="Inventory"
-                       groups="stock.group_stock_user">
-                    <field name="product_id"/>
-                    <field name="lot_id"
-                           domain="[('product_id', '=', product_id)]"
-                           context="{'default_product_id': product_id}"/>
-                    <field name="current_stock_location_id"/>
+                <group string="Inventory" groups="stock.group_stock_user">
+                    <field name="product_id" />
+                    <field
+                        name="lot_id"
+                        domain="[('product_id', '=', product_id)]"
+                        context="{'default_product_id': product_id}"
+                    />
+                    <field name="current_stock_location_id" />
                 </group>
             </group>
         </field>
@@ -22,11 +23,10 @@
     <record id="fsm_equipment_tree_view_model" model="ir.ui.view">
         <field name="name">fsm.equipment.model</field>
         <field name="model">fsm.equipment</field>
-        <field name="inherit_id"
-               ref="fieldservice.fsm_equipment_tree_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_equipment_tree_view" />
         <field name="arch" type="xml">
             <field name="person_id" position="before">
-                <field name="product_id"/>
+                <field name="product_id" />
             </field>
         </field>
     </record>
diff --git a/fieldservice_equipment_stock/views/product_template.xml b/fieldservice_equipment_stock/views/product_template.xml
index 6b9d6f36e3..4276d1a920 100644
--- a/fieldservice_equipment_stock/views/product_template.xml
+++ b/fieldservice_equipment_stock/views/product_template.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="product_template_form_create_fsm_equipment" model="ir.ui.view">
         <field name="model">product.template</field>
-        <field name="inherit_id"
-               ref="product.product_template_only_form_view"/>
+        <field name="inherit_id" ref="product.product_template_only_form_view" />
         <field name="arch" type="xml">
             <field name="tracking" position="after">
-                <field name="create_fsm_equipment"
-                       attrs="{'invisible': [('tracking', '!=', 'serial')]}"/>
+                <field
+                    name="create_fsm_equipment"
+                    attrs="{'invisible': [('tracking', '!=', 'serial')]}"
+                />
             </field>
         </field>
     </record>
diff --git a/fieldservice_equipment_stock/views/stock_picking_type.xml b/fieldservice_equipment_stock/views/stock_picking_type.xml
index d197e10f6a..85b59de062 100644
--- a/fieldservice_equipment_stock/views/stock_picking_type.xml
+++ b/fieldservice_equipment_stock/views/stock_picking_type.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="stock_picking_type_form_create_fsm" model="ir.ui.view">
         <field name="model">stock.picking.type</field>
-        <field name="inherit_id" ref="stock.view_picking_type_form"/>
+        <field name="inherit_id" ref="stock.view_picking_type_form" />
         <field name="arch" type="xml">
 
             <field name="use_existing_lots" position="after">
-                <field name="create_fsm_equipment"/>
+                <field name="create_fsm_equipment" />
             </field>
 
         </field>
diff --git a/fieldservice_equipment_stock/views/stock_production_lot.xml b/fieldservice_equipment_stock/views/stock_production_lot.xml
index 4f23b37cad..9b80ee0ac4 100644
--- a/fieldservice_equipment_stock/views/stock_production_lot.xml
+++ b/fieldservice_equipment_stock/views/stock_production_lot.xml
@@ -1,21 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="stock_production_lot_extend_equipment" model="ir.ui.view">
         <field name="model">stock.production.lot</field>
-        <field name="inherit_id" ref="stock.view_production_lot_form"/>
+        <field name="inherit_id" ref="stock.view_production_lot_form" />
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='main_group']/group[1]" position="after"
-                   sequence="0">
+            <xpath
+                expr="//group[@name='main_group']/group[1]"
+                position="after"
+                sequence="0"
+            >
                 <group>
-                    <field name="fsm_equipment_id"/>
+                    <field name="fsm_equipment_id" />
                 </group>
             </xpath>
         </field>
     </record>
 
-    <record id="stock.action_production_lot_form"
-            model="ir.actions.act_window">
+    <record id="stock.action_production_lot_form" model="ir.actions.act_window">
         <field name="context">{'search_default_group_by_product': 1,
             'default_product_id': context.get('product_id', False)}
         </field>
diff --git a/setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock b/setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock
new file mode 120000
index 0000000000..fa559f4884
--- /dev/null
+++ b/setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock
@@ -0,0 +1 @@
+../../../../fieldservice_equipment_stock
\ No newline at end of file
diff --git a/setup/fieldservice_equipment_stock/setup.py b/setup/fieldservice_equipment_stock/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_equipment_stock/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 04c032de0aaaa5c339fb0a4af63d34066f9b9781 Mon Sep 17 00:00:00 2001
From: Reed Hayashikawa <rhayashikawa@opensourceintegrators.com>
Date: Fri, 2 Jul 2021 10:17:03 -0700
Subject: [PATCH 412/631] [MIG] fieldservice_equipment_stock: Migration to 14.0

---
 fieldservice_equipment_stock/README.rst       |  1 +
 fieldservice_equipment_stock/__manifest__.py  |  2 +-
 .../migrations/12.0.1.0.0/post-migration.py   | 15 ------
 .../models/fsm_equipment.py                   |  3 +-
 .../models/stock_move.py                      |  5 +-
 .../tests/__init__.py                         |  1 +
 .../tests/test_fsm_equipment.py               | 50 +++++++++++++++---
 .../tests/test_stock_move.py                  | 51 +++++++++++++++++++
 8 files changed, 100 insertions(+), 28 deletions(-)
 delete mode 100644 fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py
 create mode 100644 fieldservice_equipment_stock/tests/test_stock_move.py

diff --git a/fieldservice_equipment_stock/README.rst b/fieldservice_equipment_stock/README.rst
index a28a09a020..d7dafa0754 100644
--- a/fieldservice_equipment_stock/README.rst
+++ b/fieldservice_equipment_stock/README.rst
@@ -95,6 +95,7 @@ Contributors
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Marcel Savegnago <marcel.savegnago@escodoo.com.br>
+* Reed Hayashikawa <rhayashikawa@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
diff --git a/fieldservice_equipment_stock/__manifest__.py b/fieldservice_equipment_stock/__manifest__.py
index c8bb0f1607..6794d16b40 100644
--- a/fieldservice_equipment_stock/__manifest__.py
+++ b/fieldservice_equipment_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Field Service - Stock Equipment",
     "summary": "Integrate stock operations with your field service equipments",
-    "version": "12.0.2.0.0",
+    "version": "14.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, "
     "Brian McMaster, "
diff --git a/fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py b/fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py
deleted file mode 100644
index c3221ab722..0000000000
--- a/fieldservice_equipment_stock/migrations/12.0.1.0.0/post-migration.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2020, 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 stock_picking_type
-        SET create_fsm_equipment = 'true'
-        WHERE code = 'outgoing';
-    """
-    )
diff --git a/fieldservice_equipment_stock/models/fsm_equipment.py b/fieldservice_equipment_stock/models/fsm_equipment.py
index 6a25ed3afe..db3f1219bf 100644
--- a/fieldservice_equipment_stock/models/fsm_equipment.py
+++ b/fieldservice_equipment_stock/models/fsm_equipment.py
@@ -29,7 +29,7 @@ def _compute_current_stock_loc_id(self):
     @api.onchange("product_id")
     def _onchange_product(self):
         for equipment in self:
-            self.current_stock_location_id = False
+            equipment.current_stock_location_id = False
 
     @api.model
     def create(self, vals):
@@ -38,7 +38,6 @@ def create(self, vals):
             res.lot_id.fsm_equipment_id = res.id
         return res
 
-    @api.multi
     def write(self, vals):
         for equipment in self:
             prev_lot = equipment.lot_id
diff --git a/fieldservice_equipment_stock/models/stock_move.py b/fieldservice_equipment_stock/models/stock_move.py
index 0547419e32..07657e8768 100644
--- a/fieldservice_equipment_stock/models/stock_move.py
+++ b/fieldservice_equipment_stock/models/stock_move.py
@@ -7,12 +7,13 @@ class StockMove(models.Model):
     _inherit = "stock.move"
 
     def prepare_equipment_values(self, move_line):
+        move = move_line.move_id
         return {
             "name": "%s (%s)" % (move_line.product_id.name, move_line.lot_id.name),
             "product_id": move_line.product_id.id,
             "lot_id": move_line.lot_id.id,
-            "location_id": move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
-            "current_location_id": move_line.move_id.stock_request_ids.fsm_order_id.location_id.id,
+            "location_id": move.stock_request_ids.fsm_order_id.location_id.id,
+            "current_location_id": move.stock_request_ids.fsm_order_id.location_id.id,
             "current_stock_location_id": move_line.location_dest_id.id,
         }
 
diff --git a/fieldservice_equipment_stock/tests/__init__.py b/fieldservice_equipment_stock/tests/__init__.py
index 50a5826fe6..81851e3f98 100644
--- a/fieldservice_equipment_stock/tests/__init__.py
+++ b/fieldservice_equipment_stock/tests/__init__.py
@@ -2,3 +2,4 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 
 from . import test_fsm_equipment
+from . import test_stock_move
diff --git a/fieldservice_equipment_stock/tests/test_fsm_equipment.py b/fieldservice_equipment_stock/tests/test_fsm_equipment.py
index dbbda29ffc..02713028ab 100644
--- a/fieldservice_equipment_stock/tests/test_fsm_equipment.py
+++ b/fieldservice_equipment_stock/tests/test_fsm_equipment.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2020 - TODAY, Marcel Savegnago (Escodoo)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo.tests.common import TransactionCase
+from odoo.tests.common import Form, TransactionCase
 
 
 class TestFSMEquipment(TransactionCase):
@@ -8,34 +8,55 @@ def setUp(self):
         super(TestFSMEquipment, self).setUp()
         self.Equipment = self.env["fsm.equipment"]
         self.stock_location = self.env.ref("stock.stock_location_customers")
+        self.current_location = self.env.ref("fieldservice.location_1")
+        self.test_location = self.env.ref("fieldservice.test_location")
 
-        product1 = self.env["product.product"].create(
+        currency = self.env["res.currency"].create(
+            {
+                "name": "Currency 1",
+                "symbol": "$",
+            }
+        )
+        partner = self.env["res.partner"].create(
+            {
+                "name": "Partner 1",
+            }
+        )
+        self.company1 = self.env["res.company"].create(
+            {
+                "name": "Company 1",
+                "currency_id": currency.id,
+                "partner_id": partner.id,
+            }
+        )
+        self.product1 = self.env["product.product"].create(
             {
                 "name": "Product A",
                 "type": "product",
                 "tracking": "serial",
             }
         )
-        lot1 = self.env["stock.production.lot"].create(
+        self.lot1 = self.env["stock.production.lot"].create(
             {
                 "name": "serial1",
-                "product_id": product1.id,
+                "product_id": self.product1.id,
+                "company_id": self.company1.id,
             }
         )
         self.env["stock.quant"].create(
             {
-                "product_id": product1.id,
+                "product_id": self.product1.id,
                 "location_id": self.stock_location.id,
                 "quantity": 1.0,
-                "lot_id": lot1.id,
+                "lot_id": self.lot1.id,
             }
         )
 
         self.equipment = self.Equipment.create(
             {
                 "name": "Equipment 1",
-                "product_id": product1.id,
-                "lot_id": lot1.id,
+                "product_id": self.product1.id,
+                "lot_id": self.lot1.id,
                 "current_stock_location_id": self.stock_location.id,
             }
         )
@@ -49,3 +70,16 @@ def test_compute_current_stock_loc_id(self):
         equipment = self.equipment
         equipment._compute_current_stock_loc_id()
         self.assertTrue(equipment.current_stock_location_id == self.stock_location)
+
+    def test_fsm_equipment(self):
+        # Create an equipment
+        view_id = "fieldservice.fsm_equipment_form_view"
+        with Form(self.Equipment, view=view_id) as f:
+            f.name = "Test Equipment 1"
+            f.current_location_id = self.current_location
+            f.location_id = self.test_location
+            f.lot_id = self.lot1
+            f.product_id = self.product1
+        equipment = f.save()
+
+        self.assertEqual(f.id, equipment.lot_id.fsm_equipment_id.id)
diff --git a/fieldservice_equipment_stock/tests/test_stock_move.py b/fieldservice_equipment_stock/tests/test_stock_move.py
new file mode 100644
index 0000000000..e6df05e763
--- /dev/null
+++ b/fieldservice_equipment_stock/tests/test_stock_move.py
@@ -0,0 +1,51 @@
+# Copyright (C) 2021 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests.common import TransactionCase
+
+
+class TestStockMove(TransactionCase):
+    def setUp(self):
+        super(TestStockMove, self).setUp()
+        self.Move = self.env["stock.move"]
+        self.stock_location = self.env.ref("stock.stock_location_customers")
+        self.supplier_location = self.env.ref("stock.stock_location_suppliers")
+        self.stock_location = self.env.ref("stock.stock_location_stock")
+        self.uom_unit = self.env.ref("uom.product_uom_unit")
+
+    def test_action_done(self):
+        # Create product template
+        templateAB = self.env["product.template"].create(
+            {"name": "templAB", "uom_id": self.uom_unit.id}
+        )
+
+        # Create product A and B
+        productA = self.env["product.product"].create(
+            {
+                "name": "product A",
+                "standard_price": 1,
+                "type": "product",
+                "uom_id": self.uom_unit.id,
+                "default_code": "A",
+                "product_tmpl_id": templateAB.id,
+            }
+        )
+
+        # Create a stock move from INCOMING to STOCK
+        stockMoveInA = self.env["stock.move"].create(
+            {
+                "location_id": self.supplier_location.id,
+                "location_dest_id": self.stock_location.id,
+                "name": "MOVE INCOMING -> STOCK ",
+                "product_id": productA.id,
+                "product_uom": productA.uom_id.id,
+                "product_uom_qty": 2,
+            }
+        )
+
+        stockMoveInA.quantity_done = stockMoveInA.product_uom_qty
+        stockMoveInA._action_confirm()
+        stockMoveInA._action_assign()
+        stockMoveInA._action_done()
+
+        self.assertEqual("done", stockMoveInA.state)

From 369b1f300463ac8f80ee6c9321fc8dbd02c90efa Mon Sep 17 00:00:00 2001
From: Reed Hayashikawa <rhayashikawa@opensourceintegrators.com>
Date: Fri, 16 Jul 2021 08:42:02 -0700
Subject: [PATCH 413/631] [14.0][FIX] Edits to res.config.settings for
 AttributeError

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

diff --git a/fieldservice/models/res_config_settings.py b/fieldservice/models/res_config_settings.py
index 51b4558c9f..424811644b 100644
--- a/fieldservice/models/res_config_settings.py
+++ b/fieldservice/models/res_config_settings.py
@@ -103,7 +103,7 @@ def _onchange_module_fieldservice_repair(self):
     def _onchange_module_fieldservice_stock(self):
         if self.module_fieldservice_stock:
             self.group_stock_production_lot = True
-            self.group_stock_request_order = True
+            # self.group_stock_request_order = True
 
     @api.onchange("module_fieldservice_purchase")
     def _onchange_module_fieldservice_purchase(self):

From 64ea0bc0aca99481e83f7309ac23c7ff335317f8 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Fri, 16 Jul 2021 16:01:55 +0000
Subject: [PATCH 414/631] [UPD] Update fieldservice_equipment_stock.pot

---
 .../i18n/fieldservice_equipment_stock.pot     | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/fieldservice_equipment_stock/i18n/fieldservice_equipment_stock.pot b/fieldservice_equipment_stock/i18n/fieldservice_equipment_stock.pot
index 99245a7fba..ef48592f4c 100644
--- a/fieldservice_equipment_stock/i18n/fieldservice_equipment_stock.pot
+++ b/fieldservice_equipment_stock/i18n/fieldservice_equipment_stock.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_equipment_stock
+# 	* fieldservice_equipment_stock
 #
 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"
@@ -29,6 +29,15 @@ msgstr ""
 msgid "Current Inventory Location"
 msgstr ""
 
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_fsm_equipment__display_name
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_product_template__display_name
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_move__display_name
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_picking_type__display_name
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_production_lot__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_equipment_stock
 #: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_production_lot__fsm_equipment_id
 msgid "Equipment"
@@ -39,11 +48,29 @@ msgstr ""
 msgid "Field Service Equipment"
 msgstr ""
 
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_fsm_equipment__id
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_product_template__id
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_move__id
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_picking_type__id
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_production_lot__id
+msgid "ID"
+msgstr ""
+
 #. module: fieldservice_equipment_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_equipment_stock.fsm_equipment_form_view_stock
 msgid "Inventory"
 msgstr ""
 
+#. module: fieldservice_equipment_stock
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_fsm_equipment____last_update
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_product_template____last_update
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_move____last_update
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_picking_type____last_update
+#: model:ir.model.fields,field_description:fieldservice_equipment_stock.field_stock_production_lot____last_update
+msgid "Last Modified on"
+msgstr ""
+
 #. module: fieldservice_equipment_stock
 #: model:ir.model,name:fieldservice_equipment_stock.model_stock_production_lot
 msgid "Lot/Serial"
@@ -66,7 +93,9 @@ msgstr ""
 
 #. module: fieldservice_equipment_stock
 #: model:ir.model.fields,help:fieldservice_equipment_stock.field_stock_picking_type__create_fsm_equipment
-msgid "Products with the 'Creates a FSM Equipment' flag will automatically be converted to an FSM Equipment."
+msgid ""
+"Products with the 'Creates a FSM Equipment' flag will automatically be "
+"converted to an FSM Equipment."
 msgstr ""
 
 #. module: fieldservice_equipment_stock
@@ -78,4 +107,3 @@ msgstr ""
 #: model:ir.model,name:fieldservice_equipment_stock.model_stock_move
 msgid "Stock Move"
 msgstr ""
-

From 8d4f83199ebf53cf88054280eb74779c7fd832e1 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 16 Jul 2021 16:10:30 +0000
Subject: [PATCH 415/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 39d3c79afb..ad77e06608 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ addon | version | summary
 [fieldservice_calendar](fieldservice_calendar/) | 14.0.1.0.0 | Add calendar to FSM Orders
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
 [fieldservice_distribution](fieldservice_distribution/) | 14.0.1.0.0 | Manage your distribution structure
+[fieldservice_equipment_stock](fieldservice_equipment_stock/) | 14.0.1.0.0 | Integrate stock operations with your field service equipments
 [fieldservice_isp_account](fieldservice_isp_account/) | 14.0.1.0.0 | Invoice Field Service orders based on employee time or contractor costs
 [fieldservice_isp_flow](fieldservice_isp_flow/) | 14.0.1.0.0 | Field Service workflow for Internet Service Providers
 [fieldservice_partner_multi_relation](fieldservice_partner_multi_relation/) | 14.0.1.0.0 | Manage relations between contacts, companies and locations

From 464c869b4b83288ed1837a9f3dd9eaa88a8ce3d2 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 16 Jul 2021 16:10:33 +0000
Subject: [PATCH 416/631] [UPD] README.rst

---
 fieldservice_equipment_stock/README.rst               | 11 +++++------
 .../static/description/index.html                     |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/fieldservice_equipment_stock/README.rst b/fieldservice_equipment_stock/README.rst
index d7dafa0754..b196483152 100644
--- a/fieldservice_equipment_stock/README.rst
+++ b/fieldservice_equipment_stock/README.rst
@@ -14,13 +14,13 @@ Field Service - Stock Equipment
     :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_equipment_stock
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_equipment_stock
     :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_equipment_stock
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_equipment_stock
     :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| 
@@ -75,7 +75,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_equipment_stock%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_equipment_stock%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.
 
@@ -95,7 +95,6 @@ Contributors
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Marcel Savegnago <marcel.savegnago@escodoo.com.br>
-* Reed Hayashikawa <rhayashikawa@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -134,6 +133,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-brian10048| |maintainer-wolfhall| |maintainer-max3903| |maintainer-smangukiya| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_equipment_stock>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_equipment_stock>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_equipment_stock/static/description/index.html b/fieldservice_equipment_stock/static/description/index.html
index 24708b961b..3e4fa9bc1e 100644
--- a/fieldservice_equipment_stock/static/description/index.html
+++ b/fieldservice_equipment_stock/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Stock Equipment</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_equipment_stock"><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_equipment_stock"><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><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_equipment_stock"><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_equipment_stock"><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>This module is an add-on for the Field Service application in Odoo.
 It allows you to track your FSM Equipments in stock moves.</p>
 <p><strong>Table of contents</strong></p>
@@ -424,7 +424,7 @@ <h1><a class="toc-backref" href="#id4">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_equipment_stock%0Aversion:%2012.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_equipment_stock%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">
@@ -461,7 +461,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/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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_equipment_stock">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/14.0/fieldservice_equipment_stock">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 346b95e1a2ee6135abaeacb6faf1c6c89c258012 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 16 Jul 2021 16:10:34 +0000
Subject: [PATCH 417/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index dbefdb29f8..ab90feed78 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210712.3
\ No newline at end of file
+14.0.20210716.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 39b7a42612..7edd7fd75f 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -16,6 +16,7 @@
         'odoo14-addon-fieldservice_calendar',
         'odoo14-addon-fieldservice_crm',
         'odoo14-addon-fieldservice_distribution',
+        'odoo14-addon-fieldservice_equipment_stock',
         'odoo14-addon-fieldservice_isp_account',
         'odoo14-addon-fieldservice_isp_flow',
         'odoo14-addon-fieldservice_partner_multi_relation',

From db35c3f3af262b6318f88f741a0b5712025e9014 Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Sun, 18 Jul 2021 16:58:40 +0000
Subject: [PATCH 418/631] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (553 of 553 strings)

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

diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index 9e58480b1d..c4a99a923c 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-07-09 21:48+0000\n"
+"PO-Revision-Date: 2021-07-18 19:49+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_AR\n"
@@ -251,7 +251,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__agreement_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__agreement_ids
 msgid "Agreements"
-msgstr ""
+msgstr "Acuerdos"
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
@@ -267,7 +267,7 @@ msgstr "Todas las Órdenes"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_all_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_all_ids
 msgid "All relations with current partner"
-msgstr ""
+msgstr "Todas las relaciones con el contacto actual"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
@@ -857,7 +857,7 @@ msgstr "Ubicación Actual"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_customer
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_customer
 msgid "Customer Location"
-msgstr ""
+msgstr "Ubicación del Cliente"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
@@ -1349,19 +1349,19 @@ msgstr "Tiene Entradas no Reconciliadas"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_type_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_type_id
 msgid "Has relation of type"
-msgstr ""
+msgstr "Tiene relación de tipo"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_id
 msgid "Has relation with"
-msgstr ""
+msgstr "Tiene relación con"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_category_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_category_id
 msgid "Has relation with a partner in category"
-msgstr ""
+msgstr "Tiene relación con un contacto en la categoría"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
@@ -2128,13 +2128,13 @@ msgstr "Mensaje para Factura"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
 msgid "Message for Sales Order"
-msgstr ""
+msgstr "Mensaje para los Pedidos de Venta"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
 msgid "Message for Stock Picking"
-msgstr ""
+msgstr "Mensaje para los Movimientos de Inventario"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
@@ -2659,13 +2659,13 @@ msgstr "Socio Relacionado"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_count
 msgid "Relation Count"
-msgstr ""
+msgstr "Cuenta de Relación"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_date
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_date
 msgid "Relation valid"
-msgstr ""
+msgstr "Relación válida"
 
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.reporting
@@ -2720,13 +2720,13 @@ msgstr "Error de entrega de SMS"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_count
 msgid "Sale Order Count"
-msgstr ""
+msgstr "Cuenta del Pedido de Venta"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_ids
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedidos de Venta"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
@@ -2738,7 +2738,7 @@ msgstr "Equipo de Ventas"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn
 msgid "Sales Warnings"
-msgstr ""
+msgstr "Advertencias de Ventas"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
@@ -2987,7 +2987,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn
 msgid "Stock Picking"
-msgstr ""
+msgstr "Movimiento de Inventario"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
@@ -3154,6 +3154,8 @@ msgstr ""
 msgid ""
 "The stock location used as destination when sending goods to this contact."
 msgstr ""
+"La ubicación de inventario utilizada como destino al enviar mercancías a "
+"este contacto."
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_supplier
@@ -3161,6 +3163,8 @@ msgstr ""
 msgid ""
 "The stock location used as source when receiving goods from this contact."
 msgstr ""
+"La ubicación de inventario utilizada como fuente al recibir mercancías de "
+"este contacto."
 
 #. module: fieldservice
 #: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
@@ -3440,7 +3444,7 @@ msgstr "Vehículos"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_supplier
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_supplier
 msgid "Vendor Location"
-msgstr ""
+msgstr "Ubicación del Vendedor"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id

From 3bd63054bb0f2781633527ea2331ee55308ff6ae Mon Sep 17 00:00:00 2001
From: hparfr <raph@hpar.fr>
Date: Tue, 20 Jul 2021 16:49:19 +0200
Subject: [PATCH 419/631] 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 71aed6686e3a63f60d750a9226d1c07b4fadf212 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 13 Dec 2018 18:57:19 -0600
Subject: [PATCH 420/631] [ADD] fieldservice_vehicle_stock

---
 fieldservice_vehicle_stock/README.rst         | 131 +++++
 fieldservice_vehicle_stock/__init__.py        |   4 +
 fieldservice_vehicle_stock/__manifest__.py    |  29 ++
 .../data/fsm_stock_data.xml                   | 142 ++++++
 fieldservice_vehicle_stock/models/__init__.py |   7 +
 .../models/fsm_order.py                       |  17 +
 .../models/fsm_vehicle.py                     |  11 +
 .../readme/CONFIGURE.rst                      |   4 +
 .../readme/CONTRIBUTORS.rst                   |   1 +
 fieldservice_vehicle_stock/readme/CREDITS.rst |   3 +
 .../readme/DESCRIPTION.rst                    |   2 +
 fieldservice_vehicle_stock/readme/INSTALL.rst |   6 +
 fieldservice_vehicle_stock/readme/ROADMAP.rst |   2 +
 fieldservice_vehicle_stock/readme/USAGE.rst   |   7 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 468 ++++++++++++++++++
 .../views/fsm_vehicle.xml                     |  14 +
 17 files changed, 848 insertions(+)
 create mode 100644 fieldservice_vehicle_stock/README.rst
 create mode 100644 fieldservice_vehicle_stock/__init__.py
 create mode 100644 fieldservice_vehicle_stock/__manifest__.py
 create mode 100644 fieldservice_vehicle_stock/data/fsm_stock_data.xml
 create mode 100644 fieldservice_vehicle_stock/models/__init__.py
 create mode 100644 fieldservice_vehicle_stock/models/fsm_order.py
 create mode 100644 fieldservice_vehicle_stock/models/fsm_vehicle.py
 create mode 100644 fieldservice_vehicle_stock/readme/CONFIGURE.rst
 create mode 100644 fieldservice_vehicle_stock/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_vehicle_stock/readme/CREDITS.rst
 create mode 100644 fieldservice_vehicle_stock/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_vehicle_stock/readme/INSTALL.rst
 create mode 100644 fieldservice_vehicle_stock/readme/ROADMAP.rst
 create mode 100644 fieldservice_vehicle_stock/readme/USAGE.rst
 create mode 100644 fieldservice_vehicle_stock/static/description/icon.png
 create mode 100644 fieldservice_vehicle_stock/static/description/index.html
 create mode 100644 fieldservice_vehicle_stock/views/fsm_vehicle.xml

diff --git a/fieldservice_vehicle_stock/README.rst b/fieldservice_vehicle_stock/README.rst
new file mode 100644
index 0000000000..3510cd588b
--- /dev/null
+++ b/fieldservice_vehicle_stock/README.rst
@@ -0,0 +1,131 @@
+=====================
+Field Service - Stock
+=====================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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_stock
+    :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_stock
+    :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| 
+
+This module is an add-on for the Field Service application in Odoo.
+It provides inventory and stock operations.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Installation
+============
+
+You will first need to install:
+
+* fieldservice
+
+Then go to Field Service > Configuration > Settings
+Enable the 'Use Odoo Stock Logistics' option under Integrations
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+* Set Inventory Locations for FSM Locations and FSM Vehicles
+* Verify procurement routes
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Create a new field service order
+* Under the Materials tab, add products with quantity
+* Confirm an order to create stock moves
+* Validate stock moves in the Inventory app
+* Quantities Delivered on FSM Order Line will be updated based on move
+
+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_stock%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
+* Brian McMaster
+
+Contributors
+~~~~~~~~~~~~
+
+* Brian McMaster <brian@mcmpest.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-brian10048| image:: https://github.com/brian10048.png?size=40px
+    :target: https://github.com/brian10048
+    :alt: brian10048
+.. |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-brian10048| |maintainer-wolfhall| |maintainer-max3903| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_stock>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_vehicle_stock/__init__.py b/fieldservice_vehicle_stock/__init__.py
new file mode 100644
index 0000000000..da2feecfe9
--- /dev/null
+++ b/fieldservice_vehicle_stock/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
new file mode 100644
index 0000000000..61606beca9
--- /dev/null
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -0,0 +1,29 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service Vehicle - Stock',
+    'summary': 'Inventory and Stock Operations for Field Service with Vehicles',
+    'version': '11.0.0.0.1',
+    'category': 'Field Service',
+    'author': "Open Source Integrators, "
+              "Brian McMaster, "
+              "Odoo Community Association (OCA)",
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice_vehicle',
+        'fieldservice_stock',
+    ],
+    'data': [
+        'data/fsm_stock_data.xml',
+        'views/fsm_vehicle.xml',
+    ],
+    'installable': True,
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'brian10048',
+        'wolfhall',
+        'max3903',
+    ],
+}
diff --git a/fieldservice_vehicle_stock/data/fsm_stock_data.xml b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
new file mode 100644
index 0000000000..18816805e5
--- /dev/null
+++ b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="stock_location_vehicle" model="stock.location">
+            <field name="name">Vehicle</field>
+            <field name="usage">view</field>
+            <field name="company_id"></field>
+        </record>
+
+        <record id="stock_location_vehicle_storage" model="stock.location">
+            <field name="name">Storage</field>
+            <field name="usage">internal</field>
+            <field name="location_id" ref="stock_location_vehicle"/>
+            <field name="company_id"></field>
+        </record>
+
+    </data>
+
+    <data noupdate="1">
+    
+        <!-- Output to Vehicle operations -->
+        <record id="seq_picking_type_output_to_vehicle" model="ir.sequence">
+            <field name="name">Vehicle Loading</field>
+            <field name="prefix">VL</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+
+        <record id="picking_type_output_to_vehicle" model="stock.picking.type">
+            <field name="name">Vehicle Loading</field>
+            <field name="sequence_id" ref="seq_picking_type_output_to_vehicle"/>
+            <field name="code">internal</field>
+            <field name="warehouse_id" eval="False"/>
+            <field name="default_location_src_id" ref="stock.stock_location_stock"/>
+            <field name="default_location_dest_id" ref="stock_location_vehicle"/>
+        </record>
+
+        <!-- Vehicle to Location operations -->
+        <record id="seq_picking_type_vehicle_to_location" model="ir.sequence">
+            <field name="name">Location Delivery</field>
+            <field name="prefix">LD</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+
+        <record id="picking_type_vehicle_to_location" model="stock.picking.type">
+            <field name="name">Location Delivery</field>
+            <field name="sequence_id" ref="seq_picking_type_vehicle_to_location"/>
+            <field name="code">outgoing</field>
+            <field name="warehouse_id" eval="False"/>
+            <field name="default_location_src_id" ref="stock_location_vehicle"/>
+        </record>
+
+        <record id="route_stock_to_vehicle_to_location" model='stock.location.route'>
+            <field name="name">Stock to Vehicle to Location</field>
+            <field name="sequence">3</field>
+            <field name="company_id"></field>
+        </record>
+
+        <record id="procurement_rule_vehicle_to_location" model="procurement.rule">
+            <field name="name">Vehicle → Location</field>
+            <field name="action">move</field>
+            <field name="location_id" ref="stock.stock_location_customers"/>
+            <field name="location_src_id" ref="stock_location_vehicle_storage"/>
+            <field name="procure_method">make_to_order</field>
+            <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
+            <field name="picking_type_id" ref="picking_type_vehicle_to_location"/>
+        </record>
+
+        <record id="procurement_rule_output_to_vehicle" model="procurement.rule">
+            <field name="name">Warehouse → Vehicle</field>
+            <field name="action">move</field>
+            <field name="location_id" ref="stock_location_vehicle_storage"/>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
+            <field name="picking_type_id" ref="picking_type_output_to_vehicle"/>
+        </record>
+
+        <!-- Location Return Operations -->
+        <record id="route_location_return" model='stock.location.route'>
+            <field name="name">Location Return</field>
+            <field name="sequence">3</field>
+            <field name="company_id"></field>
+        </record>
+
+        <!-- Location Return to Vehicle operations -->
+        <record id="seq_picking_type_location_to_vehicle" model="ir.sequence">
+            <field name="name">Location Pickup</field>
+            <field name="prefix">LP</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+
+        <record id="picking_type_location_to_vehicle" model="stock.picking.type">
+            <field name="name">Location Pickup</field>
+            <field name="sequence_id" ref="seq_picking_type_location_to_vehicle"/>
+            <field name="code">internal</field>
+            <field name="warehouse_id" eval="False"/>
+            <field name="default_location_dest_id" ref="stock_location_vehicle"/>
+        </record>
+
+        <record id="procurement_rule_location_to_vehicle" model="procurement.rule">
+            <field name="name">Warehouse → Vehicle</field>
+            <field name="action">move</field>
+            <field name="location_id" ref="stock_location_vehicle"/>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="route_id" ref="route_location_return"/>
+            <field name="picking_type_id" ref="picking_type_location_to_vehicle"/>
+        </record>
+
+
+        <!-- Vehicle to Input -->
+        <record id="seq_picking_type_vehicle_to_input" model="ir.sequence">
+            <field name="name">Vehicle Returns</field>
+            <field name="prefix">VR</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+        
+        <record id="picking_type_vehicle_to_input" model="stock.picking.type">
+            <field name="name">Vehicle Returns</field>
+            <field name="sequence_id" ref="seq_picking_type_vehicle_to_input"/>
+            <field name="code">internal</field>
+            <field name="warehouse_id" eval="False"/>
+            <field name="default_location_src_id" ref="stock_location_vehicle"/>
+            <field name="default_location_dest_id" ref="stock.stock_location_stock"/>
+        </record>
+
+        <record id="stock_location_path_vehicle_to_input" model="stock.location.path">
+            <field name="name">Vehicle → Warehouse</field>
+            <field name="location_from_id" ref="stock_location_vehicle"/>
+            <field name="location_dest_id" ref="stock.stock_location_stock"/>
+            <field name="auto">manual</field>
+            <field name="picking_type_id" ref="picking_type_vehicle_to_input"/>
+            <field name="route_id" ref="route_location_return"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/fieldservice_vehicle_stock/models/__init__.py b/fieldservice_vehicle_stock/models/__init__.py
new file mode 100644
index 0000000000..9f7a2707cf
--- /dev/null
+++ b/fieldservice_vehicle_stock/models/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import (
+    fsm_vehicle,
+    fsm_order,
+)
diff --git a/fieldservice_vehicle_stock/models/fsm_order.py b/fieldservice_vehicle_stock/models/fsm_order.py
new file mode 100644
index 0000000000..1de91cf089
--- /dev/null
+++ b/fieldservice_vehicle_stock/models/fsm_order.py
@@ -0,0 +1,17 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class FSMOrderLine(models.Model):
+    _inherit = 'fsm.order.line'
+
+    @api.multi
+    def _prepare_procurement_values(self, group_id=False):
+        values = super(self, FSMOrderLine)._prepare_procurement_values(group_id)
+        values.update({
+            'route_ids': self.env.ref(
+                'fieldservice_vehicle_stock.route_stock_to_vehicle_to_location')
+        })
+        return values
diff --git a/fieldservice_vehicle_stock/models/fsm_vehicle.py b/fieldservice_vehicle_stock/models/fsm_vehicle.py
new file mode 100644
index 0000000000..06d78920d9
--- /dev/null
+++ b/fieldservice_vehicle_stock/models/fsm_vehicle.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class FSMVehicle(models.Model):
+    _inherit = 'fsm.vehicle'
+
+    inventory_location = fields.Many2one('stock.location',
+                                         'Inventory Location')
diff --git a/fieldservice_vehicle_stock/readme/CONFIGURE.rst b/fieldservice_vehicle_stock/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..6b50a28919
--- /dev/null
+++ b/fieldservice_vehicle_stock/readme/CONFIGURE.rst
@@ -0,0 +1,4 @@
+To configure this module, you need to:
+
+* Set Inventory Locations for FSM Locations and FSM Vehicles
+* Verify procurement routes
diff --git a/fieldservice_vehicle_stock/readme/CONTRIBUTORS.rst b/fieldservice_vehicle_stock/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..39ef3fa3d7
--- /dev/null
+++ b/fieldservice_vehicle_stock/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_vehicle_stock/readme/CREDITS.rst b/fieldservice_vehicle_stock/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_vehicle_stock/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_vehicle_stock/readme/DESCRIPTION.rst b/fieldservice_vehicle_stock/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..978a9f3b33
--- /dev/null
+++ b/fieldservice_vehicle_stock/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module is an add-on for the Field Service application in Odoo.
+It provides inventory and stock operations.
diff --git a/fieldservice_vehicle_stock/readme/INSTALL.rst b/fieldservice_vehicle_stock/readme/INSTALL.rst
new file mode 100644
index 0000000000..a7c9f727b2
--- /dev/null
+++ b/fieldservice_vehicle_stock/readme/INSTALL.rst
@@ -0,0 +1,6 @@
+You will first need to install:
+
+* fieldservice
+
+Then go to Field Service > Configuration > Settings
+Enable the 'Use Odoo Stock Logistics' option under Integrations
diff --git a/fieldservice_vehicle_stock/readme/ROADMAP.rst b/fieldservice_vehicle_stock/readme/ROADMAP.rst
new file mode 100644
index 0000000000..f607015959
--- /dev/null
+++ b/fieldservice_vehicle_stock/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_vehicle_stock/readme/USAGE.rst b/fieldservice_vehicle_stock/readme/USAGE.rst
new file mode 100644
index 0000000000..2934857b2b
--- /dev/null
+++ b/fieldservice_vehicle_stock/readme/USAGE.rst
@@ -0,0 +1,7 @@
+To use this module, you need to:
+
+* Create a new field service order
+* Under the Materials tab, add products with quantity
+* Confirm an order to create stock moves
+* Validate stock moves in the Inventory app
+* Quantities Delivered on FSM Order Line will be updated based on move
diff --git a/fieldservice_vehicle_stock/static/description/icon.png b/fieldservice_vehicle_stock/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_vehicle_stock/static/description/index.html b/fieldservice_vehicle_stock/static/description/index.html
new file mode 100644
index 0000000000..7cf0406b5e
--- /dev/null
+++ b/fieldservice_vehicle_stock/static/description/index.html
@@ -0,0 +1,468 @@
+<?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 - Stock</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-stock">
+<h1 class="title">Field Service - Stock</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_stock"><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_stock"><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 an add-on for the Field Service application in Odoo.
+It provides inventory and stock operations.</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>You will first need to install:</p>
+<ul class="simple">
+<li>fieldservice</li>
+</ul>
+<p>Then go to Field Service &gt; Configuration &gt; Settings
+Enable the ‘Use Odoo Stock Logistics’ option under Integrations</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>Set Inventory Locations for FSM Locations and FSM Vehicles</li>
+<li>Verify procurement routes</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>Create a new field service order</li>
+<li>Under the Materials tab, add products with quantity</li>
+<li>Confirm an order to create stock moves</li>
+<li>Validate stock moves in the Inventory app</li>
+<li>Quantities Delivered on FSM Order Line will be updated based on move</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_stock%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>
+<li>Brian McMaster</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id8">Contributors</a></h2>
+<ul class="simple">
+<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">
+<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/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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_stock">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_vehicle_stock/views/fsm_vehicle.xml b/fieldservice_vehicle_stock/views/fsm_vehicle.xml
new file mode 100644
index 0000000000..84b559e8f0
--- /dev/null
+++ b/fieldservice_vehicle_stock/views/fsm_vehicle.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="fsm_vehicle_stock_form_view" model="ir.ui.view">
+        <field name="model">fsm.vehicle</field>
+        <field name="inherit_id" ref="fieldservice.fsm_vehicle_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form/sheet/group/group[2]" position="inside">
+                <field name="inventory_location" domain="[('usage', '=', 'internal')]"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

From f59593d3a02c41ea3a25b6ce2d187ea111289bd8 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 13 Dec 2018 19:48:34 -0600
Subject: [PATCH 421/631] [ADD] Security

---
 fieldservice_vehicle_stock/README.rst              | 14 +++++++-------
 fieldservice_vehicle_stock/__manifest__.py         |  5 +++--
 fieldservice_vehicle_stock/models/fsm_order.py     |  8 ++++----
 .../static/description/index.html                  | 12 ++++++------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/fieldservice_vehicle_stock/README.rst b/fieldservice_vehicle_stock/README.rst
index 3510cd588b..69824b38c6 100644
--- a/fieldservice_vehicle_stock/README.rst
+++ b/fieldservice_vehicle_stock/README.rst
@@ -1,6 +1,6 @@
-=====================
-Field Service - Stock
-=====================
+==============================
+Field Service Vehicles - Stock
+==============================
 
 .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
@@ -14,10 +14,10 @@ Field Service - Stock
     :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_stock
+    :target: https://github.com/OCA/field-service/tree/11.0/fieldservice_vehicle_stock
     :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_stock
+    :target: https://translation.odoo-community.org/projects/field-service-11-0/field-service-11-0-fieldservice_vehicle_stock
     :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
@@ -74,7 +74,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_stock%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_vehicle_stock%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.
 
@@ -126,6 +126,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-brian10048| |maintainer-wolfhall| |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_stock>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_vehicle_stock>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index 61606beca9..fcff212eb6 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -2,8 +2,8 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service Vehicle - Stock',
-    'summary': 'Inventory and Stock Operations for Field Service with Vehicles',
+    'name': 'Field Service Vehicles - Stock',
+    'summary': 'Inventory Operations for Field Service with Vehicles',
     'version': '11.0.0.0.1',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
@@ -19,6 +19,7 @@
         'views/fsm_vehicle.xml',
     ],
     'installable': True,
+    'auto_install': True,
     'license': 'AGPL-3',
     'development_status': 'Beta',
     'maintainers': [
diff --git a/fieldservice_vehicle_stock/models/fsm_order.py b/fieldservice_vehicle_stock/models/fsm_order.py
index 1de91cf089..c3bebf5cb1 100644
--- a/fieldservice_vehicle_stock/models/fsm_order.py
+++ b/fieldservice_vehicle_stock/models/fsm_order.py
@@ -9,9 +9,9 @@ class FSMOrderLine(models.Model):
 
     @api.multi
     def _prepare_procurement_values(self, group_id=False):
-        values = super(self, FSMOrderLine)._prepare_procurement_values(group_id)
-        values.update({
-            'route_ids': self.env.ref(
-                'fieldservice_vehicle_stock.route_stock_to_vehicle_to_location')
+        values = super(self, FSMOrderLine).\
+            _prepare_procurement_values(group_id)
+        values.update({'route_ids': self.env.ref(
+            'fieldservice_vehicle_stock.route_stock_to_vehicle_to_location')
         })
         return values
diff --git a/fieldservice_vehicle_stock/static/description/index.html b/fieldservice_vehicle_stock/static/description/index.html
index 7cf0406b5e..241e84ec55 100644
--- a/fieldservice_vehicle_stock/static/description/index.html
+++ b/fieldservice_vehicle_stock/static/description/index.html
@@ -4,7 +4,7 @@
 <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 - Stock</title>
+<title>Field Service Vehicles - Stock</title>
 <style type="text/css">
 
 /*
@@ -360,14 +360,14 @@
 </style>
 </head>
 <body>
-<div class="document" id="field-service-stock">
-<h1 class="title">Field Service - Stock</h1>
+<div class="document" id="field-service-vehicles-stock">
+<h1 class="title">Field Service Vehicles - Stock</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_stock"><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_stock"><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/11.0/fieldservice_vehicle_stock"><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_vehicle_stock"><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 an add-on for the Field Service application in Odoo.
 It provides inventory and stock operations.</p>
 <p><strong>Table of contents</strong></p>
@@ -425,7 +425,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_stock%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_vehicle_stock%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">
@@ -459,7 +459,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/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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_stock">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/11.0/fieldservice_vehicle_stock">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 dea1a2640be0799f367964937009093158815300 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 14 Dec 2018 17:18:12 -0600
Subject: [PATCH 422/631] [FIX] External ID

---
 fieldservice_vehicle_stock/__manifest__.py       | 2 +-
 fieldservice_vehicle_stock/views/fsm_vehicle.xml | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index fcff212eb6..f620c4f18c 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles - Stock',
     'summary': 'Inventory Operations for Field Service with Vehicles',
-    'version': '11.0.0.0.1',
+    'version': '11.0.0.1.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_vehicle_stock/views/fsm_vehicle.xml b/fieldservice_vehicle_stock/views/fsm_vehicle.xml
index 84b559e8f0..65629362c6 100644
--- a/fieldservice_vehicle_stock/views/fsm_vehicle.xml
+++ b/fieldservice_vehicle_stock/views/fsm_vehicle.xml
@@ -3,10 +3,12 @@
 
     <record id="fsm_vehicle_stock_form_view" model="ir.ui.view">
         <field name="model">fsm.vehicle</field>
-        <field name="inherit_id" ref="fieldservice.fsm_vehicle_form_view"/>
+        <field name="inherit_id"
+               ref="fieldservice_vehicle.fsm_vehicle_form_view"/>
         <field name="arch" type="xml">
             <xpath expr="//form/sheet/group/group[2]" position="inside">
-                <field name="inventory_location" domain="[('usage', '=', 'internal')]"/>
+                <field name="inventory_location"
+                       domain="[('usage', '=', 'internal')]"/>
             </xpath>
         </field>
     </record>

From f91f5768b29f1e1458c87cb0ff91d562a17acddd Mon Sep 17 00:00:00 2001
From: Sandip Mangukiya <smangukiya@ursainfosystems.com>
Date: Mon, 31 Dec 2018 02:55:09 -0800
Subject: [PATCH 423/631] [FIX] fieldservice_vehicle_stock

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

diff --git a/fieldservice_vehicle_stock/models/fsm_order.py b/fieldservice_vehicle_stock/models/fsm_order.py
index c3bebf5cb1..197ea0f684 100644
--- a/fieldservice_vehicle_stock/models/fsm_order.py
+++ b/fieldservice_vehicle_stock/models/fsm_order.py
@@ -9,7 +9,7 @@ class FSMOrderLine(models.Model):
 
     @api.multi
     def _prepare_procurement_values(self, group_id=False):
-        values = super(self, FSMOrderLine).\
+        values = super(FSMOrderLine, self).\
             _prepare_procurement_values(group_id)
         values.update({'route_ids': self.env.ref(
             'fieldservice_vehicle_stock.route_stock_to_vehicle_to_location')

From 53a440e6dd4d391df172b9cd3382cd93a082b966 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 7 Jan 2019 20:39:56 -0600
Subject: [PATCH 424/631] [IMP] Rename field

---
 fieldservice_vehicle_stock/models/fsm_vehicle.py | 5 +++--
 fieldservice_vehicle_stock/views/fsm_vehicle.xml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fieldservice_vehicle_stock/models/fsm_vehicle.py b/fieldservice_vehicle_stock/models/fsm_vehicle.py
index 06d78920d9..56a4747458 100644
--- a/fieldservice_vehicle_stock/models/fsm_vehicle.py
+++ b/fieldservice_vehicle_stock/models/fsm_vehicle.py
@@ -7,5 +7,6 @@
 class FSMVehicle(models.Model):
     _inherit = 'fsm.vehicle'
 
-    inventory_location = fields.Many2one('stock.location',
-                                         'Inventory Location')
+    inventory_location_id = fields.Many2one('stock.location',
+                                            string='Inventory Location',
+                                            required=True)
diff --git a/fieldservice_vehicle_stock/views/fsm_vehicle.xml b/fieldservice_vehicle_stock/views/fsm_vehicle.xml
index 65629362c6..7c6fd8fe4f 100644
--- a/fieldservice_vehicle_stock/views/fsm_vehicle.xml
+++ b/fieldservice_vehicle_stock/views/fsm_vehicle.xml
@@ -7,7 +7,7 @@
                ref="fieldservice_vehicle.fsm_vehicle_form_view"/>
         <field name="arch" type="xml">
             <xpath expr="//form/sheet/group/group[2]" position="inside">
-                <field name="inventory_location"
+                <field name="inventory_location_id"
                        domain="[('usage', '=', 'internal')]"/>
             </xpath>
         </field>

From 79d5fd76e084fcb95c5385c7c857e7dde7365c08 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Mon, 8 Apr 2019 18:50:34 +0530
Subject: [PATCH 425/631] [MIG][WIP][12.0] fieldservice_vehicle_stock

---
 fieldservice_vehicle_stock/README.rst         |  11 +-
 fieldservice_vehicle_stock/__manifest__.py    |   2 +-
 .../data/fsm_stock_data.xml                   | 100 +++++++++++-------
 .../models/fsm_order.py                       |   6 +-
 .../readme/CONTRIBUTORS.rst                   |   1 +
 .../static/description/index.html             |   7 +-
 6 files changed, 75 insertions(+), 52 deletions(-)

diff --git a/fieldservice_vehicle_stock/README.rst b/fieldservice_vehicle_stock/README.rst
index 69824b38c6..c92cc7fb7e 100644
--- a/fieldservice_vehicle_stock/README.rst
+++ b/fieldservice_vehicle_stock/README.rst
@@ -14,13 +14,13 @@ Field Service Vehicles - Stock
     :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_vehicle_stock
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_vehicle_stock
     :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_vehicle_stock
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock
     :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| 
@@ -74,7 +74,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_vehicle_stock%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_vehicle_stock%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.
 
@@ -91,6 +91,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Brian McMaster <brian@mcmpest.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -126,6 +127,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-brian10048| |maintainer-wolfhall| |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_vehicle_stock>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_vehicle_stock>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index f620c4f18c..9090431683 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles - Stock',
     'summary': 'Inventory Operations for Field Service with Vehicles',
-    'version': '11.0.0.1.0',
+    'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_vehicle_stock/data/fsm_stock_data.xml b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
index 18816805e5..c8dbf9ff4f 100644
--- a/fieldservice_vehicle_stock/data/fsm_stock_data.xml
+++ b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="stock_location_vehicle" model="stock.location">
-            <field name="name">Vehicle</field>
-            <field name="usage">view</field>
-            <field name="company_id"></field>
-        </record>
+    <record id="stock_location_vehicle" model="stock.location">
+        <field name="name">Vehicle</field>
+        <field name="usage">view</field>
+        <field name="company_id"></field>
+    </record>
 
-        <record id="stock_location_vehicle_storage" model="stock.location">
-            <field name="name">Storage</field>
-            <field name="usage">internal</field>
-            <field name="location_id" ref="stock_location_vehicle"/>
-            <field name="company_id"></field>
-        </record>
+    <record id="stock_location_vehicle_storage" model="stock.location">
+        <field name="name">Storage</field>
+        <field name="usage">internal</field>
+        <field name="location_id" ref="stock_location_vehicle"/>
+        <field name="company_id"></field>
+    </record>
 
-    </data>
 
     <data noupdate="1">
-    
+
         <!-- Output to Vehicle operations -->
         <record id="seq_picking_type_output_to_vehicle" model="ir.sequence">
             <field name="name">Vehicle Loading</field>
@@ -29,11 +27,14 @@
 
         <record id="picking_type_output_to_vehicle" model="stock.picking.type">
             <field name="name">Vehicle Loading</field>
-            <field name="sequence_id" ref="seq_picking_type_output_to_vehicle"/>
+            <field name="sequence_id"
+                   ref="seq_picking_type_output_to_vehicle"/>
             <field name="code">internal</field>
             <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id" ref="stock.stock_location_stock"/>
-            <field name="default_location_dest_id" ref="stock_location_vehicle"/>
+            <field name="default_location_src_id"
+                   ref="stock.stock_location_stock"/>
+            <field name="default_location_dest_id"
+                   ref="stock_location_vehicle"/>
         </record>
 
         <!-- Vehicle to Location operations -->
@@ -44,38 +45,48 @@
             <field name="company_id" eval="False"/>
         </record>
 
-        <record id="picking_type_vehicle_to_location" model="stock.picking.type">
+        <record id="picking_type_vehicle_to_location"
+                model="stock.picking.type">
             <field name="name">Location Delivery</field>
-            <field name="sequence_id" ref="seq_picking_type_vehicle_to_location"/>
+            <field name="sequence_id"
+                   ref="seq_picking_type_vehicle_to_location"/>
             <field name="code">outgoing</field>
             <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id" ref="stock_location_vehicle"/>
+            <field name="default_location_src_id"
+                   ref="stock_location_vehicle"/>
         </record>
 
-        <record id="route_stock_to_vehicle_to_location" model='stock.location.route'>
+        <record id="route_stock_to_vehicle_to_location"
+                model='stock.location.route'>
             <field name="name">Stock to Vehicle to Location</field>
             <field name="sequence">3</field>
+            <field name="fsm_selectable">True</field>
             <field name="company_id"></field>
         </record>
 
-        <record id="procurement_rule_vehicle_to_location" model="procurement.rule">
+        <record id="procurement_rule_vehicle_to_location"
+                model="stock.rule">
             <field name="name">Vehicle → Location</field>
-            <field name="action">move</field>
+            <field name="action">pull</field>
             <field name="location_id" ref="stock.stock_location_customers"/>
-            <field name="location_src_id" ref="stock_location_vehicle_storage"/>
+            <field name="location_src_id"
+                   ref="stock_location_vehicle_storage"/>
             <field name="procure_method">make_to_order</field>
             <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
-            <field name="picking_type_id" ref="picking_type_vehicle_to_location"/>
+            <field name="picking_type_id"
+                   ref="picking_type_vehicle_to_location"/>
         </record>
 
-        <record id="procurement_rule_output_to_vehicle" model="procurement.rule">
+        <record id="procurement_rule_output_to_vehicle"
+                model="stock.rule">
             <field name="name">Warehouse → Vehicle</field>
-            <field name="action">move</field>
+            <field name="action">pull</field>
             <field name="location_id" ref="stock_location_vehicle_storage"/>
             <field name="location_src_id" ref="stock.stock_location_stock"/>
             <field name="procure_method">make_to_stock</field>
             <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
-            <field name="picking_type_id" ref="picking_type_output_to_vehicle"/>
+            <field name="picking_type_id"
+                   ref="picking_type_output_to_vehicle"/>
         </record>
 
         <!-- Location Return Operations -->
@@ -93,22 +104,27 @@
             <field name="company_id" eval="False"/>
         </record>
 
-        <record id="picking_type_location_to_vehicle" model="stock.picking.type">
+        <record id="picking_type_location_to_vehicle"
+                model="stock.picking.type">
             <field name="name">Location Pickup</field>
-            <field name="sequence_id" ref="seq_picking_type_location_to_vehicle"/>
+            <field name="sequence_id"
+                   ref="seq_picking_type_location_to_vehicle"/>
             <field name="code">internal</field>
             <field name="warehouse_id" eval="False"/>
-            <field name="default_location_dest_id" ref="stock_location_vehicle"/>
+            <field name="default_location_dest_id"
+                   ref="stock_location_vehicle"/>
         </record>
 
-        <record id="procurement_rule_location_to_vehicle" model="procurement.rule">
+        <record id="procurement_rule_location_to_vehicle"
+                model="stock.rule">
             <field name="name">Warehouse → Vehicle</field>
-            <field name="action">move</field>
+            <field name="action">pull</field>
             <field name="location_id" ref="stock_location_vehicle"/>
             <field name="location_src_id" ref="stock.stock_location_stock"/>
             <field name="procure_method">make_to_stock</field>
             <field name="route_id" ref="route_location_return"/>
-            <field name="picking_type_id" ref="picking_type_location_to_vehicle"/>
+            <field name="picking_type_id"
+                   ref="picking_type_location_to_vehicle"/>
         </record>
 
 
@@ -119,20 +135,24 @@
             <field name="padding">5</field>
             <field name="company_id" eval="False"/>
         </record>
-        
+
         <record id="picking_type_vehicle_to_input" model="stock.picking.type">
             <field name="name">Vehicle Returns</field>
             <field name="sequence_id" ref="seq_picking_type_vehicle_to_input"/>
             <field name="code">internal</field>
             <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id" ref="stock_location_vehicle"/>
-            <field name="default_location_dest_id" ref="stock.stock_location_stock"/>
+            <field name="default_location_src_id"
+                   ref="stock_location_vehicle"/>
+            <field name="default_location_dest_id"
+                   ref="stock.stock_location_stock"/>
         </record>
 
-        <record id="stock_location_path_vehicle_to_input" model="stock.location.path">
+        <record id="stock_rule_vehicle_to_input"
+                model="stock.rule">
             <field name="name">Vehicle → Warehouse</field>
-            <field name="location_from_id" ref="stock_location_vehicle"/>
-            <field name="location_dest_id" ref="stock.stock_location_stock"/>
+            <field name="action">push</field>
+            <field name="location_scs_id" ref="stock_location_vehicle"/>
+            <field name="location_id" ref="stock.stock_location_stock"/>
             <field name="auto">manual</field>
             <field name="picking_type_id" ref="picking_type_vehicle_to_input"/>
             <field name="route_id" ref="route_location_return"/>
diff --git a/fieldservice_vehicle_stock/models/fsm_order.py b/fieldservice_vehicle_stock/models/fsm_order.py
index 197ea0f684..6f263f8024 100644
--- a/fieldservice_vehicle_stock/models/fsm_order.py
+++ b/fieldservice_vehicle_stock/models/fsm_order.py
@@ -4,12 +4,12 @@
 from odoo import api, models
 
 
-class FSMOrderLine(models.Model):
-    _inherit = 'fsm.order.line'
+class StockRequest(models.Model):
+    _inherit = 'stock.request'
 
     @api.multi
     def _prepare_procurement_values(self, group_id=False):
-        values = super(FSMOrderLine, self).\
+        values = super(StockRequest, self).\
             _prepare_procurement_values(group_id)
         values.update({'route_ids': self.env.ref(
             'fieldservice_vehicle_stock.route_stock_to_vehicle_to_location')
diff --git a/fieldservice_vehicle_stock/readme/CONTRIBUTORS.rst b/fieldservice_vehicle_stock/readme/CONTRIBUTORS.rst
index 39ef3fa3d7..7ecd842208 100644
--- a/fieldservice_vehicle_stock/readme/CONTRIBUTORS.rst
+++ b/fieldservice_vehicle_stock/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Brian McMaster <brian@mcmpest.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_vehicle_stock/static/description/index.html b/fieldservice_vehicle_stock/static/description/index.html
index 241e84ec55..e6ee657497 100644
--- a/fieldservice_vehicle_stock/static/description/index.html
+++ b/fieldservice_vehicle_stock/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service Vehicles - Stock</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_vehicle_stock"><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_vehicle_stock"><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_vehicle_stock"><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_vehicle_stock"><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>This module is an add-on for the Field Service application in Odoo.
 It provides inventory and stock operations.</p>
 <p><strong>Table of contents</strong></p>
@@ -425,7 +425,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_vehicle_stock%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_vehicle_stock%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">
@@ -441,6 +441,7 @@ <h2><a class="toc-backref" href="#id7">Authors</a></h2>
 <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.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">
@@ -459,7 +460,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/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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_vehicle_stock">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_vehicle_stock">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 88574cb6fb5377af954b67905fa3980b7a9e017b Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 10 May 2019 08:37:44 -0700
Subject: [PATCH 426/631] [IMP] Remove Unnecessary Fields

---
 fieldservice_vehicle_stock/data/fsm_stock_data.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fieldservice_vehicle_stock/data/fsm_stock_data.xml b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
index c8dbf9ff4f..cf367a3d61 100644
--- a/fieldservice_vehicle_stock/data/fsm_stock_data.xml
+++ b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
@@ -60,7 +60,6 @@
                 model='stock.location.route'>
             <field name="name">Stock to Vehicle to Location</field>
             <field name="sequence">3</field>
-            <field name="fsm_selectable">True</field>
             <field name="company_id"></field>
         </record>
 

From 3602c0ac2b2a26294efce107ccff9987f1ffdec0 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 27 Jun 2019 15:26:46 -0500
Subject: [PATCH 427/631] [FIX] fieldservice_vehicle_stock: Allow worker to
 deliver from order

---
 fieldservice_vehicle_stock/__manifest__.py    |  2 ++
 .../data/fsm_stock_data.xml                   |  4 +--
 fieldservice_vehicle_stock/models/__init__.py |  2 +-
 .../models/fsm_order.py                       | 17 ----------
 .../models/stock_request.py                   | 33 +++++++++++++++++++
 .../security/ir.model.access.csv              |  4 +++
 .../static/description/index.html             |  2 +-
 .../views/fsm_order.xml                       | 29 ++++++++++++++++
 .../views/fsm_vehicle.xml                     |  1 -
 9 files changed, 71 insertions(+), 23 deletions(-)
 delete mode 100644 fieldservice_vehicle_stock/models/fsm_order.py
 create mode 100644 fieldservice_vehicle_stock/models/stock_request.py
 create mode 100644 fieldservice_vehicle_stock/security/ir.model.access.csv
 create mode 100644 fieldservice_vehicle_stock/views/fsm_order.xml

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index 9090431683..594536418f 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -15,8 +15,10 @@
         'fieldservice_stock',
     ],
     'data': [
+        'security/ir.model.access.csv',
         'data/fsm_stock_data.xml',
         'views/fsm_vehicle.xml',
+        'views/fsm_order.xml',
     ],
     'installable': True,
     'auto_install': True,
diff --git a/fieldservice_vehicle_stock/data/fsm_stock_data.xml b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
index cf367a3d61..d8c6384521 100644
--- a/fieldservice_vehicle_stock/data/fsm_stock_data.xml
+++ b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <record id="stock_location_vehicle" model="stock.location">
@@ -14,7 +13,6 @@
         <field name="company_id"></field>
     </record>
 
-
     <data noupdate="1">
 
         <!-- Output to Vehicle operations -->
@@ -150,7 +148,7 @@
                 model="stock.rule">
             <field name="name">Vehicle → Warehouse</field>
             <field name="action">push</field>
-            <field name="location_scs_id" ref="stock_location_vehicle"/>
+            <field name="location_src_id" ref="stock_location_vehicle"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
             <field name="auto">manual</field>
             <field name="picking_type_id" ref="picking_type_vehicle_to_input"/>
diff --git a/fieldservice_vehicle_stock/models/__init__.py b/fieldservice_vehicle_stock/models/__init__.py
index 9f7a2707cf..1cd7f6d75d 100644
--- a/fieldservice_vehicle_stock/models/__init__.py
+++ b/fieldservice_vehicle_stock/models/__init__.py
@@ -3,5 +3,5 @@
 
 from . import (
     fsm_vehicle,
-    fsm_order,
+    stock_request,
 )
diff --git a/fieldservice_vehicle_stock/models/fsm_order.py b/fieldservice_vehicle_stock/models/fsm_order.py
deleted file mode 100644
index 6f263f8024..0000000000
--- a/fieldservice_vehicle_stock/models/fsm_order.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, models
-
-
-class StockRequest(models.Model):
-    _inherit = 'stock.request'
-
-    @api.multi
-    def _prepare_procurement_values(self, group_id=False):
-        values = super(StockRequest, self).\
-            _prepare_procurement_values(group_id)
-        values.update({'route_ids': self.env.ref(
-            'fieldservice_vehicle_stock.route_stock_to_vehicle_to_location')
-        })
-        return values
diff --git a/fieldservice_vehicle_stock/models/stock_request.py b/fieldservice_vehicle_stock/models/stock_request.py
new file mode 100644
index 0000000000..30db152c62
--- /dev/null
+++ b/fieldservice_vehicle_stock/models/stock_request.py
@@ -0,0 +1,33 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class StockRequest(models.Model):
+    _inherit = 'stock.request'
+
+    @api.multi
+    def action_assign(self):
+        for rec in self:
+            for move in rec.move_ids:
+                if move.picking_id.picking_type_id == self.env.ref(
+                        'fieldservice_vehicle_stock.'
+                        'picking_type_vehicle_to_location'):
+                    return move.picking_id.action_assign()
+
+    @api.multi
+    def action_deliver(self):
+        for rec in self:
+            for move in rec.move_ids:
+                if move.picking_id.picking_type_id == self.env.ref(
+                        'fieldservice_vehicle_stock.'
+                        'picking_type_vehicle_to_location'):
+                    return move.picking_id.action_done()
+
+    def action_show_details(self):
+        for move in self.move_ids:
+            if move.picking_id.picking_type_id == self.env.ref(
+                    'fieldservice_vehicle_stock.'
+                    'picking_type_vehicle_to_location'):
+                return move.action_show_details()
diff --git a/fieldservice_vehicle_stock/security/ir.model.access.csv b/fieldservice_vehicle_stock/security/ir.model.access.csv
new file mode 100644
index 0000000000..5c9a60e0d6
--- /dev/null
+++ b/fieldservice_vehicle_stock/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_stock_picking_fsm_user,stock.picking.fsm.user,stock.model_stock_picking,fieldservice.group_fsm_user,1,1,1,0
+access_stock_move_fsm_user,stock.move.fsm.user,stock.model_stock_move,fieldservice.group_fsm_user,1,1,1,0
+access_stock_move_line_fsm_user,stock.move.line.fsm.user,stock.model_stock_move_line,fieldservice.group_fsm_user,1,1,1,0
diff --git a/fieldservice_vehicle_stock/static/description/index.html b/fieldservice_vehicle_stock/static/description/index.html
index e6ee657497..fa18fa81fe 100644
--- a/fieldservice_vehicle_stock/static/description/index.html
+++ b/fieldservice_vehicle_stock/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 Vehicles - Stock</title>
 <style type="text/css">
 
diff --git a/fieldservice_vehicle_stock/views/fsm_order.xml b/fieldservice_vehicle_stock/views/fsm_order.xml
new file mode 100644
index 0000000000..519f17ae08
--- /dev/null
+++ b/fieldservice_vehicle_stock/views/fsm_order.xml
@@ -0,0 +1,29 @@
+<odoo>
+
+    <record id="fsm_order_form_view" model="ir.ui.view">
+        <field name="name">fsm.order.stock.vehicle</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id"
+               ref="fieldservice_stock.view_fsm_order_form_inherit_stock"/>
+        <field name="arch" type="xml">
+            <field name="qty_done" position="before">
+                 <button name="action_assign"
+                         string="Check Availability"
+                         type="object"
+                         icon="fa-unlock-alt"
+                         attrs="{'invisible': [('route_id', '!=', %(fieldservice_vehicle_stock.route_stock_to_vehicle_to_location)d)]}"/>
+                 <button name="action_show_details"
+                         string="Register lots, packs, location"
+                         type="object"
+                         icon="fa-list"
+                         attrs="{'invisible': [('route_id', '!=', %(fieldservice_vehicle_stock.route_stock_to_vehicle_to_location)d)]}"/>
+                 <button name="action_deliver"
+                         string="Deliver"
+                         type="object"
+                         icon="fa-arrow-right"
+                         attrs="{'invisible': [('route_id', '!=', %(fieldservice_vehicle_stock.route_stock_to_vehicle_to_location)d)]}"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_vehicle_stock/views/fsm_vehicle.xml b/fieldservice_vehicle_stock/views/fsm_vehicle.xml
index 7c6fd8fe4f..2eab6a289a 100644
--- a/fieldservice_vehicle_stock/views/fsm_vehicle.xml
+++ b/fieldservice_vehicle_stock/views/fsm_vehicle.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <record id="fsm_vehicle_stock_form_view" model="ir.ui.view">

From d983b85ba7603a8848d2cd385bcbdb2a0a473206 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 7 Aug 2019 12:20:39 -0500
Subject: [PATCH 428/631] [FIX] fieldservice_vehicle_stock: AttributeError:
 'bool' object has no attribute 'id'

---
 fieldservice_vehicle_stock/data/fsm_stock_data.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fieldservice_vehicle_stock/data/fsm_stock_data.xml b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
index d8c6384521..e2c02ec3c3 100644
--- a/fieldservice_vehicle_stock/data/fsm_stock_data.xml
+++ b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
@@ -1,7 +1,7 @@
 <odoo>
 
     <record id="stock_location_vehicle" model="stock.location">
-        <field name="name">Vehicle</field>
+        <field name="name">Vehicles</field>
         <field name="usage">view</field>
         <field name="company_id"></field>
     </record>
@@ -10,7 +10,7 @@
         <field name="name">Storage</field>
         <field name="usage">internal</field>
         <field name="location_id" ref="stock_location_vehicle"/>
-        <field name="company_id"></field>
+        <field name="company_id" ref="base.main_company"/>
     </record>
 
     <data noupdate="1">
@@ -20,7 +20,7 @@
             <field name="name">Vehicle Loading</field>
             <field name="prefix">VL</field>
             <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
+            <field name="company_id"></field>
         </record>
 
         <record id="picking_type_output_to_vehicle" model="stock.picking.type">
@@ -40,7 +40,7 @@
             <field name="name">Location Delivery</field>
             <field name="prefix">LD</field>
             <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
+            <field name="company_id"></field>
         </record>
 
         <record id="picking_type_vehicle_to_location"
@@ -98,7 +98,7 @@
             <field name="name">Location Pickup</field>
             <field name="prefix">LP</field>
             <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
+            <field name="company_id"></field>
         </record>
 
         <record id="picking_type_location_to_vehicle"
@@ -130,7 +130,7 @@
             <field name="name">Vehicle Returns</field>
             <field name="prefix">VR</field>
             <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
+            <field name="company_id"></field>
         </record>
 
         <record id="picking_type_vehicle_to_input" model="stock.picking.type">

From dc9c06bbf7cd2323c806344ab3a4fff6c3b29b4d Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Tue, 20 Jul 2021 20:20:03 +0200
Subject: [PATCH 429/631] [FIX] fieldservice: Incorrect assignation on onchange

Such field doesn't exists by dependency chain. It should be added on
the child module `fieldservice_stock_request`.

Closes #826

TT31105
---
 fieldservice/__manifest__.py               | 2 +-
 fieldservice/models/res_config_settings.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/fieldservice/__manifest__.py b/fieldservice/__manifest__.py
index bfae35b4cb..9737041ed1 100644
--- a/fieldservice/__manifest__.py
+++ b/fieldservice/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Field Service",
     "summary": "Manage Field Service Locations, Workers and Orders",
-    "version": "14.0.1.1.1",
+    "version": "14.0.1.1.2",
     "license": "AGPL-3",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
diff --git a/fieldservice/models/res_config_settings.py b/fieldservice/models/res_config_settings.py
index 51b4558c9f..6149980c6e 100644
--- a/fieldservice/models/res_config_settings.py
+++ b/fieldservice/models/res_config_settings.py
@@ -103,7 +103,6 @@ def _onchange_module_fieldservice_repair(self):
     def _onchange_module_fieldservice_stock(self):
         if self.module_fieldservice_stock:
             self.group_stock_production_lot = True
-            self.group_stock_request_order = True
 
     @api.onchange("module_fieldservice_purchase")
     def _onchange_module_fieldservice_purchase(self):

From 8cdd90f0670fee2e71d4409478e4f185388a1ef2 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 20 Jul 2021 18:23:37 +0000
Subject: [PATCH 430/631] [UPD] addons table in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ad77e06608..7ad35a1add 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Available addons
 addon | version | summary
 --- | --- | ---
 [base_territory](base_territory/) | 14.0.1.0.0 | This module allows you to define territories, branches, districts and regions to be used for Field Service operations or Sales.
-[fieldservice](fieldservice/) | 14.0.1.1.1 | Manage Field Service Locations, Workers and Orders
+[fieldservice](fieldservice/) | 14.0.1.1.2 | Manage Field Service Locations, Workers and Orders
 [fieldservice_account](fieldservice_account/) | 14.0.1.0.0 | Track invoices linked to Field Service orders
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
 [fieldservice_agreement](fieldservice_agreement/) | 14.0.1.0.0 | Manage Field Service agreements and contracts

From 8374969423e7a182dbaac8116e9e5cb7908c233f Mon Sep 17 00:00:00 2001
From: HemanginiPatel <h.patel.serpentcs@gmail.com>
Date: Thu, 22 Jul 2021 17:16:50 +0530
Subject: [PATCH 431/631] [14.0][FIX]AttributeError: 'res.config.settings'
 object has no attribute 'group_manage_vendor_price'.

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

diff --git a/fieldservice/models/res_config_settings.py b/fieldservice/models/res_config_settings.py
index 51b4558c9f..10231638f9 100644
--- a/fieldservice/models/res_config_settings.py
+++ b/fieldservice/models/res_config_settings.py
@@ -108,4 +108,4 @@ def _onchange_module_fieldservice_stock(self):
     @api.onchange("module_fieldservice_purchase")
     def _onchange_module_fieldservice_purchase(self):
         if self.module_fieldservice_purchase:
-            self.group_manage_vendor_price = True
+            self.group_product_variant = True

From 244e886fc5ba787a01924171b1d8068145c79171 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 22 Jul 2021 15:49:53 +0000
Subject: [PATCH 432/631] fieldservice 14.0.1.2.0

---
 fieldservice/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice/__manifest__.py b/fieldservice/__manifest__.py
index 9737041ed1..92e31859ca 100644
--- a/fieldservice/__manifest__.py
+++ b/fieldservice/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Field Service",
     "summary": "Manage Field Service Locations, Workers and Orders",
-    "version": "14.0.1.1.2",
+    "version": "14.0.1.2.0",
     "license": "AGPL-3",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",

From 4b3497e87d04b1f518c6155abe1b79a254ab012b Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 22 Jul 2021 15:50:00 +0000
Subject: [PATCH 433/631] [UPD] addons table in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7ad35a1add..d679c0cad2 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Available addons
 addon | version | summary
 --- | --- | ---
 [base_territory](base_territory/) | 14.0.1.0.0 | This module allows you to define territories, branches, districts and regions to be used for Field Service operations or Sales.
-[fieldservice](fieldservice/) | 14.0.1.1.2 | Manage Field Service Locations, Workers and Orders
+[fieldservice](fieldservice/) | 14.0.1.2.0 | Manage Field Service Locations, Workers and Orders
 [fieldservice_account](fieldservice_account/) | 14.0.1.0.0 | Track invoices linked to Field Service orders
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
 [fieldservice_agreement](fieldservice_agreement/) | 14.0.1.0.0 | Manage Field Service agreements and contracts

From 361de595595207267370c37faeb33bbdbb2c5d12 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Fri, 23 Jul 2021 23:21:55 +0000
Subject: [PATCH 434/631] [UPD] Update fieldservice.pot

---
 fieldservice/i18n/fieldservice.pot | 86 ++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/fieldservice/i18n/fieldservice.pot b/fieldservice/i18n/fieldservice.pot
index e386039b06..ae2698c30b 100644
--- a/fieldservice/i18n/fieldservice.pot
+++ b/fieldservice/i18n/fieldservice.pot
@@ -30,6 +30,12 @@ msgstr ""
 msgid "# Tasks"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_invoice_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_invoice_count
+msgid "# Vendor Bills"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
@@ -351,6 +357,14 @@ msgid ""
 "Automatically creates a day route when an order is assigned and scheduled"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__receipt_reminder_email
+msgid ""
+"Automatically send a confirmation email to the vendor X days before the "
+"expected receipt date, asking him to confirm the exact date."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
@@ -865,6 +879,12 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Days Before Receipt"
+msgstr ""
+
 #. module: fieldservice
 #: model:fsm.team,name:fieldservice.fsm_team_default
 msgid "Default Team"
@@ -2072,6 +2092,12 @@ msgstr ""
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn_msg
+msgid "Message for Purchase Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
@@ -2209,6 +2235,12 @@ msgstr ""
 msgid "Number of Actions"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Number of days to send reminder email before the promised receipt date"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error_counter
@@ -2250,6 +2282,12 @@ msgstr ""
 msgid "Office Hours"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__on_time_rate
+msgid "On-Time Delivery Rate"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.operations
 msgid "Operations"
@@ -2412,6 +2450,14 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__on_time_rate
+msgid ""
+"Over the past 12 months; the number of products received on time divided by "
+"the number of ordered products."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
 msgid "Owned By"
@@ -2560,6 +2606,30 @@ msgstr ""
 msgid "Projects and Tasks"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_line_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_line_ids
+msgid "Purchase Lines"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn
+msgid "Purchase Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_order_count
+msgid "Purchase Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__receipt_reminder_email
+msgid "Receipt Reminder"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
 msgid "Record Type"
@@ -2767,9 +2837,11 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
@@ -2962,6 +3034,12 @@ msgstr ""
 msgid "Sub-Locations"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid "Supplier Currency"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
@@ -3115,6 +3193,14 @@ msgid ""
 "account for the current partner"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid ""
+"This currency will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized

From 0ee2dfb10ac5e01a726b7ca8fbf8aef79f1f3045 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Fri, 23 Jul 2021 23:22:04 +0000
Subject: [PATCH 435/631] [UPD] Update fieldservice_purchase.pot

---
 .../i18n/fieldservice_purchase.pot            | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/fieldservice_purchase/i18n/fieldservice_purchase.pot b/fieldservice_purchase/i18n/fieldservice_purchase.pot
index 523774d1e1..dcc12615bd 100644
--- a/fieldservice_purchase/i18n/fieldservice_purchase.pot
+++ b/fieldservice_purchase/i18n/fieldservice_purchase.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_purchase
+# 	* fieldservice_purchase
 #
 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"
@@ -18,13 +18,27 @@ msgstr ""
 msgid "# Pricelists"
 msgstr ""
 
+#. module: fieldservice_purchase
+#: model:ir.model.fields,field_description:fieldservice_purchase.field_fsm_person__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_purchase
 #: model:ir.model,name:fieldservice_purchase.model_fsm_person
 msgid "Field Service Worker"
 msgstr ""
 
+#. module: fieldservice_purchase
+#: model:ir.model.fields,field_description:fieldservice_purchase.field_fsm_person__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_purchase
+#: model:ir.model.fields,field_description:fieldservice_purchase.field_fsm_person____last_update
+msgid "Last Modified on"
+msgstr ""
+
 #. module: fieldservice_purchase
 #: model_terms:ir.ui.view,arch_db:fieldservice_purchase.fsm_person_form_view_pricelists
 msgid "Pricelists"
 msgstr ""
-

From 32dc206e902355b66aa2fb4420d1b780e17ebe86 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 23 Jul 2021 23:27:51 +0000
Subject: [PATCH 436/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d679c0cad2..591f5235d3 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ addon | version | summary
 [fieldservice_isp_flow](fieldservice_isp_flow/) | 14.0.1.0.0 | Field Service workflow for Internet Service Providers
 [fieldservice_partner_multi_relation](fieldservice_partner_multi_relation/) | 14.0.1.0.0 | Manage relations between contacts, companies and locations
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
+[fieldservice_purchase](fieldservice_purchase/) | 14.0.1.0.0 | Manage FSM Purchases
 [fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
 [fieldservice_sale](fieldservice_sale/) | 14.0.1.0.0 | Sell field services.
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills

From 0f04279c0435a1e3dd86dbb0f75fcfa27376276f Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 23 Jul 2021 23:27:56 +0000
Subject: [PATCH 437/631] [UPD] README.rst

---
 fieldservice_purchase/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_purchase/static/description/index.html b/fieldservice_purchase/static/description/index.html
index faf80a479d..40b2b0b315 100644
--- a/fieldservice_purchase/static/description/index.html
+++ b/fieldservice_purchase/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: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Field Service - Purchase</title>
 <style type="text/css">
 

From de75ebd5aede82560f1b671f33480cfa19cef73c Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 23 Jul 2021 23:27:58 +0000
Subject: [PATCH 438/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index ab90feed78..9199c13d12 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210716.0
\ No newline at end of file
+14.0.20210723.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 7edd7fd75f..00affb6e01 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -21,6 +21,7 @@
         'odoo14-addon-fieldservice_isp_flow',
         'odoo14-addon-fieldservice_partner_multi_relation',
         'odoo14-addon-fieldservice_project',
+        'odoo14-addon-fieldservice_purchase',
         'odoo14-addon-fieldservice_route',
         'odoo14-addon-fieldservice_sale',
         'odoo14-addon-fieldservice_skill',

From 750abd1bb1b65654510c45a1aa76d4464c2849e9 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Fri, 23 Jul 2021 23:28:16 +0000
Subject: [PATCH 439/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-14.0/field-service-14.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice/
---
 fieldservice/i18n/de.po    |  89 +++++++++++++++++++++++++++++-
 fieldservice/i18n/es.po    | 110 +++++++++++++++++++++++++++++--------
 fieldservice/i18n/es_AR.po |  86 +++++++++++++++++++++++++++++
 fieldservice/i18n/es_CL.po | 110 +++++++++++++++++++++++++++++--------
 fieldservice/i18n/fr.po    |  86 +++++++++++++++++++++++++++++
 fieldservice/i18n/fr_FR.po |  86 +++++++++++++++++++++++++++++
 fieldservice/i18n/pt_BR.po | 101 +++++++++++++++++++++++++++++-----
 fieldservice/i18n/tr.po    |  86 +++++++++++++++++++++++++++++
 8 files changed, 692 insertions(+), 62 deletions(-)

diff --git a/fieldservice/i18n/de.po b/fieldservice/i18n/de.po
index e4cb93028a..f8755eafea 100644
--- a/fieldservice/i18n/de.po
+++ b/fieldservice/i18n/de.po
@@ -33,6 +33,12 @@ msgstr "# Verkaufschancen"
 msgid "# Tasks"
 msgstr "# Aufgaben"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_invoice_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_invoice_count
+msgid "# Vendor Bills"
+msgstr "# Eingangsrechnungen"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
@@ -355,6 +361,14 @@ msgid ""
 "Automatically creates a day route when an order is assigned and scheduled"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__receipt_reminder_email
+msgid ""
+"Automatically send a confirmation email to the vendor X days before the "
+"expected receipt date, asking him to confirm the exact date."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
@@ -871,6 +885,12 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Days Before Receipt"
+msgstr ""
+
 #. module: fieldservice
 #: model:fsm.team,name:fieldservice.fsm_team_default
 msgid "Default Team"
@@ -2085,6 +2105,12 @@ msgstr ""
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn_msg
+msgid "Message for Purchase Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
@@ -2219,6 +2245,12 @@ msgstr ""
 msgid "Number of Actions"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Number of days to send reminder email before the promised receipt date"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error_counter
@@ -2260,6 +2292,12 @@ msgstr ""
 msgid "Office Hours"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__on_time_rate
+msgid "On-Time Delivery Rate"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.operations
 msgid "Operations"
@@ -2424,6 +2462,14 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__on_time_rate
+msgid ""
+"Over the past 12 months; the number of products received on time divided by "
+"the number of ordered products."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
 msgid "Owned By"
@@ -2572,6 +2618,30 @@ msgstr ""
 msgid "Projects and Tasks"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_line_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_line_ids
+msgid "Purchase Lines"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn
+msgid "Purchase Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_order_count
+msgid "Purchase Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__receipt_reminder_email
+msgid "Receipt Reminder"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
 msgid "Record Type"
@@ -2779,9 +2849,11 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
@@ -2974,6 +3046,12 @@ msgstr ""
 msgid "Sub-Locations"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid "Supplier Currency"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
@@ -3127,6 +3205,14 @@ msgid ""
 "account for the current partner"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid ""
+"This currency will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
@@ -3508,9 +3594,6 @@ msgstr ""
 msgid "templates"
 msgstr ""
 
-#~ msgid "# Vendor Bills"
-#~ msgstr "# Eingangsrechnungen"
-
 #~ msgid "Apply"
 #~ msgstr "Anwenden"
 
diff --git a/fieldservice/i18n/es.po b/fieldservice/i18n/es.po
index e353b3123a..3f02faeeed 100644
--- a/fieldservice/i18n/es.po
+++ b/fieldservice/i18n/es.po
@@ -33,6 +33,12 @@ msgstr "# Oportunidades"
 msgid "# Tasks"
 msgstr "# Tareas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_invoice_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_invoice_count
+msgid "# Vendor Bills"
+msgstr "# Facturas de Proveedor"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
@@ -364,6 +370,14 @@ msgid ""
 msgstr ""
 "Crea automáticamente una ruta de día cuando se asigna y programa un pedido"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__receipt_reminder_email
+msgid ""
+"Automatically send a confirmation email to the vendor X days before the "
+"expected receipt date, asking him to confirm the exact date."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
@@ -887,6 +901,12 @@ msgstr "Tablero"
 msgid "Date"
 msgstr "Fecha"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Days Before Receipt"
+msgstr ""
+
 #. module: fieldservice
 #: model:fsm.team,name:fieldservice.fsm_team_default
 msgid "Default Team"
@@ -2116,6 +2136,12 @@ msgstr "Error de Mensaje de Entrega"
 msgid "Message for Invoice"
 msgstr "Mensaje para factura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn_msg
+msgid "Message for Purchase Order"
+msgstr "Mensaje para Orden de Compra"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
@@ -2251,6 +2277,12 @@ msgstr "Notas"
 msgid "Number of Actions"
 msgstr "Número de Acciones"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Number of days to send reminder email before the promised receipt date"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error_counter
@@ -2293,6 +2325,12 @@ msgstr "Número de mensajes no leídos"
 msgid "Office Hours"
 msgstr "Horas de Oficina"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__on_time_rate
+msgid "On-Time Delivery Rate"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.operations
 msgid "Operations"
@@ -2455,6 +2493,14 @@ msgstr "Ordenes a Programar"
 msgid "Others"
 msgstr "Otros"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__on_time_rate
+msgid ""
+"Over the past 12 months; the number of products received on time divided by "
+"the number of ordered products."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
 msgid "Owned By"
@@ -2604,6 +2650,30 @@ msgstr "Proyecto y Tareas"
 msgid "Projects and Tasks"
 msgstr "Proyectos y Tareas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_line_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_line_ids
+msgid "Purchase Lines"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn
+msgid "Purchase Order"
+msgstr "Orden de Compra"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_order_count
+msgid "Purchase Order Count"
+msgstr "Cuenta de Orden de Compra"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__receipt_reminder_email
+msgid "Receipt Reminder"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
 msgid "Record Type"
@@ -2815,9 +2885,11 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
@@ -3018,6 +3090,12 @@ msgstr "Sububicaciones"
 msgid "Sub-Locations"
 msgstr "Sububicaciones"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid "Supplier Currency"
+msgstr "Moneda de Proveedor"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
@@ -3185,6 +3263,16 @@ msgstr ""
 "Esta cuenta se usará en lugar de la predeterminada como la cuenta por cobrar "
 "del contacto actual"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid ""
+"This currency will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+"Esta moneda se usará, en lugar de la predeterminada, para compras del "
+"contacto actual"
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
@@ -3596,9 +3684,6 @@ msgstr "plantillas"
 #~ msgid "This internal reference already exists!"
 #~ msgstr "¡Esta referencia interna ya existe!"
 
-#~ msgid "# Vendor Bills"
-#~ msgstr "# Facturas de Proveedor"
-
 #~ msgid "Apply"
 #~ msgstr "Aplicar"
 
@@ -3664,9 +3749,6 @@ msgstr "plantillas"
 #~ "como una imagen de 128x128px, con una relación de aspecto preservada. "
 #~ "Utilice este campo en vistas de formulario o algunas vistas kanban."
 
-#~ msgid "Message for Purchase Order"
-#~ msgstr "Mensaje para Orden de Compra"
-
 #~ msgid "Overdue"
 #~ msgstr "Atrasado"
 
@@ -3676,12 +3758,6 @@ msgstr "plantillas"
 #~ msgid "Planned"
 #~ msgstr "Planificado"
 
-#~ msgid "Purchase Order"
-#~ msgstr "Orden de Compra"
-
-#~ msgid "Purchase Order Count"
-#~ msgstr "Cuenta de Orden de Compra"
-
 #~ msgid "Regions"
 #~ msgstr "Regiones"
 
@@ -3707,9 +3783,6 @@ msgstr "plantillas"
 #~ msgid "State Names"
 #~ msgstr "Nombre de Estado"
 
-#~ msgid "Supplier Currency"
-#~ msgstr "Moneda de Proveedor"
-
 #~ msgid ""
 #~ "The partner's timezone, used to output proper date and time values inside "
 #~ "printed reports. It is important to set a value for this field. You "
@@ -3722,13 +3795,6 @@ msgstr "plantillas"
 #~ "se usa para elegir y representar valores de fecha y hora: la zona horaria "
 #~ "de su computadora."
 
-#~ msgid ""
-#~ "This currency will be used, instead of the default one, for purchases "
-#~ "from the current partner"
-#~ msgstr ""
-#~ "Esta moneda se usará, en lugar de la predeterminada, para compras del "
-#~ "contacto actual"
-
 #~ msgid "This delivery method will be used when invoicing from picking."
 #~ msgstr "Este método de entrega se utilizará al facturar desde el despacho."
 
diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index c4a99a923c..80f170a9ce 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -33,6 +33,12 @@ msgstr "# Oportunidades"
 msgid "# Tasks"
 msgstr "# Tareas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_invoice_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_invoice_count
+msgid "# Vendor Bills"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
@@ -363,6 +369,14 @@ msgid ""
 msgstr ""
 "Crea automáticamente una ruta de día cuando se asigna y programa un pedido"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__receipt_reminder_email
+msgid ""
+"Automatically send a confirmation email to the vendor X days before the "
+"expected receipt date, asking him to confirm the exact date."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
@@ -888,6 +902,12 @@ msgstr "Tablero"
 msgid "Date"
 msgstr "Fecha"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Days Before Receipt"
+msgstr ""
+
 #. module: fieldservice
 #: model:fsm.team,name:fieldservice.fsm_team_default
 msgid "Default Team"
@@ -2124,6 +2144,12 @@ msgstr "Error de Mensaje de Entrega"
 msgid "Message for Invoice"
 msgstr "Mensaje para Factura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn_msg
+msgid "Message for Purchase Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
@@ -2258,6 +2284,12 @@ msgstr "Notas"
 msgid "Number of Actions"
 msgstr "Número de Acciones"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Number of days to send reminder email before the promised receipt date"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error_counter
@@ -2299,6 +2331,12 @@ msgstr "Número de mensajes sin leer"
 msgid "Office Hours"
 msgstr "Horas de Oficina"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__on_time_rate
+msgid "On-Time Delivery Rate"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.operations
 msgid "Operations"
@@ -2461,6 +2499,14 @@ msgstr "Pedidos para Programar"
 msgid "Others"
 msgstr "Otros"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__on_time_rate
+msgid ""
+"Over the past 12 months; the number of products received on time divided by "
+"the number of ordered products."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
 msgid "Owned By"
@@ -2613,6 +2659,30 @@ msgstr "Proyecto y Tareas"
 msgid "Projects and Tasks"
 msgstr "Proyectos y Tareas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_line_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_line_ids
+msgid "Purchase Lines"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn
+msgid "Purchase Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_order_count
+msgid "Purchase Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__receipt_reminder_email
+msgid "Receipt Reminder"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
 msgid "Record Type"
@@ -2822,9 +2892,11 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
@@ -3025,6 +3097,12 @@ msgstr "Sub Ubicaciones"
 msgid "Sub-Locations"
 msgstr "Sub-ubicaciones"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid "Supplier Currency"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
@@ -3191,6 +3269,14 @@ msgstr ""
 "Esta cuenta se utilizará en lugar de la predeterminada como la cuenta por "
 "cobrar del socio actual"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid ""
+"This currency will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
diff --git a/fieldservice/i18n/es_CL.po b/fieldservice/i18n/es_CL.po
index ffb4e62742..285d3d6983 100644
--- a/fieldservice/i18n/es_CL.po
+++ b/fieldservice/i18n/es_CL.po
@@ -33,6 +33,12 @@ msgstr "# Oportunidades"
 msgid "# Tasks"
 msgstr "# Tareas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_invoice_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_invoice_count
+msgid "# Vendor Bills"
+msgstr "# Facturas de Proveedor"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
@@ -364,6 +370,14 @@ msgid ""
 msgstr ""
 "Crea automáticamente una ruta de día cuando se asigna y programa un pedido"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__receipt_reminder_email
+msgid ""
+"Automatically send a confirmation email to the vendor X days before the "
+"expected receipt date, asking him to confirm the exact date."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
@@ -887,6 +901,12 @@ msgstr "Tablero"
 msgid "Date"
 msgstr "Fecha"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Days Before Receipt"
+msgstr ""
+
 #. module: fieldservice
 #: model:fsm.team,name:fieldservice.fsm_team_default
 msgid "Default Team"
@@ -2116,6 +2136,12 @@ msgstr "Error de Mensaje de Entrega"
 msgid "Message for Invoice"
 msgstr "Mensaje para factura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn_msg
+msgid "Message for Purchase Order"
+msgstr "Mensaje para Orden de Compra"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
@@ -2251,6 +2277,12 @@ msgstr "Notas"
 msgid "Number of Actions"
 msgstr "Número de Acciones"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Number of days to send reminder email before the promised receipt date"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error_counter
@@ -2293,6 +2325,12 @@ msgstr "Número de mensajes no leídos"
 msgid "Office Hours"
 msgstr "Horas de Oficina"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__on_time_rate
+msgid "On-Time Delivery Rate"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.operations
 msgid "Operations"
@@ -2455,6 +2493,14 @@ msgstr "Ordenes a Programar"
 msgid "Others"
 msgstr "Otros"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__on_time_rate
+msgid ""
+"Over the past 12 months; the number of products received on time divided by "
+"the number of ordered products."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
 msgid "Owned By"
@@ -2604,6 +2650,30 @@ msgstr "Proyecto y Tareas"
 msgid "Projects and Tasks"
 msgstr "Proyectos y Tareas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_line_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_line_ids
+msgid "Purchase Lines"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn
+msgid "Purchase Order"
+msgstr "Orden de Compra"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_order_count
+msgid "Purchase Order Count"
+msgstr "Cuenta de Orden de Compra"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__receipt_reminder_email
+msgid "Receipt Reminder"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
 msgid "Record Type"
@@ -2815,9 +2885,11 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
@@ -3018,6 +3090,12 @@ msgstr "Sububicaciones"
 msgid "Sub-Locations"
 msgstr "Sububicaciones"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid "Supplier Currency"
+msgstr "Moneda de Proveedor"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
@@ -3185,6 +3263,16 @@ msgstr ""
 "Esta cuenta se usará en lugar de la predeterminada como la cuenta por cobrar "
 "del contacto actual"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid ""
+"This currency will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+"Esta moneda se usará, en lugar de la predeterminada, para compras del "
+"contacto actual"
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
@@ -3596,9 +3684,6 @@ msgstr "plantillas"
 #~ msgid "This internal reference already exists!"
 #~ msgstr "¡Esta referencia interna ya existe!"
 
-#~ msgid "# Vendor Bills"
-#~ msgstr "# Facturas de Proveedor"
-
 #~ msgid "Apply"
 #~ msgstr "Aplicar"
 
@@ -3664,9 +3749,6 @@ msgstr "plantillas"
 #~ "como una imagen de 128x128px, con una relación de aspecto preservada. "
 #~ "Utilice este campo en vistas de formulario o algunas vistas kanban."
 
-#~ msgid "Message for Purchase Order"
-#~ msgstr "Mensaje para Orden de Compra"
-
 #~ msgid "Overdue"
 #~ msgstr "Atrasado"
 
@@ -3676,12 +3758,6 @@ msgstr "plantillas"
 #~ msgid "Planned"
 #~ msgstr "Planificado"
 
-#~ msgid "Purchase Order"
-#~ msgstr "Orden de Compra"
-
-#~ msgid "Purchase Order Count"
-#~ msgstr "Cuenta de Orden de Compra"
-
 #~ msgid "Regions"
 #~ msgstr "Regiones"
 
@@ -3707,9 +3783,6 @@ msgstr "plantillas"
 #~ msgid "State Names"
 #~ msgstr "Nombre de Estado"
 
-#~ msgid "Supplier Currency"
-#~ msgstr "Moneda de Proveedor"
-
 #~ msgid ""
 #~ "The partner's timezone, used to output proper date and time values inside "
 #~ "printed reports. It is important to set a value for this field. You "
@@ -3722,13 +3795,6 @@ msgstr "plantillas"
 #~ "se usa para elegir y representar valores de fecha y hora: la zona horaria "
 #~ "de su computadora."
 
-#~ msgid ""
-#~ "This currency will be used, instead of the default one, for purchases "
-#~ "from the current partner"
-#~ msgstr ""
-#~ "Esta moneda se usará, en lugar de la predeterminada, para compras del "
-#~ "contacto actual"
-
 #~ msgid "This delivery method will be used when invoicing from picking."
 #~ msgstr "Este método de entrega se utilizará al facturar desde el despacho."
 
diff --git a/fieldservice/i18n/fr.po b/fieldservice/i18n/fr.po
index ee47cf591e..9b209e6f7a 100644
--- a/fieldservice/i18n/fr.po
+++ b/fieldservice/i18n/fr.po
@@ -33,6 +33,12 @@ msgstr "# Opportunités"
 msgid "# Tasks"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_invoice_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_invoice_count
+msgid "# Vendor Bills"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
@@ -367,6 +373,14 @@ msgstr ""
 "Création automatique d'un itinéraire de jour lorsqu'une commande est "
 "attribuée et programmée"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__receipt_reminder_email
+msgid ""
+"Automatically send a confirmation email to the vendor X days before the "
+"expected receipt date, asking him to confirm the exact date."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
@@ -888,6 +902,12 @@ msgstr "Tableau de bord"
 msgid "Date"
 msgstr "Date"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Days Before Receipt"
+msgstr ""
+
 #. module: fieldservice
 #: model:fsm.team,name:fieldservice.fsm_team_default
 msgid "Default Team"
@@ -2136,6 +2156,12 @@ msgstr "Erreur de livraison du message"
 msgid "Message for Invoice"
 msgstr "Message pour la facturation"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn_msg
+msgid "Message for Purchase Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
@@ -2270,6 +2296,12 @@ msgstr "Notes"
 msgid "Number of Actions"
 msgstr "Nombre d'actions"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Number of days to send reminder email before the promised receipt date"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error_counter
@@ -2311,6 +2343,12 @@ msgstr "Nombre de messages non lus"
 msgid "Office Hours"
 msgstr "Heures de bureau"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__on_time_rate
+msgid "On-Time Delivery Rate"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.operations
 msgid "Operations"
@@ -2473,6 +2511,14 @@ msgstr "Commandes à l'agenda"
 msgid "Others"
 msgstr "Autres"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__on_time_rate
+msgid ""
+"Over the past 12 months; the number of products received on time divided by "
+"the number of ordered products."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
 msgid "Owned By"
@@ -2621,6 +2667,30 @@ msgstr "Projet et étiquettes"
 msgid "Projects and Tasks"
 msgstr "Projets et étiquettes"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_line_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_line_ids
+msgid "Purchase Lines"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn
+msgid "Purchase Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_order_count
+msgid "Purchase Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__receipt_reminder_email
+msgid "Receipt Reminder"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
 msgid "Record Type"
@@ -2831,9 +2901,11 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
@@ -3034,6 +3106,12 @@ msgstr "Sites secondaires"
 msgid "Sub-Locations"
 msgstr "Sites secondaires"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid "Supplier Currency"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
@@ -3197,6 +3275,14 @@ msgstr ""
 "Ce compte sera utilisé à la place du compte par défaut comme compte débiteur "
 "pour le partenaire actuel"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid ""
+"This currency will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
diff --git a/fieldservice/i18n/fr_FR.po b/fieldservice/i18n/fr_FR.po
index 20e896a00b..abe7b8f434 100644
--- a/fieldservice/i18n/fr_FR.po
+++ b/fieldservice/i18n/fr_FR.po
@@ -33,6 +33,12 @@ msgstr ""
 msgid "# Tasks"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_invoice_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_invoice_count
+msgid "# Vendor Bills"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
@@ -367,6 +373,14 @@ msgstr ""
 "Création automatique d'un itinéraire de jour lorsqu'une commande est "
 "attribuée et programmée"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__receipt_reminder_email
+msgid ""
+"Automatically send a confirmation email to the vendor X days before the "
+"expected receipt date, asking him to confirm the exact date."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
@@ -891,6 +905,12 @@ msgstr "Tableau de bord"
 msgid "Date"
 msgstr "Date"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Days Before Receipt"
+msgstr ""
+
 #. module: fieldservice
 #: model:fsm.team,name:fieldservice.fsm_team_default
 msgid "Default Team"
@@ -2133,6 +2153,12 @@ msgstr "Erreur de livraison du message"
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn_msg
+msgid "Message for Purchase Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
@@ -2267,6 +2293,12 @@ msgstr "Notes"
 msgid "Number of Actions"
 msgstr "Nombre d'actions"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Number of days to send reminder email before the promised receipt date"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error_counter
@@ -2308,6 +2340,12 @@ msgstr "Nombre de messages non lus"
 msgid "Office Hours"
 msgstr "Heures de bureau"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__on_time_rate
+msgid "On-Time Delivery Rate"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.operations
 msgid "Operations"
@@ -2470,6 +2508,14 @@ msgstr "Commandes à l'agenda"
 msgid "Others"
 msgstr "Autres"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__on_time_rate
+msgid ""
+"Over the past 12 months; the number of products received on time divided by "
+"the number of ordered products."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
 msgid "Owned By"
@@ -2618,6 +2664,30 @@ msgstr "Projet et étiquettes"
 msgid "Projects and Tasks"
 msgstr "Projets et étiquettes"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_line_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_line_ids
+msgid "Purchase Lines"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn
+msgid "Purchase Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_order_count
+msgid "Purchase Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__receipt_reminder_email
+msgid "Receipt Reminder"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
 msgid "Record Type"
@@ -2828,9 +2898,11 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
@@ -3027,6 +3099,12 @@ msgstr "Sites secondaires"
 msgid "Sub-Locations"
 msgstr "Sites secondaires"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid "Supplier Currency"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
@@ -3182,6 +3260,14 @@ msgid ""
 "account for the current partner"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid ""
+"This currency will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
diff --git a/fieldservice/i18n/pt_BR.po b/fieldservice/i18n/pt_BR.po
index a39371e601..c8a61f094c 100644
--- a/fieldservice/i18n/pt_BR.po
+++ b/fieldservice/i18n/pt_BR.po
@@ -33,6 +33,12 @@ msgstr "# Oportunidades"
 msgid "# Tasks"
 msgstr "# Tarefas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_invoice_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_invoice_count
+msgid "# Vendor Bills"
+msgstr "# Contas de Fornecedores"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
@@ -361,6 +367,14 @@ msgstr ""
 "Cria automaticamente um roteiro diário quando uma solicitação é designada e "
 "agendada"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__receipt_reminder_email
+msgid ""
+"Automatically send a confirmation email to the vendor X days before the "
+"expected receipt date, asking him to confirm the exact date."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
@@ -882,6 +896,12 @@ msgstr "Painel"
 msgid "Date"
 msgstr "Data"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Days Before Receipt"
+msgstr ""
+
 #. module: fieldservice
 #: model:fsm.team,name:fieldservice.fsm_team_default
 msgid "Default Team"
@@ -2118,6 +2138,12 @@ msgstr "Erro de entrega de Mensagem"
 msgid "Message for Invoice"
 msgstr "Mensagem para Fatura"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn_msg
+msgid "Message for Purchase Order"
+msgstr "Mensagem para Ordem de Compra"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
@@ -2252,6 +2278,12 @@ msgstr "Observações"
 msgid "Number of Actions"
 msgstr "Número de ações"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Number of days to send reminder email before the promised receipt date"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error_counter
@@ -2293,6 +2325,12 @@ msgstr "Número de mensagens não lidas"
 msgid "Office Hours"
 msgstr "Horário de Atendimento"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__on_time_rate
+msgid "On-Time Delivery Rate"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.operations
 msgid "Operations"
@@ -2455,6 +2493,14 @@ msgstr "Programação das Ordens"
 msgid "Others"
 msgstr "Outros"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__on_time_rate
+msgid ""
+"Over the past 12 months; the number of products received on time divided by "
+"the number of ordered products."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
 msgid "Owned By"
@@ -2607,6 +2653,30 @@ msgstr "Projeto e Tarefas"
 msgid "Projects and Tasks"
 msgstr "Projetos e Tarefas"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_line_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_line_ids
+msgid "Purchase Lines"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn
+msgid "Purchase Order"
+msgstr "Ordem de Compra"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_order_count
+msgid "Purchase Order Count"
+msgstr "Contagem de Ordens de Compra"
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__receipt_reminder_email
+msgid "Receipt Reminder"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
 msgid "Record Type"
@@ -2816,9 +2886,11 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
@@ -3018,6 +3090,12 @@ msgstr "Sub Locais"
 msgid "Sub-Locations"
 msgstr "Sub-Locais"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid "Supplier Currency"
+msgstr "Moeda do Fornecedor"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
@@ -3183,6 +3261,14 @@ msgstr ""
 "Esta conta será usada ao invés da padrão como a conta a receber para o "
 "parceiro atual"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid ""
+"This currency will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
@@ -3604,9 +3690,6 @@ msgstr "modelos"
 #~ msgid "This internal reference already exists!"
 #~ msgstr "Essa referência interna já existe!"
 
-#~ msgid "# Vendor Bills"
-#~ msgstr "# Contas de Fornecedores"
-
 #~ msgid "Apply"
 #~ msgstr "Aplicar"
 
@@ -3663,9 +3746,6 @@ msgstr "modelos"
 #~ msgid "Medium-sized image"
 #~ msgstr "Imagem de tamanho médio"
 
-#~ msgid "Message for Purchase Order"
-#~ msgstr "Mensagem para Ordem de Compra"
-
 #~ msgid "Overdue"
 #~ msgstr "Vencido"
 
@@ -3675,12 +3755,6 @@ msgstr "modelos"
 #~ msgid "Planned"
 #~ msgstr "Planejado"
 
-#~ msgid "Purchase Order"
-#~ msgstr "Ordem de Compra"
-
-#~ msgid "Purchase Order Count"
-#~ msgstr "Contagem de Ordens de Compra"
-
 #~ msgid "Regions"
 #~ msgstr "Regiões"
 
@@ -3696,9 +3770,6 @@ msgstr "modelos"
 #~ msgid "State Names"
 #~ msgstr "Nomes do Estado"
 
-#~ msgid "Supplier Currency"
-#~ msgstr "Moeda do Fornecedor"
-
 #~ msgid ""
 #~ "This field holds the image used as avatar for this contact, limited to "
 #~ "1024x1024px"
diff --git a/fieldservice/i18n/tr.po b/fieldservice/i18n/tr.po
index 79228138e8..19a9f409c1 100644
--- a/fieldservice/i18n/tr.po
+++ b/fieldservice/i18n/tr.po
@@ -33,6 +33,12 @@ msgstr "# Fırsatalar"
 msgid "# Tasks"
 msgstr "# Görevler"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_invoice_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_invoice_count
+msgid "# Vendor Bills"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
@@ -353,6 +359,14 @@ msgid ""
 "Automatically creates a day route when an order is assigned and scheduled"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__receipt_reminder_email
+msgid ""
+"Automatically send a confirmation email to the vendor X days before the "
+"expected receipt date, asking him to confirm the exact date."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
@@ -867,6 +881,12 @@ msgstr "Gösterge Paneli"
 msgid "Date"
 msgstr "Tarih"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Days Before Receipt"
+msgstr ""
+
 #. module: fieldservice
 #: model:fsm.team,name:fieldservice.fsm_team_default
 msgid "Default Team"
@@ -2082,6 +2102,12 @@ msgstr ""
 msgid "Message for Invoice"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn_msg
+msgid "Message for Purchase Order"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
@@ -2216,6 +2242,12 @@ msgstr "Notlar"
 msgid "Number of Actions"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Number of days to send reminder email before the promised receipt date"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error_counter
@@ -2257,6 +2289,12 @@ msgstr ""
 msgid "Office Hours"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__on_time_rate
+msgid "On-Time Delivery Rate"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.operations
 msgid "Operations"
@@ -2419,6 +2457,14 @@ msgstr "Planlanacak Siparişler"
 msgid "Others"
 msgstr "Diğer"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__on_time_rate
+msgid ""
+"Over the past 12 months; the number of products received on time divided by "
+"the number of ordered products."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
 msgid "Owned By"
@@ -2567,6 +2613,30 @@ msgstr ""
 msgid "Projects and Tasks"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_line_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_line_ids
+msgid "Purchase Lines"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn
+msgid "Purchase Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_order_count
+msgid "Purchase Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__receipt_reminder_email
+msgid "Receipt Reminder"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
 msgid "Record Type"
@@ -2776,9 +2846,11 @@ msgstr ""
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__purchase_warn
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
 msgid ""
 "Selecting the \"Warning\" option will notify user with the message, "
@@ -2971,6 +3043,12 @@ msgstr "Alt Konumlar"
 msgid "Sub-Locations"
 msgstr "Alt-Konumlar"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid "Supplier Currency"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
@@ -3124,6 +3202,14 @@ msgid ""
 "account for the current partner"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid ""
+"This currency will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized

From 1ea51e651153a1e59c58e9a5d2a50369ce65f1d8 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Fri, 23 Jul 2021 23:45:13 +0000
Subject: [PATCH 440/631] [UPD] Update fieldservice_stage_server_action.pot

---
 .../i18n/fieldservice_stage_server_action.pot   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot b/fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot
index 2cb6fdcca8..0870cf21cf 100644
--- a/fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot
+++ b/fieldservice_stage_server_action/i18n/fieldservice_stage_server_action.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 13.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -13,6 +13,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: fieldservice_stage_server_action
+#: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_stage_server_action
 #: model:ir.actions.server,name:fieldservice_stage_server_action.fsm_order_parent_canceled
 msgid "FSM Order Canceled Parent"
@@ -34,6 +39,16 @@ msgstr ""
 msgid "Field Service Stage"
 msgstr ""
 
+#. module: fieldservice_stage_server_action
+#: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_stage_server_action
+#: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage____last_update
+msgid "Last Modified on"
+msgstr ""
+
 #. module: fieldservice_stage_server_action
 #: model:ir.model.fields,field_description:fieldservice_stage_server_action.field_fsm_stage__action_id
 msgid "Server Action"

From 4dd5760fc01815c06bd06309a519a3f9cc852888 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 23 Jul 2021 23:51:01 +0000
Subject: [PATCH 441/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 591f5235d3..de66a73310 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ addon | version | summary
 [fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
 [fieldservice_sale](fieldservice_sale/) | 14.0.1.0.0 | Sell field services.
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills
+[fieldservice_stage_server_action](fieldservice_stage_server_action/) | 14.0.1.0.0 | Execute server actions when reaching a Field Service stage
 [fieldservice_stock](fieldservice_stock/) | 14.0.1.0.0 | Integrate the logistics operations with Field Service
 [fieldservice_timeline](fieldservice_timeline/) | 14.0.1.1.1 | This module is a display timeline view of the Field Service order in Odoo.
 

From 3231e5bc1ecdcff1be444bc9681a8990de3ea38c Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 23 Jul 2021 23:51:04 +0000
Subject: [PATCH 442/631] [UPD] README.rst

---
 fieldservice_stage_server_action/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_stage_server_action/static/description/index.html b/fieldservice_stage_server_action/static/description/index.html
index 1064aa5ebd..3e2d79ef1d 100644
--- a/fieldservice_stage_server_action/static/description/index.html
+++ b/fieldservice_stage_server_action/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: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>FSM Stage Server Action</title>
 <style type="text/css">
 

From 4a2c1c2fbbe0a2bd1606c665576cdd3e29345631 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 23 Jul 2021 23:51:05 +0000
Subject: [PATCH 443/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 9199c13d12..df10cb6550 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210723.0
\ No newline at end of file
+14.0.20210723.1
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 00affb6e01..d997cf81e9 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -25,6 +25,7 @@
         'odoo14-addon-fieldservice_route',
         'odoo14-addon-fieldservice_sale',
         'odoo14-addon-fieldservice_skill',
+        'odoo14-addon-fieldservice_stage_server_action',
         'odoo14-addon-fieldservice_stock',
         'odoo14-addon-fieldservice_timeline',
     ],

From da5ed6844dad15ab80672c5018dce90e0310383e Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Sat, 24 Jul 2021 16:01:56 +0000
Subject: [PATCH 444/631] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (566 of 566 strings)

Translation: field-service-14.0/field-service-14.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice/es_AR/
---
 fieldservice/i18n/es_AR.po | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index 80f170a9ce..c02f58c98f 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-07-18 19:49+0000\n"
+"PO-Revision-Date: 2021-07-24 18:49+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_AR\n"
@@ -37,7 +37,7 @@ msgstr "# Tareas"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_invoice_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_invoice_count
 msgid "# Vendor Bills"
-msgstr ""
+msgstr "# Facturas de Proveedor"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
@@ -376,6 +376,9 @@ msgid ""
 "Automatically send a confirmation email to the vendor X days before the "
 "expected receipt date, asking him to confirm the exact date."
 msgstr ""
+"Envíe automáticamente un correo electrónico de confirmación al proveedor X "
+"días antes de la fecha de recepción esperada, pidiéndole que confirme la "
+"fecha exacta."
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
@@ -906,7 +909,7 @@ msgstr "Fecha"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__reminder_date_before_receipt
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__reminder_date_before_receipt
 msgid "Days Before Receipt"
-msgstr ""
+msgstr "Días Antes de la Recepción"
 
 #. module: fieldservice
 #: model:fsm.team,name:fieldservice.fsm_team_default
@@ -2148,7 +2151,7 @@ msgstr "Mensaje para Factura"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn_msg
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn_msg
 msgid "Message for Purchase Order"
-msgstr ""
+msgstr "Mensaje para la Orden de Compras"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
@@ -2289,6 +2292,8 @@ msgstr "Número de Acciones"
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__reminder_date_before_receipt
 msgid "Number of days to send reminder email before the promised receipt date"
 msgstr ""
+"Número de días para enviar un correo electrónico de recordatorio antes de la "
+"fecha de recepción prometida"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
@@ -2335,7 +2340,7 @@ msgstr "Horas de Oficina"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__on_time_rate
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__on_time_rate
 msgid "On-Time Delivery Rate"
-msgstr ""
+msgstr "Tasa de Entrega A Tiempo"
 
 #. module: fieldservice
 #: model:ir.ui.menu,name:fieldservice.operations
@@ -2506,6 +2511,8 @@ msgid ""
 "Over the past 12 months; the number of products received on time divided by "
 "the number of ordered products."
 msgstr ""
+"Durante los últimos 12 meses; el número de productos recibidos a tiempo "
+"dividido por el número de productos pedidos."
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
@@ -2663,25 +2670,25 @@ msgstr "Proyectos y Tareas"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_line_ids
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_line_ids
 msgid "Purchase Lines"
-msgstr ""
+msgstr "Líneas de Compra"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn
 msgid "Purchase Order"
-msgstr ""
+msgstr "Orden de Compra"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_order_count
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_order_count
 msgid "Purchase Order Count"
-msgstr ""
+msgstr "Cuenta de Orden de Compra"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__receipt_reminder_email
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__receipt_reminder_email
 msgid "Receipt Reminder"
-msgstr ""
+msgstr "Recordatorio de Recepción"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
@@ -3101,7 +3108,7 @@ msgstr "Sub-ubicaciones"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_purchase_currency_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_purchase_currency_id
 msgid "Supplier Currency"
-msgstr ""
+msgstr "Moneda del Proveedor"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
@@ -3276,6 +3283,8 @@ msgid ""
 "This currency will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
+"Esta moneda se utilizará, en lugar de la predeterminada, para las compras "
+"del contacto actual"
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized

From e9c6ca4d0ad2063bde3a0d1a599ddff6f6185df7 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Wed, 11 Dec 2019 20:26:25 +0530
Subject: [PATCH 445/631] [WIP][12.0][ADD] fieldservice_account_payment

---
 fieldservice_account_payment/README.rst       | 112 +++++
 fieldservice_account_payment/__init__.py      |   4 +
 fieldservice_account_payment/__manifest__.py  |  24 +
 .../models/__init__.py                        |   6 +
 .../models/account_payment.py                 |  10 +
 .../models/fsm_order.py                       |  19 +
 .../readme/CONFIGURE.rst                      |   1 +
 .../readme/CONTRIBUTORS.rst                   |   2 +
 .../readme/CREDITS.rst                        |   4 +
 .../readme/DESCRIPTION.rst                    |   1 +
 .../readme/INSTALL.rst                        |   1 +
 fieldservice_account_payment/readme/USAGE.rst |   8 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 454 ++++++++++++++++++
 .../views/account_payment_view.xml            |  14 +
 .../views/fsm_order.xml                       |  16 +
 16 files changed, 676 insertions(+)
 create mode 100644 fieldservice_account_payment/README.rst
 create mode 100644 fieldservice_account_payment/__init__.py
 create mode 100644 fieldservice_account_payment/__manifest__.py
 create mode 100644 fieldservice_account_payment/models/__init__.py
 create mode 100644 fieldservice_account_payment/models/account_payment.py
 create mode 100644 fieldservice_account_payment/models/fsm_order.py
 create mode 100644 fieldservice_account_payment/readme/CONFIGURE.rst
 create mode 100644 fieldservice_account_payment/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_account_payment/readme/CREDITS.rst
 create mode 100644 fieldservice_account_payment/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_account_payment/readme/INSTALL.rst
 create mode 100644 fieldservice_account_payment/readme/USAGE.rst
 create mode 100644 fieldservice_account_payment/static/description/icon.png
 create mode 100644 fieldservice_account_payment/static/description/index.html
 create mode 100644 fieldservice_account_payment/views/account_payment_view.xml
 create mode 100644 fieldservice_account_payment/views/fsm_order.xml

diff --git a/fieldservice_account_payment/README.rst b/fieldservice_account_payment/README.rst
new file mode 100644
index 0000000000..099b424f7d
--- /dev/null
+++ b/fieldservice_account_payment/README.rst
@@ -0,0 +1,112 @@
+==================================
+Field Service - Accounting Payment
+==================================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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/12.0/fieldservice_account_payment
+    :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_account_payment
+    :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
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module allows the worker to accept payments during his work at the location.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Installation
+============
+
+No special installation instructions
+
+Configuration
+=============
+
+No special configuration instructions.
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go to Field Service
+* Select or create a Field Service order
+* Click on the "Register Payment" button
+* Select the Payment Method
+* Enter the amount
+* Validate
+
+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_account_payment%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+
+Contributors
+~~~~~~~~~~~~
+
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+
+Other credits
+~~~~~~~~~~~~~
+
+The development of this module has been financially supported by:
+
+* Open Source Integrators <https://opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.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-max3903| image:: https://github.com/max3903.png?size=40px
+    :target: https://github.com/max3903
+    :alt: max3903
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-max3903| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_account_payment>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_account_payment/__init__.py b/fieldservice_account_payment/__init__.py
new file mode 100644
index 0000000000..33c2f06eff
--- /dev/null
+++ b/fieldservice_account_payment/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_account_payment/__manifest__.py b/fieldservice_account_payment/__manifest__.py
new file mode 100644
index 0000000000..4d91d1f917
--- /dev/null
+++ b/fieldservice_account_payment/__manifest__.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - Accounting Payment',
+    'summary': 'This module allows the worker to accept payments during'
+    ' his work at the location.',
+    'version': '12.0.1.0.0',
+    'category': 'Field Service',
+    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice_account',
+    ],
+    'data': [
+        'views/fsm_order.xml',
+        'views/account_payment_view.xml',
+    ],
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'max3903',
+    ],
+}
diff --git a/fieldservice_account_payment/models/__init__.py b/fieldservice_account_payment/models/__init__.py
new file mode 100644
index 0000000000..5f02111e3f
--- /dev/null
+++ b/fieldservice_account_payment/models/__init__.py
@@ -0,0 +1,6 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import (
+    account_payment,
+    fsm_order,
+)
diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
new file mode 100644
index 0000000000..eb7381c6e6
--- /dev/null
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class AccountPayment(models.Model):
+    _inherit = "account.payment"
+
+    fsm_order_id = fields.Many2one('fsm.order', 'FSM Order')
diff --git a/fieldservice_account_payment/models/fsm_order.py b/fieldservice_account_payment/models/fsm_order.py
new file mode 100644
index 0000000000..5267e31f77
--- /dev/null
+++ b/fieldservice_account_payment/models/fsm_order.py
@@ -0,0 +1,19 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models, _
+
+
+class FSMOrder(models.Model):
+    _inherit = 'fsm.order'
+
+    @api.multi
+    def open_fieldservice_payments(self):
+        return {'name': _('Payments'),
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'account.payment',
+                'view_id': False,
+                'type': 'ir.actions.act_window',
+                'domain': [('fsm_order_id', '=', self.id)],
+                }
diff --git a/fieldservice_account_payment/readme/CONFIGURE.rst b/fieldservice_account_payment/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..89a40f9121
--- /dev/null
+++ b/fieldservice_account_payment/readme/CONFIGURE.rst
@@ -0,0 +1 @@
+No special configuration instructions.
diff --git a/fieldservice_account_payment/readme/CONTRIBUTORS.rst b/fieldservice_account_payment/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..64881b41a3
--- /dev/null
+++ b/fieldservice_account_payment/readme/CONTRIBUTORS.rst
@@ -0,0 +1,2 @@
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_account_payment/readme/CREDITS.rst b/fieldservice_account_payment/readme/CREDITS.rst
new file mode 100644
index 0000000000..d2eaed7d81
--- /dev/null
+++ b/fieldservice_account_payment/readme/CREDITS.rst
@@ -0,0 +1,4 @@
+The development of this module has been financially supported by:
+
+* Open Source Integrators <https://opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_account_payment/readme/DESCRIPTION.rst b/fieldservice_account_payment/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..e928de5815
--- /dev/null
+++ b/fieldservice_account_payment/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module allows the worker to accept payments during his work at the location.
diff --git a/fieldservice_account_payment/readme/INSTALL.rst b/fieldservice_account_payment/readme/INSTALL.rst
new file mode 100644
index 0000000000..54fea7becb
--- /dev/null
+++ b/fieldservice_account_payment/readme/INSTALL.rst
@@ -0,0 +1 @@
+No special installation instructions
diff --git a/fieldservice_account_payment/readme/USAGE.rst b/fieldservice_account_payment/readme/USAGE.rst
new file mode 100644
index 0000000000..09d6db6dfb
--- /dev/null
+++ b/fieldservice_account_payment/readme/USAGE.rst
@@ -0,0 +1,8 @@
+To use this module, you need to:
+
+* Go to Field Service
+* Select or create a Field Service order
+* Click on the "Register Payment" button
+* Select the Payment Method
+* Enter the amount
+* Validate
diff --git a/fieldservice_account_payment/static/description/icon.png b/fieldservice_account_payment/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_account_payment/static/description/index.html b/fieldservice_account_payment/static/description/index.html
new file mode 100644
index 0000000000..172b1570a0
--- /dev/null
+++ b/fieldservice_account_payment/static/description/index.html
@@ -0,0 +1,454 @@
+<?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 - Accounting Payment</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-accounting-payment">
+<h1 class="title">Field Service - Accounting Payment</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_account_payment"><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_account_payment"><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>This module allows the worker to accept payments during his work at the location.</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="#bug-tracker" id="id4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id8">Other credits</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>No special installation instructions</p>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id2">Configuration</a></h1>
+<p>No special configuration instructions.</p>
+</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>Select or create a Field Service order</li>
+<li>Click on the “Register Payment” button</li>
+<li>Select the Payment Method</li>
+<li>Enter the amount</li>
+<li>Validate</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id4">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_account_payment%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="#id5">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id6">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
+<ul class="simple">
+<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#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">
+<h2><a class="toc-backref" href="#id8">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>
+<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="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">maintainer</a>:</p>
+<p><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_account_payment">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_account_payment/views/account_payment_view.xml b/fieldservice_account_payment/views/account_payment_view.xml
new file mode 100644
index 0000000000..b7048080be
--- /dev/null
+++ b/fieldservice_account_payment/views/account_payment_view.xml
@@ -0,0 +1,14 @@
+<odoo>
+
+    <record id="view_account_payment_invoice_form_inherite" model="ir.ui.view">
+        <field name="name">account.payment.invoice.form</field>
+        <field name="model">account.payment</field>
+        <field name="inherit_id" ref="account.view_account_payment_invoice_form"/>
+        <field name="arch" type="xml">
+            <field name="communication" position="after">
+                <field name="fsm_order_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_account_payment/views/fsm_order.xml b/fieldservice_account_payment/views/fsm_order.xml
new file mode 100644
index 0000000000..a87d723a8e
--- /dev/null
+++ b/fieldservice_account_payment/views/fsm_order.xml
@@ -0,0 +1,16 @@
+<odoo>
+
+    <record id="view_fsm_order_form_inherit_acct_payment" model="ir.ui.view">
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice_account.view_fsm_order_form_inherit_account"/>
+        <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <button class="oe_stat_button" name="open_fieldservice_payments" string="Payments" type="object" icon="fa-bars"/>
+            </div>
+            <xpath expr="//page[@name='invoices']/field[@name='invoice_ids']/tree/field[@name='state']" position="after">
+                <button name="%(account.action_account_invoice_payment)d" type="action" string="Register Payment" attrs="{'invisible': [('state', '!=', 'open')]}" context="{'default_fsm_order_id': parent.id}"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

From 9470c0e4e64882002bd744f6cca4ac98e6657ba4 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 19 Dec 2019 17:03:24 -0600
Subject: [PATCH 446/631] [FIX] fieldservice_account_payment

---
 .../models/fsm_order.py                       | 28 +++++++++++--------
 .../views/fsm_order.xml                       | 17 +++++++----
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/fieldservice_account_payment/models/fsm_order.py b/fieldservice_account_payment/models/fsm_order.py
index 5267e31f77..e091bae5c4 100644
--- a/fieldservice_account_payment/models/fsm_order.py
+++ b/fieldservice_account_payment/models/fsm_order.py
@@ -1,19 +1,25 @@
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, models, _
+from odoo import api, fields, models, _
 
 
 class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
+    payment_ids = fields.One2many('account.payment', 'fsm_order_id',
+                                  string='Payments')
+    payment_count = fields.Integer(
+        string='Payment Count',
+        compute='_compute_account_payment_count', readonly=True)
+
+    @api.depends('payment_ids')
+    def _compute_account_payment_count(self):
+        for order in self:
+            order.payment_count = len(order.payment_ids)
+
     @api.multi
-    def open_fieldservice_payments(self):
-        return {'name': _('Payments'),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'account.payment',
-                'view_id': False,
-                'type': 'ir.actions.act_window',
-                'domain': [('fsm_order_id', '=', self.id)],
-                }
+    def action_view_payments(self):
+        action = self.env.ref(
+            'account.action_account_payment').read()[0]
+        action['domain'] = [('fsm_order_id', '=', self.id)]
+        return action
diff --git a/fieldservice_account_payment/views/fsm_order.xml b/fieldservice_account_payment/views/fsm_order.xml
index a87d723a8e..e3f7bd9036 100644
--- a/fieldservice_account_payment/views/fsm_order.xml
+++ b/fieldservice_account_payment/views/fsm_order.xml
@@ -2,14 +2,21 @@
 
     <record id="view_fsm_order_form_inherit_acct_payment" model="ir.ui.view">
         <field name="model">fsm.order</field>
-        <field name="inherit_id" ref="fieldservice_account.view_fsm_order_form_inherit_account"/>
+        <field name="inherit_id"
+               ref="fieldservice_account.view_fsm_order_form_inherit_account"/>
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
-                <button class="oe_stat_button" name="open_fieldservice_payments" string="Payments" type="object" icon="fa-bars"/>
+                <button class="oe_stat_button"
+                        name="action_view_payments"
+                        string="Payments"
+                        type="object"
+                        icon="fa-bars"
+                        attrs="{'invisible': [('payment_count', '=', 0)]}">
+                    <field name="payment_count"
+                           widget="statinfo"
+                           string="Payments"/>
+                </button>
             </div>
-            <xpath expr="//page[@name='invoices']/field[@name='invoice_ids']/tree/field[@name='state']" position="after">
-                <button name="%(account.action_account_invoice_payment)d" type="action" string="Register Payment" attrs="{'invisible': [('state', '!=', 'open')]}" context="{'default_fsm_order_id': parent.id}"/>
-            </xpath>
         </field>
     </record>
 

From fc13706920c5e51984dce71f5e921e276ae7dd14 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 20 Dec 2019 12:55:38 -0600
Subject: [PATCH 447/631] [FIX] fieldservice_account_payment

---
 fieldservice_account_payment/__init__.py      |  2 +-
 fieldservice_account_payment/__manifest__.py  | 14 ++--
 .../models/__init__.py                        |  3 +-
 .../models/account_payment.py                 | 27 ++++++-
 .../models/fsm_order.py                       |  8 +-
 .../security/ir.model.access.csv              |  2 +
 .../tests/__init__.py                         |  4 +
 .../tests/test_fsm_account_payment.py         | 81 +++++++++++++++++++
 .../views/account_payment.xml                 | 23 ++++++
 .../views/account_payment_view.xml            | 14 ----
 10 files changed, 148 insertions(+), 30 deletions(-)
 create mode 100644 fieldservice_account_payment/security/ir.model.access.csv
 create mode 100644 fieldservice_account_payment/tests/__init__.py
 create mode 100644 fieldservice_account_payment/tests/test_fsm_account_payment.py
 create mode 100644 fieldservice_account_payment/views/account_payment.xml
 delete mode 100644 fieldservice_account_payment/views/account_payment_view.xml

diff --git a/fieldservice_account_payment/__init__.py b/fieldservice_account_payment/__init__.py
index 33c2f06eff..9ba431ff8e 100644
--- a/fieldservice_account_payment/__init__.py
+++ b/fieldservice_account_payment/__init__.py
@@ -1,4 +1,4 @@
 # Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent Consulting Services
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from . import models
diff --git a/fieldservice_account_payment/__manifest__.py b/fieldservice_account_payment/__manifest__.py
index 4d91d1f917..f943e93bb4 100644
--- a/fieldservice_account_payment/__manifest__.py
+++ b/fieldservice_account_payment/__manifest__.py
@@ -1,10 +1,9 @@
 # Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent Consulting Services
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 {
     'name': 'Field Service - Accounting Payment',
-    'summary': 'This module allows the worker to accept payments during'
-    ' his work at the location.',
+    'summary': 'Allow workers to collect payments from the order.',
     'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
@@ -13,12 +12,11 @@
         'fieldservice_account',
     ],
     'data': [
+        'security/ir.model.access.csv',
         'views/fsm_order.xml',
-        'views/account_payment_view.xml',
+        'views/account_payment.xml',
     ],
     'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'max3903',
-    ],
+    'development_status': 'Production/Stable',
+    'maintainers': ['max3903'],
 }
diff --git a/fieldservice_account_payment/models/__init__.py b/fieldservice_account_payment/models/__init__.py
index 5f02111e3f..beeacbd94a 100644
--- a/fieldservice_account_payment/models/__init__.py
+++ b/fieldservice_account_payment/models/__init__.py
@@ -1,5 +1,6 @@
+# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent Consulting Services
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from . import (
     account_payment,
     fsm_order,
diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
index eb7381c6e6..3ae792acb3 100644
--- a/fieldservice_account_payment/models/account_payment.py
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -1,10 +1,31 @@
 # Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent Consulting Services
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class AccountPayment(models.Model):
     _inherit = "account.payment"
 
-    fsm_order_id = fields.Many2one('fsm.order', 'FSM Order')
+    fsm_order_ids = fields.Many2many(
+        'fsm.order', 'fsm_order_account_payment',
+        'payment_id', 'fsm_order_id', string='FSM Orders')
+    fsm_order_count = fields.Integer(
+        string='FSM Order Count',
+        compute='_compute_fsm_order_count', readonly=True)
+
+    @api.depends('payment_ids')
+    def _compute_fsm_order_count(self):
+        for payment in self:
+            payment.fsm_order_count = len(payment.fsm_order_ids)
+
+    @api.multi
+    def action_view_fsm_orders(self):
+        action = self.env.ref(
+            'fieldservice.action_fsm_dash_order').read()[0]
+        action['domain'] = [('payment_ids', 'in', self.id)]
+        return action
+
+    @api.depends('invoice_ids.fsm_order_ids')
+    def compute_fsm_order_ids(self):
+        self.fsm_order_ids = self.invoice_ids.fsm_order_ids
diff --git a/fieldservice_account_payment/models/fsm_order.py b/fieldservice_account_payment/models/fsm_order.py
index e091bae5c4..0623ceb153 100644
--- a/fieldservice_account_payment/models/fsm_order.py
+++ b/fieldservice_account_payment/models/fsm_order.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent Consulting Services
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import api, fields, models, _
 
@@ -6,8 +7,9 @@
 class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
-    payment_ids = fields.One2many('account.payment', 'fsm_order_id',
-                                  string='Payments')
+    payment_ids = fields.Many2many(
+        'account.payment', 'fsm_order_account_payment',
+        'fsm_order_id', 'payment_id', string='Payments')
     payment_count = fields.Integer(
         string='Payment Count',
         compute='_compute_account_payment_count', readonly=True)
@@ -21,5 +23,5 @@ def _compute_account_payment_count(self):
     def action_view_payments(self):
         action = self.env.ref(
             'account.action_account_payment').read()[0]
-        action['domain'] = [('fsm_order_id', '=', self.id)]
+        action['domain'] = [('fsm_order_ids', 'in', self.id)]
         return action
diff --git a/fieldservice_account_payment/security/ir.model.access.csv b/fieldservice_account_payment/security/ir.model.access.csv
new file mode 100644
index 0000000000..2c5ff232a3
--- /dev/null
+++ b/fieldservice_account_payment/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_account_payment_fsm_user,account.payment.fsm.user,model_account_payment,fieldservice.group_fsm_user,1,1,1,1
diff --git a/fieldservice_account_payment/tests/__init__.py b/fieldservice_account_payment/tests/__init__.py
new file mode 100644
index 0000000000..ed1b02e990
--- /dev/null
+++ b/fieldservice_account_payment/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent Consulting Services
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from . import test_fsm_account
diff --git a/fieldservice_account_payment/tests/test_fsm_account_payment.py b/fieldservice_account_payment/tests/test_fsm_account_payment.py
new file mode 100644
index 0000000000..102c8d4a2b
--- /dev/null
+++ b/fieldservice_account_payment/tests/test_fsm_account_payment.py
@@ -0,0 +1,81 @@
+# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019 Serpent consulting Services
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+from datetime import datetime, timedelta
+from odoo.tests.common import TransactionCase
+
+
+class FSMAccountPaymentCase(TransactionCase):
+
+    def setUp(self):
+        super(FSMAccountPaymentCase, self).setUp()
+        self.register_payments_model = self.env[
+            'account.register.payments'].with_context(
+            active_model='account.invoice')
+        self.payment_method_manual_in = \
+            self.env.ref("account.account_payment_method_manual_in")
+        self.payment_model = self.env['account.payment']
+        # create a Partner
+        self.test_partner = self.env['res.partner'].\
+            create({
+                'name': 'Test Partner',
+                'phone': '123',
+                'email': 'tp@email.com',
+                })
+        # Create a location
+        self.test_location = self.env['fsm.location'].\
+            create({
+                'name': 'Test Location',
+                'phone': '123',
+                'email': 'tp@email.com',
+                'partner_id': self.test_loc_partner.id,
+                'owner_id': self.test_loc_partner.id,
+                'customer_id': self.test_loc_partner.id,
+                })
+        # Create a FSM order
+        self.test_order = self.env['fsm.order'].create({
+            'location_id': self.test_location.id,
+            'date_start': datetime.today(),
+            'date_end': datetime.today() + timedelta(hours=2),
+            'request_early': datetime.today()
+        })
+        # Create an invoice
+        self.test_invoice = self.env['account.invoice'].create({
+            'partner_id': self.test_partner.id,
+            'type': 'out_invoice',
+            'date_invoice': datetime.today(),
+            'invoice_line_ids': [(6, 0, [{
+                'name': 'Test',
+                'quantity': 1.00,
+                'price_unit': 100.00,
+                'fsm_order_id': self.test_order.id,
+            }])],
+            'fsm_order_ids': [(6, 0, [self.test_order.id])]
+        })
+        # Create a payment method
+        self.bank_journal = self.env['account.journal'].create({
+            'name': 'Bank',
+            'type': 'bank',
+            'code': 'BNK99',
+        })
+
+    def test_fsm_account_payment(self):
+        self.test_invoice.action_invoice_open()
+
+        ctx = {'active_model': 'account.invoice',
+               'active_ids': [self.test_invoice.id]}
+        register_payments = self.register_payments_model.with_context(ctx).create({
+            'payment_date': datetime.today(),
+            'journal_id': self.bank_journal.id,
+            'payment_method_id': self.payment_method_manual_in.id,
+        })
+        register_payments.create_payments()
+        payment = self.payment_model.search([], order="id desc", limit=1)
+
+        self.assertAlmostEquals(payment.amount, 100)
+        self.assertEqual(payment.state, 'posted')
+        self.assertEqual(self.test_invoice.state, 'paid')
+        self.assertEqual(self.test_invoice.fsm_order_ids,
+                         payment.fsm_order_ids)
+        res = self.env['fsm.order'].search([('payment_ids', 'in', payment.id)])
+        self.assertEqual(len(res), 1)
diff --git a/fieldservice_account_payment/views/account_payment.xml b/fieldservice_account_payment/views/account_payment.xml
new file mode 100644
index 0000000000..ef6c966668
--- /dev/null
+++ b/fieldservice_account_payment/views/account_payment.xml
@@ -0,0 +1,23 @@
+<odoo>
+
+    <record id="view_account_payment_invoice_form_inherite" model="ir.ui.view">
+        <field name="name">account.payment.invoice.form</field>
+        <field name="model">account.payment</field>
+        <field name="inherit_id" ref="account.view_account_payment_invoice_form"/>
+        <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <button class="oe_stat_button"
+                        name="action_view_fsm_orders"
+                        string="FSM Orders"
+                        type="object"
+                        icon="fa-map"
+                        attrs="{'invisible': [('fsm_order_count', '=', 0)]}">
+                    <field name="fsm_order_count"
+                           widget="statinfo"
+                           string="FSM Orders"/>
+                </button>
+            </div>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_account_payment/views/account_payment_view.xml b/fieldservice_account_payment/views/account_payment_view.xml
deleted file mode 100644
index b7048080be..0000000000
--- a/fieldservice_account_payment/views/account_payment_view.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<odoo>
-
-    <record id="view_account_payment_invoice_form_inherite" model="ir.ui.view">
-        <field name="name">account.payment.invoice.form</field>
-        <field name="model">account.payment</field>
-        <field name="inherit_id" ref="account.view_account_payment_invoice_form"/>
-        <field name="arch" type="xml">
-            <field name="communication" position="after">
-                <field name="fsm_order_id"/>
-            </field>
-        </field>
-    </record>
-
-</odoo>

From a958bbc04f9c1e740cd6c818fb3a04f666142eca Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sat, 21 Dec 2019 15:57:06 -0600
Subject: [PATCH 448/631] [FIX] fieldservice_account_payment

---
 fieldservice_account_payment/models/account_payment.py | 2 +-
 fieldservice_account_payment/views/account_payment.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
index 3ae792acb3..ae6de8a0f5 100644
--- a/fieldservice_account_payment/models/account_payment.py
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -14,7 +14,7 @@ class AccountPayment(models.Model):
         string='FSM Order Count',
         compute='_compute_fsm_order_count', readonly=True)
 
-    @api.depends('payment_ids')
+    @api.depends('fsm_order_ids')
     def _compute_fsm_order_count(self):
         for payment in self:
             payment.fsm_order_count = len(payment.fsm_order_ids)
diff --git a/fieldservice_account_payment/views/account_payment.xml b/fieldservice_account_payment/views/account_payment.xml
index ef6c966668..4147b23792 100644
--- a/fieldservice_account_payment/views/account_payment.xml
+++ b/fieldservice_account_payment/views/account_payment.xml
@@ -3,7 +3,7 @@
     <record id="view_account_payment_invoice_form_inherite" model="ir.ui.view">
         <field name="name">account.payment.invoice.form</field>
         <field name="model">account.payment</field>
-        <field name="inherit_id" ref="account.view_account_payment_invoice_form"/>
+        <field name="inherit_id" ref="account.view_account_payment_form"/>
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
                 <button class="oe_stat_button"

From 273bdff9853697ecad5a08a97c9157dca5ac64f2 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 22 Dec 2019 14:17:13 -0600
Subject: [PATCH 449/631] [IMP] fieldservice_account_payment

---
 .../models/account_payment.py                 | 20 ++++++++++++++-----
 .../models/fsm_order.py                       | 11 +++++++---
 .../views/account_payment.xml                 |  1 -
 .../views/fsm_order.xml                       |  1 -
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
index ae6de8a0f5..bd2711b530 100644
--- a/fieldservice_account_payment/models/account_payment.py
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -9,7 +9,9 @@ class AccountPayment(models.Model):
 
     fsm_order_ids = fields.Many2many(
         'fsm.order', 'fsm_order_account_payment',
-        'payment_id', 'fsm_order_id', string='FSM Orders')
+        'payment_id', 'fsm_order_id', string='FSM Orders',
+        compute='_compute_fsm_order_ids',
+        store=True, index=True)
     fsm_order_count = fields.Integer(
         string='FSM Order Count',
         compute='_compute_fsm_order_count', readonly=True)
@@ -22,10 +24,18 @@ def _compute_fsm_order_count(self):
     @api.multi
     def action_view_fsm_orders(self):
         action = self.env.ref(
-            'fieldservice.action_fsm_dash_order').read()[0]
-        action['domain'] = [('payment_ids', 'in', self.id)]
+            'fieldservice.action_fsm_operation_order').read()[0]
+        if self.fsm_order_count > 1:
+            action['domain'] = [('id', 'in', self.fsm_order_ids)]
+        elif self.fsm_order_ids:
+            action['views'] = \
+                [(self.env.ref('fieldservice.fsm_order_form').id, 'form')]
+            action['res_id'] = self.fsm_order_ids[0].id
         return action
 
     @api.depends('invoice_ids.fsm_order_ids')
-    def compute_fsm_order_ids(self):
-        self.fsm_order_ids = self.invoice_ids.fsm_order_ids
+    def _compute_fsm_order_ids(self):
+        fsm_order_ids = []
+        for invoice in self.invoice_ids:
+            fsm_order_ids.append(invoice.fsm_order_ids.id)
+        self.fsm_order_ids = [(6, 0, fsm_order_ids)]
diff --git a/fieldservice_account_payment/models/fsm_order.py b/fieldservice_account_payment/models/fsm_order.py
index 0623ceb153..c504bb49b1 100644
--- a/fieldservice_account_payment/models/fsm_order.py
+++ b/fieldservice_account_payment/models/fsm_order.py
@@ -21,7 +21,12 @@ def _compute_account_payment_count(self):
 
     @api.multi
     def action_view_payments(self):
-        action = self.env.ref(
-            'account.action_account_payment').read()[0]
-        action['domain'] = [('fsm_order_ids', 'in', self.id)]
+        action = self.env.ref('account.action_account_payments').read()[0]
+        if self.payment_count > 1:
+            action['domain'] = [('id', 'in', self.payment_ids)]
+        elif self.payment_ids:
+            action['views'] = \
+                [(self.env.ref('account.view_account_payment_form').id,
+                  'form')]
+            action['res_id'] = self.payment_ids[0]
         return action
diff --git a/fieldservice_account_payment/views/account_payment.xml b/fieldservice_account_payment/views/account_payment.xml
index 4147b23792..119a4dcc39 100644
--- a/fieldservice_account_payment/views/account_payment.xml
+++ b/fieldservice_account_payment/views/account_payment.xml
@@ -8,7 +8,6 @@
             <div class="oe_button_box" position="inside">
                 <button class="oe_stat_button"
                         name="action_view_fsm_orders"
-                        string="FSM Orders"
                         type="object"
                         icon="fa-map"
                         attrs="{'invisible': [('fsm_order_count', '=', 0)]}">
diff --git a/fieldservice_account_payment/views/fsm_order.xml b/fieldservice_account_payment/views/fsm_order.xml
index e3f7bd9036..236342ac66 100644
--- a/fieldservice_account_payment/views/fsm_order.xml
+++ b/fieldservice_account_payment/views/fsm_order.xml
@@ -8,7 +8,6 @@
             <div class="oe_button_box" position="inside">
                 <button class="oe_stat_button"
                         name="action_view_payments"
-                        string="Payments"
                         type="object"
                         icon="fa-bars"
                         attrs="{'invisible': [('payment_count', '=', 0)]}">

From aeef9f69a2c120dd8c8bde8d63e6feed0d1cd8ff Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Mon, 23 Dec 2019 17:50:16 +0530
Subject: [PATCH 450/631] [IMP] Improved code

---
 fieldservice_account_payment/README.rst       |  4 +-
 fieldservice_account_payment/i18n/es.po       | 43 ++++++++++++++++
 fieldservice_account_payment/i18n/es_CL.po    | 45 +++++++++++++++++
 .../i18n/fieldservice_account_payment.pot     | 43 ++++++++++++++++
 .../models/fsm_order.py                       |  4 +-
 .../static/description/index.html             |  4 +-
 .../tests/__init__.py                         |  2 +-
 .../tests/test_fsm_account_payment.py         | 49 ++++++++++++++-----
 8 files changed, 174 insertions(+), 20 deletions(-)
 create mode 100644 fieldservice_account_payment/i18n/es.po
 create mode 100644 fieldservice_account_payment/i18n/es_CL.po
 create mode 100644 fieldservice_account_payment/i18n/fieldservice_account_payment.pot

diff --git a/fieldservice_account_payment/README.rst b/fieldservice_account_payment/README.rst
index 099b424f7d..e1550c1e0a 100644
--- a/fieldservice_account_payment/README.rst
+++ b/fieldservice_account_payment/README.rst
@@ -7,9 +7,9 @@ Field Service - Accounting Payment
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
-    :alt: Beta
+    :alt: Production/Stable
 .. |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
diff --git a/fieldservice_account_payment/i18n/es.po b/fieldservice_account_payment/i18n/es.po
new file mode 100644
index 0000000000..42f48265d3
--- /dev/null
+++ b/fieldservice_account_payment/i18n/es.po
@@ -0,0 +1,43 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_account_payment
+#
+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: 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"
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_count
+msgid "FSM Order Count"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_account_payment_invoice_form_inherite
+msgid "FSM Orders"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model,name:fieldservice_account_payment.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_count
+msgid "Payment Count"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model,name:fieldservice_account_payment.model_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_fsm_order_form_inherit_acct_payment
+msgid "Payments"
+msgstr ""
diff --git a/fieldservice_account_payment/i18n/es_CL.po b/fieldservice_account_payment/i18n/es_CL.po
new file mode 100644
index 0000000000..27681d255e
--- /dev/null
+++ b/fieldservice_account_payment/i18n/es_CL.po
@@ -0,0 +1,45 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_account_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-01-16 22:38+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.10\n"
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_count
+msgid "FSM Order Count"
+msgstr "Orden FSM Contada"
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_account_payment_invoice_form_inherite
+msgid "FSM Orders"
+msgstr "Orden FSM"
+
+#. module: fieldservice_account_payment
+#: model:ir.model,name:fieldservice_account_payment.model_fsm_order
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_count
+msgid "Payment Count"
+msgstr "Cuenta de Pago"
+
+#. module: fieldservice_account_payment
+#: model:ir.model,name:fieldservice_account_payment.model_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_fsm_order_form_inherit_acct_payment
+msgid "Payments"
+msgstr "Pagos"
diff --git a/fieldservice_account_payment/i18n/fieldservice_account_payment.pot b/fieldservice_account_payment/i18n/fieldservice_account_payment.pot
new file mode 100644
index 0000000000..17bf072682
--- /dev/null
+++ b/fieldservice_account_payment/i18n/fieldservice_account_payment.pot
@@ -0,0 +1,43 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_account_payment
+#
+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_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_count
+msgid "FSM Order Count"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_account_payment_invoice_form_inherite
+msgid "FSM Orders"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model,name:fieldservice_account_payment.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_count
+msgid "Payment Count"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model,name:fieldservice_account_payment.model_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_fsm_order_form_inherit_acct_payment
+msgid "Payments"
+msgstr ""
+
diff --git a/fieldservice_account_payment/models/fsm_order.py b/fieldservice_account_payment/models/fsm_order.py
index c504bb49b1..8a958671a2 100644
--- a/fieldservice_account_payment/models/fsm_order.py
+++ b/fieldservice_account_payment/models/fsm_order.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2019 Open Source Integrators
 # Copyright (C) 2019 Serpent Consulting Services
 # 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 FSMOrder(models.Model):
@@ -28,5 +28,5 @@ def action_view_payments(self):
             action['views'] = \
                 [(self.env.ref('account.view_account_payment_form').id,
                   'form')]
-            action['res_id'] = self.payment_ids[0]
+            action['res_id'] = self.payment_ids[0].id
         return action
diff --git a/fieldservice_account_payment/static/description/index.html b/fieldservice_account_payment/static/description/index.html
index 172b1570a0..45e4173e86 100644
--- a/fieldservice_account_payment/static/description/index.html
+++ b/fieldservice_account_payment/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 - Accounting Payment</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Accounting Payment</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_account_payment"><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_account_payment"><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><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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_account_payment"><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_account_payment"><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>This module allows the worker to accept payments during his work at the location.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
diff --git a/fieldservice_account_payment/tests/__init__.py b/fieldservice_account_payment/tests/__init__.py
index ed1b02e990..ed4ca4b792 100644
--- a/fieldservice_account_payment/tests/__init__.py
+++ b/fieldservice_account_payment/tests/__init__.py
@@ -1,4 +1,4 @@
 # Copyright (C) 2019 Open Source Integrators
 # Copyright (C) 2019 Serpent Consulting Services
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from . import test_fsm_account
+from . import test_fsm_account_payment
diff --git a/fieldservice_account_payment/tests/test_fsm_account_payment.py b/fieldservice_account_payment/tests/test_fsm_account_payment.py
index 102c8d4a2b..18fdb8029a 100644
--- a/fieldservice_account_payment/tests/test_fsm_account_payment.py
+++ b/fieldservice_account_payment/tests/test_fsm_account_payment.py
@@ -15,14 +15,28 @@ def setUp(self):
         self.payment_method_manual_in = \
             self.env.ref("account.account_payment_method_manual_in")
         self.payment_model = self.env['account.payment']
-        # create a Partner
+        self.test_analytic = self.env.ref('analytic.analytic_administratif')
+        # create a Res Partner
         self.test_partner = self.env['res.partner'].\
             create({
                 'name': 'Test Partner',
                 'phone': '123',
                 'email': 'tp@email.com',
-                })
-        # Create a location
+            })
+        # create a Res Partner to be converted to FSM Location/Person
+        self.test_loc_partner = self.env['res.partner'].\
+            create({
+                'name': 'Test Loc Partner',
+                'phone': 'ABC',
+                'email': 'tlp@email.com',
+            })
+        self.test_loc_partner2 = self.env['res.partner'].\
+            create({
+                'name': 'Test Loc Partner 2',
+                'phone': '123',
+                'email': 'tlp@example.com',
+            })
+        # create expected FSM Location to compare to converted FSM Location
         self.test_location = self.env['fsm.location'].\
             create({
                 'name': 'Test Location',
@@ -31,7 +45,15 @@ def setUp(self):
                 'partner_id': self.test_loc_partner.id,
                 'owner_id': self.test_loc_partner.id,
                 'customer_id': self.test_loc_partner.id,
-                })
+                'analytic_account_id': self.test_analytic.id
+            })
+        self.account_income = self.env['account.account'].create({
+            'code': 'X1112',
+            'name': 'Sale - Test Account',
+            'user_type_id': self.env.ref(
+                'account.data_account_type_direct_costs').id
+        })
+
         # Create a FSM order
         self.test_order = self.env['fsm.order'].create({
             'location_id': self.test_location.id,
@@ -43,13 +65,13 @@ def setUp(self):
         self.test_invoice = self.env['account.invoice'].create({
             'partner_id': self.test_partner.id,
             'type': 'out_invoice',
-            'date_invoice': datetime.today(),
-            'invoice_line_ids': [(6, 0, [{
+            'date_invoice': datetime.today().date(),
+            'invoice_line_ids': [(0, 0, {
                 'name': 'Test',
                 'quantity': 1.00,
                 'price_unit': 100.00,
                 'fsm_order_id': self.test_order.id,
-            }])],
+                'account_id': self.account_income.id})],
             'fsm_order_ids': [(6, 0, [self.test_order.id])]
         })
         # Create a payment method
@@ -64,14 +86,15 @@ def test_fsm_account_payment(self):
 
         ctx = {'active_model': 'account.invoice',
                'active_ids': [self.test_invoice.id]}
-        register_payments = self.register_payments_model.with_context(ctx).create({
-            'payment_date': datetime.today(),
-            'journal_id': self.bank_journal.id,
-            'payment_method_id': self.payment_method_manual_in.id,
-        })
+        register_payments = self.register_payments_model.with_context(
+            ctx).create({'payment_date': datetime.today(),
+                         'journal_id': self.bank_journal.id,
+                         'payment_method_id': self.payment_method_manual_in.id,
+                         })
         register_payments.create_payments()
         payment = self.payment_model.search([], order="id desc", limit=1)
-
+        payment.action_view_fsm_orders()
+        self.test_invoice.fsm_order_ids.action_view_payments()
         self.assertAlmostEquals(payment.amount, 100)
         self.assertEqual(payment.state, 'posted')
         self.assertEqual(self.test_invoice.state, 'paid')

From 991c6cf5fb6dd304e58afee58ae616bdbb9f3dc0 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 6 May 2020 14:57:14 -0500
Subject: [PATCH 451/631] [FIX] fieldervice_account_payment

---
 fieldservice_account_payment/models/account_payment.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
index bd2711b530..8a27b0fd77 100644
--- a/fieldservice_account_payment/models/account_payment.py
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -38,4 +38,5 @@ def _compute_fsm_order_ids(self):
         fsm_order_ids = []
         for invoice in self.invoice_ids:
             fsm_order_ids.append(invoice.fsm_order_ids.id)
-        self.fsm_order_ids = [(6, 0, fsm_order_ids)]
+        if len(fsm_order_ids) > 0:
+            self.fsm_order_ids = [(6, 0, fsm_order_ids)]

From a0515ad031565fe681abc8bce4a763d6ef826293 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 11 May 2020 14:35:04 -0500
Subject: [PATCH 452/631] [FIX] fieldservice_account_payment

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

diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
index 8a27b0fd77..71b2ecf30b 100644
--- a/fieldservice_account_payment/models/account_payment.py
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -39,4 +39,4 @@ def _compute_fsm_order_ids(self):
         for invoice in self.invoice_ids:
             fsm_order_ids.append(invoice.fsm_order_ids.id)
         if len(fsm_order_ids) > 0:
-            self.fsm_order_ids = [(6, 0, fsm_order_ids)]
+            self.fsm_order_ids = [(6, 0, fsm_order_ids.ids)]

From 0915bf7db8c2ed788a0139398cdc0bf0efd5e8f1 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 12 May 2020 10:30:17 -0500
Subject: [PATCH 453/631] [FIX] fieldservice_account_payment

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

diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
index 71b2ecf30b..8a27b0fd77 100644
--- a/fieldservice_account_payment/models/account_payment.py
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -39,4 +39,4 @@ def _compute_fsm_order_ids(self):
         for invoice in self.invoice_ids:
             fsm_order_ids.append(invoice.fsm_order_ids.id)
         if len(fsm_order_ids) > 0:
-            self.fsm_order_ids = [(6, 0, fsm_order_ids.ids)]
+            self.fsm_order_ids = [(6, 0, fsm_order_ids)]

From 0854c0621871153cb1ebdafc883a10df42cc322e Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sat, 16 May 2020 09:27:47 -0500
Subject: [PATCH 454/631] Update
 fieldservice_account_payment/models/account_payment.py

Co-authored-by: Daniel Reis <dreis@opensourceintegrators.com>
---
 fieldservice_account_payment/models/account_payment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
index 8a27b0fd77..4b3f9814f5 100644
--- a/fieldservice_account_payment/models/account_payment.py
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -38,5 +38,5 @@ def _compute_fsm_order_ids(self):
         fsm_order_ids = []
         for invoice in self.invoice_ids:
             fsm_order_ids.append(invoice.fsm_order_ids.id)
-        if len(fsm_order_ids) > 0:
+        if fsm_order_ids:
             self.fsm_order_ids = [(6, 0, fsm_order_ids)]

From 1a5eea33881cd0e98340992bb19644e5ae86f1f1 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sat, 16 May 2020 14:39:40 +0000
Subject: [PATCH 455/631] fieldservice_account_payment 12.0.1.0.1

---
 fieldservice_account_payment/__manifest__.py |  2 +-
 fieldservice_account_payment/i18n/pt_BR.po   | 43 ++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_account_payment/i18n/pt_BR.po

diff --git a/fieldservice_account_payment/__manifest__.py b/fieldservice_account_payment/__manifest__.py
index f943e93bb4..c61435c386 100644
--- a/fieldservice_account_payment/__manifest__.py
+++ b/fieldservice_account_payment/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Accounting Payment',
     'summary': 'Allow workers to collect payments from the order.',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.0.1',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_account_payment/i18n/pt_BR.po b/fieldservice_account_payment/i18n/pt_BR.po
new file mode 100644
index 0000000000..2599374667
--- /dev/null
+++ b/fieldservice_account_payment/i18n/pt_BR.po
@@ -0,0 +1,43 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_account_payment
+#
+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_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_count
+msgid "FSM Order Count"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_account_payment_invoice_form_inherite
+msgid "FSM Orders"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model,name:fieldservice_account_payment.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_count
+msgid "Payment Count"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model,name:fieldservice_account_payment.model_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_fsm_order_form_inherit_acct_payment
+msgid "Payments"
+msgstr ""

From 81eea73d3521b7a0e7b063a6b8171407e0b9968a Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 25 May 2020 16:55:59 -0500
Subject: [PATCH 456/631] [FIX] fieldservice_account_payment

---
 fieldservice_account_payment/models/account_payment.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
index 4b3f9814f5..78746de0a1 100644
--- a/fieldservice_account_payment/models/account_payment.py
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -11,7 +11,7 @@ class AccountPayment(models.Model):
         'fsm.order', 'fsm_order_account_payment',
         'payment_id', 'fsm_order_id', string='FSM Orders',
         compute='_compute_fsm_order_ids',
-        store=True, index=True)
+        store=True, index=True, copy=False)
     fsm_order_count = fields.Integer(
         string='FSM Order Count',
         compute='_compute_fsm_order_count', readonly=True)
@@ -37,6 +37,7 @@ def action_view_fsm_orders(self):
     def _compute_fsm_order_ids(self):
         fsm_order_ids = []
         for invoice in self.invoice_ids:
-            fsm_order_ids.append(invoice.fsm_order_ids.id)
+            if invoice.fsm_order_ids:
+                fsm_order_ids.extend(invoice.fsm_order_ids.ids)
         if fsm_order_ids:
             self.fsm_order_ids = [(6, 0, fsm_order_ids)]

From 8edb6d518b07b7c999f6bb937ba39845ce403ac9 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sun, 31 May 2020 01:12:44 +0000
Subject: [PATCH 457/631] fieldservice_account_payment 12.0.1.1.0

---
 fieldservice_account_payment/__manifest__.py |  2 +-
 fieldservice_account_payment/i18n/es.po      | 14 ++++++++------
 fieldservice_account_payment/i18n/pt_BR.po   | 14 ++++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/fieldservice_account_payment/__manifest__.py b/fieldservice_account_payment/__manifest__.py
index c61435c386..b715c18f2c 100644
--- a/fieldservice_account_payment/__manifest__.py
+++ b/fieldservice_account_payment/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Accounting Payment',
     'summary': 'Allow workers to collect payments from the order.',
-    'version': '12.0.1.0.1',
+    'version': '12.0.1.1.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_account_payment/i18n/es.po b/fieldservice_account_payment/i18n/es.po
index 42f48265d3..0047614d2d 100644
--- a/fieldservice_account_payment/i18n/es.po
+++ b/fieldservice_account_payment/i18n/es.po
@@ -6,38 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\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\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_account_payment
 #: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_count
 msgid "FSM Order Count"
-msgstr ""
+msgstr "Número de Ordenes FSM"
 
 #. module: fieldservice_account_payment
 #: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_account_payment_invoice_form_inherite
 msgid "FSM Orders"
-msgstr ""
+msgstr "Ordenes FSM"
 
 #. module: fieldservice_account_payment
 #: model:ir.model,name:fieldservice_account_payment.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Pedidos de Servicio de Campo"
 
 #. module: fieldservice_account_payment
 #: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_count
 msgid "Payment Count"
-msgstr ""
+msgstr "Número de Pagos"
 
 #. module: fieldservice_account_payment
 #: model:ir.model,name:fieldservice_account_payment.model_account_payment
 #: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_fsm_order_form_inherit_acct_payment
 msgid "Payments"
-msgstr ""
+msgstr "Pagos"
diff --git a/fieldservice_account_payment/i18n/pt_BR.po b/fieldservice_account_payment/i18n/pt_BR.po
index 2599374667..5b80692738 100644
--- a/fieldservice_account_payment/i18n/pt_BR.po
+++ b/fieldservice_account_payment/i18n/pt_BR.po
@@ -6,38 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2020-06-17 02:19+0000\n"
+"Last-Translator: Fernando Colus <fcolus1@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_account_payment
 #: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_count
 msgid "FSM Order Count"
-msgstr ""
+msgstr "Contador de Ordens do FSM (Field Services Management)"
 
 #. module: fieldservice_account_payment
 #: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_account_payment_invoice_form_inherite
 msgid "FSM Orders"
-msgstr ""
+msgstr "Ordens do FSM (Field Services Management)"
 
 #. module: fieldservice_account_payment
 #: model:ir.model,name:fieldservice_account_payment.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Ordem do FSM (Field Services Management)"
 
 #. module: fieldservice_account_payment
 #: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_count
 msgid "Payment Count"
-msgstr ""
+msgstr "Contador de Pagamentos"
 
 #. module: fieldservice_account_payment
 #: model:ir.model,name:fieldservice_account_payment.model_account_payment
 #: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_fsm_order_form_inherit_acct_payment
 msgid "Payments"
-msgstr ""
+msgstr "Pagamentos"

From 958f8f6c768f2ac9277aca5d88848fabb27357d9 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 16 Jan 2021 10:42:06 -0500
Subject: [PATCH 458/631] [IMP] fieldservice_account_payment: black, isort,
 prettier

---
 fieldservice_account_payment/__manifest__.py  |  30 ++--
 .../models/account_payment.py                 |  32 ++--
 .../models/fsm_order.py                       |  28 ++--
 .../tests/test_fsm_account_payment.py         | 157 +++++++++---------
 .../views/account_payment.xml                 |  24 +--
 .../views/fsm_order.xml                       |  24 +--
 6 files changed, 154 insertions(+), 141 deletions(-)

diff --git a/fieldservice_account_payment/__manifest__.py b/fieldservice_account_payment/__manifest__.py
index b715c18f2c..afd6165224 100644
--- a/fieldservice_account_payment/__manifest__.py
+++ b/fieldservice_account_payment/__manifest__.py
@@ -2,21 +2,19 @@
 # Copyright (C) 2019 Serpent Consulting Services
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
-    'name': 'Field Service - Accounting Payment',
-    'summary': 'Allow workers to collect payments from the order.',
-    'version': '12.0.1.1.0',
-    'category': 'Field Service',
-    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice_account',
+    "name": "Field Service - Accounting Payment",
+    "summary": "Allow workers to collect payments from the order.",
+    "version": "12.0.1.1.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": ["fieldservice_account"],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/fsm_order.xml",
+        "views/account_payment.xml",
     ],
-    'data': [
-        'security/ir.model.access.csv',
-        'views/fsm_order.xml',
-        'views/account_payment.xml',
-    ],
-    'license': 'AGPL-3',
-    'development_status': 'Production/Stable',
-    'maintainers': ['max3903'],
+    "license": "AGPL-3",
+    "development_status": "Production/Stable",
+    "maintainers": ["max3903"],
 }
diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
index 78746de0a1..7800fb9fda 100644
--- a/fieldservice_account_payment/models/account_payment.py
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -8,32 +8,36 @@ class AccountPayment(models.Model):
     _inherit = "account.payment"
 
     fsm_order_ids = fields.Many2many(
-        'fsm.order', 'fsm_order_account_payment',
-        'payment_id', 'fsm_order_id', string='FSM Orders',
-        compute='_compute_fsm_order_ids',
-        store=True, index=True, copy=False)
+        "fsm.order",
+        "fsm_order_account_payment",
+        "payment_id",
+        "fsm_order_id",
+        string="FSM Orders",
+        compute="_compute_fsm_order_ids",
+        store=True,
+        index=True,
+        copy=False,
+    )
     fsm_order_count = fields.Integer(
-        string='FSM Order Count',
-        compute='_compute_fsm_order_count', readonly=True)
+        string="FSM Order Count", compute="_compute_fsm_order_count", readonly=True
+    )
 
-    @api.depends('fsm_order_ids')
+    @api.depends("fsm_order_ids")
     def _compute_fsm_order_count(self):
         for payment in self:
             payment.fsm_order_count = len(payment.fsm_order_ids)
 
     @api.multi
     def action_view_fsm_orders(self):
-        action = self.env.ref(
-            'fieldservice.action_fsm_operation_order').read()[0]
+        action = self.env.ref("fieldservice.action_fsm_operation_order").read()[0]
         if self.fsm_order_count > 1:
-            action['domain'] = [('id', 'in', self.fsm_order_ids)]
+            action["domain"] = [("id", "in", self.fsm_order_ids)]
         elif self.fsm_order_ids:
-            action['views'] = \
-                [(self.env.ref('fieldservice.fsm_order_form').id, 'form')]
-            action['res_id'] = self.fsm_order_ids[0].id
+            action["views"] = [(self.env.ref("fieldservice.fsm_order_form").id, "form")]
+            action["res_id"] = self.fsm_order_ids[0].id
         return action
 
-    @api.depends('invoice_ids.fsm_order_ids')
+    @api.depends("invoice_ids.fsm_order_ids")
     def _compute_fsm_order_ids(self):
         fsm_order_ids = []
         for invoice in self.invoice_ids:
diff --git a/fieldservice_account_payment/models/fsm_order.py b/fieldservice_account_payment/models/fsm_order.py
index 8a958671a2..4440f7d9aa 100644
--- a/fieldservice_account_payment/models/fsm_order.py
+++ b/fieldservice_account_payment/models/fsm_order.py
@@ -5,28 +5,32 @@
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
     payment_ids = fields.Many2many(
-        'account.payment', 'fsm_order_account_payment',
-        'fsm_order_id', 'payment_id', string='Payments')
+        "account.payment",
+        "fsm_order_account_payment",
+        "fsm_order_id",
+        "payment_id",
+        string="Payments",
+    )
     payment_count = fields.Integer(
-        string='Payment Count',
-        compute='_compute_account_payment_count', readonly=True)
+        string="Payment Count", compute="_compute_account_payment_count", readonly=True
+    )
 
-    @api.depends('payment_ids')
+    @api.depends("payment_ids")
     def _compute_account_payment_count(self):
         for order in self:
             order.payment_count = len(order.payment_ids)
 
     @api.multi
     def action_view_payments(self):
-        action = self.env.ref('account.action_account_payments').read()[0]
+        action = self.env.ref("account.action_account_payments").read()[0]
         if self.payment_count > 1:
-            action['domain'] = [('id', 'in', self.payment_ids)]
+            action["domain"] = [("id", "in", self.payment_ids)]
         elif self.payment_ids:
-            action['views'] = \
-                [(self.env.ref('account.view_account_payment_form').id,
-                  'form')]
-            action['res_id'] = self.payment_ids[0].id
+            action["views"] = [
+                (self.env.ref("account.view_account_payment_form").id, "form")
+            ]
+            action["res_id"] = self.payment_ids[0].id
         return action
diff --git a/fieldservice_account_payment/tests/test_fsm_account_payment.py b/fieldservice_account_payment/tests/test_fsm_account_payment.py
index 18fdb8029a..0778722d12 100644
--- a/fieldservice_account_payment/tests/test_fsm_account_payment.py
+++ b/fieldservice_account_payment/tests/test_fsm_account_payment.py
@@ -2,103 +2,108 @@
 # Copyright (C) 2019 Serpent consulting Services
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 from datetime import datetime, timedelta
+
 from odoo.tests.common import TransactionCase
 
 
 class FSMAccountPaymentCase(TransactionCase):
-
     def setUp(self):
         super(FSMAccountPaymentCase, self).setUp()
         self.register_payments_model = self.env[
-            'account.register.payments'].with_context(
-            active_model='account.invoice')
-        self.payment_method_manual_in = \
-            self.env.ref("account.account_payment_method_manual_in")
-        self.payment_model = self.env['account.payment']
-        self.test_analytic = self.env.ref('analytic.analytic_administratif')
+            "account.register.payments"
+        ].with_context(active_model="account.invoice")
+        self.payment_method_manual_in = self.env.ref(
+            "account.account_payment_method_manual_in"
+        )
+        self.payment_model = self.env["account.payment"]
+        self.test_analytic = self.env.ref("analytic.analytic_administratif")
         # create a Res Partner
-        self.test_partner = self.env['res.partner'].\
-            create({
-                'name': 'Test Partner',
-                'phone': '123',
-                'email': 'tp@email.com',
-            })
+        self.test_partner = self.env["res.partner"].create(
+            {"name": "Test Partner", "phone": "123", "email": "tp@email.com"}
+        )
         # create a Res Partner to be converted to FSM Location/Person
-        self.test_loc_partner = self.env['res.partner'].\
-            create({
-                'name': 'Test Loc Partner',
-                'phone': 'ABC',
-                'email': 'tlp@email.com',
-            })
-        self.test_loc_partner2 = self.env['res.partner'].\
-            create({
-                'name': 'Test Loc Partner 2',
-                'phone': '123',
-                'email': 'tlp@example.com',
-            })
+        self.test_loc_partner = self.env["res.partner"].create(
+            {"name": "Test Loc Partner", "phone": "ABC", "email": "tlp@email.com"}
+        )
+        self.test_loc_partner2 = self.env["res.partner"].create(
+            {"name": "Test Loc Partner 2", "phone": "123", "email": "tlp@example.com"}
+        )
         # create expected FSM Location to compare to converted FSM Location
-        self.test_location = self.env['fsm.location'].\
-            create({
-                'name': 'Test Location',
-                'phone': '123',
-                'email': 'tp@email.com',
-                'partner_id': self.test_loc_partner.id,
-                'owner_id': self.test_loc_partner.id,
-                'customer_id': self.test_loc_partner.id,
-                'analytic_account_id': self.test_analytic.id
-            })
-        self.account_income = self.env['account.account'].create({
-            'code': 'X1112',
-            'name': 'Sale - Test Account',
-            'user_type_id': self.env.ref(
-                'account.data_account_type_direct_costs').id
-        })
+        self.test_location = self.env["fsm.location"].create(
+            {
+                "name": "Test Location",
+                "phone": "123",
+                "email": "tp@email.com",
+                "partner_id": self.test_loc_partner.id,
+                "owner_id": self.test_loc_partner.id,
+                "customer_id": self.test_loc_partner.id,
+                "analytic_account_id": self.test_analytic.id,
+            }
+        )
+        self.account_income = self.env["account.account"].create(
+            {
+                "code": "X1112",
+                "name": "Sale - Test Account",
+                "user_type_id": self.env.ref(
+                    "account.data_account_type_direct_costs"
+                ).id,
+            }
+        )
 
         # Create a FSM order
-        self.test_order = self.env['fsm.order'].create({
-            'location_id': self.test_location.id,
-            'date_start': datetime.today(),
-            'date_end': datetime.today() + timedelta(hours=2),
-            'request_early': datetime.today()
-        })
+        self.test_order = self.env["fsm.order"].create(
+            {
+                "location_id": self.test_location.id,
+                "date_start": datetime.today(),
+                "date_end": datetime.today() + timedelta(hours=2),
+                "request_early": datetime.today(),
+            }
+        )
         # Create an invoice
-        self.test_invoice = self.env['account.invoice'].create({
-            'partner_id': self.test_partner.id,
-            'type': 'out_invoice',
-            'date_invoice': datetime.today().date(),
-            'invoice_line_ids': [(0, 0, {
-                'name': 'Test',
-                'quantity': 1.00,
-                'price_unit': 100.00,
-                'fsm_order_id': self.test_order.id,
-                'account_id': self.account_income.id})],
-            'fsm_order_ids': [(6, 0, [self.test_order.id])]
-        })
+        self.test_invoice = self.env["account.invoice"].create(
+            {
+                "partner_id": self.test_partner.id,
+                "type": "out_invoice",
+                "date_invoice": datetime.today().date(),
+                "invoice_line_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "name": "Test",
+                            "quantity": 1.00,
+                            "price_unit": 100.00,
+                            "fsm_order_id": self.test_order.id,
+                            "account_id": self.account_income.id,
+                        },
+                    )
+                ],
+                "fsm_order_ids": [(6, 0, [self.test_order.id])],
+            }
+        )
         # Create a payment method
-        self.bank_journal = self.env['account.journal'].create({
-            'name': 'Bank',
-            'type': 'bank',
-            'code': 'BNK99',
-        })
+        self.bank_journal = self.env["account.journal"].create(
+            {"name": "Bank", "type": "bank", "code": "BNK99"}
+        )
 
     def test_fsm_account_payment(self):
         self.test_invoice.action_invoice_open()
 
-        ctx = {'active_model': 'account.invoice',
-               'active_ids': [self.test_invoice.id]}
-        register_payments = self.register_payments_model.with_context(
-            ctx).create({'payment_date': datetime.today(),
-                         'journal_id': self.bank_journal.id,
-                         'payment_method_id': self.payment_method_manual_in.id,
-                         })
+        ctx = {"active_model": "account.invoice", "active_ids": [self.test_invoice.id]}
+        register_payments = self.register_payments_model.with_context(ctx).create(
+            {
+                "payment_date": datetime.today(),
+                "journal_id": self.bank_journal.id,
+                "payment_method_id": self.payment_method_manual_in.id,
+            }
+        )
         register_payments.create_payments()
         payment = self.payment_model.search([], order="id desc", limit=1)
         payment.action_view_fsm_orders()
         self.test_invoice.fsm_order_ids.action_view_payments()
         self.assertAlmostEquals(payment.amount, 100)
-        self.assertEqual(payment.state, 'posted')
-        self.assertEqual(self.test_invoice.state, 'paid')
-        self.assertEqual(self.test_invoice.fsm_order_ids,
-                         payment.fsm_order_ids)
-        res = self.env['fsm.order'].search([('payment_ids', 'in', payment.id)])
+        self.assertEqual(payment.state, "posted")
+        self.assertEqual(self.test_invoice.state, "paid")
+        self.assertEqual(self.test_invoice.fsm_order_ids, payment.fsm_order_ids)
+        res = self.env["fsm.order"].search([("payment_ids", "in", payment.id)])
         self.assertEqual(len(res), 1)
diff --git a/fieldservice_account_payment/views/account_payment.xml b/fieldservice_account_payment/views/account_payment.xml
index 119a4dcc39..1cd3e56ecb 100644
--- a/fieldservice_account_payment/views/account_payment.xml
+++ b/fieldservice_account_payment/views/account_payment.xml
@@ -1,22 +1,24 @@
 <odoo>
-
     <record id="view_account_payment_invoice_form_inherite" model="ir.ui.view">
         <field name="name">account.payment.invoice.form</field>
         <field name="model">account.payment</field>
-        <field name="inherit_id" ref="account.view_account_payment_form"/>
+        <field name="inherit_id" ref="account.view_account_payment_form" />
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
-                <button class="oe_stat_button"
-                        name="action_view_fsm_orders"
-                        type="object"
-                        icon="fa-map"
-                        attrs="{'invisible': [('fsm_order_count', '=', 0)]}">
-                    <field name="fsm_order_count"
-                           widget="statinfo"
-                           string="FSM Orders"/>
+                <button
+                    class="oe_stat_button"
+                    name="action_view_fsm_orders"
+                    type="object"
+                    icon="fa-map"
+                    attrs="{'invisible': [('fsm_order_count', '=', 0)]}"
+                >
+                    <field
+                        name="fsm_order_count"
+                        widget="statinfo"
+                        string="FSM Orders"
+                    />
                 </button>
             </div>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_account_payment/views/fsm_order.xml b/fieldservice_account_payment/views/fsm_order.xml
index 236342ac66..c621f4db5a 100644
--- a/fieldservice_account_payment/views/fsm_order.xml
+++ b/fieldservice_account_payment/views/fsm_order.xml
@@ -1,22 +1,22 @@
 <odoo>
-
     <record id="view_fsm_order_form_inherit_acct_payment" model="ir.ui.view">
         <field name="model">fsm.order</field>
-        <field name="inherit_id"
-               ref="fieldservice_account.view_fsm_order_form_inherit_account"/>
+        <field
+            name="inherit_id"
+            ref="fieldservice_account.view_fsm_order_form_inherit_account"
+        />
         <field name="arch" type="xml">
             <div class="oe_button_box" position="inside">
-                <button class="oe_stat_button"
-                        name="action_view_payments"
-                        type="object"
-                        icon="fa-bars"
-                        attrs="{'invisible': [('payment_count', '=', 0)]}">
-                    <field name="payment_count"
-                           widget="statinfo"
-                           string="Payments"/>
+                <button
+                    class="oe_stat_button"
+                    name="action_view_payments"
+                    type="object"
+                    icon="fa-bars"
+                    attrs="{'invisible': [('payment_count', '=', 0)]}"
+                >
+                    <field name="payment_count" widget="statinfo" string="Payments" />
                 </button>
             </div>
         </field>
     </record>
-
 </odoo>

From 9071930182843b49302d78963d2c60fc8ce6cdcf Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 16 Jan 2021 11:01:25 -0500
Subject: [PATCH 459/631] [MIG] fieldservice_account_payment: Migration to 13.0

---
 fieldservice_account_payment/__manifest__.py           | 2 +-
 fieldservice_account_payment/models/account_payment.py | 5 ++---
 fieldservice_account_payment/models/fsm_order.py       | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/fieldservice_account_payment/__manifest__.py b/fieldservice_account_payment/__manifest__.py
index afd6165224..217facaa46 100644
--- a/fieldservice_account_payment/__manifest__.py
+++ b/fieldservice_account_payment/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Field Service - Accounting Payment",
     "summary": "Allow workers to collect payments from the order.",
-    "version": "12.0.1.1.0",
+    "version": "13.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",
diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
index 7800fb9fda..938d29c2d4 100644
--- a/fieldservice_account_payment/models/account_payment.py
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -27,7 +27,6 @@ def _compute_fsm_order_count(self):
         for payment in self:
             payment.fsm_order_count = len(payment.fsm_order_ids)
 
-    @api.multi
     def action_view_fsm_orders(self):
         action = self.env.ref("fieldservice.action_fsm_operation_order").read()[0]
         if self.fsm_order_count > 1:
@@ -37,10 +36,10 @@ def action_view_fsm_orders(self):
             action["res_id"] = self.fsm_order_ids[0].id
         return action
 
-    @api.depends("invoice_ids.fsm_order_ids")
+    @api.depends("move_ids.fsm_order_ids")
     def _compute_fsm_order_ids(self):
         fsm_order_ids = []
-        for invoice in self.invoice_ids:
+        for invoice in self.move_ids:
             if invoice.fsm_order_ids:
                 fsm_order_ids.extend(invoice.fsm_order_ids.ids)
         if fsm_order_ids:
diff --git a/fieldservice_account_payment/models/fsm_order.py b/fieldservice_account_payment/models/fsm_order.py
index 4440f7d9aa..76af322de5 100644
--- a/fieldservice_account_payment/models/fsm_order.py
+++ b/fieldservice_account_payment/models/fsm_order.py
@@ -23,7 +23,6 @@ def _compute_account_payment_count(self):
         for order in self:
             order.payment_count = len(order.payment_ids)
 
-    @api.multi
     def action_view_payments(self):
         action = self.env.ref("account.action_account_payments").read()[0]
         if self.payment_count > 1:

From a1157d9e3f67c59552396adb071e0d4f98844ba1 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 13 Dec 2018 18:16:29 -0600
Subject: [PATCH 460/631] [ADD] fieldservice_vehicle

---
 fieldservice_vehicle/README.rst               | 125 +++++
 fieldservice_vehicle/__init__.py              |   4 +
 fieldservice_vehicle/__manifest__.py          |  27 +
 fieldservice_vehicle/models/__init__.py       |   7 +
 fieldservice_vehicle/models/fsm_route.py      |  16 +
 fieldservice_vehicle/models/fsm_vehicle.py    |  16 +
 fieldservice_vehicle/readme/CONFIGURE.rst     |   4 +
 fieldservice_vehicle/readme/CONTRIBUTORS.rst  |   5 +
 fieldservice_vehicle/readme/CREDITS.rst       |   3 +
 fieldservice_vehicle/readme/DESCRIPTION.rst   |   1 +
 fieldservice_vehicle/readme/INSTALL.rst       |   4 +
 fieldservice_vehicle/readme/ROADMAP.rst       |   2 +
 fieldservice_vehicle/readme/USAGE.rst         |   5 +
 .../security/ir.model.access.csv              |   3 +
 fieldservice_vehicle/security/res_groups.xml  |  14 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 464 ++++++++++++++++++
 fieldservice_vehicle/views/fsm_route.xml      |  16 +
 fieldservice_vehicle/views/fsm_vehicle.xml    |  81 +++
 fieldservice_vehicle/views/menu.xml           |  18 +
 20 files changed, 815 insertions(+)
 create mode 100644 fieldservice_vehicle/README.rst
 create mode 100644 fieldservice_vehicle/__init__.py
 create mode 100644 fieldservice_vehicle/__manifest__.py
 create mode 100644 fieldservice_vehicle/models/__init__.py
 create mode 100644 fieldservice_vehicle/models/fsm_route.py
 create mode 100644 fieldservice_vehicle/models/fsm_vehicle.py
 create mode 100644 fieldservice_vehicle/readme/CONFIGURE.rst
 create mode 100644 fieldservice_vehicle/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_vehicle/readme/CREDITS.rst
 create mode 100644 fieldservice_vehicle/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_vehicle/readme/INSTALL.rst
 create mode 100644 fieldservice_vehicle/readme/ROADMAP.rst
 create mode 100644 fieldservice_vehicle/readme/USAGE.rst
 create mode 100644 fieldservice_vehicle/security/ir.model.access.csv
 create mode 100644 fieldservice_vehicle/security/res_groups.xml
 create mode 100644 fieldservice_vehicle/static/description/icon.png
 create mode 100644 fieldservice_vehicle/static/description/index.html
 create mode 100644 fieldservice_vehicle/views/fsm_route.xml
 create mode 100644 fieldservice_vehicle/views/fsm_vehicle.xml
 create mode 100644 fieldservice_vehicle/views/menu.xml

diff --git a/fieldservice_vehicle/README.rst b/fieldservice_vehicle/README.rst
new file mode 100644
index 0000000000..1df865173a
--- /dev/null
+++ b/fieldservice_vehicle/README.rst
@@ -0,0 +1,125 @@
+=============
+Field Service
+=============
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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
+    :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
+    :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| 
+
+This module is the base of the Field Service application in Odoo.
+
+**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 configure this module, you need to:
+
+* Go to Field Service > Configuration > Settings
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go to Field Service
+* Create or select an order
+* Follow the process
+
+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%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
+~~~~~~~~~~~~
+
+* Wolfgang Hall <whall@opensourceintegrators.com>
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Steve Campbell <scampbell@opensourceintegrators.com>
+* Bhavesh Odedra <bodedra@opensourceintegrators.com>
+* Michael Allen <mallen@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>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_vehicle/__init__.py b/fieldservice_vehicle/__init__.py
new file mode 100644
index 0000000000..631bd4893a
--- /dev/null
+++ b/fieldservice_vehicle/__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_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
new file mode 100644
index 0000000000..fc4c53aa9a
--- /dev/null
+++ b/fieldservice_vehicle/__manifest__.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service',
+    'summary': 'Locations, Orders, Calls',
+    'version': '11.0.0.0.2',
+    'category': 'Field Service',
+    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice',
+    ],
+    'data': [
+        'security/res_groups.xml',
+        'security/ir.model.access.csv',
+        'views/fsm_vehicle.xml',
+        'views/fsm_route.xml',
+        'views/menu.xml',
+    ],
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'wolfhall',
+        'max3903',
+    ],
+}
diff --git a/fieldservice_vehicle/models/__init__.py b/fieldservice_vehicle/models/__init__.py
new file mode 100644
index 0000000000..07dd1a0e4d
--- /dev/null
+++ b/fieldservice_vehicle/models/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import (
+    fsm_vehicle,
+    fsm_route,
+)
diff --git a/fieldservice_vehicle/models/fsm_route.py b/fieldservice_vehicle/models/fsm_route.py
new file mode 100644
index 0000000000..b027568910
--- /dev/null
+++ b/fieldservice_vehicle/models/fsm_route.py
@@ -0,0 +1,16 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models, _
+
+
+class FSMRoute(models.Model):
+    _inherit = 'fsm.route'
+    vehicle_id = fields.Many2one('fsm.vehicle',
+                                 string='Assigned Vehicle')
+
+    _sql_constraints = [
+        ('fsm_route_vehicle_date_uniq',
+         'unique (vehicle_id, date)',
+         "You cannot create 2 routes for the same vehicle on the same day!"),
+    ]
diff --git a/fieldservice_vehicle/models/fsm_vehicle.py b/fieldservice_vehicle/models/fsm_vehicle.py
new file mode 100644
index 0000000000..88012c17f1
--- /dev/null
+++ b/fieldservice_vehicle/models/fsm_vehicle.py
@@ -0,0 +1,16 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class FSMVehicle(models.Model):
+    _name = 'fsm.vehicle'
+    _description = 'Field Service Vehicle'
+
+    name = fields.Char(string='Name', required='True')
+    person_id = fields.Many2one('fsm.person', string='Assigned Driver')
+
+    _sql_constraints = [
+        ('name_uniq', 'unique (name)', "Vehicle name already exists!"),
+    ]
diff --git a/fieldservice_vehicle/readme/CONFIGURE.rst b/fieldservice_vehicle/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..3d6bbd9adc
--- /dev/null
+++ b/fieldservice_vehicle/readme/CONFIGURE.rst
@@ -0,0 +1,4 @@
+To configure this module, you need to:
+
+* Go to Field Service > Master Data > Vehicles
+* Create your vehicles and assign them to a person
diff --git a/fieldservice_vehicle/readme/CONTRIBUTORS.rst b/fieldservice_vehicle/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..1da5e9efa3
--- /dev/null
+++ b/fieldservice_vehicle/readme/CONTRIBUTORS.rst
@@ -0,0 +1,5 @@
+* Wolfgang Hall <whall@opensourceintegrators.com>
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Steve Campbell <scampbell@opensourceintegrators.com>
+* Bhavesh Odedra <bodedra@opensourceintegrators.com>
+* Michael Allen <mallen@opensourceintegrators.com>
diff --git a/fieldservice_vehicle/readme/CREDITS.rst b/fieldservice_vehicle/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_vehicle/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_vehicle/readme/DESCRIPTION.rst b/fieldservice_vehicle/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..986213ea0c
--- /dev/null
+++ b/fieldservice_vehicle/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module allows you to manage your vehicles and assign them to a person.
diff --git a/fieldservice_vehicle/readme/INSTALL.rst b/fieldservice_vehicle/readme/INSTALL.rst
new file mode 100644
index 0000000000..c010f8f6a2
--- /dev/null
+++ b/fieldservice_vehicle/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_vehicle/readme/ROADMAP.rst b/fieldservice_vehicle/readme/ROADMAP.rst
new file mode 100644
index 0000000000..f607015959
--- /dev/null
+++ b/fieldservice_vehicle/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_vehicle/readme/USAGE.rst b/fieldservice_vehicle/readme/USAGE.rst
new file mode 100644
index 0000000000..87c1a3e8dc
--- /dev/null
+++ b/fieldservice_vehicle/readme/USAGE.rst
@@ -0,0 +1,5 @@
+To use this module, you need to:
+
+* Go to Field Service
+* Create or select an order and assign it
+* Follow the process
diff --git a/fieldservice_vehicle/security/ir.model.access.csv b/fieldservice_vehicle/security/ir.model.access.csv
new file mode 100644
index 0000000000..c42f4b8c16
--- /dev/null
+++ b/fieldservice_vehicle/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_fsm_vehicle_fsm_user,fsm.vehicle.user,model_fsm_vehicle,fieldservice.group_fsm_user,1,0,0,0
+access_fsm_vehicle_fsm_manager,fsm.vehicle.manager,model_fsm_vehicle,fieldservice.group_fsm_manager,1,1,1,1
diff --git a/fieldservice_vehicle/security/res_groups.xml b/fieldservice_vehicle/security/res_groups.xml
new file mode 100644
index 0000000000..2ca0f18b60
--- /dev/null
+++ b/fieldservice_vehicle/security/res_groups.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- FSM groups -->
+    <record id="group_fsm_vehicle" model="res.groups">
+        <field name="name">Manage Vehicles</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
+    <record id="group_fsm_user" model="res.groups">
+        <field name="implied_ids" eval="[(4, ref('group_fsm_user'))]"/>
+    </record>
+
+</odoo>
diff --git a/fieldservice_vehicle/static/description/icon.png b/fieldservice_vehicle/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_vehicle/static/description/index.html b/fieldservice_vehicle/static/description/index.html
new file mode 100644
index 0000000000..734a351843
--- /dev/null
+++ b/fieldservice_vehicle/static/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_vehicle/views/fsm_route.xml b/fieldservice_vehicle/views/fsm_route.xml
new file mode 100644
index 0000000000..967c9ba211
--- /dev/null
+++ b/fieldservice_vehicle/views/fsm_route.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Routes -->
+    <record id="fsm_route_form" model="ir.ui.view">
+        <field name="name">fsm.route.form</field>
+        <field name="model">fsm.route</field>
+        <field name="inherit_id" ref="fieldservice.fsm_route_form"/>
+        <field name="arch" type="xml">
+            <field name="person_id" position="after">
+                <field name="vehicle_id" groups="fieldservice.group_fsm_vehicle"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_vehicle/views/fsm_vehicle.xml b/fieldservice_vehicle/views/fsm_vehicle.xml
new file mode 100644
index 0000000000..270aa518d8
--- /dev/null
+++ b/fieldservice_vehicle/views/fsm_vehicle.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Field Service Vehicle -->
+    <record id="fsm_vehicle_tree_view" model="ir.ui.view">
+        <field name="name">fsm.vehicle.tree</field>
+        <field name="model">fsm.vehicle</field>
+        <field name="arch" type="xml">
+            <tree string="Vehicles">
+                <field name="name"/>
+                <field name="person_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="fsm_vehicle_form_view" model="ir.ui.view">
+        <field name="name">fsm.vehicle.form</field>
+        <field name="model">fsm.vehicle</field>
+        <field name="arch" type="xml">
+            <form string="Vehicle">
+                <sheet>
+                    <label for="name" class="oe_edit_only"/>
+                    <h1><field name="name"/></h1>
+                    <group>
+                        <group>
+                            <field name="person_id"/>
+                        </group>
+                        <group></group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <!-- Field Service Vehicles -->
+    <record id="action_fsm_vehicle" model="ir.actions.act_window">
+        <field name="name">Field Service Vehicles</field>
+        <field name="res_model">fsm.vehicle</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Add a Field Service Vehicle here.
+            </p>
+        </field>
+    </record>
+
+    <!-- Reporting -->
+    <record id="fsm_vehicle_graph_view" model="ir.ui.view">
+        <field name="name">fsm.vehicle.graph</field>
+        <field name="model">fsm.vehicle</field>
+        <field name="arch" type="xml">
+            <graph string="Vehicles" type="bar">
+                <field name="person_id" type="row"/>
+            </graph>
+        </field>
+    </record>
+
+    <record id="fsm_vehicle_pivot_view" model="ir.ui.view">
+        <field name="name">fsm.vehicle.pivot</field>
+        <field name="model">fsm.vehicle</field>
+        <field name="arch" type="xml">
+            <pivot string="Vehicles" display_quantity="true">
+                <field name="person_id" type="row"/>
+            </pivot>
+        </field>
+    </record>
+
+    <record id="action_fsm_report_vehicle" model="ir.actions.act_window">
+        <field name="name">Vehicles</field>
+        <field name="res_model">fsm.vehicle</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,pivot</field>
+        <field name="help" type="html">
+            <p>
+                Vehicles Report
+            </p>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_vehicle/views/menu.xml b/fieldservice_vehicle/views/menu.xml
new file mode 100644
index 0000000000..105a594639
--- /dev/null
+++ b/fieldservice_vehicle/views/menu.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <menuitem id="menu_fsm_vehicle"
+              name="Vehicles"
+              action="action_fsm_vehicle"
+              parent="data"
+              sequence="40"
+              groups="group_fsm_vehicle"/>
+
+    <menuitem id="menu_fsm_report_vehicle"
+              name="Vehicles"
+              action="action_fsm_report_vehicle"
+              parent="reporting"
+              sequence="50"
+              groups="group_fsm_vehicle"/>
+
+</odoo>

From 09d95eef28f78eec812f8f11dca571082cf6ad15 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 13 Dec 2018 18:57:19 -0600
Subject: [PATCH 461/631] [ADD] fieldservice_vehicle_stock

---
 fieldservice_vehicle/__manifest__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index fc4c53aa9a..23451fcf79 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -2,8 +2,8 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service',
-    'summary': 'Locations, Orders, Calls',
+    'name': 'Field Service Vehicle',
+    'summary': 'manage your field service vehicles',
     'version': '11.0.0.0.2',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',

From cd2128e7557c6335c075316171ae777141b6f700 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 13 Dec 2018 19:48:34 -0600
Subject: [PATCH 462/631] [ADD] Security

---
 fieldservice_vehicle/README.rst               | 21 ++++++++++---------
 fieldservice_vehicle/__manifest__.py          |  2 +-
 fieldservice_vehicle/models/fsm_route.py      |  4 ++--
 .../static/description/index.html             | 19 +++++++++--------
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/fieldservice_vehicle/README.rst b/fieldservice_vehicle/README.rst
index 1df865173a..5165676005 100644
--- a/fieldservice_vehicle/README.rst
+++ b/fieldservice_vehicle/README.rst
@@ -1,6 +1,6 @@
-=============
-Field Service
-=============
+======================
+Field Service Vehicles
+======================
 
 .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
@@ -14,10 +14,10 @@ Field Service
     :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
+    :target: https://github.com/OCA/field-service/tree/11.0/fieldservice_vehicle
     :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
+    :target: https://translation.odoo-community.org/projects/field-service-11-0/field-service-11-0-fieldservice_vehicle
     :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
@@ -25,7 +25,7 @@ Field Service
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
-This module is the base of the Field Service application in Odoo.
+This module allows you to manage your vehicles and assign them to a person.
 
 **Table of contents**
 
@@ -45,7 +45,8 @@ Configuration
 
 To configure this module, you need to:
 
-* Go to Field Service > Configuration > Settings
+* Go to Field Service > Master Data > Vehicles
+* Create your vehicles and assign them to a person
 
 Usage
 =====
@@ -53,7 +54,7 @@ Usage
 To use this module, you need to:
 
 * Go to Field Service
-* Create or select an order
+* Create or select an order and assign it
 * Follow the process
 
 Known issues / Roadmap
@@ -68,7 +69,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/field-service/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <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 <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_vehicle%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.
 
@@ -120,6 +121,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>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_vehicle>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index 23451fcf79..733ff67b11 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service Vehicle',
+    'name': 'Field Service Vehicles',
     'summary': 'manage your field service vehicles',
     'version': '11.0.0.0.2',
     'category': 'Field Service',
diff --git a/fieldservice_vehicle/models/fsm_route.py b/fieldservice_vehicle/models/fsm_route.py
index b027568910..a71866fdcf 100644
--- a/fieldservice_vehicle/models/fsm_route.py
+++ b/fieldservice_vehicle/models/fsm_route.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, 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 FSMRoute(models.Model):
@@ -12,5 +12,5 @@ class FSMRoute(models.Model):
     _sql_constraints = [
         ('fsm_route_vehicle_date_uniq',
          'unique (vehicle_id, date)',
-         "You cannot create 2 routes for the same vehicle on the same day!"),
+         _("The vehicle is already assigned to another route on that day!")),
     ]
diff --git a/fieldservice_vehicle/static/description/index.html b/fieldservice_vehicle/static/description/index.html
index 734a351843..0c833d6e04 100644
--- a/fieldservice_vehicle/static/description/index.html
+++ b/fieldservice_vehicle/static/description/index.html
@@ -4,7 +4,7 @@
 <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>
+<title>Field Service Vehicles</title>
 <style type="text/css">
 
 /*
@@ -360,15 +360,15 @@
 </style>
 </head>
 <body>
-<div class="document" id="field-service">
-<h1 class="title">Field Service</h1>
+<div class="document" id="field-service-vehicles">
+<h1 class="title">Field Service Vehicles</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><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_vehicle"><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_vehicle"><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 allows you to manage your vehicles and assign them to a person.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -396,7 +396,8 @@ <h1><a class="toc-backref" href="#id1">Installation</a></h1>
 <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>
+<li>Go to Field Service &gt; Master Data &gt; Vehicles</li>
+<li>Create your vehicles and assign them to a person</li>
 </ul>
 </div>
 <div class="section" id="usage">
@@ -404,7 +405,7 @@ <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>Create or select an order and assign it</li>
 <li>Follow the process</li>
 </ul>
 </div>
@@ -418,7 +419,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%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_vehicle%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">
@@ -455,7 +456,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">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/11.0/fieldservice_vehicle">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 fb1b92eda9da4d0c9278116bb38b60e7a0e91d11 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 14 Dec 2018 17:17:28 -0600
Subject: [PATCH 463/631] [FIX] External ID

---
 fieldservice_vehicle/__manifest__.py         | 2 +-
 fieldservice_vehicle/security/res_groups.xml | 5 +++--
 fieldservice_vehicle/views/menu.xml          | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index 733ff67b11..1bb82fd92b 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles',
     'summary': 'manage your field service vehicles',
-    'version': '11.0.0.0.2',
+    'version': '11.0.0.1.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_vehicle/security/res_groups.xml b/fieldservice_vehicle/security/res_groups.xml
index 2ca0f18b60..de16a9ec6e 100644
--- a/fieldservice_vehicle/security/res_groups.xml
+++ b/fieldservice_vehicle/security/res_groups.xml
@@ -7,8 +7,9 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="group_fsm_user" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('group_fsm_user'))]"/>
+    <record id="fieldservice.group_fsm_user" model="res.groups">
+        <field name="implied_ids"
+               eval="[(4, ref('fieldservice_vehicle.group_fsm_vehicle'))]"/>
     </record>
 
 </odoo>
diff --git a/fieldservice_vehicle/views/menu.xml b/fieldservice_vehicle/views/menu.xml
index 105a594639..5255eea256 100644
--- a/fieldservice_vehicle/views/menu.xml
+++ b/fieldservice_vehicle/views/menu.xml
@@ -4,15 +4,15 @@
     <menuitem id="menu_fsm_vehicle"
               name="Vehicles"
               action="action_fsm_vehicle"
-              parent="data"
+              parent="fieldservice.data"
               sequence="40"
-              groups="group_fsm_vehicle"/>
+              groups="fieldservice_vehicle.group_fsm_vehicle"/>
 
     <menuitem id="menu_fsm_report_vehicle"
               name="Vehicles"
               action="action_fsm_report_vehicle"
-              parent="reporting"
+              parent="fieldservice.reporting"
               sequence="50"
-              groups="group_fsm_vehicle"/>
+              groups="fieldservice_vehicle.group_fsm_vehicle"/>
 
 </odoo>

From 56b2aeebb29f5f2794ccbe1046755a828079137d Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 1 Feb 2019 19:06:36 -0600
Subject: [PATCH 464/631] [FIX] fieldservice_vehicle

---
 fieldservice_vehicle/README.rst                    | 4 ++--
 fieldservice_vehicle/__manifest__.py               | 2 +-
 fieldservice_vehicle/readme/CONFIGURE.rst          | 2 +-
 fieldservice_vehicle/readme/DESCRIPTION.rst        | 2 +-
 fieldservice_vehicle/static/description/index.html | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fieldservice_vehicle/README.rst b/fieldservice_vehicle/README.rst
index 5165676005..ba513c6d4e 100644
--- a/fieldservice_vehicle/README.rst
+++ b/fieldservice_vehicle/README.rst
@@ -25,7 +25,7 @@ Field Service Vehicles
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
-This module allows you to manage your vehicles and assign them to a person.
+This module allows you to manage your vehicles and assign them to a worker.
 
 **Table of contents**
 
@@ -46,7 +46,7 @@ Configuration
 To configure this module, you need to:
 
 * Go to Field Service > Master Data > Vehicles
-* Create your vehicles and assign them to a person
+* Create your vehicles and assign them to a worker
 
 Usage
 =====
diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index 1bb82fd92b..ce9c8d1d44 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles',
     'summary': 'manage your field service vehicles',
-    'version': '11.0.0.1.0',
+    'version': '11.0.0.1.1',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_vehicle/readme/CONFIGURE.rst b/fieldservice_vehicle/readme/CONFIGURE.rst
index 3d6bbd9adc..e3d062d52d 100644
--- a/fieldservice_vehicle/readme/CONFIGURE.rst
+++ b/fieldservice_vehicle/readme/CONFIGURE.rst
@@ -1,4 +1,4 @@
 To configure this module, you need to:
 
 * Go to Field Service > Master Data > Vehicles
-* Create your vehicles and assign them to a person
+* Create your vehicles and assign them to a worker
diff --git a/fieldservice_vehicle/readme/DESCRIPTION.rst b/fieldservice_vehicle/readme/DESCRIPTION.rst
index 986213ea0c..99adf15c86 100644
--- a/fieldservice_vehicle/readme/DESCRIPTION.rst
+++ b/fieldservice_vehicle/readme/DESCRIPTION.rst
@@ -1 +1 @@
-This module allows you to manage your vehicles and assign them to a person.
+This module allows you to manage your vehicles and assign them to a worker.
diff --git a/fieldservice_vehicle/static/description/index.html b/fieldservice_vehicle/static/description/index.html
index 0c833d6e04..2104f7750f 100644
--- a/fieldservice_vehicle/static/description/index.html
+++ b/fieldservice_vehicle/static/description/index.html
@@ -368,7 +368,7 @@ <h1 class="title">Field Service Vehicles</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/11.0/fieldservice_vehicle"><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_vehicle"><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 allows you to manage your vehicles and assign them to a person.</p>
+<p>This module allows you to manage your vehicles and assign them to a worker.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -397,7 +397,7 @@ <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; Master Data &gt; Vehicles</li>
-<li>Create your vehicles and assign them to a person</li>
+<li>Create your vehicles and assign them to a worker</li>
 </ul>
 </div>
 <div class="section" id="usage">

From aafd5cdb77006280c18aa1b3cac22ccde8236b23 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Wed, 3 Apr 2019 20:59:44 +0530
Subject: [PATCH 465/631] [MIG][WIP][12.0] fieldservice_vehicle

---
 fieldservice_vehicle/README.rst                    | 13 +++++++------
 fieldservice_vehicle/__manifest__.py               |  3 ++-
 fieldservice_vehicle/readme/CONTRIBUTORS.rst       |  1 +
 fieldservice_vehicle/readme/INSTALL.rst            |  2 +-
 fieldservice_vehicle/static/description/index.html | 11 ++++++-----
 fieldservice_vehicle/views/fsm_route.xml           |  3 ++-
 fieldservice_vehicle/views/fsm_vehicle.xml         |  4 +++-
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/fieldservice_vehicle/README.rst b/fieldservice_vehicle/README.rst
index ba513c6d4e..0fb60233a2 100644
--- a/fieldservice_vehicle/README.rst
+++ b/fieldservice_vehicle/README.rst
@@ -14,13 +14,13 @@ Field Service Vehicles
     :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_vehicle
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_vehicle
     :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_vehicle
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle
     :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
 =============
@@ -69,7 +69,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/field-service/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_vehicle%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_vehicle%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.
 
@@ -89,6 +89,7 @@ Contributors
 * Steve Campbell <scampbell@opensourceintegrators.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
 * Michael Allen <mallen@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -121,6 +122,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_vehicle>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_vehicle>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index ce9c8d1d44..9639c3d151 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles',
     'summary': 'manage your field service vehicles',
-    'version': '11.0.0.1.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',
@@ -24,4 +24,5 @@
         'wolfhall',
         'max3903',
     ],
+    'installable': True,
 }
diff --git a/fieldservice_vehicle/readme/CONTRIBUTORS.rst b/fieldservice_vehicle/readme/CONTRIBUTORS.rst
index 1da5e9efa3..331a0e21ed 100644
--- a/fieldservice_vehicle/readme/CONTRIBUTORS.rst
+++ b/fieldservice_vehicle/readme/CONTRIBUTORS.rst
@@ -3,3 +3,4 @@
 * Steve Campbell <scampbell@opensourceintegrators.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
 * Michael Allen <mallen@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_vehicle/readme/INSTALL.rst b/fieldservice_vehicle/readme/INSTALL.rst
index c010f8f6a2..8571f65376 100644
--- a/fieldservice_vehicle/readme/INSTALL.rst
+++ b/fieldservice_vehicle/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_vehicle/static/description/index.html b/fieldservice_vehicle/static/description/index.html
index 2104f7750f..15710693a2 100644
--- a/fieldservice_vehicle/static/description/index.html
+++ b/fieldservice_vehicle/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 Vehicles</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Field Service Vehicles</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_vehicle"><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_vehicle"><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_vehicle"><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_vehicle"><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>This module allows you to manage your vehicles and assign them to a worker.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -390,7 +390,7 @@ <h1 class="title">Field Service Vehicles</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>
@@ -419,7 +419,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_vehicle%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_vehicle%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">
@@ -438,6 +438,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>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>
+<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">
@@ -456,7 +457,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_vehicle">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_vehicle">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_vehicle/views/fsm_route.xml b/fieldservice_vehicle/views/fsm_route.xml
index 967c9ba211..0918dd00a5 100644
--- a/fieldservice_vehicle/views/fsm_route.xml
+++ b/fieldservice_vehicle/views/fsm_route.xml
@@ -8,7 +8,8 @@
         <field name="inherit_id" ref="fieldservice.fsm_route_form"/>
         <field name="arch" type="xml">
             <field name="person_id" position="after">
-                <field name="vehicle_id" groups="fieldservice.group_fsm_vehicle"/>
+                <field name="vehicle_id"
+                       groups="fieldservice_vehicle.group_fsm_vehicle"/>
             </field>
         </field>
     </record>
diff --git a/fieldservice_vehicle/views/fsm_vehicle.xml b/fieldservice_vehicle/views/fsm_vehicle.xml
index 270aa518d8..a579adf7d2 100644
--- a/fieldservice_vehicle/views/fsm_vehicle.xml
+++ b/fieldservice_vehicle/views/fsm_vehicle.xml
@@ -20,7 +20,9 @@
             <form string="Vehicle">
                 <sheet>
                     <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
                     <group>
                         <group>
                             <field name="person_id"/>

From d185c8d6b2441dd49ff9300fcc8c4c4bd758b524 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Wed, 21 Aug 2019 17:40:37 -0400
Subject: [PATCH 466/631] [IMP] UI

minor UI improvements
---
 fieldservice_vehicle/views/fsm_vehicle.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_vehicle/views/fsm_vehicle.xml b/fieldservice_vehicle/views/fsm_vehicle.xml
index a579adf7d2..8d8a81a311 100644
--- a/fieldservice_vehicle/views/fsm_vehicle.xml
+++ b/fieldservice_vehicle/views/fsm_vehicle.xml
@@ -41,7 +41,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
+            <p class="o_view_nocontent_smiling_face">
                 Add a Field Service Vehicle here.
             </p>
         </field>

From 5752063b54de3c0b16784f4db7003096a216efd4 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 11 Oct 2019 12:33:55 -0500
Subject: [PATCH 467/631] [IMP] fieldservice_vehicle

---
 fieldservice_vehicle/__manifest__.py          |   2 +-
 fieldservice_vehicle/i18n/de.po               | 124 ++++++++++++++++++
 fieldservice_vehicle/i18n/es_CL.po            | 124 ++++++++++++++++++
 .../i18n/fieldservice_vehicle.pot             | 122 +++++++++++++++++
 4 files changed, 371 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_vehicle/i18n/de.po
 create mode 100644 fieldservice_vehicle/i18n/es_CL.po
 create mode 100644 fieldservice_vehicle/i18n/fieldservice_vehicle.pot

diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index 9639c3d151..2d6b8de317 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service Vehicles',
-    'summary': 'manage your field service vehicles',
+    'summary': 'Manage Field Service vehicles and assign drivers',
     'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_vehicle/i18n/de.po b/fieldservice_vehicle/i18n/de.po
new file mode 100644
index 0000000000..5c63d5cf22
--- /dev/null
+++ b/fieldservice_vehicle/i18n/de.po
@@ -0,0 +1,124 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_vehicle
+#
+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"
+"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_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr "Field-Service-Fahrzeuge hinzuf??gen."
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr "Zugewiesener Fahrer"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_route__vehicle_id
+msgid "Assigned Vehicle"
+msgstr "Zugewiesenes Fahrzeug"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr "Erstellt von"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr "Erstellt am"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_route
+msgid "Field Service Route"
+msgstr "Service-Route"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Service-Fahrzeug"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr "Service-Fahrzeuge"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr "ID"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr "Zuletzt ge??ndert am"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr "Zuletzt aktualisiert von"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr "Zuletzt aktualisiert am"
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr "Fahrzeuge verwalten"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr "Bezeichnung"
+
+#. module: fieldservice_vehicle
+#: code:addons/fieldservice_vehicle/models/fsm_route.py:15
+#: sql_constraint:fsm.route:0
+#, python-format
+msgid "The vehicle is already assigned to another route on that day!"
+msgstr "Das Fahrzeug ist an diesem Tag bereits einer anderen Route zugewiesen!"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
+msgid "Vehicle"
+msgstr "Fahrzeug"
+
+#. module: fieldservice_vehicle
+#: sql_constraint:fsm.vehicle:0
+msgid "Vehicle name already exists!"
+msgstr "Es existiert bereits ein Fahrzeug mit diesem Namen!"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_tree_view
+msgid "Vehicles"
+msgstr "Fahrzeuge"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr "Fahrzeug-Bericht"
diff --git a/fieldservice_vehicle/i18n/es_CL.po b/fieldservice_vehicle/i18n/es_CL.po
new file mode 100644
index 0000000000..99c649d027
--- /dev/null
+++ b/fieldservice_vehicle/i18n/es_CL.po
@@ -0,0 +1,124 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_vehicle
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-21 20:35+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.8\n"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr "Agregue un veh??culo de servicio de campo aqu??."
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr "Conductor Asignado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_route__vehicle_id
+msgid "Assigned Vehicle"
+msgstr "Veh??culo Asignado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr "Nombre Mostrado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_route
+msgid "Field Service Route"
+msgstr "Ruta de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Veh??culo de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr "Veh??culos de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr "??ltima Modificaci??n en"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr "??ltima Actualizaci??n por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr "??ltima Actualizaci??n el"
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr "Gestionar Veh??culos"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: fieldservice_vehicle
+#: code:addons/fieldservice_vehicle/models/fsm_route.py:15
+#: sql_constraint:fsm.route:0
+#, python-format
+msgid "The vehicle is already assigned to another route on that day!"
+msgstr "??El veh??culo ya est?? asignado a otra ruta ese d??a!"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
+msgid "Vehicle"
+msgstr "Veh??culo"
+
+#. module: fieldservice_vehicle
+#: sql_constraint:fsm.vehicle:0
+msgid "Vehicle name already exists!"
+msgstr "??El nombre del veh??culo ya existe!"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_tree_view
+msgid "Vehicles"
+msgstr "Veh??culos"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr "Reporte de Veh??culos"
diff --git a/fieldservice_vehicle/i18n/fieldservice_vehicle.pot b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
new file mode 100644
index 0000000000..68ffc295cf
--- /dev/null
+++ b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
@@ -0,0 +1,122 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_vehicle
+#
+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_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_route__vehicle_id
+msgid "Assigned Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_route
+msgid "Field Service Route"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: code:addons/fieldservice_vehicle/models/fsm_route.py:15
+#: sql_constraint:fsm.route:0
+#, python-format
+msgid "The vehicle is already assigned to another route on that day!"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
+msgid "Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: sql_constraint:fsm.vehicle:0
+msgid "Vehicle name already exists!"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_tree_view
+msgid "Vehicles"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr ""
+

From 7d7672b83fbc36e8edfb26aa5c013808bbb8dd64 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Tue, 17 Dec 2019 13:51:21 +0530
Subject: [PATCH 468/631] [12.0][IMP] fieldservice

---
 fieldservice_vehicle/__manifest__.py            |  1 -
 .../i18n/fieldservice_vehicle.pot               | 17 -----------------
 fieldservice_vehicle/models/__init__.py         |  1 -
 fieldservice_vehicle/models/fsm_route.py        | 16 ----------------
 fieldservice_vehicle/views/fsm_route.xml        | 17 -----------------
 5 files changed, 52 deletions(-)
 delete mode 100644 fieldservice_vehicle/models/fsm_route.py
 delete mode 100644 fieldservice_vehicle/views/fsm_route.xml

diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index 2d6b8de317..53d65f0146 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -15,7 +15,6 @@
         'security/res_groups.xml',
         'security/ir.model.access.csv',
         'views/fsm_vehicle.xml',
-        'views/fsm_route.xml',
         'views/menu.xml',
     ],
     'license': 'AGPL-3',
diff --git a/fieldservice_vehicle/i18n/fieldservice_vehicle.pot b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
index 68ffc295cf..f2514ab407 100644
--- a/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
+++ b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
@@ -23,11 +23,6 @@ msgstr ""
 msgid "Assigned Driver"
 msgstr ""
 
-#. module: fieldservice_vehicle
-#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_route__vehicle_id
-msgid "Assigned Vehicle"
-msgstr ""
-
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
 msgid "Created by"
@@ -43,11 +38,6 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
-#. module: fieldservice_vehicle
-#: model:ir.model,name:fieldservice_vehicle.model_fsm_route
-msgid "Field Service Route"
-msgstr ""
-
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
 msgid "Field Service Vehicle"
@@ -88,13 +78,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#. module: fieldservice_vehicle
-#: code:addons/fieldservice_vehicle/models/fsm_route.py:15
-#: sql_constraint:fsm.route:0
-#, python-format
-msgid "The vehicle is already assigned to another route on that day!"
-msgstr ""
-
 #. module: fieldservice_vehicle
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
 msgid "Vehicle"
diff --git a/fieldservice_vehicle/models/__init__.py b/fieldservice_vehicle/models/__init__.py
index 07dd1a0e4d..a2cbe3303d 100644
--- a/fieldservice_vehicle/models/__init__.py
+++ b/fieldservice_vehicle/models/__init__.py
@@ -3,5 +3,4 @@
 
 from . import (
     fsm_vehicle,
-    fsm_route,
 )
diff --git a/fieldservice_vehicle/models/fsm_route.py b/fieldservice_vehicle/models/fsm_route.py
deleted file mode 100644
index a71866fdcf..0000000000
--- a/fieldservice_vehicle/models/fsm_route.py
+++ /dev/null
@@ -1,16 +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, models, _
-
-
-class FSMRoute(models.Model):
-    _inherit = 'fsm.route'
-    vehicle_id = fields.Many2one('fsm.vehicle',
-                                 string='Assigned Vehicle')
-
-    _sql_constraints = [
-        ('fsm_route_vehicle_date_uniq',
-         'unique (vehicle_id, date)',
-         _("The vehicle is already assigned to another route on that day!")),
-    ]
diff --git a/fieldservice_vehicle/views/fsm_route.xml b/fieldservice_vehicle/views/fsm_route.xml
deleted file mode 100644
index 0918dd00a5..0000000000
--- a/fieldservice_vehicle/views/fsm_route.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <!-- Routes -->
-    <record id="fsm_route_form" model="ir.ui.view">
-        <field name="name">fsm.route.form</field>
-        <field name="model">fsm.route</field>
-        <field name="inherit_id" ref="fieldservice.fsm_route_form"/>
-        <field name="arch" type="xml">
-            <field name="person_id" position="after">
-                <field name="vehicle_id"
-                       groups="fieldservice_vehicle.group_fsm_vehicle"/>
-            </field>
-        </field>
-    </record>
-
-</odoo>

From 738c06aa4e3ce72e7bd55178a938e55e7f0f60c1 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 18 Dec 2019 15:26:48 +0000
Subject: [PATCH 469/631] fieldservice_vehicle 12.0.2.0.0

---
 fieldservice_vehicle/__manifest__.py |  2 +-
 fieldservice_vehicle/i18n/de.po      | 29 +++++++++++-----------------
 fieldservice_vehicle/i18n/es_CL.po   | 28 ++++++++++-----------------
 3 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index 53d65f0146..d89c7e40a7 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles',
     'summary': 'Manage Field Service vehicles and assign drivers',
-    'version': '12.0.1.0.0',
+    'version': '12.0.2.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_vehicle/i18n/de.po b/fieldservice_vehicle/i18n/de.po
index 5c63d5cf22..429c391e6b 100644
--- a/fieldservice_vehicle/i18n/de.po
+++ b/fieldservice_vehicle/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_vehicle
+# 	* fieldservice_vehicle
 #
 msgid ""
 msgstr ""
@@ -26,11 +26,6 @@ msgstr "Field-Service-Fahrzeuge hinzuf??gen."
 msgid "Assigned Driver"
 msgstr "Zugewiesener Fahrer"
 
-#. module: fieldservice_vehicle
-#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_route__vehicle_id
-msgid "Assigned Vehicle"
-msgstr "Zugewiesenes Fahrzeug"
-
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
 msgid "Created by"
@@ -46,11 +41,6 @@ msgstr "Erstellt am"
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#. module: fieldservice_vehicle
-#: model:ir.model,name:fieldservice_vehicle.model_fsm_route
-msgid "Field Service Route"
-msgstr "Service-Route"
-
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
 msgid "Field Service Vehicle"
@@ -91,13 +81,6 @@ msgstr "Fahrzeuge verwalten"
 msgid "Name"
 msgstr "Bezeichnung"
 
-#. module: fieldservice_vehicle
-#: code:addons/fieldservice_vehicle/models/fsm_route.py:15
-#: sql_constraint:fsm.route:0
-#, python-format
-msgid "The vehicle is already assigned to another route on that day!"
-msgstr "Das Fahrzeug ist an diesem Tag bereits einer anderen Route zugewiesen!"
-
 #. module: fieldservice_vehicle
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
 msgid "Vehicle"
@@ -122,3 +105,13 @@ msgstr "Fahrzeuge"
 #: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
 msgid "Vehicles Report"
 msgstr "Fahrzeug-Bericht"
+
+#~ msgid "Assigned Vehicle"
+#~ msgstr "Zugewiesenes Fahrzeug"
+
+#~ msgid "Field Service Route"
+#~ msgstr "Service-Route"
+
+#~ msgid "The vehicle is already assigned to another route on that day!"
+#~ msgstr ""
+#~ "Das Fahrzeug ist an diesem Tag bereits einer anderen Route zugewiesen!"
diff --git a/fieldservice_vehicle/i18n/es_CL.po b/fieldservice_vehicle/i18n/es_CL.po
index 99c649d027..e8e190cf75 100644
--- a/fieldservice_vehicle/i18n/es_CL.po
+++ b/fieldservice_vehicle/i18n/es_CL.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_vehicle
+# 	* fieldservice_vehicle
 #
 msgid ""
 msgstr ""
@@ -26,11 +26,6 @@ msgstr "Agregue un veh??culo de servicio de campo aqu??."
 msgid "Assigned Driver"
 msgstr "Conductor Asignado"
 
-#. module: fieldservice_vehicle
-#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_route__vehicle_id
-msgid "Assigned Vehicle"
-msgstr "Veh??culo Asignado"
-
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
 msgid "Created by"
@@ -46,11 +41,6 @@ msgstr "Creado en"
 msgid "Display Name"
 msgstr "Nombre Mostrado"
 
-#. module: fieldservice_vehicle
-#: model:ir.model,name:fieldservice_vehicle.model_fsm_route
-msgid "Field Service Route"
-msgstr "Ruta de Servicio de Campo"
-
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
 msgid "Field Service Vehicle"
@@ -91,13 +81,6 @@ msgstr "Gestionar Veh??culos"
 msgid "Name"
 msgstr "Nombre"
 
-#. module: fieldservice_vehicle
-#: code:addons/fieldservice_vehicle/models/fsm_route.py:15
-#: sql_constraint:fsm.route:0
-#, python-format
-msgid "The vehicle is already assigned to another route on that day!"
-msgstr "??El veh??culo ya est?? asignado a otra ruta ese d??a!"
-
 #. module: fieldservice_vehicle
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
 msgid "Vehicle"
@@ -122,3 +105,12 @@ msgstr "Veh??culos"
 #: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
 msgid "Vehicles Report"
 msgstr "Reporte de Veh??culos"
+
+#~ msgid "Assigned Vehicle"
+#~ msgstr "Veh??culo Asignado"
+
+#~ msgid "Field Service Route"
+#~ msgstr "Ruta de Servicio de Campo"
+
+#~ msgid "The vehicle is already assigned to another route on that day!"
+#~ msgstr "??El veh??culo ya est?? asignado a otra ruta ese d??a!"

From ce379bb9f07b6a714956fd9c0a5785e9629d71ce Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 9 Jan 2020 08:09:22 -0800
Subject: [PATCH 470/631] [IMP] fieldservice_vehicle

---
 fieldservice_vehicle/__manifest__.py          |  6 ++---
 .../i18n/fieldservice_vehicle.pot             | 16 ++++++++++++
 fieldservice_vehicle/models/__init__.py       |  5 ++--
 fieldservice_vehicle/models/fsm_order.py      | 21 ++++++++++++++++
 fieldservice_vehicle/models/fsm_person.py     |  9 +++++++
 fieldservice_vehicle/models/fsm_vehicle.py    |  3 +--
 fieldservice_vehicle/views/fsm_order.xml      | 14 +++++++++++
 fieldservice_vehicle/views/fsm_person.xml     | 25 +++++++++++++++++++
 fieldservice_vehicle/views/fsm_vehicle.xml    |  1 -
 fieldservice_vehicle/views/menu.xml           |  1 -
 10 files changed, 92 insertions(+), 9 deletions(-)
 create mode 100644 fieldservice_vehicle/models/fsm_order.py
 create mode 100644 fieldservice_vehicle/models/fsm_person.py
 create mode 100644 fieldservice_vehicle/views/fsm_order.xml
 create mode 100644 fieldservice_vehicle/views/fsm_person.xml

diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index d89c7e40a7..75ca1c5fda 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -1,6 +1,5 @@
-# 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 Vehicles',
     'summary': 'Manage Field Service vehicles and assign drivers',
@@ -15,6 +14,8 @@
         'security/res_groups.xml',
         'security/ir.model.access.csv',
         'views/fsm_vehicle.xml',
+        'views/fsm_person.xml',
+        'views/fsm_order.xml',
         'views/menu.xml',
     ],
     'license': 'AGPL-3',
@@ -23,5 +24,4 @@
         'wolfhall',
         'max3903',
     ],
-    'installable': True,
 }
diff --git a/fieldservice_vehicle/i18n/fieldservice_vehicle.pot b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
index f2514ab407..0415421062 100644
--- a/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
+++ b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
@@ -33,11 +33,21 @@ msgstr ""
 msgid "Created on"
 msgstr ""
 
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+msgid "Default Vehicle"
+msgstr ""
+
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
 msgid "Display Name"
 msgstr ""
 
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
 msgid "Field Service Vehicle"
@@ -48,6 +58,11 @@ msgstr ""
 msgid "Field Service Vehicles"
 msgstr ""
 
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+msgid "Field Service Worker"
+msgstr ""
+
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
 msgid "ID"
@@ -79,6 +94,7 @@ msgid "Name"
 msgstr ""
 
 #. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
 msgid "Vehicle"
 msgstr ""
diff --git a/fieldservice_vehicle/models/__init__.py b/fieldservice_vehicle/models/__init__.py
index a2cbe3303d..910d4725c2 100644
--- a/fieldservice_vehicle/models/__init__.py
+++ b/fieldservice_vehicle/models/__init__.py
@@ -1,6 +1,7 @@
-# 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_vehicle,
+    fsm_person,
+    fsm_order,
 )
diff --git a/fieldservice_vehicle/models/fsm_order.py b/fieldservice_vehicle/models/fsm_order.py
new file mode 100644
index 0000000000..b7d5c015b7
--- /dev/null
+++ b/fieldservice_vehicle/models/fsm_order.py
@@ -0,0 +1,21 @@
+# 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 FSMOrder(models.Model):
+    _inherit = 'fsm.order'
+
+    @api.model
+    def _get_default_vehicle(self):
+        return self.person_id.vehicle_id.id or False
+
+    vehicle_id = fields.Many2one('fsm.vehicle', string="Vehicle",
+                                 default=_get_default_vehicle)
+
+    @api.model
+    def create(self, vals):
+        res = super().create(vals)
+        if not res.vehicle_id and res.person_id:
+            res.vehicle_id = res.person_id.vehicle_id.id or False
+        return res
diff --git a/fieldservice_vehicle/models/fsm_person.py b/fieldservice_vehicle/models/fsm_person.py
new file mode 100644
index 0000000000..2a8bb221a7
--- /dev/null
+++ b/fieldservice_vehicle/models/fsm_person.py
@@ -0,0 +1,9 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class FSMPerson(models.Model):
+    _inherit = 'fsm.person'
+
+    vehicle_id = fields.Many2one('fsm.vehicle', string='Default Vehicle')
diff --git a/fieldservice_vehicle/models/fsm_vehicle.py b/fieldservice_vehicle/models/fsm_vehicle.py
index 88012c17f1..1f48861b67 100644
--- a/fieldservice_vehicle/models/fsm_vehicle.py
+++ b/fieldservice_vehicle/models/fsm_vehicle.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
+# Copyright (C) 2018 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from odoo import fields, models
 
 
diff --git a/fieldservice_vehicle/views/fsm_order.xml b/fieldservice_vehicle/views/fsm_order.xml
new file mode 100644
index 0000000000..f1b5483448
--- /dev/null
+++ b/fieldservice_vehicle/views/fsm_order.xml
@@ -0,0 +1,14 @@
+<odoo>
+
+    <record id="fsm_order_vehicle_form_view" model="ir.ui.view">
+        <field name="name">fsm.order.vehicle.form</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
+        <field name="arch" type="xml">
+            <field name="person_id" position="after">
+                <field name="vehicle_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_vehicle/views/fsm_person.xml b/fieldservice_vehicle/views/fsm_person.xml
new file mode 100644
index 0000000000..1c27b42dc7
--- /dev/null
+++ b/fieldservice_vehicle/views/fsm_person.xml
@@ -0,0 +1,25 @@
+<odoo>
+
+    <record id="fsm_person_vehicle_tree_view" model="ir.ui.view">
+        <field name="name">fsm.person.vehicle.tree</field>
+        <field name="model">fsm.person</field>
+        <field name="inherit_id" ref="fieldservice.fsm_person_tree"/>
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="vehicle_id"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="fsm_person_vehicle_form_view" model="ir.ui.view">
+        <field name="name">fsm.person.vehicle.form</field>
+        <field name="model">fsm.person</field>
+        <field name="inherit_id" ref="fieldservice.fsm_person_form"/>
+        <field name="arch" type="xml">
+            <field name="category_ids" position="before">
+                <field name="vehicle_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_vehicle/views/fsm_vehicle.xml b/fieldservice_vehicle/views/fsm_vehicle.xml
index 8d8a81a311..b226e69812 100644
--- a/fieldservice_vehicle/views/fsm_vehicle.xml
+++ b/fieldservice_vehicle/views/fsm_vehicle.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <!-- Field Service Vehicle -->
diff --git a/fieldservice_vehicle/views/menu.xml b/fieldservice_vehicle/views/menu.xml
index 5255eea256..cd5429bd57 100644
--- a/fieldservice_vehicle/views/menu.xml
+++ b/fieldservice_vehicle/views/menu.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <menuitem id="menu_fsm_vehicle"

From ed68f6697bb7f3d6b775d4610aa47eba291a11ad Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 14 Jan 2020 17:33:15 +0000
Subject: [PATCH 471/631] fieldservice_vehicle 12.0.2.1.0

---
 fieldservice_vehicle/__manifest__.py |   2 +-
 fieldservice_vehicle/i18n/de.po      |  25 +++++-
 fieldservice_vehicle/i18n/es_CL.po   |  25 +++++-
 fieldservice_vehicle/i18n/pt_BR.po   | 121 +++++++++++++++++++++++++++
 4 files changed, 166 insertions(+), 7 deletions(-)
 create mode 100644 fieldservice_vehicle/i18n/pt_BR.po

diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index 75ca1c5fda..9533ad7969 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Field Service Vehicles',
     'summary': 'Manage Field Service vehicles and assign drivers',
-    'version': '12.0.2.0.0',
+    'version': '12.0.2.1.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_vehicle/i18n/de.po b/fieldservice_vehicle/i18n/de.po
index 429c391e6b..4fd9a82f0c 100644
--- a/fieldservice_vehicle/i18n/de.po
+++ b/fieldservice_vehicle/i18n/de.po
@@ -36,11 +36,25 @@ msgstr "Erstellt von"
 msgid "Created on"
 msgstr "Erstellt am"
 
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+#, fuzzy
+#| msgid "Vehicle"
+msgid "Default Vehicle"
+msgstr "Fahrzeug"
+
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
 msgid "Display Name"
 msgstr "Anzeigename"
 
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+#, fuzzy
+#| msgid "Field Service Route"
+msgid "Field Service Order"
+msgstr "Service-Route"
+
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
 msgid "Field Service Vehicle"
@@ -51,6 +65,13 @@ msgstr "Service-Fahrzeug"
 msgid "Field Service Vehicles"
 msgstr "Service-Fahrzeuge"
 
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+#, fuzzy
+#| msgid "Field Service Route"
+msgid "Field Service Worker"
+msgstr "Service-Route"
+
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
 msgid "ID"
@@ -82,6 +103,7 @@ msgid "Name"
 msgstr "Bezeichnung"
 
 #. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
 msgid "Vehicle"
 msgstr "Fahrzeug"
@@ -109,9 +131,6 @@ msgstr "Fahrzeug-Bericht"
 #~ msgid "Assigned Vehicle"
 #~ msgstr "Zugewiesenes Fahrzeug"
 
-#~ msgid "Field Service Route"
-#~ msgstr "Service-Route"
-
 #~ msgid "The vehicle is already assigned to another route on that day!"
 #~ msgstr ""
 #~ "Das Fahrzeug ist an diesem Tag bereits einer anderen Route zugewiesen!"
diff --git a/fieldservice_vehicle/i18n/es_CL.po b/fieldservice_vehicle/i18n/es_CL.po
index e8e190cf75..9cdc2117b6 100644
--- a/fieldservice_vehicle/i18n/es_CL.po
+++ b/fieldservice_vehicle/i18n/es_CL.po
@@ -36,11 +36,25 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+#, fuzzy
+#| msgid "Vehicle"
+msgid "Default Vehicle"
+msgstr "Veh??culo"
+
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
 msgid "Display Name"
 msgstr "Nombre Mostrado"
 
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+#, fuzzy
+#| msgid "Field Service Route"
+msgid "Field Service Order"
+msgstr "Ruta de Servicio de Campo"
+
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
 msgid "Field Service Vehicle"
@@ -51,6 +65,13 @@ msgstr "Veh??culo de Servicio de Campo"
 msgid "Field Service Vehicles"
 msgstr "Veh??culos de Servicio de Campo"
 
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+#, fuzzy
+#| msgid "Field Service Route"
+msgid "Field Service Worker"
+msgstr "Ruta de Servicio de Campo"
+
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
 msgid "ID"
@@ -82,6 +103,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
 msgid "Vehicle"
 msgstr "Veh??culo"
@@ -109,8 +131,5 @@ msgstr "Reporte de Veh??culos"
 #~ msgid "Assigned Vehicle"
 #~ msgstr "Veh??culo Asignado"
 
-#~ msgid "Field Service Route"
-#~ msgstr "Ruta de Servicio de Campo"
-
 #~ msgid "The vehicle is already assigned to another route on that day!"
 #~ msgstr "??El veh??culo ya est?? asignado a otra ruta ese d??a!"
diff --git a/fieldservice_vehicle/i18n/pt_BR.po b/fieldservice_vehicle/i18n/pt_BR.po
new file mode 100644
index 0000000000..3e086af3c8
--- /dev/null
+++ b/fieldservice_vehicle/i18n/pt_BR.po
@@ -0,0 +1,121 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_vehicle
+#
+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_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+msgid "Default Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+msgid "Field Service Worker"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
+msgid "Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: sql_constraint:fsm.vehicle:0
+msgid "Vehicle name already exists!"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_tree_view
+msgid "Vehicles"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr ""

From 74f5c6299f265f68f7c0341133f5b101631905fd Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 16 Jan 2020 11:39:15 -0600
Subject: [PATCH 472/631] [ADD] Spanish (es) translation

---
 fieldservice_vehicle/i18n/es.po    | 129 +++++++++++++++++++++++++++++
 fieldservice_vehicle/i18n/pt_BR.po |  44 +++++-----
 2 files changed, 152 insertions(+), 21 deletions(-)
 create mode 100644 fieldservice_vehicle/i18n/es.po

diff --git a/fieldservice_vehicle/i18n/es.po b/fieldservice_vehicle/i18n/es.po
new file mode 100644
index 0000000000..9650a5aa1c
--- /dev/null
+++ b/fieldservice_vehicle/i18n/es.po
@@ -0,0 +1,129 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_vehicle
+#
+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"
+"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"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr "Agregue un veh??culo de servicio de campo aqu??."
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr "Conductor Asignado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+msgid "Default Vehicle"
+msgstr "Veh??culo Predeterminado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr "Nombre Mostrado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Veh??culo de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr "Veh??culos de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabajador de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr "??ltima Modificaci??n en"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr "??ltima Actualizaci??n por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr "??ltima Actualizaci??n el"
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr "Gestionar Veh??culos"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
+msgid "Vehicle"
+msgstr "Veh??culo"
+
+#. module: fieldservice_vehicle
+#: sql_constraint:fsm.vehicle:0
+msgid "Vehicle name already exists!"
+msgstr "??El nombre del veh??culo ya existe!"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_tree_view
+msgid "Vehicles"
+msgstr "Veh??culos"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr "Reporte de Veh??culos"
+
+#~ msgid "Assigned Vehicle"
+#~ msgstr "Veh??culo Asignado"
+
+#~ msgid "The vehicle is already assigned to another route on that day!"
+#~ msgstr "??El veh??culo ya est?? asignado a otra ruta ese d??a!"
diff --git a/fieldservice_vehicle/i18n/pt_BR.po b/fieldservice_vehicle/i18n/pt_BR.po
index 3e086af3c8..1680e3000a 100644
--- a/fieldservice_vehicle/i18n/pt_BR.po
+++ b/fieldservice_vehicle/i18n/pt_BR.po
@@ -6,104 +6,106 @@ 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 11: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_vehicle
 #: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
 msgid "Add a Field Service Vehicle here."
-msgstr ""
+msgstr "Adicione um Ve??culo de Servi??o de Campo aqui."
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
 msgid "Assigned Driver"
-msgstr ""
+msgstr "Motorista Designado"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Criado por"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Criado em"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
 msgid "Default Vehicle"
-msgstr ""
+msgstr "Ve??culo Padr??o"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Nome Exibido"
 
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Ordem de Servi??o de Campo"
 
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
 msgid "Field Service Vehicle"
-msgstr ""
+msgstr "Ve??culo de Servi??o de Campo"
 
 #. module: fieldservice_vehicle
 #: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
 msgid "Field Service Vehicles"
-msgstr ""
+msgstr "Ve??culos de Servi??o de Campo"
 
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_person
 msgid "Field Service Worker"
-msgstr ""
+msgstr "Trabalhador do Servi??o de Campo"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "??ltima Modifica????o em"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "??ltima Atualiza????o por"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "??ltima Atualiza????o em"
 
 #. module: fieldservice_vehicle
 #: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
 msgid "Manage Vehicles"
-msgstr ""
+msgstr "Gerenciar Ve??culos"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view
 msgid "Vehicle"
-msgstr ""
+msgstr "Ve??culo"
 
 #. module: fieldservice_vehicle
 #: sql_constraint:fsm.vehicle:0
 msgid "Vehicle name already exists!"
-msgstr ""
+msgstr "O nome do ve??culo j?? existe!"
 
 #. module: fieldservice_vehicle
 #: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
@@ -113,9 +115,9 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_tree_view
 msgid "Vehicles"
-msgstr ""
+msgstr "Ve??culos"
 
 #. module: fieldservice_vehicle
 #: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
 msgid "Vehicles Report"
-msgstr ""
+msgstr "Relat??rio de Ve??culos"

From 30444bbc5e1183ad6cdb40178aa2c71473381fbe Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 20 Mar 2020 10:18:25 -0600
Subject: [PATCH 473/631] [IMP] fieldservice_vehicle

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

diff --git a/fieldservice_vehicle/models/fsm_order.py b/fieldservice_vehicle/models/fsm_order.py
index b7d5c015b7..813d4ea3da 100644
--- a/fieldservice_vehicle/models/fsm_order.py
+++ b/fieldservice_vehicle/models/fsm_order.py
@@ -15,7 +15,7 @@ def _get_default_vehicle(self):
 
     @api.model
     def create(self, vals):
-        res = super().create(vals)
-        if not res.vehicle_id and res.person_id:
-            res.vehicle_id = res.person_id.vehicle_id.id or False
-        return res
+        if not vals.get('vehicle_id', False) and vals.get('person_id', False):
+            person = self.env['fsm.person'].browse(vals.get('person_id'))
+            vals.update({'vehicle_id': person.vehicle_id.id})
+        return super().create(vals)

From 6ba9e44eb1dbca8a1a37c360b640929b0c368e95 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sat, 21 Mar 2020 08:33:37 -0600
Subject: [PATCH 474/631] Update fieldservice_vehicle/models/fsm_order.py

Co-Authored-By: Daniel Reis <dreis@opensourceintegrators.com>
---
 fieldservice_vehicle/models/fsm_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_vehicle/models/fsm_order.py b/fieldservice_vehicle/models/fsm_order.py
index 813d4ea3da..42e07e063c 100644
--- a/fieldservice_vehicle/models/fsm_order.py
+++ b/fieldservice_vehicle/models/fsm_order.py
@@ -15,7 +15,7 @@ def _get_default_vehicle(self):
 
     @api.model
     def create(self, vals):
-        if not vals.get('vehicle_id', False) and vals.get('person_id', False):
+        if not vals.get('vehicle_id') and vals.get('person_id'):
             person = self.env['fsm.person'].browse(vals.get('person_id'))
             vals.update({'vehicle_id': person.vehicle_id.id})
         return super().create(vals)

From 806e802a018379793600155fe061feced778fe6e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 23 Mar 2020 17:18:08 +0000
Subject: [PATCH 475/631] fieldservice_vehicle 12.0.2.1.1

---
 fieldservice_vehicle/__manifest__.py |  2 +-
 fieldservice_vehicle/i18n/es.po      |  4 ++--
 fieldservice_vehicle/i18n/es_CL.po   | 16 +++++-----------
 fieldservice_vehicle/i18n/pt_BR.po   | 12 ++++++------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index 9533ad7969..1711db19f0 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Field Service Vehicles',
     'summary': 'Manage Field Service vehicles and assign drivers',
-    'version': '12.0.2.1.0',
+    'version': '12.0.2.1.1',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_vehicle/i18n/es.po b/fieldservice_vehicle/i18n/es.po
index 9650a5aa1c..2423ae286b 100644
--- a/fieldservice_vehicle/i18n/es.po
+++ b/fieldservice_vehicle/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: 2020-03-04 00:13+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\n"
@@ -69,7 +69,7 @@ msgstr "Trabajador de Servicio de Campo"
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
diff --git a/fieldservice_vehicle/i18n/es_CL.po b/fieldservice_vehicle/i18n/es_CL.po
index 9cdc2117b6..07c12d3782 100644
--- a/fieldservice_vehicle/i18n/es_CL.po
+++ b/fieldservice_vehicle/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-11-21 20:35+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"
@@ -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.8\n"
+"X-Generator: Weblate 3.10\n"
 
 #. module: fieldservice_vehicle
 #: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
@@ -38,10 +38,8 @@ msgstr "Creado en"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
-#, fuzzy
-#| msgid "Vehicle"
 msgid "Default Vehicle"
-msgstr "Veh??culo"
+msgstr "Veh??culo Predeterminado"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
@@ -50,10 +48,8 @@ msgstr "Nombre Mostrado"
 
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_order
-#, fuzzy
-#| msgid "Field Service Route"
 msgid "Field Service Order"
-msgstr "Ruta de Servicio de Campo"
+msgstr "Pedido de Servicio de Campo"
 
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
@@ -67,10 +63,8 @@ msgstr "Veh??culos de Servicio de Campo"
 
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_person
-#, fuzzy
-#| msgid "Field Service Route"
 msgid "Field Service Worker"
-msgstr "Ruta de Servicio de Campo"
+msgstr "Trabajador de Servicio de Campo"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
diff --git a/fieldservice_vehicle/i18n/pt_BR.po b/fieldservice_vehicle/i18n/pt_BR.po
index 1680e3000a..a2d67da62e 100644
--- a/fieldservice_vehicle/i18n/pt_BR.po
+++ b/fieldservice_vehicle/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-05 11:13+0000\n"
-"Last-Translator: Marcel Savegnago <marcel.savegnago@gmail.com>\n"
+"PO-Revision-Date: 2020-06-17 02:19+0000\n"
+"Last-Translator: Fernando Colus <fcolus1@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr "Ve??culo Padr??o"
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
 msgid "Display Name"
-msgstr "Nome Exibido"
+msgstr "Exibir Nome"
 
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_order
@@ -74,17 +74,17 @@ msgstr "ID"
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
 msgid "Last Modified on"
-msgstr "??ltima Modifica????o em"
+msgstr "??ltima Modifica????o Feita em"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
 msgid "Last Updated by"
-msgstr "??ltima Atualiza????o por"
+msgstr "??ltima Atualiza????o Feita por"
 
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
 msgid "Last Updated on"
-msgstr "??ltima Atualiza????o em"
+msgstr "??ltima Atualiza????o Feita em"
 
 #. module: fieldservice_vehicle
 #: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle

From 320a0b6efa717c46af25e3d016c31fa9e4a9bcd0 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 20 Jul 2020 17:07:57 -0400
Subject: [PATCH 476/631] [IMP] fieldservice_vehicle: black, isort, prettier

---
 fieldservice_vehicle/__manifest__.py          |   39 +-
 fieldservice_vehicle/models/fsm_order.py      |   13 +-
 fieldservice_vehicle/models/fsm_person.py     |    4 +-
 fieldservice_vehicle/models/fsm_vehicle.py    |   10 +-
 fieldservice_vehicle/security/res_groups.xml  |   13 +-
 .../static/description/index.html             | 1179 +++++++++++------
 fieldservice_vehicle/views/fsm_order.xml      |    6 +-
 fieldservice_vehicle/views/fsm_person.xml     |   11 +-
 fieldservice_vehicle/views/fsm_vehicle.xml    |   23 +-
 fieldservice_vehicle/views/menu.xml           |   31 +-
 10 files changed, 811 insertions(+), 518 deletions(-)

diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index 1711db19f0..9262f8c5b2 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -1,27 +1,22 @@
 # Copyright (C) 2018 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
-    'name': 'Field Service Vehicles',
-    'summary': 'Manage Field Service vehicles and assign drivers',
-    'version': '12.0.2.1.1',
-    'category': 'Field Service',
-    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice',
-    ],
-    'data': [
-        'security/res_groups.xml',
-        'security/ir.model.access.csv',
-        'views/fsm_vehicle.xml',
-        'views/fsm_person.xml',
-        'views/fsm_order.xml',
-        'views/menu.xml',
-    ],
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'wolfhall',
-        'max3903',
+    "name": "Field Service Vehicles",
+    "summary": "Manage Field Service vehicles and assign drivers",
+    "version": "12.0.2.1.1",
+    "category": "Field Service",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": ["fieldservice"],
+    "data": [
+        "security/res_groups.xml",
+        "security/ir.model.access.csv",
+        "views/fsm_vehicle.xml",
+        "views/fsm_person.xml",
+        "views/fsm_order.xml",
+        "views/menu.xml",
     ],
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": ["wolfhall", "max3903"],
 }
diff --git a/fieldservice_vehicle/models/fsm_order.py b/fieldservice_vehicle/models/fsm_order.py
index 42e07e063c..c9929c05f1 100644
--- a/fieldservice_vehicle/models/fsm_order.py
+++ b/fieldservice_vehicle/models/fsm_order.py
@@ -4,18 +4,19 @@
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
     @api.model
     def _get_default_vehicle(self):
         return self.person_id.vehicle_id.id or False
 
-    vehicle_id = fields.Many2one('fsm.vehicle', string="Vehicle",
-                                 default=_get_default_vehicle)
+    vehicle_id = fields.Many2one(
+        "fsm.vehicle", string="Vehicle", default=_get_default_vehicle
+    )
 
     @api.model
     def create(self, vals):
-        if not vals.get('vehicle_id') and vals.get('person_id'):
-            person = self.env['fsm.person'].browse(vals.get('person_id'))
-            vals.update({'vehicle_id': person.vehicle_id.id})
+        if not vals.get("vehicle_id") and vals.get("person_id"):
+            person = self.env["fsm.person"].browse(vals.get("person_id"))
+            vals.update({"vehicle_id": person.vehicle_id.id})
         return super().create(vals)
diff --git a/fieldservice_vehicle/models/fsm_person.py b/fieldservice_vehicle/models/fsm_person.py
index 2a8bb221a7..9ea293e3ef 100644
--- a/fieldservice_vehicle/models/fsm_person.py
+++ b/fieldservice_vehicle/models/fsm_person.py
@@ -4,6 +4,6 @@
 
 
 class FSMPerson(models.Model):
-    _inherit = 'fsm.person'
+    _inherit = "fsm.person"
 
-    vehicle_id = fields.Many2one('fsm.vehicle', string='Default Vehicle')
+    vehicle_id = fields.Many2one("fsm.vehicle", string="Default Vehicle")
diff --git a/fieldservice_vehicle/models/fsm_vehicle.py b/fieldservice_vehicle/models/fsm_vehicle.py
index 1f48861b67..a982ca8769 100644
--- a/fieldservice_vehicle/models/fsm_vehicle.py
+++ b/fieldservice_vehicle/models/fsm_vehicle.py
@@ -4,12 +4,12 @@
 
 
 class FSMVehicle(models.Model):
-    _name = 'fsm.vehicle'
-    _description = 'Field Service Vehicle'
+    _name = "fsm.vehicle"
+    _description = "Field Service Vehicle"
 
-    name = fields.Char(string='Name', required='True')
-    person_id = fields.Many2one('fsm.person', string='Assigned Driver')
+    name = fields.Char(string="Name", required="True")
+    person_id = fields.Many2one("fsm.person", string="Assigned Driver")
 
     _sql_constraints = [
-        ('name_uniq', 'unique (name)', "Vehicle name already exists!"),
+        ("name_uniq", "unique (name)", "Vehicle name already exists!"),
     ]
diff --git a/fieldservice_vehicle/security/res_groups.xml b/fieldservice_vehicle/security/res_groups.xml
index de16a9ec6e..cab35f81af 100644
--- a/fieldservice_vehicle/security/res_groups.xml
+++ b/fieldservice_vehicle/security/res_groups.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!-- FSM groups -->
     <record id="group_fsm_vehicle" model="res.groups">
         <field name="name">Manage Vehicles</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
+        <field name="category_id" ref="base.module_category_hidden" />
     </record>
-
     <record id="fieldservice.group_fsm_user" model="res.groups">
-        <field name="implied_ids"
-               eval="[(4, ref('fieldservice_vehicle.group_fsm_vehicle'))]"/>
+        <field
+            name="implied_ids"
+            eval="[(4, ref('fieldservice_vehicle.group_fsm_vehicle'))]"
+        />
     </record>
-
 </odoo>
diff --git a/fieldservice_vehicle/static/description/index.html b/fieldservice_vehicle/static/description/index.html
index 15710693a2..476e4d3286 100644
--- a/fieldservice_vehicle/static/description/index.html
+++ b/fieldservice_vehicle/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 Vehicles</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 Vehicles</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,368 +134,642 @@
   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-vehicles">
-<h1 class="title">Field Service Vehicles</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-vehicles">
+      <h1 class="title">Field Service Vehicles</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_vehicle"><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_vehicle"><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>This module allows you to manage your vehicles and assign them to a worker.</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/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>To configure this module, you need to:</p>
-<ul class="simple">
-<li>Go to Field Service &gt; Master Data &gt; Vehicles</li>
-<li>Create your vehicles and assign them to a worker</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 and assign it</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_vehicle%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>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>
-<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">
-<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/12.0/fieldservice_vehicle">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_vehicle"
+          ><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_vehicle"
+          ><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>This module allows you to manage your vehicles and assign them to a worker.</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/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>To configure this module, you need to:</p>
+        <ul class="simple">
+          <li>Go to Field Service &gt; Master Data &gt; Vehicles</li>
+          <li>Create your vehicles and assign them to a worker</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 and assign it</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_vehicle%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>
+              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>
+            <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">
+          <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/12.0/fieldservice_vehicle"
+              >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_vehicle/views/fsm_order.xml b/fieldservice_vehicle/views/fsm_order.xml
index f1b5483448..a89638169a 100644
--- a/fieldservice_vehicle/views/fsm_order.xml
+++ b/fieldservice_vehicle/views/fsm_order.xml
@@ -1,14 +1,12 @@
 <odoo>
-
     <record id="fsm_order_vehicle_form_view" model="ir.ui.view">
         <field name="name">fsm.order.vehicle.form</field>
         <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">
             <field name="person_id" position="after">
-                <field name="vehicle_id"/>
+                <field name="vehicle_id" />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_vehicle/views/fsm_person.xml b/fieldservice_vehicle/views/fsm_person.xml
index 1c27b42dc7..1cc654f5e1 100644
--- a/fieldservice_vehicle/views/fsm_person.xml
+++ b/fieldservice_vehicle/views/fsm_person.xml
@@ -1,25 +1,22 @@
 <odoo>
-
     <record id="fsm_person_vehicle_tree_view" model="ir.ui.view">
         <field name="name">fsm.person.vehicle.tree</field>
         <field name="model">fsm.person</field>
-        <field name="inherit_id" ref="fieldservice.fsm_person_tree"/>
+        <field name="inherit_id" ref="fieldservice.fsm_person_tree" />
         <field name="arch" type="xml">
             <field name="name" position="after">
-                <field name="vehicle_id"/>
+                <field name="vehicle_id" />
             </field>
         </field>
     </record>
-
     <record id="fsm_person_vehicle_form_view" model="ir.ui.view">
         <field name="name">fsm.person.vehicle.form</field>
         <field name="model">fsm.person</field>
-        <field name="inherit_id" ref="fieldservice.fsm_person_form"/>
+        <field name="inherit_id" ref="fieldservice.fsm_person_form" />
         <field name="arch" type="xml">
             <field name="category_ids" position="before">
-                <field name="vehicle_id"/>
+                <field name="vehicle_id" />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_vehicle/views/fsm_vehicle.xml b/fieldservice_vehicle/views/fsm_vehicle.xml
index b226e69812..5ebcc63547 100644
--- a/fieldservice_vehicle/views/fsm_vehicle.xml
+++ b/fieldservice_vehicle/views/fsm_vehicle.xml
@@ -1,38 +1,35 @@
 <odoo>
-
     <!-- Field Service Vehicle -->
     <record id="fsm_vehicle_tree_view" model="ir.ui.view">
         <field name="name">fsm.vehicle.tree</field>
         <field name="model">fsm.vehicle</field>
         <field name="arch" type="xml">
             <tree string="Vehicles">
-                <field name="name"/>
-                <field name="person_id"/>
+                <field name="name" />
+                <field name="person_id" />
             </tree>
         </field>
     </record>
-
     <record id="fsm_vehicle_form_view" model="ir.ui.view">
         <field name="name">fsm.vehicle.form</field>
         <field name="model">fsm.vehicle</field>
         <field name="arch" type="xml">
             <form string="Vehicle">
                 <sheet>
-                    <label for="name" class="oe_edit_only"/>
+                    <label for="name" class="oe_edit_only" />
                     <h1>
-                        <field name="name"/>
+                        <field name="name" />
                     </h1>
                     <group>
                         <group>
-                            <field name="person_id"/>
+                            <field name="person_id" />
                         </group>
-                        <group></group>
+                        <group />
                     </group>
                 </sheet>
             </form>
         </field>
     </record>
-
     <!-- Field Service Vehicles -->
     <record id="action_fsm_vehicle" model="ir.actions.act_window">
         <field name="name">Field Service Vehicles</field>
@@ -45,28 +42,25 @@
             </p>
         </field>
     </record>
-
     <!-- Reporting -->
     <record id="fsm_vehicle_graph_view" model="ir.ui.view">
         <field name="name">fsm.vehicle.graph</field>
         <field name="model">fsm.vehicle</field>
         <field name="arch" type="xml">
             <graph string="Vehicles" type="bar">
-                <field name="person_id" type="row"/>
+                <field name="person_id" type="row" />
             </graph>
         </field>
     </record>
-
     <record id="fsm_vehicle_pivot_view" model="ir.ui.view">
         <field name="name">fsm.vehicle.pivot</field>
         <field name="model">fsm.vehicle</field>
         <field name="arch" type="xml">
             <pivot string="Vehicles" display_quantity="true">
-                <field name="person_id" type="row"/>
+                <field name="person_id" type="row" />
             </pivot>
         </field>
     </record>
-
     <record id="action_fsm_report_vehicle" model="ir.actions.act_window">
         <field name="name">Vehicles</field>
         <field name="res_model">fsm.vehicle</field>
@@ -78,5 +72,4 @@
             </p>
         </field>
     </record>
-
 </odoo>
diff --git a/fieldservice_vehicle/views/menu.xml b/fieldservice_vehicle/views/menu.xml
index cd5429bd57..079a7c6bca 100644
--- a/fieldservice_vehicle/views/menu.xml
+++ b/fieldservice_vehicle/views/menu.xml
@@ -1,17 +1,18 @@
 <odoo>
-
-    <menuitem id="menu_fsm_vehicle"
-              name="Vehicles"
-              action="action_fsm_vehicle"
-              parent="fieldservice.data"
-              sequence="40"
-              groups="fieldservice_vehicle.group_fsm_vehicle"/>
-
-    <menuitem id="menu_fsm_report_vehicle"
-              name="Vehicles"
-              action="action_fsm_report_vehicle"
-              parent="fieldservice.reporting"
-              sequence="50"
-              groups="fieldservice_vehicle.group_fsm_vehicle"/>
-
+    <menuitem
+        id="menu_fsm_vehicle"
+        name="Vehicles"
+        action="action_fsm_vehicle"
+        parent="fieldservice.data"
+        sequence="40"
+        groups="fieldservice_vehicle.group_fsm_vehicle"
+    />
+    <menuitem
+        id="menu_fsm_report_vehicle"
+        name="Vehicles"
+        action="action_fsm_report_vehicle"
+        parent="fieldservice.reporting"
+        sequence="50"
+        groups="fieldservice_vehicle.group_fsm_vehicle"
+    />
 </odoo>

From 47e1cd36aea1a5fefa7473832e68ccb004d907eb Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 20 Jul 2020 17:13:51 -0400
Subject: [PATCH 477/631] [MIG] fieldservice_vehicle: Migration to 13.0

---
 fieldservice_vehicle/README.rst               |   13 +-
 fieldservice_vehicle/__init__.py              |    2 +-
 fieldservice_vehicle/__manifest__.py          |    2 +-
 fieldservice_vehicle/i18n/de.po               |    5 +-
 fieldservice_vehicle/i18n/es.po               |    2 +-
 fieldservice_vehicle/i18n/es_CL.po            |    2 +-
 .../i18n/fieldservice_vehicle.pot             |    9 +-
 fieldservice_vehicle/i18n/pt_BR.po            |    4 +-
 fieldservice_vehicle/readme/CONTRIBUTORS.rst  |    1 +
 fieldservice_vehicle/readme/INSTALL.rst       |    2 +-
 .../static/description/index.html             | 1180 ++++++-----------
 fieldservice_vehicle/views/fsm_vehicle.xml    |    2 -
 12 files changed, 456 insertions(+), 768 deletions(-)

diff --git a/fieldservice_vehicle/README.rst b/fieldservice_vehicle/README.rst
index 0fb60233a2..1823a5fa68 100644
--- a/fieldservice_vehicle/README.rst
+++ b/fieldservice_vehicle/README.rst
@@ -14,13 +14,13 @@ Field Service Vehicles
     :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_vehicle
+    :target: https://github.com/OCA/field-service/tree/13.0/fieldservice_vehicle
     :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_vehicle
+    :target: https://translation.odoo-community.org/projects/field-service-13-0/field-service-13-0-fieldservice_vehicle
     :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/13.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/12.0/base_geoengine
+https://github.com/OCA/geospatial/tree/13.0/base_geoengine
 
 Configuration
 =============
@@ -69,7 +69,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/field-service/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_vehicle%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_vehicle%0Aversion:%2013.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.
 
@@ -90,6 +90,7 @@ Contributors
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
 * Michael Allen <mallen@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Brian McMaster <brian@mcmpest.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -122,6 +123,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/12.0/fieldservice_vehicle>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/13.0/fieldservice_vehicle>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_vehicle/__init__.py b/fieldservice_vehicle/__init__.py
index 631bd4893a..8fc3b4add4 100644
--- a/fieldservice_vehicle/__init__.py
+++ b/fieldservice_vehicle/__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_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index 9262f8c5b2..66a10633d4 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Field Service Vehicles",
     "summary": "Manage Field Service vehicles and assign drivers",
-    "version": "12.0.2.1.1",
+    "version": "13.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",
diff --git a/fieldservice_vehicle/i18n/de.po b/fieldservice_vehicle/i18n/de.po
index 4fd9a82f0c..5267967096 100644
--- a/fieldservice_vehicle/i18n/de.po
+++ b/fieldservice_vehicle/i18n/de.po
@@ -39,7 +39,6 @@ msgstr "Erstellt am"
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
 #, fuzzy
-#| msgid "Vehicle"
 msgid "Default Vehicle"
 msgstr "Fahrzeug"
 
@@ -51,7 +50,6 @@ msgstr "Anzeigename"
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_order
 #, fuzzy
-#| msgid "Field Service Route"
 msgid "Field Service Order"
 msgstr "Service-Route"
 
@@ -68,7 +66,6 @@ msgstr "Service-Fahrzeuge"
 #. module: fieldservice_vehicle
 #: model:ir.model,name:fieldservice_vehicle.model_fsm_person
 #, fuzzy
-#| msgid "Field Service Route"
 msgid "Field Service Worker"
 msgstr "Service-Route"
 
@@ -109,7 +106,7 @@ msgid "Vehicle"
 msgstr "Fahrzeug"
 
 #. module: fieldservice_vehicle
-#: sql_constraint:fsm.vehicle:0
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
 msgid "Vehicle name already exists!"
 msgstr "Es existiert bereits ein Fahrzeug mit diesem Namen!"
 
diff --git a/fieldservice_vehicle/i18n/es.po b/fieldservice_vehicle/i18n/es.po
index 2423ae286b..01ada7faeb 100644
--- a/fieldservice_vehicle/i18n/es.po
+++ b/fieldservice_vehicle/i18n/es.po
@@ -103,7 +103,7 @@ msgid "Vehicle"
 msgstr "Veh??culo"
 
 #. module: fieldservice_vehicle
-#: sql_constraint:fsm.vehicle:0
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
 msgid "Vehicle name already exists!"
 msgstr "??El nombre del veh??culo ya existe!"
 
diff --git a/fieldservice_vehicle/i18n/es_CL.po b/fieldservice_vehicle/i18n/es_CL.po
index 07c12d3782..b2e0ebf634 100644
--- a/fieldservice_vehicle/i18n/es_CL.po
+++ b/fieldservice_vehicle/i18n/es_CL.po
@@ -103,7 +103,7 @@ msgid "Vehicle"
 msgstr "Veh??culo"
 
 #. module: fieldservice_vehicle
-#: sql_constraint:fsm.vehicle:0
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
 msgid "Vehicle name already exists!"
 msgstr "??El nombre del veh??culo ya existe!"
 
diff --git a/fieldservice_vehicle/i18n/fieldservice_vehicle.pot b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
index 0415421062..81e71270ca 100644
--- a/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
+++ b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_vehicle
+# 	* fieldservice_vehicle
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.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"
@@ -100,7 +100,7 @@ msgid "Vehicle"
 msgstr ""
 
 #. module: fieldservice_vehicle
-#: sql_constraint:fsm.vehicle:0
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
 msgid "Vehicle name already exists!"
 msgstr ""
 
@@ -118,4 +118,3 @@ msgstr ""
 #: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
 msgid "Vehicles Report"
 msgstr ""
-
diff --git a/fieldservice_vehicle/i18n/pt_BR.po b/fieldservice_vehicle/i18n/pt_BR.po
index a2d67da62e..6197a83aa7 100644
--- a/fieldservice_vehicle/i18n/pt_BR.po
+++ b/fieldservice_vehicle/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_vehicle
+# 	* fieldservice_vehicle
 #
 msgid ""
 msgstr ""
@@ -103,7 +103,7 @@ msgid "Vehicle"
 msgstr "Ve??culo"
 
 #. module: fieldservice_vehicle
-#: sql_constraint:fsm.vehicle:0
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
 msgid "Vehicle name already exists!"
 msgstr "O nome do ve??culo j?? existe!"
 
diff --git a/fieldservice_vehicle/readme/CONTRIBUTORS.rst b/fieldservice_vehicle/readme/CONTRIBUTORS.rst
index 331a0e21ed..48f88481f1 100644
--- a/fieldservice_vehicle/readme/CONTRIBUTORS.rst
+++ b/fieldservice_vehicle/readme/CONTRIBUTORS.rst
@@ -4,3 +4,4 @@
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
 * Michael Allen <mallen@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_vehicle/readme/INSTALL.rst b/fieldservice_vehicle/readme/INSTALL.rst
index 8571f65376..e5355c4b0f 100644
--- a/fieldservice_vehicle/readme/INSTALL.rst
+++ b/fieldservice_vehicle/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
diff --git a/fieldservice_vehicle/static/description/index.html b/fieldservice_vehicle/static/description/index.html
index 476e4d3286..6adec909c9 100644
--- a/fieldservice_vehicle/static/description/index.html
+++ b/fieldservice_vehicle/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 Vehicles</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 Vehicles</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,642 +99,369 @@
   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-vehicles">
-      <h1 class="title">Field Service Vehicles</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-vehicles">
+<h1 class="title">Field Service Vehicles</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_vehicle"
-          ><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_vehicle"
-          ><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>This module allows you to manage your vehicles and assign them to a worker.</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/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>To configure this module, you need to:</p>
-        <ul class="simple">
-          <li>Go to Field Service &gt; Master Data &gt; Vehicles</li>
-          <li>Create your vehicles and assign them to a worker</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 and assign it</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_vehicle%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>
-              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>
-            <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">
-          <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/12.0/fieldservice_vehicle"
-              >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/13.0/fieldservice_vehicle"><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-13-0/field-service-13-0-fieldservice_vehicle"><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/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module allows you to manage your vehicles and assign them to a worker.</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/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>To configure this module, you need to:</p>
+<ul class="simple">
+<li>Go to Field Service &gt; Master Data &gt; Vehicles</li>
+<li>Create your vehicles and assign them to a worker</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 and assign it</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_vehicle%0Aversion:%2013.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>
+<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">
+<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/13.0/fieldservice_vehicle">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_vehicle/views/fsm_vehicle.xml b/fieldservice_vehicle/views/fsm_vehicle.xml
index 5ebcc63547..f487be7e11 100644
--- a/fieldservice_vehicle/views/fsm_vehicle.xml
+++ b/fieldservice_vehicle/views/fsm_vehicle.xml
@@ -34,7 +34,6 @@
     <record id="action_fsm_vehicle" model="ir.actions.act_window">
         <field name="name">Field Service Vehicles</field>
         <field name="res_model">fsm.vehicle</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -64,7 +63,6 @@
     <record id="action_fsm_report_vehicle" model="ir.actions.act_window">
         <field name="name">Vehicles</field>
         <field name="res_model">fsm.vehicle</field>
-        <field name="view_type">form</field>
         <field name="view_mode">graph,pivot</field>
         <field name="help" type="html">
             <p>

From f4d1f3f7ab3c047d2308632d4734c5973d086ef5 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Mon, 19 Apr 2021 13:38:26 +0530
Subject: [PATCH 478/631] [14.0][MIG] fieldservice_vehicle

---
 fieldservice_vehicle/__manifest__.py                        | 2 +-
 setup/fieldservice_vehicle/odoo/addons/fieldservice_vehicle | 1 +
 setup/fieldservice_vehicle/setup.py                         | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 120000 setup/fieldservice_vehicle/odoo/addons/fieldservice_vehicle
 create mode 100644 setup/fieldservice_vehicle/setup.py

diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
index 66a10633d4..43a1626cbd 100644
--- a/fieldservice_vehicle/__manifest__.py
+++ b/fieldservice_vehicle/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Field Service Vehicles",
     "summary": "Manage Field Service vehicles and assign drivers",
-    "version": "13.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",
diff --git a/setup/fieldservice_vehicle/odoo/addons/fieldservice_vehicle b/setup/fieldservice_vehicle/odoo/addons/fieldservice_vehicle
new file mode 120000
index 0000000000..c8b6dc755f
--- /dev/null
+++ b/setup/fieldservice_vehicle/odoo/addons/fieldservice_vehicle
@@ -0,0 +1 @@
+../../../../fieldservice_vehicle
\ No newline at end of file
diff --git a/setup/fieldservice_vehicle/setup.py b/setup/fieldservice_vehicle/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_vehicle/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From dc9dff9b38221800f1afeb41601b8a2d9d02f4c4 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sun, 10 Feb 2019 20:25:11 -0500
Subject: [PATCH 479/631] [IMP] fieldservice_substatus

add settings for feildservice_substatus module
add base for fieldservice_substatus module
---
 fieldservice_substatus/__init__.py            |   4 ++
 fieldservice_substatus/__manifest__.py        |  27 +++++++++
 fieldservice_substatus/models/__init__.py     |   6 ++
 .../models/fsm_stage_status.py                |  11 ++++
 fieldservice_substatus/readme/CONFIGURE.rst   |   6 ++
 .../readme/CONTRIBUTORS.rst                   |   1 +
 fieldservice_substatus/readme/CREDITS.rst     |   3 +
 fieldservice_substatus/readme/DESCRIPTION.rst |  10 ++++
 fieldservice_substatus/readme/INSTALL.rst     |   4 ++
 fieldservice_substatus/readme/ROADMAP.rst     |   2 +
 fieldservice_substatus/readme/USAGE.rst       |   9 +++
 .../security/ir.model.access.csv              |   3 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../views/fsm_stage_status.xml                |  53 ++++++++++++++++++
 14 files changed, 139 insertions(+)
 create mode 100644 fieldservice_substatus/__init__.py
 create mode 100644 fieldservice_substatus/__manifest__.py
 create mode 100644 fieldservice_substatus/models/__init__.py
 create mode 100644 fieldservice_substatus/models/fsm_stage_status.py
 create mode 100644 fieldservice_substatus/readme/CONFIGURE.rst
 create mode 100644 fieldservice_substatus/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_substatus/readme/CREDITS.rst
 create mode 100644 fieldservice_substatus/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_substatus/readme/INSTALL.rst
 create mode 100644 fieldservice_substatus/readme/ROADMAP.rst
 create mode 100644 fieldservice_substatus/readme/USAGE.rst
 create mode 100644 fieldservice_substatus/security/ir.model.access.csv
 create mode 100644 fieldservice_substatus/static/description/icon.png
 create mode 100644 fieldservice_substatus/views/fsm_stage_status.xml

diff --git a/fieldservice_substatus/__init__.py b/fieldservice_substatus/__init__.py
new file mode 100644
index 0000000000..9c361e1f77
--- /dev/null
+++ b/fieldservice_substatus/__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_substatus/__manifest__.py b/fieldservice_substatus/__manifest__.py
new file mode 100644
index 0000000000..f8e90d8232
--- /dev/null
+++ b/fieldservice_substatus/__manifest__.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - Sub-Status',
+    'summary': 'Sub-statuses for Field Service Orders',
+    'version': '11.0.0.0.1',
+    'category': 'Field Service',
+    'author': "Open Source Integrators, "
+              "Brian McMaster, "
+              "Odoo Community Association (OCA)",
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/fsm_stage_status.xml',
+    ],
+    'installable': True,
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'max3903',
+        'brian10048',
+    ],
+}
diff --git a/fieldservice_substatus/models/__init__.py b/fieldservice_substatus/models/__init__.py
new file mode 100644
index 0000000000..20b277bdc3
--- /dev/null
+++ b/fieldservice_substatus/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import (
+    fsm_stage_status,
+)
diff --git a/fieldservice_substatus/models/fsm_stage_status.py b/fieldservice_substatus/models/fsm_stage_status.py
new file mode 100644
index 0000000000..3bc5463427
--- /dev/null
+++ b/fieldservice_substatus/models/fsm_stage_status.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMStageStatus(models.Model):
+    _name = 'fsm.stage.status'
+    _description = 'Order Sub-Status'
+
+    name = fields.Char(string='Name', required=True)
diff --git a/fieldservice_substatus/readme/CONFIGURE.rst b/fieldservice_substatus/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..084e18710d
--- /dev/null
+++ b/fieldservice_substatus/readme/CONFIGURE.rst
@@ -0,0 +1,6 @@
+To configure this module, you need to:
+
+* Go to Field Service > Configuration > Orders > Sub-Statuses
+* Create your list of sub-statuses
+* Go to Field Service > Configuration > Orders > Stages
+* Select a stage and set the default sub-statuses as well as the potential sub-statuses
diff --git a/fieldservice_substatus/readme/CONTRIBUTORS.rst b/fieldservice_substatus/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..39ef3fa3d7
--- /dev/null
+++ b/fieldservice_substatus/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_substatus/readme/CREDITS.rst b/fieldservice_substatus/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_substatus/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_substatus/readme/DESCRIPTION.rst b/fieldservice_substatus/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..4b0dacb87c
--- /dev/null
+++ b/fieldservice_substatus/readme/DESCRIPTION.rst
@@ -0,0 +1,10 @@
+Odoo and the Field Service App do not provide a way to track what is required
+ and/or missing at the different stages of the FSM order process. Some 
+ organizations needs a way to track documentation, materials, signature 
+ and various activities.
+
+This module allows you to have a list of sub-statuses and set them as default 
+ or potential sub-statuses on each FSM stage. The stage configuration will drive:
+
+    * the sub-status set when entering a stage
+    * the list of potential sub-statuses available depending on the stage
diff --git a/fieldservice_substatus/readme/INSTALL.rst b/fieldservice_substatus/readme/INSTALL.rst
new file mode 100644
index 0000000000..c010f8f6a2
--- /dev/null
+++ b/fieldservice_substatus/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_substatus/readme/ROADMAP.rst b/fieldservice_substatus/readme/ROADMAP.rst
new file mode 100644
index 0000000000..f607015959
--- /dev/null
+++ b/fieldservice_substatus/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_substatus/readme/USAGE.rst b/fieldservice_substatus/readme/USAGE.rst
new file mode 100644
index 0000000000..2393273604
--- /dev/null
+++ b/fieldservice_substatus/readme/USAGE.rst
@@ -0,0 +1,9 @@
+To use this module, you need to:
+
+* Go to Field Service > Operations > Orders
+* Create a new service order.  
+  * The sub-status is set to the default sub-status of the New stage.
+  * The list of sub-statuses is filtered based on the potential sub-statuses
+   of the New stage.
+* Move the service order in the process. The sub-status is set and filtered
+ according to the stage.
\ No newline at end of file
diff --git a/fieldservice_substatus/security/ir.model.access.csv b/fieldservice_substatus/security/ir.model.access.csv
new file mode 100644
index 0000000000..8e30fa334c
--- /dev/null
+++ b/fieldservice_substatus/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_fsm_stage_status_fsm_user,fsm.stage.status.user,model_fsm_stage_status,fieldservice.group_fsm_user,1,0,0,0
+access_fsm_stage_status_fsm_manager,fsm.stage.status.manager,model_fsm_stage_status,fieldservice.group_fsm_manager,1,1,1,1
diff --git a/fieldservice_substatus/static/description/icon.png b/fieldservice_substatus/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_substatus/views/fsm_stage_status.xml b/fieldservice_substatus/views/fsm_stage_status.xml
new file mode 100644
index 0000000000..d4b1a51573
--- /dev/null
+++ b/fieldservice_substatus/views/fsm_stage_status.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Field Service Stage Status -->
+    <record id="fsm_stage_status_tree_view" model="ir.ui.view">
+        <field name="name">Order Sub-Status</field>
+        <field name="model">fsm.stage.status</field>
+        <field name="arch" type="xml">
+            <tree string="substatus">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="fsm_stage_status_form_view" model="ir.ui.view">
+        <field name="name">Order Sub-Status</field>
+        <field name="model">fsm.stage.status</field>
+        <field name="arch" type="xml">
+            <form string="substatus">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                        <group>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_fsm_stage_status" model="ir.actions.act_window">
+        <field name="name">Order Sub-Status</field>
+        <field name="res_model">fsm.stage.status</field>
+        <field name="view_id" ref="fsm_stage_status_tree_view"/>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Create an order sub-status.
+            </p>
+        </field>
+    </record>
+
+    <menuitem id="menu_fsm_stage_status"
+              name="Sub-Status"
+              action="action_fsm_stage_status"
+              parent="fieldservice.menu_fsm_config_order"
+              sequence="21"
+              groups="base.group_no_one"/>
+
+</odoo>

From ec13d0388baaea8b34bceb02659ca93c929bcbf1 Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@ursainfosystems.com>
Date: Wed, 13 Feb 2019 13:24:32 +0530
Subject: [PATCH 480/631] [IMP] Complete fieldservice_substatus

---
 fieldservice_substatus/README.rst             | 144 ++++++
 fieldservice_substatus/__init__.py            |  16 +-
 fieldservice_substatus/__manifest__.py        |  13 +-
 .../data/fsm_stage_status.xml                 |   9 +
 fieldservice_substatus/models/__init__.py     |   4 +-
 fieldservice_substatus/models/fsm_order.py    |  25 +
 fieldservice_substatus/models/fsm_stage.py    |  21 +
 .../models/fsm_stage_status.py                |  15 +-
 .../readme/CONTRIBUTORS.rst                   |   1 +
 fieldservice_substatus/readme/DESCRIPTION.rst |  12 +-
 fieldservice_substatus/readme/USAGE.rst       |   8 +-
 .../static/description/index.html             | 480 ++++++++++++++++++
 fieldservice_substatus/views/fsm_order.xml    |  18 +
 fieldservice_substatus/views/fsm_stage.xml    |  16 +
 14 files changed, 766 insertions(+), 16 deletions(-)
 create mode 100644 fieldservice_substatus/README.rst
 create mode 100644 fieldservice_substatus/data/fsm_stage_status.xml
 create mode 100644 fieldservice_substatus/models/fsm_order.py
 create mode 100644 fieldservice_substatus/models/fsm_stage.py
 create mode 100644 fieldservice_substatus/static/description/index.html
 create mode 100644 fieldservice_substatus/views/fsm_order.xml
 create mode 100644 fieldservice_substatus/views/fsm_stage.xml

diff --git a/fieldservice_substatus/README.rst b/fieldservice_substatus/README.rst
new file mode 100644
index 0000000000..684f00c9f6
--- /dev/null
+++ b/fieldservice_substatus/README.rst
@@ -0,0 +1,144 @@
+==========================
+Field Service - Sub-Status
+==========================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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_substatus
+    :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_substatus
+    :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| 
+
+Odoo and the Field Service App do not provide a way to track what is required
+and/or missing at the different stages of the FSM order process. Some
+organizations needs a way to track documentation, materials, signature
+and various activities.
+
+This module allows you to have a list of sub-statuses and set them as default 
+or potential sub-statuses on each FSM stage. The stage configuration will drive:
+
+* the sub-status set when entering a stage
+* the list of potential sub-statuses available depending on the stage
+
+**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 configure this module, you need to:
+
+* Go to Field Service > Configuration > Orders > Sub-Statuses
+* Create your list of sub-statuses
+* Go to Field Service > Configuration > Orders > Stages
+* Select a stage and set the default sub-statuses as well as the potential sub-statuses
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go to Field Service > Operations > Orders
+* Create a new service order.
+
+  * The sub-status is set to the default sub-status of the New stage.
+  * The list of sub-statuses is filtered based on the potential sub-statuses
+    of the New stage.
+
+* Move the service order in the process. The sub-status is set and filtered
+  according to the stage.
+
+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_substatus%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
+* Brian McMaster
+
+Contributors
+~~~~~~~~~~~~
+
+* Brian McMaster <brian@mcmpest.com>
+* Bhavesh Odedra <bodedra@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-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
+.. |maintainer-bodedra| image:: https://github.com/bodedra.png?size=40px
+    :target: https://github.com/bodedra
+    :alt: bodedra
+
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-max3903| |maintainer-brian10048| |maintainer-bodedra| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_substatus>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_substatus/__init__.py b/fieldservice_substatus/__init__.py
index 9c361e1f77..db4b94224e 100644
--- a/fieldservice_substatus/__init__.py
+++ b/fieldservice_substatus/__init__.py
@@ -1,4 +1,18 @@
-# Copyright (C) 2018 - TODAY,  Open Source Integrators
+# Copyright (C) 2019 - TODAY,  Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
+
+
+def post_init_fsm(cr, registry):
+    cr.execute("""UPDATE fsm_stage
+        SET sub_stage_id = (SELECT id FROM fsm_stage_status LIMIT 1)
+        WHERE sub_stage_id IS NULL""")
+    cr.execute("""UPDATE fsm_order
+        SET sub_stage_id = (SELECT id FROM fsm_stage_status LIMIT 1)
+        WHERE sub_stage_id IS NULL""")
+    cr.execute("""ALTER TABLE fsm_stage
+        ALTER COLUMN sub_stage_id SET NOT NULL""")
+    cr.execute("""ALTER TABLE fsm_order
+        ALTER COLUMN sub_stage_id SET NOT NULL""")
+    return True
diff --git a/fieldservice_substatus/__manifest__.py b/fieldservice_substatus/__manifest__.py
index f8e90d8232..3c094188a7 100644
--- a/fieldservice_substatus/__manifest__.py
+++ b/fieldservice_substatus/__manifest__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators, Brian McMaster
+# Copyright (C) 2019 - TODAY, Open Source Integrators, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
@@ -6,16 +6,19 @@
     'summary': 'Sub-statuses for Field Service Orders',
     'version': '11.0.0.0.1',
     'category': 'Field Service',
-    'author': "Open Source Integrators, "
-              "Brian McMaster, "
-              "Odoo Community Association (OCA)",
+    'author': 'Open Source Integrators, '
+              'Brian McMaster, '
+              'Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice',
     ],
     'data': [
+        'data/fsm_stage_status.xml',
         'security/ir.model.access.csv',
         'views/fsm_stage_status.xml',
+        'views/fsm_stage.xml',
+        'views/fsm_order.xml'
     ],
     'installable': True,
     'license': 'AGPL-3',
@@ -23,5 +26,7 @@
     'maintainers': [
         'max3903',
         'brian10048',
+        'bodedra'
     ],
+    'post_init_hook': 'post_init_fsm',
 }
diff --git a/fieldservice_substatus/data/fsm_stage_status.xml b/fieldservice_substatus/data/fsm_stage_status.xml
new file mode 100644
index 0000000000..171c5533c5
--- /dev/null
+++ b/fieldservice_substatus/data/fsm_stage_status.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <!-- Default Status -->
+    <record id="fsm_stage_status_default" model="fsm.stage.status">
+        <field name="name">Default</field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_substatus/models/__init__.py b/fieldservice_substatus/models/__init__.py
index 20b277bdc3..41dc4b7356 100644
--- a/fieldservice_substatus/models/__init__.py
+++ b/fieldservice_substatus/models/__init__.py
@@ -1,6 +1,8 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators, Brian McMaster
+# Copyright (C) 2019 - TODAY, Open Source Integrators, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
     fsm_stage_status,
+    fsm_stage,
+    fsm_order
 )
diff --git a/fieldservice_substatus/models/fsm_order.py b/fieldservice_substatus/models/fsm_order.py
new file mode 100644
index 0000000000..d3e6eb59df
--- /dev/null
+++ b/fieldservice_substatus/models/fsm_order.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields
+
+from odoo.addons.base_geoengine import geo_model
+
+
+class FSMOrder(geo_model.GeoModel):
+    _inherit = 'fsm.order'
+
+    sub_stage_id = fields.Many2one(
+        'fsm.stage.status',
+        string='Sub-Status',
+        required=True,
+        default=lambda self: self._default_stage_id().sub_stage_id)
+
+    @api.multi
+    def write(self, vals):
+        if 'stage_id' in vals:
+            sub_stage_id = self.env['fsm.stage'].browse(
+                vals.get('stage_id')).sub_stage_id
+            if sub_stage_id:
+                vals.update({'sub_stage_id': sub_stage_id.id})
+        return super().write(vals)
diff --git a/fieldservice_substatus/models/fsm_stage.py b/fieldservice_substatus/models/fsm_stage.py
new file mode 100644
index 0000000000..97dcc91e91
--- /dev/null
+++ b/fieldservice_substatus/models/fsm_stage.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2019 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FSMStage(models.Model):
+    _inherit = 'fsm.stage'
+
+    sub_stage_id = fields.Many2one('fsm.stage.status',
+                                   string='Default Sub-Status',
+                                   required=True)
+    sub_stage_ids = fields.Many2many('fsm.stage.status', 'fsm_sub_stage_rel',
+                                     'fsm_stage_id',
+                                     'sub_stage_id',
+                                     string='Potential Sub-Statuses')
+
+    @api.onchange('sub_stage_id')
+    def onchange_sub_stage_id(self):
+        if self.sub_stage_id:
+            self.sub_stage_ids = [(6, 0, [self.sub_stage_id.id])]
diff --git a/fieldservice_substatus/models/fsm_stage_status.py b/fieldservice_substatus/models/fsm_stage_status.py
index 3bc5463427..7462bdbdec 100644
--- a/fieldservice_substatus/models/fsm_stage_status.py
+++ b/fieldservice_substatus/models/fsm_stage_status.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators, Brian McMaster
+# Copyright (C) 2019 - TODAY, Open Source Integrators, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models
@@ -9,3 +9,16 @@ class FSMStageStatus(models.Model):
     _description = 'Order Sub-Status'
 
     name = fields.Char(string='Name', required=True)
+
+    @api.model
+    def _search(self, args, offset=0, limit=None, order=None, count=False,
+                access_rights_uid=None):
+        context = self._context or {}
+        if context.get('fsm_order_stage_id'):
+            stage_id = self.env['fsm.stage'].browse(context.get(
+                'fsm_order_stage_id'))
+            sub_stage_ids = stage_id.sub_stage_id + stage_id.sub_stage_ids
+            if sub_stage_ids:
+                args = [('id', 'in', sub_stage_ids.ids)]
+        return super()._search(args, offset, limit, order, count=count,
+                               access_rights_uid=access_rights_uid)
diff --git a/fieldservice_substatus/readme/CONTRIBUTORS.rst b/fieldservice_substatus/readme/CONTRIBUTORS.rst
index 39ef3fa3d7..e8af61409a 100644
--- a/fieldservice_substatus/readme/CONTRIBUTORS.rst
+++ b/fieldservice_substatus/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Brian McMaster <brian@mcmpest.com>
+* Bhavesh Odedra <bodedra@opensourceintegrators.com>
diff --git a/fieldservice_substatus/readme/DESCRIPTION.rst b/fieldservice_substatus/readme/DESCRIPTION.rst
index 4b0dacb87c..f0e674b25f 100644
--- a/fieldservice_substatus/readme/DESCRIPTION.rst
+++ b/fieldservice_substatus/readme/DESCRIPTION.rst
@@ -1,10 +1,10 @@
 Odoo and the Field Service App do not provide a way to track what is required
- and/or missing at the different stages of the FSM order process. Some 
- organizations needs a way to track documentation, materials, signature 
- and various activities.
+and/or missing at the different stages of the FSM order process. Some
+organizations needs a way to track documentation, materials, signature
+and various activities.
 
 This module allows you to have a list of sub-statuses and set them as default 
- or potential sub-statuses on each FSM stage. The stage configuration will drive:
+or potential sub-statuses on each FSM stage. The stage configuration will drive:
 
-    * the sub-status set when entering a stage
-    * the list of potential sub-statuses available depending on the stage
+* the sub-status set when entering a stage
+* the list of potential sub-statuses available depending on the stage
diff --git a/fieldservice_substatus/readme/USAGE.rst b/fieldservice_substatus/readme/USAGE.rst
index 2393273604..fdacec8660 100644
--- a/fieldservice_substatus/readme/USAGE.rst
+++ b/fieldservice_substatus/readme/USAGE.rst
@@ -1,9 +1,11 @@
 To use this module, you need to:
 
 * Go to Field Service > Operations > Orders
-* Create a new service order.  
+* Create a new service order.
+
   * The sub-status is set to the default sub-status of the New stage.
   * The list of sub-statuses is filtered based on the potential sub-statuses
-   of the New stage.
+    of the New stage.
+
 * Move the service order in the process. The sub-status is set and filtered
- according to the stage.
\ No newline at end of file
+  according to the stage.
diff --git a/fieldservice_substatus/static/description/index.html b/fieldservice_substatus/static/description/index.html
new file mode 100644
index 0000000000..c1983860e7
--- /dev/null
+++ b/fieldservice_substatus/static/description/index.html
@@ -0,0 +1,480 @@
+<?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 - Sub-Status</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-sub-status">
+<h1 class="title">Field Service - Sub-Status</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_substatus"><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_substatus"><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>Odoo and the Field Service App do not provide a way to track what is required
+and/or missing at the different stages of the FSM order process. Some
+organizations needs a way to track documentation, materials, signature
+and various activities.</p>
+<p>This module allows you to have a list of sub-statuses and set them as default
+or potential sub-statuses on each FSM stage. The stage configuration will drive:</p>
+<ul class="simple">
+<li>the sub-status set when entering a stage</li>
+<li>the list of potential sub-statuses available depending on the stage</li>
+</ul>
+<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; Orders &gt; Sub-Statuses</li>
+<li>Create your list of sub-statuses</li>
+<li>Go to Field Service &gt; Configuration &gt; Orders &gt; Stages</li>
+<li>Select a stage and set the default sub-statuses as well as the potential sub-statuses</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 &gt; Operations &gt; Orders</li>
+<li>Create a new service order.<ul>
+<li>The sub-status is set to the default sub-status of the New stage.</li>
+<li>The list of sub-statuses is filtered based on the potential sub-statuses
+of the New stage.</li>
+</ul>
+</li>
+<li>Move the service order in the process. The sub-status is set and filtered
+according to the stage.</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_substatus%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>
+<li>Brian McMaster</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id8">Contributors</a></h2>
+<ul class="simple">
+<li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.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>
+</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/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> <a class="reference external" href="https://github.com/bodedra"><img alt="bodedra" src="https://github.com/bodedra.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_substatus">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_substatus/views/fsm_order.xml b/fieldservice_substatus/views/fsm_order.xml
new file mode 100644
index 0000000000..f2dd9f4066
--- /dev/null
+++ b/fieldservice_substatus/views/fsm_order.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Fieldservice Order Form View-->
+    <record id="fsm_sub_stage_order_form_view" model="ir.ui.view">
+        <field name="name">fsm.sub.stage.order.form</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
+        <field name="arch" type="xml">
+            <field name="tag_ids" position="after">
+                <field name="sub_stage_id"
+                       context="{'fsm_order_stage_id': stage_id}"
+                       options="{'no_create': True}"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_substatus/views/fsm_stage.xml b/fieldservice_substatus/views/fsm_stage.xml
new file mode 100644
index 0000000000..0e0d59ebaf
--- /dev/null
+++ b/fieldservice_substatus/views/fsm_stage.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Fieldservice Stage Form View-->
+    <record id="fsm_sub_stage_form_view" model="ir.ui.view">
+        <field name="name">fsm.sub.stage.form</field>
+        <field name="model">fsm.stage</field>
+        <field name="inherit_id" ref="fieldservice.fsm_stage_form_view"/>
+        <field name="arch" type="xml">
+            <field name="sequence" position="after">
+                <field name="sub_stage_id"/>
+                <field name="sub_stage_ids" widget="many2many_tags"/>
+            </field>
+        </field>
+    </record>
+</odoo>

From 251c53481dc2ba02e0f9d24e9077a608b1673f3f Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Mon, 22 Apr 2019 18:58:21 +0530
Subject: [PATCH 481/631] [MIG][12.0] fieldservice_substatus

---
 fieldservice_substatus/README.rst                    | 11 ++++++-----
 fieldservice_substatus/__init__.py                   |  1 -
 fieldservice_substatus/__manifest__.py               |  2 +-
 fieldservice_substatus/models/__init__.py            |  1 -
 fieldservice_substatus/models/fsm_order.py           |  8 +++-----
 fieldservice_substatus/models/fsm_stage_status.py    |  5 +++--
 fieldservice_substatus/readme/CONTRIBUTORS.rst       |  1 +
 fieldservice_substatus/static/description/index.html |  7 ++++---
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/fieldservice_substatus/README.rst b/fieldservice_substatus/README.rst
index 684f00c9f6..59d72bdc49 100644
--- a/fieldservice_substatus/README.rst
+++ b/fieldservice_substatus/README.rst
@@ -14,13 +14,13 @@ Field Service - Sub-Status
     :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_substatus
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_substatus
     :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_substatus
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_substatus
     :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| 
@@ -86,7 +86,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_substatus%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_substatus%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.
 
@@ -104,6 +104,7 @@ Contributors
 
 * Brian McMaster <brian@mcmpest.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -139,6 +140,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| |maintainer-brian10048| |maintainer-bodedra| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_substatus>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_substatus>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_substatus/__init__.py b/fieldservice_substatus/__init__.py
index db4b94224e..754592b26e 100644
--- a/fieldservice_substatus/__init__.py
+++ b/fieldservice_substatus/__init__.py
@@ -1,4 +1,3 @@
-# Copyright (C) 2019 - TODAY,  Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
diff --git a/fieldservice_substatus/__manifest__.py b/fieldservice_substatus/__manifest__.py
index 3c094188a7..ef83b41fa2 100644
--- a/fieldservice_substatus/__manifest__.py
+++ b/fieldservice_substatus/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Sub-Status',
     'summary': 'Sub-statuses for Field Service Orders',
-    'version': '11.0.0.0.1',
+    'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, '
               'Brian McMaster, '
diff --git a/fieldservice_substatus/models/__init__.py b/fieldservice_substatus/models/__init__.py
index 41dc4b7356..1bac61402e 100644
--- a/fieldservice_substatus/models/__init__.py
+++ b/fieldservice_substatus/models/__init__.py
@@ -1,4 +1,3 @@
-# Copyright (C) 2019 - TODAY, Open Source Integrators, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
diff --git a/fieldservice_substatus/models/fsm_order.py b/fieldservice_substatus/models/fsm_order.py
index d3e6eb59df..7cfe69e397 100644
--- a/fieldservice_substatus/models/fsm_order.py
+++ b/fieldservice_substatus/models/fsm_order.py
@@ -1,12 +1,10 @@
 # Copyright (C) 2019 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields
+from odoo import api, fields, models
 
-from odoo.addons.base_geoengine import geo_model
 
-
-class FSMOrder(geo_model.GeoModel):
+class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
     sub_stage_id = fields.Many2one(
@@ -22,4 +20,4 @@ def write(self, vals):
                 vals.get('stage_id')).sub_stage_id
             if sub_stage_id:
                 vals.update({'sub_stage_id': sub_stage_id.id})
-        return super().write(vals)
+        return super(FSMOrder, self).write(vals)
diff --git a/fieldservice_substatus/models/fsm_stage_status.py b/fieldservice_substatus/models/fsm_stage_status.py
index 7462bdbdec..20b0c0fe0a 100644
--- a/fieldservice_substatus/models/fsm_stage_status.py
+++ b/fieldservice_substatus/models/fsm_stage_status.py
@@ -20,5 +20,6 @@ def _search(self, args, offset=0, limit=None, order=None, count=False,
             sub_stage_ids = stage_id.sub_stage_id + stage_id.sub_stage_ids
             if sub_stage_ids:
                 args = [('id', 'in', sub_stage_ids.ids)]
-        return super()._search(args, offset, limit, order, count=count,
-                               access_rights_uid=access_rights_uid)
+        return super(FSMStageStatus, self)._search(
+            args, offset, limit, order, count=count,
+            access_rights_uid=access_rights_uid)
diff --git a/fieldservice_substatus/readme/CONTRIBUTORS.rst b/fieldservice_substatus/readme/CONTRIBUTORS.rst
index e8af61409a..2b032ef01a 100644
--- a/fieldservice_substatus/readme/CONTRIBUTORS.rst
+++ b/fieldservice_substatus/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
 * Brian McMaster <brian@mcmpest.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_substatus/static/description/index.html b/fieldservice_substatus/static/description/index.html
index c1983860e7..30c3f4a73b 100644
--- a/fieldservice_substatus/static/description/index.html
+++ b/fieldservice_substatus/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Sub-Status</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_substatus"><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_substatus"><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_substatus"><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_substatus"><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>Odoo and the Field Service App do not provide a way to track what is required
 and/or missing at the different stages of the FSM order process. Some
 organizations needs a way to track documentation, materials, signature
@@ -436,7 +436,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_substatus%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_substatus%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">
@@ -453,6 +453,7 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.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>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">
@@ -471,7 +472,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/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> <a class="reference external" href="https://github.com/bodedra"><img alt="bodedra" src="https://github.com/bodedra.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_substatus">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_substatus">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 2208d06c3cd2849663272b2eec7f8190f24861f5 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 1 May 2019 13:45:10 -0700
Subject: [PATCH 482/631] [IMP] Substages Only Orders

---
 fieldservice_substatus/views/fsm_stage.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_substatus/views/fsm_stage.xml b/fieldservice_substatus/views/fsm_stage.xml
index 0e0d59ebaf..af54f4a048 100644
--- a/fieldservice_substatus/views/fsm_stage.xml
+++ b/fieldservice_substatus/views/fsm_stage.xml
@@ -8,8 +8,8 @@
         <field name="inherit_id" ref="fieldservice.fsm_stage_form_view"/>
         <field name="arch" type="xml">
             <field name="sequence" position="after">
-                <field name="sub_stage_id"/>
-                <field name="sub_stage_ids" widget="many2many_tags"/>
+                <field name="sub_stage_id" attrs="{'invisible':[('stage_type', '!=', 'order')]}"/>
+                <field name="sub_stage_ids" widget="many2many_tags" attrs="{'invisible':[('stage_type', '!=', 'order')]}"/>
             </field>
         </field>
     </record>

From a952c2c533ba5f791fcc1aeee95fae8d781922b9 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 3 May 2019 09:43:54 -0700
Subject: [PATCH 483/631] [IMP] #59 Substatus Visible NonDebug

---
 fieldservice_substatus/views/fsm_stage_status.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_substatus/views/fsm_stage_status.xml b/fieldservice_substatus/views/fsm_stage_status.xml
index d4b1a51573..4bb2fbeeb9 100644
--- a/fieldservice_substatus/views/fsm_stage_status.xml
+++ b/fieldservice_substatus/views/fsm_stage_status.xml
@@ -48,6 +48,6 @@
               action="action_fsm_stage_status"
               parent="fieldservice.menu_fsm_config_order"
               sequence="21"
-              groups="base.group_no_one"/>
+              groups="fieldservice.group_fsm_substatus"/>
 
 </odoo>

From 61e3ea65086fc76e736b408e4d595af009589555 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 3 May 2019 12:54:19 -0700
Subject: [PATCH 484/631] [IMP] #108 sub_stage_id Default Val

---
 fieldservice_substatus/models/fsm_stage.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fieldservice_substatus/models/fsm_stage.py b/fieldservice_substatus/models/fsm_stage.py
index 97dcc91e91..3ab4c833ca 100644
--- a/fieldservice_substatus/models/fsm_stage.py
+++ b/fieldservice_substatus/models/fsm_stage.py
@@ -7,9 +7,15 @@
 class FSMStage(models.Model):
     _inherit = 'fsm.stage'
 
+    @api.model
+    def _default_sub_stage(self):
+        ret = self.env['fsm.stage.status'].search([('name', '=', 'Default')])
+        return ret
+
     sub_stage_id = fields.Many2one('fsm.stage.status',
                                    string='Default Sub-Status',
-                                   required=True)
+                                   required=True,
+                                   default=_default_sub_stage)
     sub_stage_ids = fields.Many2many('fsm.stage.status', 'fsm_sub_stage_rel',
                                      'fsm_stage_id',
                                      'sub_stage_id',

From ec4596609acf57d3f1ed7c149157f434f55e853a Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 10 May 2019 15:39:30 -0700
Subject: [PATCH 485/631] [IMP] Store Substage ID

---
 fieldservice_substatus/models/fsm_stage.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fieldservice_substatus/models/fsm_stage.py b/fieldservice_substatus/models/fsm_stage.py
index 3ab4c833ca..04d7ba0651 100644
--- a/fieldservice_substatus/models/fsm_stage.py
+++ b/fieldservice_substatus/models/fsm_stage.py
@@ -15,6 +15,7 @@ def _default_sub_stage(self):
     sub_stage_id = fields.Many2one('fsm.stage.status',
                                    string='Default Sub-Status',
                                    required=True,
+                                   store=True,
                                    default=_default_sub_stage)
     sub_stage_ids = fields.Many2many('fsm.stage.status', 'fsm_sub_stage_rel',
                                      'fsm_stage_id',

From 0177fb522fc4a1ad3c1091b701905224d4808c0e Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 10 May 2019 17:10:06 -0700
Subject: [PATCH 486/631] [ADD] FSM Substage Data

---
 fieldservice_substatus/data/fsm_stage.xml | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 fieldservice_substatus/data/fsm_stage.xml

diff --git a/fieldservice_substatus/data/fsm_stage.xml b/fieldservice_substatus/data/fsm_stage.xml
new file mode 100644
index 0000000000..87338e3d00
--- /dev/null
+++ b/fieldservice_substatus/data/fsm_stage.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <record id="fieldservice.fsm_stage_new" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_confirmed" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_requested" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_assigned" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_scheduled" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_enroute" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_started" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_completed" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_cancelled" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+</odoo>
\ No newline at end of file

From e2adb2ca84bee31b09c8bfe5f859d6ab9bef9c5a Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 10 May 2019 19:13:24 -0500
Subject: [PATCH 487/631] Update fsm_stage.xml

---
 fieldservice_substatus/data/fsm_stage.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_substatus/data/fsm_stage.xml b/fieldservice_substatus/data/fsm_stage.xml
index 87338e3d00..b627b91a04 100644
--- a/fieldservice_substatus/data/fsm_stage.xml
+++ b/fieldservice_substatus/data/fsm_stage.xml
@@ -36,4 +36,4 @@
     <record id="fieldservice.fsm_stage_cancelled" model="fsm.stage">
         <field name="sub_stage_id" ref="fsm_stage_status_default"/>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>

From 8cc33cf403676b16bdfffd6ed82c7f7c5c0a8999 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 24 May 2019 16:37:36 -0500
Subject: [PATCH 488/631] [REM] fieldservice_substatus: Data

---
 fieldservice_substatus/data/fsm_stage.xml | 39 -----------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 fieldservice_substatus/data/fsm_stage.xml

diff --git a/fieldservice_substatus/data/fsm_stage.xml b/fieldservice_substatus/data/fsm_stage.xml
deleted file mode 100644
index b627b91a04..0000000000
--- a/fieldservice_substatus/data/fsm_stage.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo noupdate="1">
-
-    <record id="fieldservice.fsm_stage_new" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_confirmed" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_requested" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_assigned" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_scheduled" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_enroute" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_started" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_completed" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_cancelled" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-</odoo>

From 89f7699add43c062735f200d72b4c73055f28a61 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sat, 25 May 2019 16:23:05 -0500
Subject: [PATCH 489/631] [FIX] fieldservice_substatus: Travis and Runbot
 errors

---
 fieldservice_substatus/__init__.py            | 14 -------
 fieldservice_substatus/__manifest__.py        |  4 +-
 fieldservice_substatus/data/fsm_stage.xml     | 39 +++++++++++++++++++
 fieldservice_substatus/models/fsm_stage.py    |  1 -
 .../static/description/index.html             |  2 +-
 fieldservice_substatus/views/fsm_stage.xml    |  2 +-
 6 files changed, 43 insertions(+), 19 deletions(-)
 create mode 100644 fieldservice_substatus/data/fsm_stage.xml

diff --git a/fieldservice_substatus/__init__.py b/fieldservice_substatus/__init__.py
index 754592b26e..69f7babdfb 100644
--- a/fieldservice_substatus/__init__.py
+++ b/fieldservice_substatus/__init__.py
@@ -1,17 +1,3 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
-
-
-def post_init_fsm(cr, registry):
-    cr.execute("""UPDATE fsm_stage
-        SET sub_stage_id = (SELECT id FROM fsm_stage_status LIMIT 1)
-        WHERE sub_stage_id IS NULL""")
-    cr.execute("""UPDATE fsm_order
-        SET sub_stage_id = (SELECT id FROM fsm_stage_status LIMIT 1)
-        WHERE sub_stage_id IS NULL""")
-    cr.execute("""ALTER TABLE fsm_stage
-        ALTER COLUMN sub_stage_id SET NOT NULL""")
-    cr.execute("""ALTER TABLE fsm_order
-        ALTER COLUMN sub_stage_id SET NOT NULL""")
-    return True
diff --git a/fieldservice_substatus/__manifest__.py b/fieldservice_substatus/__manifest__.py
index ef83b41fa2..5d58633888 100644
--- a/fieldservice_substatus/__manifest__.py
+++ b/fieldservice_substatus/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sub-Status',
-    'summary': 'Sub-statuses for Field Service Orders',
+    'summary': 'Add sub-statuses to Field Service orders',
     'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, '
@@ -15,6 +15,7 @@
     ],
     'data': [
         'data/fsm_stage_status.xml',
+        'data/fsm_stage.xml',
         'security/ir.model.access.csv',
         'views/fsm_stage_status.xml',
         'views/fsm_stage.xml',
@@ -28,5 +29,4 @@
         'brian10048',
         'bodedra'
     ],
-    'post_init_hook': 'post_init_fsm',
 }
diff --git a/fieldservice_substatus/data/fsm_stage.xml b/fieldservice_substatus/data/fsm_stage.xml
new file mode 100644
index 0000000000..b627b91a04
--- /dev/null
+++ b/fieldservice_substatus/data/fsm_stage.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <record id="fieldservice.fsm_stage_new" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_confirmed" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_requested" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_assigned" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_scheduled" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_enroute" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_started" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_completed" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+
+    <record id="fieldservice.fsm_stage_cancelled" model="fsm.stage">
+        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+    </record>
+</odoo>
diff --git a/fieldservice_substatus/models/fsm_stage.py b/fieldservice_substatus/models/fsm_stage.py
index 04d7ba0651..a8da111b51 100644
--- a/fieldservice_substatus/models/fsm_stage.py
+++ b/fieldservice_substatus/models/fsm_stage.py
@@ -14,7 +14,6 @@ def _default_sub_stage(self):
 
     sub_stage_id = fields.Many2one('fsm.stage.status',
                                    string='Default Sub-Status',
-                                   required=True,
                                    store=True,
                                    default=_default_sub_stage)
     sub_stage_ids = fields.Many2many('fsm.stage.status', 'fsm_sub_stage_rel',
diff --git a/fieldservice_substatus/static/description/index.html b/fieldservice_substatus/static/description/index.html
index 30c3f4a73b..fcbd827ffb 100644
--- a/fieldservice_substatus/static/description/index.html
+++ b/fieldservice_substatus/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 - Sub-Status</title>
 <style type="text/css">
 
diff --git a/fieldservice_substatus/views/fsm_stage.xml b/fieldservice_substatus/views/fsm_stage.xml
index af54f4a048..b6661851b6 100644
--- a/fieldservice_substatus/views/fsm_stage.xml
+++ b/fieldservice_substatus/views/fsm_stage.xml
@@ -8,7 +8,7 @@
         <field name="inherit_id" ref="fieldservice.fsm_stage_form_view"/>
         <field name="arch" type="xml">
             <field name="sequence" position="after">
-                <field name="sub_stage_id" attrs="{'invisible':[('stage_type', '!=', 'order')]}"/>
+                <field name="sub_stage_id" required="1" attrs="{'invisible':[('stage_type', '!=', 'order')]}"/>
                 <field name="sub_stage_ids" widget="many2many_tags" attrs="{'invisible':[('stage_type', '!=', 'order')]}"/>
             </field>
         </field>

From 35fd64ad3fae29a08a78262326c95f8cf24e34d0 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Wed, 21 Aug 2019 17:40:37 -0400
Subject: [PATCH 490/631] [IMP] UI

minor UI improvements
---
 fieldservice_substatus/views/fsm_stage_status.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_substatus/views/fsm_stage_status.xml b/fieldservice_substatus/views/fsm_stage_status.xml
index 4bb2fbeeb9..a536c52fb0 100644
--- a/fieldservice_substatus/views/fsm_stage_status.xml
+++ b/fieldservice_substatus/views/fsm_stage_status.xml
@@ -37,7 +37,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
+            <p class="o_view_nocontent_smiling_face">
                 Create an order sub-status.
             </p>
         </field>

From e150cda70652e1bed1ab2f18f62fe30fefff8cb3 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 3 Sep 2019 16:42:32 -0500
Subject: [PATCH 491/631] [IMP] fieldservice (#323)

---
 fieldservice_substatus/__manifest__.py            | 2 +-
 fieldservice_substatus/views/fsm_stage_status.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fieldservice_substatus/__manifest__.py b/fieldservice_substatus/__manifest__.py
index 5d58633888..db6bb3a6a6 100644
--- a/fieldservice_substatus/__manifest__.py
+++ b/fieldservice_substatus/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Sub-Status',
     'summary': 'Add sub-statuses to Field Service orders',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.1.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, '
               'Brian McMaster, '
diff --git a/fieldservice_substatus/views/fsm_stage_status.xml b/fieldservice_substatus/views/fsm_stage_status.xml
index a536c52fb0..bed9cafe76 100644
--- a/fieldservice_substatus/views/fsm_stage_status.xml
+++ b/fieldservice_substatus/views/fsm_stage_status.xml
@@ -47,7 +47,6 @@
               name="Sub-Status"
               action="action_fsm_stage_status"
               parent="fieldservice.menu_fsm_config_order"
-              sequence="21"
-              groups="fieldservice.group_fsm_substatus"/>
+              sequence="21"/>
 
 </odoo>

From 08b676135b588e742184c93892289516ab20bcfc Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 9 Oct 2019 22:45:36 -0500
Subject: [PATCH 492/631] [FIX] fieldservice_substatus

---
 fieldservice_substatus/data/fsm_stage.xml     |  26 +----
 .../data/fsm_stage_status.xml                 |   1 -
 fieldservice_substatus/i18n/de.po             | 100 ++++++++++++++++++
 fieldservice_substatus/i18n/es_CL.po          | 100 ++++++++++++++++++
 .../i18n/fieldservice_substatus.pot           |  98 +++++++++++++++++
 fieldservice_substatus/i18n/pt_BR.po          |  98 +++++++++++++++++
 6 files changed, 397 insertions(+), 26 deletions(-)
 create mode 100644 fieldservice_substatus/i18n/de.po
 create mode 100644 fieldservice_substatus/i18n/es_CL.po
 create mode 100644 fieldservice_substatus/i18n/fieldservice_substatus.pot
 create mode 100644 fieldservice_substatus/i18n/pt_BR.po

diff --git a/fieldservice_substatus/data/fsm_stage.xml b/fieldservice_substatus/data/fsm_stage.xml
index b627b91a04..37017a87fb 100644
--- a/fieldservice_substatus/data/fsm_stage.xml
+++ b/fieldservice_substatus/data/fsm_stage.xml
@@ -1,34 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
 
     <record id="fieldservice.fsm_stage_new" model="fsm.stage">
         <field name="sub_stage_id" ref="fsm_stage_status_default"/>
     </record>
 
-    <record id="fieldservice.fsm_stage_confirmed" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_requested" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_assigned" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_scheduled" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_enroute" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
-    <record id="fieldservice.fsm_stage_started" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
-    </record>
-
     <record id="fieldservice.fsm_stage_completed" model="fsm.stage">
         <field name="sub_stage_id" ref="fsm_stage_status_default"/>
     </record>
@@ -36,4 +11,5 @@
     <record id="fieldservice.fsm_stage_cancelled" model="fsm.stage">
         <field name="sub_stage_id" ref="fsm_stage_status_default"/>
     </record>
+
 </odoo>
diff --git a/fieldservice_substatus/data/fsm_stage_status.xml b/fieldservice_substatus/data/fsm_stage_status.xml
index 171c5533c5..df8cd73385 100644
--- a/fieldservice_substatus/data/fsm_stage_status.xml
+++ b/fieldservice_substatus/data/fsm_stage_status.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <odoo>
 
     <!-- Default Status -->
diff --git a/fieldservice_substatus/i18n/de.po b/fieldservice_substatus/i18n/de.po
new file mode 100644
index 0000000000..1c073674df
--- /dev/null
+++ b/fieldservice_substatus/i18n/de.po
@@ -0,0 +1,100 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_substatus
+#
+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"
+"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_substatus
+#: model_terms:ir.actions.act_window,help:fieldservice_substatus.action_fsm_stage_status
+msgid "Create an order sub-status."
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_uid
+msgid "Created by"
+msgstr "Erstellt von"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_date
+msgid "Created on"
+msgstr "Erstellt am"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_id
+msgid "Default Sub-Status"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__display_name
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#. module: fieldservice_substatus
+#: model:ir.model,name:fieldservice_substatus.model_fsm_order
+msgid "Field Service Order"
+msgstr "Field-Service-Auftrag"
+
+#. module: fieldservice_substatus
+#: model:ir.model,name:fieldservice_substatus.model_fsm_stage
+msgid "Field Service Stage"
+msgstr "Field-Service-Stufe"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__id
+msgid "ID"
+msgstr "ID"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status____last_update
+msgid "Last Modified on"
+msgstr "Zuletzt geändert am"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_uid
+msgid "Last Updated by"
+msgstr "Zuletzt aktualisiert von"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_date
+msgid "Last Updated on"
+msgstr "Zuletzt aktualisiert am"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__name
+msgid "Name"
+msgstr "Bezeichnung"
+
+#. module: fieldservice_substatus
+#: model:ir.actions.act_window,name:fieldservice_substatus.action_fsm_stage_status
+#: model:ir.model,name:fieldservice_substatus.model_fsm_stage_status
+msgid "Order Sub-Status"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_ids
+msgid "Potential Sub-Statuses"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_order__sub_stage_id
+#: model:ir.ui.menu,name:fieldservice_substatus.menu_fsm_stage_status
+msgid "Sub-Status"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view
+msgid "substatus"
+msgstr ""
diff --git a/fieldservice_substatus/i18n/es_CL.po b/fieldservice_substatus/i18n/es_CL.po
new file mode 100644
index 0000000000..2565a35887
--- /dev/null
+++ b/fieldservice_substatus/i18n/es_CL.po
@@ -0,0 +1,100 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_substatus
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-22 04:35+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.8\n"
+
+#. module: fieldservice_substatus
+#: model_terms:ir.actions.act_window,help:fieldservice_substatus.action_fsm_stage_status
+msgid "Create an order sub-status."
+msgstr "Crear un subestado de pedido."
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_date
+msgid "Created on"
+msgstr "Creado el"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_id
+msgid "Default Sub-Status"
+msgstr "Subestado Predeterminado"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__display_name
+msgid "Display Name"
+msgstr "Nombre para Mostrar"
+
+#. module: fieldservice_substatus
+#: model:ir.model,name:fieldservice_substatus.model_fsm_order
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_substatus
+#: model:ir.model,name:fieldservice_substatus.model_fsm_stage
+msgid "Field Service Stage"
+msgstr "Etapa de Servicio de Campo"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status____last_update
+msgid "Last Modified on"
+msgstr "Última modificación el"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_uid
+msgid "Last Updated by"
+msgstr "Última Actualización por"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_date
+msgid "Last Updated on"
+msgstr "Última Actualización el"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: fieldservice_substatus
+#: model:ir.actions.act_window,name:fieldservice_substatus.action_fsm_stage_status
+#: model:ir.model,name:fieldservice_substatus.model_fsm_stage_status
+msgid "Order Sub-Status"
+msgstr "Subestado de Pedido"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_ids
+msgid "Potential Sub-Statuses"
+msgstr "Subestados Potenciales"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_order__sub_stage_id
+#: model:ir.ui.menu,name:fieldservice_substatus.menu_fsm_stage_status
+msgid "Sub-Status"
+msgstr "Subestado"
+
+#. module: fieldservice_substatus
+#: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view
+msgid "substatus"
+msgstr "subestado"
diff --git a/fieldservice_substatus/i18n/fieldservice_substatus.pot b/fieldservice_substatus/i18n/fieldservice_substatus.pot
new file mode 100644
index 0000000000..586535d4f9
--- /dev/null
+++ b/fieldservice_substatus/i18n/fieldservice_substatus.pot
@@ -0,0 +1,98 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_substatus
+#
+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_substatus
+#: model_terms:ir.actions.act_window,help:fieldservice_substatus.action_fsm_stage_status
+msgid "Create an order sub-status."
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_id
+msgid "Default Sub-Status"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model,name:fieldservice_substatus.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model,name:fieldservice_substatus.model_fsm_stage
+msgid "Field Service Stage"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.actions.act_window,name:fieldservice_substatus.action_fsm_stage_status
+#: model:ir.model,name:fieldservice_substatus.model_fsm_stage_status
+msgid "Order Sub-Status"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_ids
+msgid "Potential Sub-Statuses"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_order__sub_stage_id
+#: model:ir.ui.menu,name:fieldservice_substatus.menu_fsm_stage_status
+msgid "Sub-Status"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view
+msgid "substatus"
+msgstr ""
+
diff --git a/fieldservice_substatus/i18n/pt_BR.po b/fieldservice_substatus/i18n/pt_BR.po
new file mode 100644
index 0000000000..bfe7f343f9
--- /dev/null
+++ b/fieldservice_substatus/i18n/pt_BR.po
@@ -0,0 +1,98 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_substatus
+#
+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_substatus
+#: model_terms:ir.actions.act_window,help:fieldservice_substatus.action_fsm_stage_status
+msgid "Create an order sub-status."
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_id
+msgid "Default Sub-Status"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model,name:fieldservice_substatus.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model,name:fieldservice_substatus.model_fsm_stage
+msgid "Field Service Stage"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.actions.act_window,name:fieldservice_substatus.action_fsm_stage_status
+#: model:ir.model,name:fieldservice_substatus.model_fsm_stage_status
+msgid "Order Sub-Status"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_ids
+msgid "Potential Sub-Statuses"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_order__sub_stage_id
+#: model:ir.ui.menu,name:fieldservice_substatus.menu_fsm_stage_status
+msgid "Sub-Status"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view
+msgid "substatus"
+msgstr ""

From 2bc5b14b4c89e573bf775cd59ad8439ae426a5f9 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 16 Jan 2020 11:39:15 -0600
Subject: [PATCH 493/631] [ADD] Spanish (es) translation

---
 fieldservice_substatus/i18n/es.po    | 100 +++++++++++++++++++++++++++
 fieldservice_substatus/i18n/pt_BR.po |  34 ++++-----
 2 files changed, 118 insertions(+), 16 deletions(-)
 create mode 100644 fieldservice_substatus/i18n/es.po

diff --git a/fieldservice_substatus/i18n/es.po b/fieldservice_substatus/i18n/es.po
new file mode 100644
index 0000000000..40ad364234
--- /dev/null
+++ b/fieldservice_substatus/i18n/es.po
@@ -0,0 +1,100 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_substatus
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-22 04:35+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.8\n"
+
+#. module: fieldservice_substatus
+#: model_terms:ir.actions.act_window,help:fieldservice_substatus.action_fsm_stage_status
+msgid "Create an order sub-status."
+msgstr "Crear un subestado de pedido."
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_date
+msgid "Created on"
+msgstr "Creado el"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_id
+msgid "Default Sub-Status"
+msgstr "Subestado Predeterminado"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__display_name
+msgid "Display Name"
+msgstr "Nombre para Mostrar"
+
+#. module: fieldservice_substatus
+#: model:ir.model,name:fieldservice_substatus.model_fsm_order
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_substatus
+#: model:ir.model,name:fieldservice_substatus.model_fsm_stage
+msgid "Field Service Stage"
+msgstr "Etapa de Servicio de Campo"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status____last_update
+msgid "Last Modified on"
+msgstr "Última modificación el"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_uid
+msgid "Last Updated by"
+msgstr "Última Actualización por"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_date
+msgid "Last Updated on"
+msgstr "Última Actualización el"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: fieldservice_substatus
+#: model:ir.actions.act_window,name:fieldservice_substatus.action_fsm_stage_status
+#: model:ir.model,name:fieldservice_substatus.model_fsm_stage_status
+msgid "Order Sub-Status"
+msgstr "Subestado de Pedido"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_ids
+msgid "Potential Sub-Statuses"
+msgstr "Subestados Potenciales"
+
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_order__sub_stage_id
+#: model:ir.ui.menu,name:fieldservice_substatus.menu_fsm_stage_status
+msgid "Sub-Status"
+msgstr "Subestado"
+
+#. module: fieldservice_substatus
+#: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view
+msgid "substatus"
+msgstr "subestado"
diff --git a/fieldservice_substatus/i18n/pt_BR.po b/fieldservice_substatus/i18n/pt_BR.po
index bfe7f343f9..480ab41d7f 100644
--- a/fieldservice_substatus/i18n/pt_BR.po
+++ b/fieldservice_substatus/i18n/pt_BR.po
@@ -6,79 +6,81 @@ 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_substatus
 #: model_terms:ir.actions.act_window,help:fieldservice_substatus.action_fsm_stage_status
 msgid "Create an order sub-status."
-msgstr ""
+msgstr "Crie um sub-status de ordem."
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Criado por"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Criado em"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_id
 msgid "Default Sub-Status"
-msgstr ""
+msgstr "Sub-Status Padrão"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Nome Exibido"
 
 #. module: fieldservice_substatus
 #: model:ir.model,name:fieldservice_substatus.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Ordem de Serviço de Campo"
 
 #. module: fieldservice_substatus
 #: model:ir.model,name:fieldservice_substatus.model_fsm_stage
 msgid "Field Service Stage"
-msgstr ""
+msgstr "Estágio do Serviço de Campo"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Última Modificação em"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "Última Atualização por"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "Última Atualização em"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__name
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: fieldservice_substatus
 #: model:ir.actions.act_window,name:fieldservice_substatus.action_fsm_stage_status
 #: model:ir.model,name:fieldservice_substatus.model_fsm_stage_status
 msgid "Order Sub-Status"
-msgstr ""
+msgstr "Sub-Status de Ordem"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_ids
@@ -89,10 +91,10 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_order__sub_stage_id
 #: model:ir.ui.menu,name:fieldservice_substatus.menu_fsm_stage_status
 msgid "Sub-Status"
-msgstr ""
+msgstr "Sub-Status"
 
 #. module: fieldservice_substatus
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view
 msgid "substatus"
-msgstr ""
+msgstr "substatus"

From 177da8ca1c9a9bef7b2f45aa952b01e9698b2714 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 28 May 2020 11:13:23 -0700
Subject: [PATCH 494/631] [IMP] Track Visibility + Notifications

Update fieldservice_substatus/data/mail_data.xml

Co-authored-by: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>

Update fieldservice_substatus/data/mail_data.xml

Co-authored-by: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
---
 fieldservice_substatus/__manifest__.py         |  1 +
 fieldservice_substatus/data/mail_data.xml      | 12 ++++++++++++
 .../i18n/fieldservice_substatus.pot            |  6 ++++++
 fieldservice_substatus/i18n/pt_BR.po           | 18 +++++++++---------
 fieldservice_substatus/models/fsm_order.py     |  8 ++++++++
 5 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 fieldservice_substatus/data/mail_data.xml

diff --git a/fieldservice_substatus/__manifest__.py b/fieldservice_substatus/__manifest__.py
index db6bb3a6a6..698093d5cb 100644
--- a/fieldservice_substatus/__manifest__.py
+++ b/fieldservice_substatus/__manifest__.py
@@ -16,6 +16,7 @@
     'data': [
         'data/fsm_stage_status.xml',
         'data/fsm_stage.xml',
+        'data/mail_data.xml',
         'security/ir.model.access.csv',
         'views/fsm_stage_status.xml',
         'views/fsm_stage.xml',
diff --git a/fieldservice_substatus/data/mail_data.xml b/fieldservice_substatus/data/mail_data.xml
new file mode 100644
index 0000000000..02f5169d6a
--- /dev/null
+++ b/fieldservice_substatus/data/mail_data.xml
@@ -0,0 +1,12 @@
+<odoo noupdate="1">
+
+    <record id="fso_substatus_changed" model="mail.message.subtype">
+        <field name="name">Substatus Changed</field>
+        <field name="sequence">10</field>
+        <field name="res_model">fsm.order</field>
+        <field name="default" eval="False"/>
+        <field name="internal" eval="True"/>
+        <field name="description">Substatus Changed</field>
+    </record>
+    
+</odoo>
diff --git a/fieldservice_substatus/i18n/fieldservice_substatus.pot b/fieldservice_substatus/i18n/fieldservice_substatus.pot
index 586535d4f9..29e9cc07db 100644
--- a/fieldservice_substatus/i18n/fieldservice_substatus.pot
+++ b/fieldservice_substatus/i18n/fieldservice_substatus.pot
@@ -90,6 +90,12 @@ msgstr ""
 msgid "Sub-Status"
 msgstr ""
 
+#. module: fieldservice_substatus
+#: model:mail.message.subtype,description:fieldservice_substatus.fso_substatus_changed
+#: model:mail.message.subtype,name:fieldservice_substatus.fso_substatus_changed
+msgid "Substatus Changed"
+msgstr ""
+
 #. module: fieldservice_substatus
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view
diff --git a/fieldservice_substatus/i18n/pt_BR.po b/fieldservice_substatus/i18n/pt_BR.po
index 480ab41d7f..4576120cfa 100644
--- a/fieldservice_substatus/i18n/pt_BR.po
+++ b/fieldservice_substatus/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-05 22:13+0000\n"
-"Last-Translator: Marcel Savegnago <marcel.savegnago@gmail.com>\n"
+"PO-Revision-Date: 2020-06-17 02:19+0000\n"
+"Last-Translator: Fernando Colus <fcolus1@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 #. module: fieldservice_substatus
 #: model_terms:ir.actions.act_window,help:fieldservice_substatus.action_fsm_stage_status
 msgid "Create an order sub-status."
-msgstr "Crie um sub-status de ordem."
+msgstr "Criar um sub-status de ordem."
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__create_uid
@@ -39,7 +39,7 @@ msgstr "Sub-Status Padrão"
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__display_name
 msgid "Display Name"
-msgstr "Nome Exibido"
+msgstr "Exibir Nome"
 
 #. module: fieldservice_substatus
 #: model:ir.model,name:fieldservice_substatus.model_fsm_order
@@ -59,17 +59,17 @@ msgstr "ID"
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status____last_update
 msgid "Last Modified on"
-msgstr "Última Modificação em"
+msgstr "Última Modificação Feita em"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_uid
 msgid "Last Updated by"
-msgstr "Última Atualização por"
+msgstr "Última Atualização Feita por"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__write_date
 msgid "Last Updated on"
-msgstr "Última Atualização em"
+msgstr "Última Atualização Feita em"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__name
@@ -80,12 +80,12 @@ msgstr "Nome"
 #: model:ir.actions.act_window,name:fieldservice_substatus.action_fsm_stage_status
 #: model:ir.model,name:fieldservice_substatus.model_fsm_stage_status
 msgid "Order Sub-Status"
-msgstr "Sub-Status de Ordem"
+msgstr "Sub-Status da Ordem"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__sub_stage_ids
 msgid "Potential Sub-Statuses"
-msgstr ""
+msgstr "Sub-Status Potenciais"
 
 #. module: fieldservice_substatus
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_order__sub_stage_id
diff --git a/fieldservice_substatus/models/fsm_order.py b/fieldservice_substatus/models/fsm_order.py
index 7cfe69e397..a5ce3c4df2 100644
--- a/fieldservice_substatus/models/fsm_order.py
+++ b/fieldservice_substatus/models/fsm_order.py
@@ -11,6 +11,7 @@ class FSMOrder(models.Model):
         'fsm.stage.status',
         string='Sub-Status',
         required=True,
+        track_visibility='onchange',
         default=lambda self: self._default_stage_id().sub_stage_id)
 
     @api.multi
@@ -21,3 +22,10 @@ def write(self, vals):
             if sub_stage_id:
                 vals.update({'sub_stage_id': sub_stage_id.id})
         return super(FSMOrder, self).write(vals)
+
+    @api.multi
+    def _track_subtype(self, init_values):
+        self.ensure_one()
+        if 'sub_stage_id' in init_values:
+            return 'fieldservice_substatus.fso_substatus_changed'
+        return super()._track_subtype(init_values)

From 5cb343ed4744112829bb1613ebc89a0b52d6ec29 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 18 Jun 2020 02:25:35 +0000
Subject: [PATCH 495/631] fieldservice_substatus 12.0.1.2.0

---
 fieldservice_substatus/__manifest__.py | 2 +-
 fieldservice_substatus/i18n/de.po      | 8 +++++++-
 fieldservice_substatus/i18n/es.po      | 9 ++++++++-
 fieldservice_substatus/i18n/es_CL.po   | 9 ++++++++-
 fieldservice_substatus/i18n/pt_BR.po   | 9 ++++++++-
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/fieldservice_substatus/__manifest__.py b/fieldservice_substatus/__manifest__.py
index 698093d5cb..e98b77d62a 100644
--- a/fieldservice_substatus/__manifest__.py
+++ b/fieldservice_substatus/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Sub-Status',
     'summary': 'Add sub-statuses to Field Service orders',
-    'version': '12.0.1.1.0',
+    'version': '12.0.1.2.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, '
               'Brian McMaster, '
diff --git a/fieldservice_substatus/i18n/de.po b/fieldservice_substatus/i18n/de.po
index 1c073674df..ff617d6f8e 100644
--- a/fieldservice_substatus/i18n/de.po
+++ b/fieldservice_substatus/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_substatus
+# 	* fieldservice_substatus
 #
 msgid ""
 msgstr ""
@@ -93,6 +93,12 @@ msgstr ""
 msgid "Sub-Status"
 msgstr ""
 
+#. module: fieldservice_substatus
+#: model:mail.message.subtype,description:fieldservice_substatus.fso_substatus_changed
+#: model:mail.message.subtype,name:fieldservice_substatus.fso_substatus_changed
+msgid "Substatus Changed"
+msgstr ""
+
 #. module: fieldservice_substatus
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view
diff --git a/fieldservice_substatus/i18n/es.po b/fieldservice_substatus/i18n/es.po
index 40ad364234..976bd63f9c 100644
--- a/fieldservice_substatus/i18n/es.po
+++ b/fieldservice_substatus/i18n/es.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_substatus
+# 	* fieldservice_substatus
 #
 msgid ""
 msgstr ""
@@ -93,6 +93,13 @@ msgstr "Subestados Potenciales"
 msgid "Sub-Status"
 msgstr "Subestado"
 
+#. module: fieldservice_substatus
+#: model:mail.message.subtype,description:fieldservice_substatus.fso_substatus_changed
+#: model:mail.message.subtype,name:fieldservice_substatus.fso_substatus_changed
+#, fuzzy
+msgid "Substatus Changed"
+msgstr "subestado"
+
 #. module: fieldservice_substatus
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view
diff --git a/fieldservice_substatus/i18n/es_CL.po b/fieldservice_substatus/i18n/es_CL.po
index 2565a35887..6e586e07c9 100644
--- a/fieldservice_substatus/i18n/es_CL.po
+++ b/fieldservice_substatus/i18n/es_CL.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_substatus
+# 	* fieldservice_substatus
 #
 msgid ""
 msgstr ""
@@ -93,6 +93,13 @@ msgstr "Subestados Potenciales"
 msgid "Sub-Status"
 msgstr "Subestado"
 
+#. module: fieldservice_substatus
+#: model:mail.message.subtype,description:fieldservice_substatus.fso_substatus_changed
+#: model:mail.message.subtype,name:fieldservice_substatus.fso_substatus_changed
+#, fuzzy
+msgid "Substatus Changed"
+msgstr "subestado"
+
 #. module: fieldservice_substatus
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view
diff --git a/fieldservice_substatus/i18n/pt_BR.po b/fieldservice_substatus/i18n/pt_BR.po
index 4576120cfa..bf3acc7d4b 100644
--- a/fieldservice_substatus/i18n/pt_BR.po
+++ b/fieldservice_substatus/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_substatus
+# 	* fieldservice_substatus
 #
 msgid ""
 msgstr ""
@@ -93,6 +93,13 @@ msgstr "Sub-Status Potenciais"
 msgid "Sub-Status"
 msgstr "Sub-Status"
 
+#. module: fieldservice_substatus
+#: model:mail.message.subtype,description:fieldservice_substatus.fso_substatus_changed
+#: model:mail.message.subtype,name:fieldservice_substatus.fso_substatus_changed
+#, fuzzy
+msgid "Substatus Changed"
+msgstr "substatus"
+
 #. module: fieldservice_substatus
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_form_view
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view

From a04408defe36666363b794c8ea21a852545eba51 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Tue, 20 Apr 2021 10:25:01 +0530
Subject: [PATCH 496/631] [FIX] Travis

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

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

From e71e8d571b468512822475d0e1cdc0f6115e85df Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Mon, 26 Jul 2021 17:57:10 +0000
Subject: [PATCH 497/631] [UPD] Update fieldservice.pot

---
 fieldservice/i18n/fieldservice.pot | 154 +++++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)

diff --git a/fieldservice/i18n/fieldservice.pot b/fieldservice/i18n/fieldservice.pot
index acdd445f19..ae2698c30b 100644
--- a/fieldservice/i18n/fieldservice.pot
+++ b/fieldservice/i18n/fieldservice.pot
@@ -112,6 +112,18 @@ msgstr ""
 msgid "A Field Service Worker related to that partner already exists."
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_payable_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_payable_id
+msgid "Account Payable"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_receivable_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_receivable_id
+msgid "Account Receivable"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_needaction
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_needaction
@@ -565,6 +577,12 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__ref_company_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__ref_company_ids
+msgid "Companies that refers to partner"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__company_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__company_id
@@ -691,6 +709,12 @@ msgstr ""
 msgid "Convert to a Field Service Worker or Location"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__payment_token_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__payment_token_count
+msgid "Count Payment Token"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__message_bounce
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__message_bounce
@@ -804,6 +828,12 @@ msgstr ""
 msgid "Credit Limit"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__currency_id
+msgid "Currency"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__current_date
 msgid "Current Date"
@@ -1183,6 +1213,12 @@ msgid ""
 "comparisons."
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_position_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_position_id
+msgid "Fiscal Position"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__fold
 msgid "Folded in Kanban"
@@ -1495,6 +1531,12 @@ msgstr ""
 msgid "Internal Type"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_warn
+msgid "Invoice"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__type
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__type
@@ -1513,6 +1555,12 @@ msgstr ""
 msgid "Invoice your Service Orders"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_ids
+msgid "Invoices"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__is_button
 msgid "Is Button"
@@ -1565,6 +1613,12 @@ msgstr ""
 msgid "Job Position"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__journal_item_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__journal_item_count
+msgid "Journal Items"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__lang
@@ -1626,6 +1680,27 @@ msgstr ""
 msgid "Last Updated on"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__calendar_last_notif_ack
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__calendar_last_notif_ack
+msgid "Last notification marked as read from base Calendar"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__last_time_entries_checked
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__last_time_entries_checked
+msgid ""
+"Last time the invoices & payments matching was performed for this partner. "
+"It is set either if there's not at least an unreconciled debit and an "
+"unreconciled credit or if you click the \"Done\" button."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__last_time_entries_checked
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__last_time_entries_checked
+msgid "Latest Invoices & Payments Matching Date"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__request_late
 msgid "Latest Request Date"
@@ -1996,6 +2071,12 @@ msgstr ""
 msgid "Me"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__meeting_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__meeting_ids
+msgid "Meetings"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error
@@ -2411,6 +2492,12 @@ msgstr ""
 msgid "Parent name"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contract_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__contract_ids
+msgid "Partner Contracts"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__same_vat_partner_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__same_vat_partner_id
@@ -2474,6 +2561,12 @@ msgstr ""
 msgid "Previous Stage"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_product_pricelist
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_product_pricelist
+msgid "Pricelist"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__territory_manager_id
 #: model:ir.model.fields,field_description:fieldservice.field_res_territory__person_id
@@ -3039,6 +3132,13 @@ msgid ""
 "government taxes. Used in some legal statements."
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_account_position_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_account_position_id
+msgid ""
+"The fiscal position determines the taxes/accounts used for this contact."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_order__country_name
 msgid "The full name of the country."
@@ -3179,6 +3279,36 @@ msgstr ""
 msgid "Today Orders"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__total_invoiced
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__total_invoiced
+msgid "Total Invoiced"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__debit
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__debit
+msgid "Total Payable"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__credit
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__credit
+msgid "Total Receivable"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__credit
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__credit
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__debit
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__debit
+msgid "Total amount you have to pay to this vendor."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_order__type
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__stage_type
@@ -3298,6 +3428,12 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__currency_id
+msgid "Utility field to express amount currency"
+msgstr ""
+
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid "Vehicles"
@@ -3321,6 +3457,24 @@ msgstr ""
 msgid "Website Link"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__tz
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__tz

From 582e0b6aee884f18141237a8b3429d0a5ac20d4c Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Mon, 26 Jul 2021 17:57:12 +0000
Subject: [PATCH 498/631] [UPD] Update fieldservice_activity.pot

---
 fieldservice_activity/i18n/fieldservice_activity.pot | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/fieldservice_activity/i18n/fieldservice_activity.pot b/fieldservice_activity/i18n/fieldservice_activity.pot
index 64998311bf..a158431dec 100644
--- a/fieldservice_activity/i18n/fieldservice_activity.pot
+++ b/fieldservice_activity/i18n/fieldservice_activity.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 13.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -70,6 +70,7 @@ msgstr ""
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__display_name
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -100,11 +101,15 @@ msgstr ""
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__id
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template__id
 msgid "ID"
 msgstr ""
 
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity____last_update
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -123,6 +128,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: fieldservice_activity
+#: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_activity
 #: model:ir.model.fields,field_description:fieldservice_activity.field_fsm_activity__ref
 msgid "Reference"

From 79cea38b292f41e104004eb02d78ace6d72ed962 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 26 Jul 2021 18:07:30 +0000
Subject: [PATCH 499/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index de66a73310..16393ee0b0 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ addon | version | summary
 [fieldservice](fieldservice/) | 14.0.1.2.0 | Manage Field Service Locations, Workers and Orders
 [fieldservice_account](fieldservice_account/) | 14.0.1.0.0 | Track invoices linked to Field Service orders
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
+[fieldservice_activity](fieldservice_activity/) | 14.0.1.0.0 | Field Service Activities are a set of actions that need to be performed on a service order
 [fieldservice_agreement](fieldservice_agreement/) | 14.0.1.0.0 | Manage Field Service agreements and contracts
 [fieldservice_calendar](fieldservice_calendar/) | 14.0.1.0.0 | Add calendar to FSM Orders
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM

From 9c3d726822a1f856761d45ed949baa236e280074 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 26 Jul 2021 18:07:33 +0000
Subject: [PATCH 500/631] [UPD] README.rst

---
 fieldservice_activity/README.rst                    | 11 +++++------
 fieldservice_activity/static/description/index.html |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/fieldservice_activity/README.rst b/fieldservice_activity/README.rst
index abdd1f5635..e29fffddfb 100644
--- a/fieldservice_activity/README.rst
+++ b/fieldservice_activity/README.rst
@@ -14,13 +14,13 @@ Field Service Activity
     :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/13.0/fieldservice_activity
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_activity
     :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-13-0/field-service-13-0-fieldservice_activity
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_activity
     :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/13.0
+    :target: https://runbot.odoo-community.org/runbot/264/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -58,7 +58,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_activity%0Aversion:%2013.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_activity%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.
 
@@ -76,7 +76,6 @@ Contributors
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbells@opensourceintegrators.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
-* Chanakya Soni <csoni@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -109,6 +108,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| |maintainer-osi-scampbell| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/13.0/fieldservice_activity>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_activity>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_activity/static/description/index.html b/fieldservice_activity/static/description/index.html
index 4021e90be8..d1dcf439a3 100644
--- a/fieldservice_activity/static/description/index.html
+++ b/fieldservice_activity/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service Activity</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/13.0/fieldservice_activity"><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-13-0/field-service-13-0-fieldservice_activity"><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/13.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/14.0/fieldservice_activity"><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_activity"><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 Field Service Activity gives the user the ability to define a list of tasks/activities on a service order</p>
 <p>The user can add tasks/activities to the FSM order to the ones created from the template.</p>
 <p><strong>Table of contents</strong></p>
@@ -408,7 +408,7 @@ <h1><a class="toc-backref" href="#id3">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_activity%0Aversion:%2013.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_activity%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">
@@ -443,7 +443,7 @@ <h2><a class="toc-backref" href="#id8">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/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external" href="https://github.com/osi-scampbell"><img alt="osi-scampbell" src="https://github.com/osi-scampbell.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/13.0/fieldservice_activity">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/14.0/fieldservice_activity">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 f38c3fe33e41cb5b6126c01a74afe59f4e08738f Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 26 Jul 2021 18:07:34 +0000
Subject: [PATCH 501/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index df10cb6550..4bd843cce2 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210723.1
\ No newline at end of file
+14.0.20210726.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index d997cf81e9..c3de1d6b89 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -12,6 +12,7 @@
         'odoo14-addon-fieldservice',
         'odoo14-addon-fieldservice_account',
         'odoo14-addon-fieldservice_account_analytic',
+        'odoo14-addon-fieldservice_activity',
         'odoo14-addon-fieldservice_agreement',
         'odoo14-addon-fieldservice_calendar',
         'odoo14-addon-fieldservice_crm',

From d00403ccf60b8715537ee0b09cc4d879618b9f1b Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 15 Apr 2021 18:42:56 +0530
Subject: [PATCH 502/631] [14.0][MIG] fieldservice_account_payment

---
 fieldservice_account_payment/__manifest__.py  |  6 ++-
 .../models/account_payment.py                 |  3 +-
 .../models/fsm_order.py                       |  2 +-
 .../tests/test_fsm_account_payment.py         | 38 +++++++++++--------
 .../odoo/addons/fieldservice_account_payment  |  1 +
 setup/fieldservice_account_payment/setup.py   |  6 +++
 6 files changed, 36 insertions(+), 20 deletions(-)
 create mode 120000 setup/fieldservice_account_payment/odoo/addons/fieldservice_account_payment
 create mode 100644 setup/fieldservice_account_payment/setup.py

diff --git a/fieldservice_account_payment/__manifest__.py b/fieldservice_account_payment/__manifest__.py
index 217facaa46..ffab8af53f 100644
--- a/fieldservice_account_payment/__manifest__.py
+++ b/fieldservice_account_payment/__manifest__.py
@@ -4,11 +4,13 @@
 {
     "name": "Field Service - Accounting Payment",
     "summary": "Allow workers to collect payments from the order.",
-    "version": "13.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",
-    "depends": ["fieldservice_account"],
+    "depends": [
+        "fieldservice_account",
+    ],
     "data": [
         "security/ir.model.access.csv",
         "views/fsm_order.xml",
diff --git a/fieldservice_account_payment/models/account_payment.py b/fieldservice_account_payment/models/account_payment.py
index 938d29c2d4..38cb313bd3 100644
--- a/fieldservice_account_payment/models/account_payment.py
+++ b/fieldservice_account_payment/models/account_payment.py
@@ -36,10 +36,9 @@ def action_view_fsm_orders(self):
             action["res_id"] = self.fsm_order_ids[0].id
         return action
 
-    @api.depends("move_ids.fsm_order_ids")
     def _compute_fsm_order_ids(self):
         fsm_order_ids = []
-        for invoice in self.move_ids:
+        for invoice in self.reconciled_invoice_ids:
             if invoice.fsm_order_ids:
                 fsm_order_ids.extend(invoice.fsm_order_ids.ids)
         if fsm_order_ids:
diff --git a/fieldservice_account_payment/models/fsm_order.py b/fieldservice_account_payment/models/fsm_order.py
index 76af322de5..5d221a14f0 100644
--- a/fieldservice_account_payment/models/fsm_order.py
+++ b/fieldservice_account_payment/models/fsm_order.py
@@ -26,7 +26,7 @@ def _compute_account_payment_count(self):
     def action_view_payments(self):
         action = self.env.ref("account.action_account_payments").read()[0]
         if self.payment_count > 1:
-            action["domain"] = [("id", "in", self.payment_ids)]
+            action["domain"] = [("id", "in", self.payment_ids.ids)]
         elif self.payment_ids:
             action["views"] = [
                 (self.env.ref("account.view_account_payment_form").id, "form")
diff --git a/fieldservice_account_payment/tests/test_fsm_account_payment.py b/fieldservice_account_payment/tests/test_fsm_account_payment.py
index 0778722d12..5ea554d8eb 100644
--- a/fieldservice_account_payment/tests/test_fsm_account_payment.py
+++ b/fieldservice_account_payment/tests/test_fsm_account_payment.py
@@ -10,8 +10,8 @@ class FSMAccountPaymentCase(TransactionCase):
     def setUp(self):
         super(FSMAccountPaymentCase, self).setUp()
         self.register_payments_model = self.env[
-            "account.register.payments"
-        ].with_context(active_model="account.invoice")
+            "account.payment.register"
+        ].with_context(active_model="account.move")
         self.payment_method_manual_in = self.env.ref(
             "account.account_payment_method_manual_in"
         )
@@ -60,11 +60,11 @@ def setUp(self):
             }
         )
         # Create an invoice
-        self.test_invoice = self.env["account.invoice"].create(
+        self.test_invoice = self.env["account.move"].create(
             {
                 "partner_id": self.test_partner.id,
-                "type": "out_invoice",
-                "date_invoice": datetime.today().date(),
+                "move_type": "out_invoice",
+                "invoice_date": datetime.today().date(),
                 "invoice_line_ids": [
                     (
                         0,
@@ -73,8 +73,6 @@ def setUp(self):
                             "name": "Test",
                             "quantity": 1.00,
                             "price_unit": 100.00,
-                            "fsm_order_id": self.test_order.id,
-                            "account_id": self.account_income.id,
                         },
                     )
                 ],
@@ -85,11 +83,14 @@ def setUp(self):
         self.bank_journal = self.env["account.journal"].create(
             {"name": "Bank", "type": "bank", "code": "BNK99"}
         )
+        self.test_invoice.action_post()
 
     def test_fsm_account_payment(self):
-        self.test_invoice.action_invoice_open()
-
-        ctx = {"active_model": "account.invoice", "active_ids": [self.test_invoice.id]}
+        ctx = {
+            "active_model": "account.move",
+            "active_id": self.test_invoice.id,
+            "active_ids": self.test_invoice.ids,
+        }
         register_payments = self.register_payments_model.with_context(ctx).create(
             {
                 "payment_date": datetime.today(),
@@ -97,13 +98,20 @@ def test_fsm_account_payment(self):
                 "payment_method_id": self.payment_method_manual_in.id,
             }
         )
-        register_payments.create_payments()
-        payment = self.payment_model.search([], order="id desc", limit=1)
+        order = self.test_order
+        register_payment_action = register_payments.action_create_payments()
+        payment = self.payment_model.browse(register_payment_action.get("res_id"))
+        test_order = self.test_order.id
+        payment.fsm_order_ids = [(6, 0, [test_order])]
+        self.test_invoice.fsm_order_ids = [(6, 0, [test_order])]
+        order.payment_ids = [(6, 0, [payment.id])]
+        self.test_order._compute_account_payment_count()
+        payment._compute_fsm_order_ids()
         payment.action_view_fsm_orders()
-        self.test_invoice.fsm_order_ids.action_view_payments()
-        self.assertAlmostEquals(payment.amount, 100)
+        order.action_view_payments()
+        self.assertAlmostEqual(payment.amount, 100)
         self.assertEqual(payment.state, "posted")
-        self.assertEqual(self.test_invoice.state, "paid")
+        self.assertEqual(self.test_invoice.state, "posted")
         self.assertEqual(self.test_invoice.fsm_order_ids, payment.fsm_order_ids)
         res = self.env["fsm.order"].search([("payment_ids", "in", payment.id)])
         self.assertEqual(len(res), 1)
diff --git a/setup/fieldservice_account_payment/odoo/addons/fieldservice_account_payment b/setup/fieldservice_account_payment/odoo/addons/fieldservice_account_payment
new file mode 120000
index 0000000000..c622fa3a70
--- /dev/null
+++ b/setup/fieldservice_account_payment/odoo/addons/fieldservice_account_payment
@@ -0,0 +1 @@
+../../../../fieldservice_account_payment
\ No newline at end of file
diff --git a/setup/fieldservice_account_payment/setup.py b/setup/fieldservice_account_payment/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_account_payment/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From bc99f9354a21e8af6952306ce164073f7d2f62a0 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Tue, 20 Apr 2021 10:29:25 +0530
Subject: [PATCH 503/631] [14.0][MIG] fieldservice_substatus

---
 fieldservice_substatus/README.rst             | 11 ++--
 fieldservice_substatus/__manifest__.py        | 48 +++++++---------
 fieldservice_substatus/data/fsm_stage.xml     |  6 +-
 fieldservice_substatus/data/mail_data.xml     |  6 +-
 fieldservice_substatus/models/__init__.py     |  6 +-
 fieldservice_substatus/models/fsm_order.py    | 28 ++++-----
 fieldservice_substatus/models/fsm_stage.py    | 27 +++++----
 .../models/fsm_stage_status.py                | 28 +++++----
 .../readme/CONTRIBUTORS.rst                   |  1 +
 fieldservice_substatus/readme/DESCRIPTION.rst |  2 +-
 .../static/description/index.html             |  9 +--
 fieldservice_substatus/tests/__init__.py      |  4 ++
 .../tests/test_fsm_substatus.py               | 57 +++++++++++++++++++
 fieldservice_substatus/views/fsm_order.xml    | 12 ++--
 fieldservice_substatus/views/fsm_stage.xml    | 16 ++++--
 .../views/fsm_stage_status.xml                | 21 +++----
 16 files changed, 180 insertions(+), 102 deletions(-)
 create mode 100644 fieldservice_substatus/tests/__init__.py
 create mode 100644 fieldservice_substatus/tests/test_fsm_substatus.py

diff --git a/fieldservice_substatus/README.rst b/fieldservice_substatus/README.rst
index 59d72bdc49..2abc9ea124 100644
--- a/fieldservice_substatus/README.rst
+++ b/fieldservice_substatus/README.rst
@@ -14,13 +14,13 @@ Field Service - Sub-Status
     :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_substatus
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_substatus
     :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_substatus
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_substatus
     :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| 
@@ -86,7 +86,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_substatus%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_substatus%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.
 
@@ -104,6 +104,7 @@ Contributors
 
 * Brian McMaster <brian@mcmpest.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
+* Freni Patel <fpatel@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
@@ -140,6 +141,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| |maintainer-brian10048| |maintainer-bodedra| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_substatus>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_substatus>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_substatus/__manifest__.py b/fieldservice_substatus/__manifest__.py
index e98b77d62a..f12431532e 100644
--- a/fieldservice_substatus/__manifest__.py
+++ b/fieldservice_substatus/__manifest__.py
@@ -2,32 +2,28 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - Sub-Status',
-    'summary': 'Add sub-statuses to Field Service orders',
-    'version': '12.0.1.2.0',
-    'category': 'Field Service',
-    'author': 'Open Source Integrators, '
-              'Brian McMaster, '
-              'Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice',
+    "name": "Field Service - Sub-Status",
+    "summary": "Add sub-statuses to Field Service orders",
+    "version": "14.0.1.0.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, "
+    "Brian McMaster, "
+    "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": [
+        "fieldservice",
     ],
-    'data': [
-        'data/fsm_stage_status.xml',
-        'data/fsm_stage.xml',
-        'data/mail_data.xml',
-        'security/ir.model.access.csv',
-        'views/fsm_stage_status.xml',
-        'views/fsm_stage.xml',
-        'views/fsm_order.xml'
-    ],
-    'installable': True,
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'max3903',
-        'brian10048',
-        'bodedra'
+    "data": [
+        "data/fsm_stage_status.xml",
+        "data/fsm_stage.xml",
+        "data/mail_data.xml",
+        "security/ir.model.access.csv",
+        "views/fsm_stage_status.xml",
+        "views/fsm_stage.xml",
+        "views/fsm_order.xml",
     ],
+    "installable": True,
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": ["max3903", "brian10048", "bodedra"],
 }
diff --git a/fieldservice_substatus/data/fsm_stage.xml b/fieldservice_substatus/data/fsm_stage.xml
index 37017a87fb..ed16855782 100644
--- a/fieldservice_substatus/data/fsm_stage.xml
+++ b/fieldservice_substatus/data/fsm_stage.xml
@@ -1,15 +1,15 @@
 <odoo noupdate="1">
 
     <record id="fieldservice.fsm_stage_new" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+        <field name="sub_stage_id" ref="fsm_stage_status_default" />
     </record>
 
     <record id="fieldservice.fsm_stage_completed" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+        <field name="sub_stage_id" ref="fsm_stage_status_default" />
     </record>
 
     <record id="fieldservice.fsm_stage_cancelled" model="fsm.stage">
-        <field name="sub_stage_id" ref="fsm_stage_status_default"/>
+        <field name="sub_stage_id" ref="fsm_stage_status_default" />
     </record>
 
 </odoo>
diff --git a/fieldservice_substatus/data/mail_data.xml b/fieldservice_substatus/data/mail_data.xml
index 02f5169d6a..f627175f30 100644
--- a/fieldservice_substatus/data/mail_data.xml
+++ b/fieldservice_substatus/data/mail_data.xml
@@ -4,9 +4,9 @@
         <field name="name">Substatus Changed</field>
         <field name="sequence">10</field>
         <field name="res_model">fsm.order</field>
-        <field name="default" eval="False"/>
-        <field name="internal" eval="True"/>
+        <field name="default" eval="False" />
+        <field name="internal" eval="True" />
         <field name="description">Substatus Changed</field>
     </record>
-    
+
 </odoo>
diff --git a/fieldservice_substatus/models/__init__.py b/fieldservice_substatus/models/__init__.py
index 1bac61402e..cb428fb3e5 100644
--- a/fieldservice_substatus/models/__init__.py
+++ b/fieldservice_substatus/models/__init__.py
@@ -1,7 +1,3 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import (
-    fsm_stage_status,
-    fsm_stage,
-    fsm_order
-)
+from . import fsm_stage_status, fsm_stage, fsm_order
diff --git a/fieldservice_substatus/models/fsm_order.py b/fieldservice_substatus/models/fsm_order.py
index a5ce3c4df2..822b0602a9 100644
--- a/fieldservice_substatus/models/fsm_order.py
+++ b/fieldservice_substatus/models/fsm_order.py
@@ -1,31 +1,31 @@
 # Copyright (C) 2019 - TODAY, 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):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
     sub_stage_id = fields.Many2one(
-        'fsm.stage.status',
-        string='Sub-Status',
+        "fsm.stage.status",
+        string="Sub-Status",
         required=True,
-        track_visibility='onchange',
-        default=lambda self: self._default_stage_id().sub_stage_id)
+        tracking=True,
+        default=lambda self: self._default_stage_id().sub_stage_id,
+    )
 
-    @api.multi
     def write(self, vals):
-        if 'stage_id' in vals:
-            sub_stage_id = self.env['fsm.stage'].browse(
-                vals.get('stage_id')).sub_stage_id
+        if "stage_id" in vals:
+            sub_stage_id = (
+                self.env["fsm.stage"].browse(vals.get("stage_id")).sub_stage_id
+            )
             if sub_stage_id:
-                vals.update({'sub_stage_id': sub_stage_id.id})
+                vals.update({"sub_stage_id": sub_stage_id.id})
         return super(FSMOrder, self).write(vals)
 
-    @api.multi
     def _track_subtype(self, init_values):
         self.ensure_one()
-        if 'sub_stage_id' in init_values:
-            return 'fieldservice_substatus.fso_substatus_changed'
+        if "sub_stage_id" in init_values:
+            return "fieldservice_substatus.fso_substatus_changed"
         return super()._track_subtype(init_values)
diff --git a/fieldservice_substatus/models/fsm_stage.py b/fieldservice_substatus/models/fsm_stage.py
index a8da111b51..1ca803a952 100644
--- a/fieldservice_substatus/models/fsm_stage.py
+++ b/fieldservice_substatus/models/fsm_stage.py
@@ -5,23 +5,28 @@
 
 
 class FSMStage(models.Model):
-    _inherit = 'fsm.stage'
+    _inherit = "fsm.stage"
 
     @api.model
     def _default_sub_stage(self):
-        ret = self.env['fsm.stage.status'].search([('name', '=', 'Default')])
+        ret = self.env["fsm.stage.status"].search([("name", "=", "Default")])
         return ret
 
-    sub_stage_id = fields.Many2one('fsm.stage.status',
-                                   string='Default Sub-Status',
-                                   store=True,
-                                   default=_default_sub_stage)
-    sub_stage_ids = fields.Many2many('fsm.stage.status', 'fsm_sub_stage_rel',
-                                     'fsm_stage_id',
-                                     'sub_stage_id',
-                                     string='Potential Sub-Statuses')
+    sub_stage_id = fields.Many2one(
+        "fsm.stage.status",
+        string="Default Sub-Status",
+        store=True,
+        default=_default_sub_stage,
+    )
+    sub_stage_ids = fields.Many2many(
+        "fsm.stage.status",
+        "fsm_sub_stage_rel",
+        "fsm_stage_id",
+        "sub_stage_id",
+        string="Potential Sub-Statuses",
+    )
 
-    @api.onchange('sub_stage_id')
+    @api.onchange("sub_stage_id")
     def onchange_sub_stage_id(self):
         if self.sub_stage_id:
             self.sub_stage_ids = [(6, 0, [self.sub_stage_id.id])]
diff --git a/fieldservice_substatus/models/fsm_stage_status.py b/fieldservice_substatus/models/fsm_stage_status.py
index 20b0c0fe0a..c7cdcc1813 100644
--- a/fieldservice_substatus/models/fsm_stage_status.py
+++ b/fieldservice_substatus/models/fsm_stage_status.py
@@ -5,21 +5,27 @@
 
 
 class FSMStageStatus(models.Model):
-    _name = 'fsm.stage.status'
-    _description = 'Order Sub-Status'
+    _name = "fsm.stage.status"
+    _description = "Order Sub-Status"
 
-    name = fields.Char(string='Name', required=True)
+    name = fields.Char(string="Name", required=True)
 
     @api.model
-    def _search(self, args, offset=0, limit=None, order=None, count=False,
-                access_rights_uid=None):
+    def _search(
+        self,
+        args,
+        offset=0,
+        limit=None,
+        order=None,
+        count=False,
+        access_rights_uid=None,
+    ):
         context = self._context or {}
-        if context.get('fsm_order_stage_id'):
-            stage_id = self.env['fsm.stage'].browse(context.get(
-                'fsm_order_stage_id'))
+        if context.get("fsm_order_stage_id"):
+            stage_id = self.env["fsm.stage"].browse(context.get("fsm_order_stage_id"))
             sub_stage_ids = stage_id.sub_stage_id + stage_id.sub_stage_ids
             if sub_stage_ids:
-                args = [('id', 'in', sub_stage_ids.ids)]
+                args = [("id", "in", sub_stage_ids.ids)]
         return super(FSMStageStatus, self)._search(
-            args, offset, limit, order, count=count,
-            access_rights_uid=access_rights_uid)
+            args, offset, limit, order, count=count, access_rights_uid=access_rights_uid
+        )
diff --git a/fieldservice_substatus/readme/CONTRIBUTORS.rst b/fieldservice_substatus/readme/CONTRIBUTORS.rst
index 2b032ef01a..3dda6e970b 100644
--- a/fieldservice_substatus/readme/CONTRIBUTORS.rst
+++ b/fieldservice_substatus/readme/CONTRIBUTORS.rst
@@ -1,3 +1,4 @@
 * Brian McMaster <brian@mcmpest.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
+* Freni Patel <fpatel@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_substatus/readme/DESCRIPTION.rst b/fieldservice_substatus/readme/DESCRIPTION.rst
index f0e674b25f..78f42a938e 100644
--- a/fieldservice_substatus/readme/DESCRIPTION.rst
+++ b/fieldservice_substatus/readme/DESCRIPTION.rst
@@ -3,7 +3,7 @@ and/or missing at the different stages of the FSM order process. Some
 organizations needs a way to track documentation, materials, signature
 and various activities.
 
-This module allows you to have a list of sub-statuses and set them as default 
+This module allows you to have a list of sub-statuses and set them as default
 or potential sub-statuses on each FSM stage. The stage configuration will drive:
 
 * the sub-status set when entering a stage
diff --git a/fieldservice_substatus/static/description/index.html b/fieldservice_substatus/static/description/index.html
index fcbd827ffb..2f7b8cfc07 100644
--- a/fieldservice_substatus/static/description/index.html
+++ b/fieldservice_substatus/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 - Sub-Status</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Sub-Status</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_substatus"><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_substatus"><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><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_substatus"><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_substatus"><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>Odoo and the Field Service App do not provide a way to track what is required
 and/or missing at the different stages of the FSM order process. Some
 organizations needs a way to track documentation, materials, signature
@@ -436,7 +436,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_substatus%0Aversion:%2012.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_substatus%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">
@@ -453,6 +453,7 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.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>Freni Patel &lt;<a class="reference external" href="mailto:fpatel&#64;opensourceintegrators.com">fpatel&#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>
@@ -472,7 +473,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/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> <a class="reference external" href="https://github.com/bodedra"><img alt="bodedra" src="https://github.com/bodedra.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_substatus">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/14.0/fieldservice_substatus">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_substatus/tests/__init__.py b/fieldservice_substatus/tests/__init__.py
new file mode 100644
index 0000000000..25151acf0e
--- /dev/null
+++ b/fieldservice_substatus/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+
+from . import test_fsm_substatus
diff --git a/fieldservice_substatus/tests/test_fsm_substatus.py b/fieldservice_substatus/tests/test_fsm_substatus.py
new file mode 100644
index 0000000000..dc9a28c4af
--- /dev/null
+++ b/fieldservice_substatus/tests/test_fsm_substatus.py
@@ -0,0 +1,57 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
+from datetime import timedelta
+
+from odoo import fields
+from odoo.tests.common import TransactionCase
+
+
+class FSMSubstatusCase(TransactionCase):
+    def setUp(self):
+        super(FSMSubstatusCase, self).setUp()
+        self.WorkOrder = self.env["fsm.order"]
+        self.stage_id = self.WorkOrder._default_stage_id()
+        self.init_values = {"sub_stage_id": self.stage_id.sub_stage_id.id}
+        self.StageStatus = self.env["fsm.stage.status"]
+        # create a Res Partner to be converted to FSM Location/Person
+        self.test_loc_partner = self.env["res.partner"].create(
+            {"name": "Test Loc Partner", "phone": "ABC", "email": "tlp@email.com"}
+        )
+        # create expected FSM Location to compare to converted FSM Location
+        self.test_location = self.env["fsm.location"].create(
+            {
+                "name": "Test Location",
+                "phone": "123",
+                "email": "tp@email.com",
+                "partner_id": self.test_loc_partner.id,
+                "owner_id": self.test_loc_partner.id,
+            }
+        )
+        self.stage = self.env["fsm.stage"].create(
+            {
+                "name": "Stage 1",
+                "sequence": 2,
+                "stage_type": "order",
+                "sub_stage_id": self.stage_id.sub_stage_id.id,
+            }
+        )
+
+    def test_fsm_orders(self):
+        """Test creating new workorders, and test following functions."""
+        # Create an Orders
+        hours_diff = 100
+        date_start = fields.Datetime.today()
+        order = self.WorkOrder.create(
+            {
+                "location_id": self.test_location.id,
+                "date_start": date_start,
+                "date_end": date_start + timedelta(hours=hours_diff),
+                "request_early": fields.Datetime.today(),
+            }
+        )
+        order._track_subtype(self.init_values)
+        self.stage.onchange_sub_stage_id()
+        stage_status_id = self.StageStatus.with_context(
+            fsm_order_stage_id=self.stage_id.id
+        ).create({"name": "Test"})
+        stage_status_id.search([])
diff --git a/fieldservice_substatus/views/fsm_order.xml b/fieldservice_substatus/views/fsm_order.xml
index f2dd9f4066..7355f481fc 100644
--- a/fieldservice_substatus/views/fsm_order.xml
+++ b/fieldservice_substatus/views/fsm_order.xml
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <!-- Fieldservice Order Form View-->
     <record id="fsm_sub_stage_order_form_view" model="ir.ui.view">
         <field name="name">fsm.sub.stage.order.form</field>
         <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">
             <field name="tag_ids" position="after">
-                <field name="sub_stage_id"
-                       context="{'fsm_order_stage_id': stage_id}"
-                       options="{'no_create': True}"/>
+                <field
+                    name="sub_stage_id"
+                    context="{'fsm_order_stage_id': stage_id}"
+                    options="{'no_create': True}"
+                />
             </field>
         </field>
     </record>
diff --git a/fieldservice_substatus/views/fsm_stage.xml b/fieldservice_substatus/views/fsm_stage.xml
index b6661851b6..492c1eec46 100644
--- a/fieldservice_substatus/views/fsm_stage.xml
+++ b/fieldservice_substatus/views/fsm_stage.xml
@@ -1,15 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <!-- Fieldservice Stage Form View-->
     <record id="fsm_sub_stage_form_view" model="ir.ui.view">
         <field name="name">fsm.sub.stage.form</field>
         <field name="model">fsm.stage</field>
-        <field name="inherit_id" ref="fieldservice.fsm_stage_form_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_stage_form_view" />
         <field name="arch" type="xml">
             <field name="sequence" position="after">
-                <field name="sub_stage_id" required="1" attrs="{'invisible':[('stage_type', '!=', 'order')]}"/>
-                <field name="sub_stage_ids" widget="many2many_tags" attrs="{'invisible':[('stage_type', '!=', 'order')]}"/>
+                <field
+                    name="sub_stage_id"
+                    required="1"
+                    attrs="{'invisible':[('stage_type', '!=', 'order')]}"
+                />
+                <field
+                    name="sub_stage_ids"
+                    widget="many2many_tags"
+                    attrs="{'invisible':[('stage_type', '!=', 'order')]}"
+                />
             </field>
         </field>
     </record>
diff --git a/fieldservice_substatus/views/fsm_stage_status.xml b/fieldservice_substatus/views/fsm_stage_status.xml
index bed9cafe76..9e1e4e8b5a 100644
--- a/fieldservice_substatus/views/fsm_stage_status.xml
+++ b/fieldservice_substatus/views/fsm_stage_status.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <!-- Field Service Stage Status -->
@@ -7,7 +7,7 @@
         <field name="model">fsm.stage.status</field>
         <field name="arch" type="xml">
             <tree string="substatus">
-                <field name="name"/>
+                <field name="name" />
             </tree>
         </field>
     </record>
@@ -20,7 +20,7 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="name"/>
+                            <field name="name" />
                         </group>
                         <group>
                         </group>
@@ -33,8 +33,7 @@
     <record id="action_fsm_stage_status" model="ir.actions.act_window">
         <field name="name">Order Sub-Status</field>
         <field name="res_model">fsm.stage.status</field>
-        <field name="view_id" ref="fsm_stage_status_tree_view"/>
-        <field name="view_type">form</field>
+        <field name="view_id" ref="fsm_stage_status_tree_view" />
         <field name="view_mode">tree,form</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -43,10 +42,12 @@
         </field>
     </record>
 
-    <menuitem id="menu_fsm_stage_status"
-              name="Sub-Status"
-              action="action_fsm_stage_status"
-              parent="fieldservice.menu_fsm_config_order"
-              sequence="21"/>
+    <menuitem
+        id="menu_fsm_stage_status"
+        name="Sub-Status"
+        action="action_fsm_stage_status"
+        parent="fieldservice.menu_fsm_config_order"
+        sequence="21"
+    />
 
 </odoo>

From c041188c7edacde337619c00f1016296b6d234a9 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 27 Jul 2021 18:58:25 +0000
Subject: [PATCH 504/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 16393ee0b0..f72d8b7498 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ addon | version | summary
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills
 [fieldservice_stage_server_action](fieldservice_stage_server_action/) | 14.0.1.0.0 | Execute server actions when reaching a Field Service stage
 [fieldservice_stock](fieldservice_stock/) | 14.0.1.0.0 | Integrate the logistics operations with Field Service
+[fieldservice_substatus](fieldservice_substatus/) | 14.0.1.0.0 | Add sub-statuses to Field Service orders
 [fieldservice_timeline](fieldservice_timeline/) | 14.0.1.1.1 | This module is a display timeline view of the Field Service order in Odoo.
 
 [//]: # (end addons)

From ec75f2ac556c3dde8d727b83f5d046139853826a Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 27 Jul 2021 18:58:28 +0000
Subject: [PATCH 505/631] [UPD] README.rst

---
 fieldservice_substatus/README.rst                    | 2 +-
 fieldservice_substatus/static/description/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_substatus/README.rst b/fieldservice_substatus/README.rst
index 2abc9ea124..415748119c 100644
--- a/fieldservice_substatus/README.rst
+++ b/fieldservice_substatus/README.rst
@@ -30,7 +30,7 @@ and/or missing at the different stages of the FSM order process. Some
 organizations needs a way to track documentation, materials, signature
 and various activities.
 
-This module allows you to have a list of sub-statuses and set them as default 
+This module allows you to have a list of sub-statuses and set them as default
 or potential sub-statuses on each FSM stage. The stage configuration will drive:
 
 * the sub-status set when entering a stage
diff --git a/fieldservice_substatus/static/description/index.html b/fieldservice_substatus/static/description/index.html
index 2f7b8cfc07..ca59c59554 100644
--- a/fieldservice_substatus/static/description/index.html
+++ b/fieldservice_substatus/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: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Field Service - Sub-Status</title>
 <style type="text/css">
 

From 8fdea3a2e430e7cb658a2dd608c40d57b626d6f7 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 27 Jul 2021 18:58:28 +0000
Subject: [PATCH 506/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 4bd843cce2..882b0b7bb2 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210726.0
\ No newline at end of file
+14.0.20210727.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index c3de1d6b89..81307b5f34 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -28,6 +28,7 @@
         'odoo14-addon-fieldservice_skill',
         'odoo14-addon-fieldservice_stage_server_action',
         'odoo14-addon-fieldservice_stock',
+        'odoo14-addon-fieldservice_substatus',
         'odoo14-addon-fieldservice_timeline',
     ],
     classifiers=[

From c286de0a4aac2d8742784a5c98b895fb7f871bb4 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 27 Jul 2021 18:58:51 +0000
Subject: [PATCH 507/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f72d8b7498..89c35551c6 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ addon | version | summary
 [fieldservice](fieldservice/) | 14.0.1.2.0 | Manage Field Service Locations, Workers and Orders
 [fieldservice_account](fieldservice_account/) | 14.0.1.0.0 | Track invoices linked to Field Service orders
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
+[fieldservice_account_payment](fieldservice_account_payment/) | 14.0.1.0.0 | Allow workers to collect payments from the order.
 [fieldservice_activity](fieldservice_activity/) | 14.0.1.0.0 | Field Service Activities are a set of actions that need to be performed on a service order
 [fieldservice_agreement](fieldservice_agreement/) | 14.0.1.0.0 | Manage Field Service agreements and contracts
 [fieldservice_calendar](fieldservice_calendar/) | 14.0.1.0.0 | Add calendar to FSM Orders

From 5b4b6601f13907ed0811ef633ac103c7df9d561f Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 27 Jul 2021 18:58:54 +0000
Subject: [PATCH 508/631] [UPD] README.rst

---
 fieldservice_account_payment/README.rst                | 10 +++++-----
 .../static/description/index.html                      |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fieldservice_account_payment/README.rst b/fieldservice_account_payment/README.rst
index e1550c1e0a..47ca9a7650 100644
--- a/fieldservice_account_payment/README.rst
+++ b/fieldservice_account_payment/README.rst
@@ -14,13 +14,13 @@ Field Service - Accounting Payment
     :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_account_payment
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_account_payment
     :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_account_payment
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_account_payment
     :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| 
@@ -60,7 +60,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_account_payment%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_account_payment%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.
 
@@ -107,6 +107,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_account_payment>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_account_payment>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_account_payment/static/description/index.html b/fieldservice_account_payment/static/description/index.html
index 45e4173e86..0ccf320cf7 100644
--- a/fieldservice_account_payment/static/description/index.html
+++ b/fieldservice_account_payment/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Accounting Payment</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="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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_account_payment"><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_account_payment"><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><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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_account_payment"><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_account_payment"><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>This module allows the worker to accept payments during his work at the location.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -410,7 +410,7 @@ <h1><a class="toc-backref" href="#id4">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_account_payment%0Aversion:%2012.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_account_payment%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">
@@ -445,7 +445,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">maintainer</a>:</p>
 <p><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_account_payment">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/14.0/fieldservice_account_payment">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 650633888ab471adaed25652aa3c7caa573a572a Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 27 Jul 2021 18:58:54 +0000
Subject: [PATCH 509/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 882b0b7bb2..9fe02c6306 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210727.0
\ No newline at end of file
+14.0.20210727.1
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 81307b5f34..e9fcc67360 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -12,6 +12,7 @@
         'odoo14-addon-fieldservice',
         'odoo14-addon-fieldservice_account',
         'odoo14-addon-fieldservice_account_analytic',
+        'odoo14-addon-fieldservice_account_payment',
         'odoo14-addon-fieldservice_activity',
         'odoo14-addon-fieldservice_agreement',
         'odoo14-addon-fieldservice_calendar',

From 11a5ea21c1552960d654d4c15009fb4248827a56 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Tue, 27 Jul 2021 19:37:44 +0000
Subject: [PATCH 510/631] [UPD] Update fieldservice_account.pot

---
 fieldservice_account/i18n/fieldservice_account.pot | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fieldservice_account/i18n/fieldservice_account.pot b/fieldservice_account/i18n/fieldservice_account.pot
index 24afefcd95..f3c15cf288 100644
--- a/fieldservice_account/i18n/fieldservice_account.pot
+++ b/fieldservice_account/i18n/fieldservice_account.pot
@@ -19,11 +19,16 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_count
+msgid "FSM Order Count"
+msgstr ""
+
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__fsm_order_ids
-#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_count
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.account_invoice_form
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.invoice_search_view_fso
 msgid "FSM Orders"
@@ -42,7 +47,6 @@ msgstr ""
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_ids
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_ids
-#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_ids
 msgid "Field Service orders associated to this invoice"
 msgstr ""
 

From 216b9b444d0f0a1e0ddc3f1812fd0b814982c17c Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Tue, 27 Jul 2021 19:37:46 +0000
Subject: [PATCH 511/631] [UPD] Update fieldservice_account_payment.pot

---
 .../i18n/fieldservice_account_payment.pot     | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/fieldservice_account_payment/i18n/fieldservice_account_payment.pot b/fieldservice_account_payment/i18n/fieldservice_account_payment.pot
index 17bf072682..6da2e8477b 100644
--- a/fieldservice_account_payment/i18n/fieldservice_account_payment.pot
+++ b/fieldservice_account_payment/i18n/fieldservice_account_payment.pot
@@ -1,18 +1,23 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_account_payment
+# 	* fieldservice_account_payment
 #
 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"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_account_payment
 #: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__fsm_order_count
 msgid "FSM Order Count"
@@ -29,6 +34,23 @@ msgstr ""
 msgid "Field Service Order"
 msgstr ""
 
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment__id
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_account_payment____last_update
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_account_payment
+#: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_account_payment
 #: model:ir.model.fields,field_description:fieldservice_account_payment.field_fsm_order__payment_count
 msgid "Payment Count"
@@ -40,4 +62,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_payment.view_fsm_order_form_inherit_acct_payment
 msgid "Payments"
 msgstr ""
-

From ccf86e7a94a817911a6e77b898e8545ce3fa6a38 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Tue, 27 Jul 2021 19:38:00 +0000
Subject: [PATCH 512/631] [UPD] Update fieldservice_substatus.pot

---
 .../i18n/fieldservice_substatus.pot             | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/fieldservice_substatus/i18n/fieldservice_substatus.pot b/fieldservice_substatus/i18n/fieldservice_substatus.pot
index 29e9cc07db..5f54be48e4 100644
--- a/fieldservice_substatus/i18n/fieldservice_substatus.pot
+++ b/fieldservice_substatus/i18n/fieldservice_substatus.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_substatus
+# 	* fieldservice_substatus
 #
 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"
@@ -34,6 +34,7 @@ msgid "Default Sub-Status"
 msgstr ""
 
 #. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__display_name
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__display_name
 msgid "Display Name"
 msgstr ""
@@ -49,11 +50,15 @@ msgid "Field Service Stage"
 msgstr ""
 
 #. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage__id
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status__id
 msgid "ID"
 msgstr ""
 
 #. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage____last_update
 #: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_stage_status____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -73,6 +78,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: fieldservice_substatus
+#: model:ir.model.fields,field_description:fieldservice_substatus.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_substatus
 #: model:ir.actions.act_window,name:fieldservice_substatus.action_fsm_stage_status
 #: model:ir.model,name:fieldservice_substatus.model_fsm_stage_status
@@ -101,4 +111,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice_substatus.fsm_stage_status_tree_view
 msgid "substatus"
 msgstr ""
-

From 6979f7f858ce793f55e3a068303ecf97e487b741 Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Tue, 27 Jul 2021 19:55:52 +0000
Subject: [PATCH 513/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-14.0/field-service-14.0-fieldservice_account
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_account/
---
 fieldservice_account/i18n/de.po    | 41 +++++++++++++++++++++++-----
 fieldservice_account/i18n/es.po    | 38 +++++++++++++++++++++++---
 fieldservice_account/i18n/es_CL.po | 38 +++++++++++++++++++++++---
 fieldservice_account/i18n/it.po    | 35 +++++++++++++++++++++++-
 fieldservice_account/i18n/pt_BR.po | 43 ++++++++++++++++++++++++++----
 fieldservice_account/i18n/tr.po    |  8 ++++--
 6 files changed, 181 insertions(+), 22 deletions(-)

diff --git a/fieldservice_account/i18n/de.po b/fieldservice_account/i18n/de.po
index 7488b8358b..98537fa4a5 100644
--- a/fieldservice_account/i18n/de.po
+++ b/fieldservice_account/i18n/de.po
@@ -17,8 +17,22 @@ msgstr ""
 "X-Generator: Weblate 3.8\n"
 
 #. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__display_name
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_count
+#, fuzzy
+msgid "FSM Order Count"
+msgstr "Field-Service-Auftrag"
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__fsm_order_ids
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.account_invoice_form
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.invoice_search_view_fso
 #, fuzzy
@@ -37,10 +51,18 @@ msgid "Field Service Orders"
 msgstr "Field-Service-Auftrag"
 
 #. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_ids
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_ids
 msgid "Field Service orders associated to this invoice"
 msgstr ""
 
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__id
+msgid "ID"
+msgstr ""
+
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__invoice_count
 msgid "Invoice Count"
@@ -63,7 +85,7 @@ msgstr ""
 
 #. module: fieldservice_account
 #: model:ir.model,name:fieldservice_account.model_account_move
-msgid "Journal Entries"
+msgid "Journal Entry"
 msgstr ""
 
 #. module: fieldservice_account
@@ -71,12 +93,19 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
-#~ msgid "FSM Order"
-#~ msgstr "Field-Service-Auftrag"
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order____last_update
+msgid "Last Modified on"
+msgstr ""
 
-#, fuzzy
-#~| msgid "FSM Order"
-#~ msgid "FSM Order Count"
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
+#~ msgid "FSM Order"
 #~ msgstr "Field-Service-Auftrag"
 
 #~ msgid "Analytic Account"
diff --git a/fieldservice_account/i18n/es.po b/fieldservice_account/i18n/es.po
index ca07ffce3b..8ba176da45 100644
--- a/fieldservice_account/i18n/es.po
+++ b/fieldservice_account/i18n/es.po
@@ -17,8 +17,21 @@ msgstr ""
 "X-Generator: Weblate 3.10\n"
 
 #. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__display_name
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_count
+msgid "FSM Order Count"
+msgstr "Cuenta Orden FSM"
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__fsm_order_ids
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.account_invoice_form
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.invoice_search_view_fso
 msgid "FSM Orders"
@@ -35,10 +48,18 @@ msgid "Field Service Orders"
 msgstr "Pedidos de Servicio de Campo"
 
 #. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_ids
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_ids
 msgid "Field Service orders associated to this invoice"
 msgstr ""
 
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__id
+msgid "ID"
+msgstr ""
+
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__invoice_count
 msgid "Invoice Count"
@@ -61,7 +82,7 @@ msgstr "Facturas"
 
 #. module: fieldservice_account
 #: model:ir.model,name:fieldservice_account.model_account_move
-msgid "Journal Entries"
+msgid "Journal Entry"
 msgstr ""
 
 #. module: fieldservice_account
@@ -69,12 +90,21 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #~ msgid "FSM Order"
 #~ msgstr "Orden FSM"
 
-#~ msgid "FSM Order Count"
-#~ msgstr "Cuenta Orden FSM"
-
 #~ msgid "Invoice"
 #~ msgstr "Factura"
 
diff --git a/fieldservice_account/i18n/es_CL.po b/fieldservice_account/i18n/es_CL.po
index cdb2aa440c..6b45d8c266 100644
--- a/fieldservice_account/i18n/es_CL.po
+++ b/fieldservice_account/i18n/es_CL.po
@@ -17,8 +17,21 @@ msgstr ""
 "X-Generator: Weblate 3.10\n"
 
 #. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__display_name
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_count
+msgid "FSM Order Count"
+msgstr "Cuenta Pedidos FSM"
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__fsm_order_ids
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.account_invoice_form
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.invoice_search_view_fso
 msgid "FSM Orders"
@@ -35,10 +48,18 @@ msgid "Field Service Orders"
 msgstr "Pedidos de Servicio de Campo"
 
 #. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_ids
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_ids
 msgid "Field Service orders associated to this invoice"
 msgstr ""
 
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__id
+msgid "ID"
+msgstr ""
+
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__invoice_count
 msgid "Invoice Count"
@@ -61,7 +82,7 @@ msgstr "Facturas/Boletas"
 
 #. module: fieldservice_account
 #: model:ir.model,name:fieldservice_account.model_account_move
-msgid "Journal Entries"
+msgid "Journal Entry"
 msgstr ""
 
 #. module: fieldservice_account
@@ -69,12 +90,21 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #~ msgid "FSM Order"
 #~ msgstr "Pedido FSM"
 
-#~ msgid "FSM Order Count"
-#~ msgstr "Cuenta Pedidos FSM"
-
 #~ msgid "Invoice"
 #~ msgstr "Factura"
 
diff --git a/fieldservice_account/i18n/it.po b/fieldservice_account/i18n/it.po
index a2515250d4..0c24aa131a 100644
--- a/fieldservice_account/i18n/it.po
+++ b/fieldservice_account/i18n/it.po
@@ -17,8 +17,21 @@ msgstr ""
 "X-Generator: Weblate 3.10\n"
 
 #. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__display_name
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_count
+msgid "FSM Order Count"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__fsm_order_ids
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.account_invoice_form
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.invoice_search_view_fso
 msgid "FSM Orders"
@@ -35,10 +48,18 @@ msgid "Field Service Orders"
 msgstr ""
 
 #. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_ids
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_ids
 msgid "Field Service orders associated to this invoice"
 msgstr ""
 
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__id
+msgid "ID"
+msgstr ""
+
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__invoice_count
 msgid "Invoice Count"
@@ -61,7 +82,7 @@ msgstr "Fatture"
 
 #. module: fieldservice_account
 #: model:ir.model,name:fieldservice_account.model_account_move
-msgid "Journal Entries"
+msgid "Journal Entry"
 msgstr ""
 
 #. module: fieldservice_account
@@ -69,6 +90,18 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #~ msgid "Invoice"
 #~ msgstr "Fattura"
 
diff --git a/fieldservice_account/i18n/pt_BR.po b/fieldservice_account/i18n/pt_BR.po
index 24f169a52c..958ef7a6f5 100644
--- a/fieldservice_account/i18n/pt_BR.po
+++ b/fieldservice_account/i18n/pt_BR.po
@@ -17,8 +17,21 @@ msgstr ""
 "X-Generator: Weblate 4.3.2\n"
 
 #. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__display_name
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_count
+msgid "FSM Order Count"
+msgstr "Contagem de Ordens do FSM (Field Service Management)"
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__fsm_order_ids
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.account_invoice_form
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.invoice_search_view_fso
 msgid "FSM Orders"
@@ -35,10 +48,18 @@ msgid "Field Service Orders"
 msgstr "Ordens de Serviço de Campo"
 
 #. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_ids
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_ids
 msgid "Field Service orders associated to this invoice"
 msgstr "Ordens de Serviço de Campo associadas a esta fatura"
 
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__id
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__id
+msgid "ID"
+msgstr ""
+
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__invoice_count
 msgid "Invoice Count"
@@ -61,20 +82,32 @@ msgstr "Faturas/Contas"
 
 #. module: fieldservice_account
 #: model:ir.model,name:fieldservice_account.model_account_move
-msgid "Journal Entries"
-msgstr "Lançamentos de Diário"
+msgid "Journal Entry"
+msgstr ""
 
 #. module: fieldservice_account
 #: model:ir.model,name:fieldservice_account.model_account_move_line
 msgid "Journal Item"
 msgstr "Item de Diário"
 
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line____last_update
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
+#~ msgid "Journal Entries"
+#~ msgstr "Lançamentos de Diário"
+
 #~ msgid "FSM Order"
 #~ msgstr "Ordem FSM (Field Service Management)"
 
-#~ msgid "FSM Order Count"
-#~ msgstr "Contagem de Ordens do FSM (Field Service Management)"
-
 #~ msgid "Invoice"
 #~ msgstr "Fatura"
 
diff --git a/fieldservice_account/i18n/tr.po b/fieldservice_account/i18n/tr.po
index 62093a1cbf..3a6c87b6a5 100644
--- a/fieldservice_account/i18n/tr.po
+++ b/fieldservice_account/i18n/tr.po
@@ -22,11 +22,16 @@ msgstr ""
 msgid "Display Name"
 msgstr "Görünüm Adı"
 
+#. module: fieldservice_account
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_count
+msgid "FSM Order Count"
+msgstr ""
+
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_count
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move_line__fsm_order_ids
-#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_count
+#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_ids
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.account_invoice_form
 #: model_terms:ir.ui.view,arch_db:fieldservice_account.invoice_search_view_fso
 msgid "FSM Orders"
@@ -45,7 +50,6 @@ msgstr "Saha Servis Siparişleri"
 #. module: fieldservice_account
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_bank_statement_line__fsm_order_ids
 #: model:ir.model.fields,field_description:fieldservice_account.field_account_move__fsm_order_ids
-#: model:ir.model.fields,field_description:fieldservice_account.field_account_payment__fsm_order_ids
 msgid "Field Service orders associated to this invoice"
 msgstr "Bu faturayla ilişkili Saha Servisi siparişleri"
 

From 97b99e515877bc2b4cc97a63860b3b2c7d01883f Mon Sep 17 00:00:00 2001
From: Sandip Mangukiya <smangukiya@ursainfosystems.com>
Date: Fri, 23 Jul 2021 08:24:32 -0700
Subject: [PATCH 514/631] Update fieldservice/models/res_config_settings.py

---
 fieldservice/models/res_config_settings.py | 1 -
 fieldservice/tests/test_fsm_order.py       | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/fieldservice/models/res_config_settings.py b/fieldservice/models/res_config_settings.py
index 424811644b..6149980c6e 100644
--- a/fieldservice/models/res_config_settings.py
+++ b/fieldservice/models/res_config_settings.py
@@ -103,7 +103,6 @@ def _onchange_module_fieldservice_repair(self):
     def _onchange_module_fieldservice_stock(self):
         if self.module_fieldservice_stock:
             self.group_stock_production_lot = True
-            # self.group_stock_request_order = True
 
     @api.onchange("module_fieldservice_purchase")
     def _onchange_module_fieldservice_purchase(self):
diff --git a/fieldservice/tests/test_fsm_order.py b/fieldservice/tests/test_fsm_order.py
index d077e5bc8c..7c4d6117f8 100644
--- a/fieldservice/tests/test_fsm_order.py
+++ b/fieldservice/tests/test_fsm_order.py
@@ -29,6 +29,8 @@ def test_fsm_order(self):
             f.date_end = f.date_start + timedelta(hours=hours_diff)
             f.request_early = fields.Datetime.today()
         order = f.save()
+        order._get_stage_color()
+        self.assertEqual(order.custom_color, order.stage_id.custom_color)
         # Test _compute_duration
         self.assertEqual(order.duration, hours_diff)
         # Test _compute_request_late()

From 9bbdb400366b68ce49565db89a56479f8d4342af Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 27 Jul 2021 22:29:26 +0000
Subject: [PATCH 515/631] fieldservice 14.0.1.3.0

---
 fieldservice/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice/__manifest__.py b/fieldservice/__manifest__.py
index 92e31859ca..b82dda0baf 100644
--- a/fieldservice/__manifest__.py
+++ b/fieldservice/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Field Service",
     "summary": "Manage Field Service Locations, Workers and Orders",
-    "version": "14.0.1.2.0",
+    "version": "14.0.1.3.0",
     "license": "AGPL-3",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",

From 5b2262df25b31e927cadecae9e34dd670865647b Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 27 Jul 2021 22:29:33 +0000
Subject: [PATCH 516/631] [UPD] addons table in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 89c35551c6..25f7d22b43 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Available addons
 addon | version | summary
 --- | --- | ---
 [base_territory](base_territory/) | 14.0.1.0.0 | This module allows you to define territories, branches, districts and regions to be used for Field Service operations or Sales.
-[fieldservice](fieldservice/) | 14.0.1.2.0 | Manage Field Service Locations, Workers and Orders
+[fieldservice](fieldservice/) | 14.0.1.3.0 | Manage Field Service Locations, Workers and Orders
 [fieldservice_account](fieldservice_account/) | 14.0.1.0.0 | Track invoices linked to Field Service orders
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
 [fieldservice_account_payment](fieldservice_account_payment/) | 14.0.1.0.0 | Allow workers to collect payments from the order.

From 44ae4107964570af0986c3378dcb1121ab6f9816 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Wed, 20 Nov 2019 15:24:04 -0500
Subject: [PATCH 517/631] [ADD] fieldservice_sale_stock

---
 fieldservice_sale_stock/README.rst            | 141 +++++
 fieldservice_sale_stock/__init__.py           |   4 +
 fieldservice_sale_stock/__manifest__.py       |  23 +
 fieldservice_sale_stock/models/__init__.py    |   6 +
 fieldservice_sale_stock/models/sale_order.py  |  25 +
 fieldservice_sale_stock/readme/CONFIGURE.rst  |   7 +
 .../readme/CONTRIBUTORS.rst                   |   1 +
 .../readme/DESCRIPTION.rst                    |   2 +
 fieldservice_sale_stock/readme/INSTALL.rst    |   4 +
 fieldservice_sale_stock/readme/ROADMAP.rst    |   2 +
 fieldservice_sale_stock/readme/USAGE.rst      |   8 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 480 ++++++++++++++++++
 13 files changed, 703 insertions(+)
 create mode 100644 fieldservice_sale_stock/README.rst
 create mode 100644 fieldservice_sale_stock/__init__.py
 create mode 100644 fieldservice_sale_stock/__manifest__.py
 create mode 100644 fieldservice_sale_stock/models/__init__.py
 create mode 100644 fieldservice_sale_stock/models/sale_order.py
 create mode 100644 fieldservice_sale_stock/readme/CONFIGURE.rst
 create mode 100644 fieldservice_sale_stock/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_sale_stock/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_sale_stock/readme/INSTALL.rst
 create mode 100644 fieldservice_sale_stock/readme/ROADMAP.rst
 create mode 100644 fieldservice_sale_stock/readme/USAGE.rst
 create mode 100644 fieldservice_sale_stock/static/description/icon.png
 create mode 100644 fieldservice_sale_stock/static/description/index.html

diff --git a/fieldservice_sale_stock/README.rst b/fieldservice_sale_stock/README.rst
new file mode 100644
index 0000000000..9bf6f8719e
--- /dev/null
+++ b/fieldservice_sale_stock/README.rst
@@ -0,0 +1,141 @@
+=====================
+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/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-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/12.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+The module integrates the Field Service application with the Sales one and
+allows you to sell field service products.
+
+**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/12.0/base_geoengine
+
+Configuration
+=============
+
+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:
+
+* Go to Field Service > Master Data > Locations
+* Create or select a location
+* Go to the Sales tab and select the sales territory
+
+Usage
+=====
+
+* 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
+* 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
+======================
+
+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:%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+
+Contributors
+~~~~~~~~~~~~
+
+* 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>
+
+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
+.. |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-brian10048| 
+
+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_stock/__init__.py b/fieldservice_sale_stock/__init__.py
new file mode 100644
index 0000000000..c827f99758
--- /dev/null
+++ b/fieldservice_sale_stock/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2019 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_sale_stock/__manifest__.py b/fieldservice_sale_stock/__manifest__.py
new file mode 100644
index 0000000000..5286658789
--- /dev/null
+++ b/fieldservice_sale_stock/__manifest__.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2019 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - Sale Stock',
+    'version': '12.0.0.1.0',
+    'summary': 'Sell stockable items linked to field service orders.',
+    'category': 'Field Service',
+    'author': 'Brian McMaster, Odoo Community Association (OCA)',
+    'website': 'https://github.com/OCA/field-service',
+    'depends': [
+        'fieldservice_sale',
+        'fieldservice_stock',
+    ],
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'wolfhall',
+        'max3903',
+        'brian10048',
+    ],
+    'installable': True,
+}
diff --git a/fieldservice_sale_stock/models/__init__.py b/fieldservice_sale_stock/models/__init__.py
new file mode 100644
index 0000000000..e02b396f5b
--- /dev/null
+++ b/fieldservice_sale_stock/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2019 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import (
+    sale_order
+)
diff --git a/fieldservice_sale_stock/models/sale_order.py b/fieldservice_sale_stock/models/sale_order.py
new file mode 100644
index 0000000000..e91eefe162
--- /dev/null
+++ b/fieldservice_sale_stock/models/sale_order.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2019 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    @api.multi
+    def _link_pickings_to_fsm(self):
+        for order in self:
+            fsm_order = self.env['fsm.order'].search([
+                ('sale_id', '=', order.id)
+            ])
+            pickings = order.picking_ids
+            pickings.write({'fsm_order_id': fsm_order.id})
+
+    @api.multi
+    def action_confirm(self):
+        """ On SO confirmation, link the fsm order on the pickings
+            created by the sale order """
+        result = super().action_confirm()
+        self._link_pickings_to_fsm()
+        return result
diff --git a/fieldservice_sale_stock/readme/CONFIGURE.rst b/fieldservice_sale_stock/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..3efde2018d
--- /dev/null
+++ b/fieldservice_sale_stock/readme/CONFIGURE.rst
@@ -0,0 +1,7 @@
+Configure a storable 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 type to 'Storable'
+* Set the Service Policy to 'Per Sale Order'
diff --git a/fieldservice_sale_stock/readme/CONTRIBUTORS.rst b/fieldservice_sale_stock/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..39ef3fa3d7
--- /dev/null
+++ b/fieldservice_sale_stock/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_sale_stock/readme/DESCRIPTION.rst b/fieldservice_sale_stock/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..ccb347ff13
--- /dev/null
+++ b/fieldservice_sale_stock/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module links pickings created by a sale order to the field
+service order created by the sale order.
diff --git a/fieldservice_sale_stock/readme/INSTALL.rst b/fieldservice_sale_stock/readme/INSTALL.rst
new file mode 100644
index 0000000000..8571f65376
--- /dev/null
+++ b/fieldservice_sale_stock/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/12.0/base_geoengine
diff --git a/fieldservice_sale_stock/readme/ROADMAP.rst b/fieldservice_sale_stock/readme/ROADMAP.rst
new file mode 100644
index 0000000000..f607015959
--- /dev/null
+++ b/fieldservice_sale_stock/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_stock/readme/USAGE.rst b/fieldservice_sale_stock/readme/USAGE.rst
new file mode 100644
index 0000000000..7946d6b88d
--- /dev/null
+++ b/fieldservice_sale_stock/readme/USAGE.rst
@@ -0,0 +1,8 @@
+* 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
+* The pickings for storable products will get linked to the newly created
+  field service order
diff --git a/fieldservice_sale_stock/static/description/icon.png b/fieldservice_sale_stock/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_stock/static/description/index.html b/fieldservice_sale_stock/static/description/index.html
new file mode 100644
index 0000000000..ae8d6fe6d4
--- /dev/null
+++ b/fieldservice_sale_stock/static/description/index.html
@@ -0,0 +1,480 @@
+<?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">
+
+/*
+: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/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>
+<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>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>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>
+<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:%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>
+</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>

From 069981029af36fcff0b2b261f12aa65e88c969a0 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Fri, 6 Dec 2019 08:32:16 -0500
Subject: [PATCH 518/631] [IMP] fieldservice_sale_stock: Auto Install module

---
 fieldservice_sale_stock/__manifest__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fieldservice_sale_stock/__manifest__.py b/fieldservice_sale_stock/__manifest__.py
index 5286658789..22c39ca41c 100644
--- a/fieldservice_sale_stock/__manifest__.py
+++ b/fieldservice_sale_stock/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sale Stock',
-    'version': '12.0.0.1.0',
+    'version': '12.0.1.0.0',
     'summary': 'Sell stockable items linked to field service orders.',
     'category': 'Field Service',
     'author': 'Brian McMaster, Odoo Community Association (OCA)',
@@ -20,4 +20,5 @@
         'brian10048',
     ],
     'installable': True,
+    'auto_install': True,
 }

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

Consumable and Storable product types were not generating field services
---
 fieldservice_sale_stock/models/sale_order.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_sale_stock/models/sale_order.py b/fieldservice_sale_stock/models/sale_order.py
index e91eefe162..69420597c9 100644
--- a/fieldservice_sale_stock/models/sale_order.py
+++ b/fieldservice_sale_stock/models/sale_order.py
@@ -17,9 +17,9 @@ def _link_pickings_to_fsm(self):
             pickings.write({'fsm_order_id': fsm_order.id})
 
     @api.multi
-    def action_confirm(self):
+    def _action_confirm(self):
         """ On SO confirmation, link the fsm order on the pickings
             created by the sale order """
-        result = super().action_confirm()
+        result = super()._action_confirm()
         self._link_pickings_to_fsm()
         return result

From c9b46a6cf5170ba56642083c5e3a07221ae57731 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 10 Dec 2019 09:28:08 -0600
Subject: [PATCH 520/631] [FIX] fieldservice_sale_stock: Expecting one result

---
 fieldservice_sale_stock/README.rst            | 48 ++++++------------
 .../i18n/fieldservice_sale_stock.pot          | 20 ++++++++
 fieldservice_sale_stock/models/sale_order.py  |  5 +-
 .../static/description/index.html             | 49 ++++++-------------
 4 files changed, 55 insertions(+), 67 deletions(-)
 create mode 100644 fieldservice_sale_stock/i18n/fieldservice_sale_stock.pot

diff --git a/fieldservice_sale_stock/README.rst b/fieldservice_sale_stock/README.rst
index 9bf6f8719e..ef394251e2 100644
--- a/fieldservice_sale_stock/README.rst
+++ b/fieldservice_sale_stock/README.rst
@@ -1,6 +1,6 @@
-=====================
-Field Service - Sales
-=====================
+==========================
+Field Service - Sale Stock
+==========================
 
 .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
@@ -14,10 +14,10 @@ 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/12.0/fieldservice_sale_stock
     :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-12-0/field-service-12-0-fieldservice_sale_stock
     :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
@@ -25,8 +25,8 @@ 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.
+This module links pickings created by a sale order to the field
+service order created by the sale order.
 
 **Table of contents**
 
@@ -44,20 +44,13 @@ https://github.com/OCA/geospatial/tree/12.0/base_geoengine
 Configuration
 =============
 
-To setup a product for quoting and selling field service orders:
+Configure a storable 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
-* 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:
-
-* Go to Field Service > Master Data > Locations
-* Create or select a location
-* Go to the Sales tab and select the sales territory
+* Set the type to 'Storable'
+* Set the Service Policy to 'Per Sale Order'
 
 Usage
 =====
@@ -68,9 +61,8 @@ 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.
+* The pickings for storable products will get linked to the newly created
+  field service order
 
 Known issues / Roadmap
 ======================
@@ -84,7 +76,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_stock%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.
 
@@ -94,20 +86,12 @@ Credits
 Authors
 ~~~~~~~
 
-* Open Source Integrators
+* Brian McMaster
 
 Contributors
 ~~~~~~~~~~~~
 
-* 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>
 
 Maintainers
 ~~~~~~~~~~~
@@ -136,6 +120,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/12.0/fieldservice_sale_stock>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_sale_stock/i18n/fieldservice_sale_stock.pot b/fieldservice_sale_stock/i18n/fieldservice_sale_stock.pot
new file mode 100644
index 0000000000..92e47bb20e
--- /dev/null
+++ b/fieldservice_sale_stock/i18n/fieldservice_sale_stock.pot
@@ -0,0 +1,20 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_sale_stock
+#
+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_stock
+#: model:ir.model,name:fieldservice_sale_stock.model_sale_order
+msgid "Sale Order"
+msgstr ""
+
diff --git a/fieldservice_sale_stock/models/sale_order.py b/fieldservice_sale_stock/models/sale_order.py
index 69420597c9..a5ba38ee72 100644
--- a/fieldservice_sale_stock/models/sale_order.py
+++ b/fieldservice_sale_stock/models/sale_order.py
@@ -10,8 +10,11 @@ class SaleOrder(models.Model):
     @api.multi
     def _link_pickings_to_fsm(self):
         for order in self:
+            # TODO: We may want to split the picking to have one picking
+            #  per FSM order
             fsm_order = self.env['fsm.order'].search([
-                ('sale_id', '=', order.id)
+                ('sale_id', '=', order.id),
+                ('sale_line_id', '=', False),
             ])
             pickings = order.picking_ids
             pickings.write({'fsm_order_id': fsm_order.id})
diff --git a/fieldservice_sale_stock/static/description/index.html b/fieldservice_sale_stock/static/description/index.html
index ae8d6fe6d4..92a5f96904 100644
--- a/fieldservice_sale_stock/static/description/index.html
+++ b/fieldservice_sale_stock/static/description/index.html
@@ -4,7 +4,7 @@
 <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>
+<title>Field Service - Sale Stock</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,16 @@
 </style>
 </head>
 <body>
-<div class="document" id="field-service-sales">
-<h1 class="title">Field Service - Sales</h1>
+<div class="document" id="field-service-sale-stock">
+<h1 class="title">Field Service - Sale Stock</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 field service products.</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_stock"><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_stock"><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>This module links pickings created by a sale order to the field
+service order created by the sale order.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -394,20 +394,13 @@ <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>Configure a storable 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 Product Type to ‘Service’ under General Information tab</li>
-<li>Under Invoicing tab, set the Field Service Tracking option</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>
+<li>Set the type to ‘Storable’</li>
+<li>Set the Service Policy to ‘Per Sale Order’</li>
 </ul>
 </div>
 <div class="section" id="usage">
@@ -419,12 +412,8 @@ <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>
+<li>The pickings for storable products will get linked to the newly created
+field service order</li>
 </ul>
 </div>
 <div class="section" id="known-issues-roadmap">
@@ -437,7 +426,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:%2012.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_stock%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">
@@ -445,21 +434,13 @@ <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>
+<li>Brian McMaster</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>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -471,7 +452,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/12.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_stock">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 d74e3aaf5be186e991d8255c504382df62ca4b89 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 22 Dec 2019 10:55:20 -0600
Subject: [PATCH 521/631] [IMP] fieldservice_sale_stock

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

diff --git a/fieldservice_sale_stock/models/sale_order.py b/fieldservice_sale_stock/models/sale_order.py
index a5ba38ee72..eafbc6ea1a 100644
--- a/fieldservice_sale_stock/models/sale_order.py
+++ b/fieldservice_sale_stock/models/sale_order.py
@@ -17,7 +17,10 @@ def _link_pickings_to_fsm(self):
                 ('sale_line_id', '=', False),
             ])
             pickings = order.picking_ids
-            pickings.write({'fsm_order_id': fsm_order.id})
+            for picking in pickings:
+                picking.fsm_order_id = fsm_order.id
+                for move in picking.move_lines:
+                    move.fsm_order_id = move.sale_line_id.fsm_order_id.id
 
     @api.multi
     def _action_confirm(self):

From a5f97e5f9765c636c6a224a293efd30ef027a3f1 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 30 Dec 2019 15:48:53 +0000
Subject: [PATCH 522/631] fieldservice_sale_stock 12.0.1.0.1

---
 fieldservice_sale_stock/__manifest__.py |  2 +-
 fieldservice_sale_stock/i18n/es_CL.po   | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_sale_stock/i18n/es_CL.po

diff --git a/fieldservice_sale_stock/__manifest__.py b/fieldservice_sale_stock/__manifest__.py
index 22c39ca41c..f171d3d74d 100644
--- a/fieldservice_sale_stock/__manifest__.py
+++ b/fieldservice_sale_stock/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sale Stock',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.0.1',
     'summary': 'Sell stockable items linked to field service orders.',
     'category': 'Field Service',
     'author': 'Brian McMaster, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale_stock/i18n/es_CL.po b/fieldservice_sale_stock/i18n/es_CL.po
new file mode 100644
index 0000000000..2dbbf3dec4
--- /dev/null
+++ b/fieldservice_sale_stock/i18n/es_CL.po
@@ -0,0 +1,20 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_sale_stock
+#
+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: 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"
+
+#. module: fieldservice_sale_stock
+#: model:ir.model,name:fieldservice_sale_stock.model_sale_order
+msgid "Sale Order"
+msgstr ""

From 50f3b74ba9723cb73511f73cef50594c57ea7acd Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 9 Jan 2020 08:07:57 -0800
Subject: [PATCH 523/631] [IMP] fieldservice_sale_stock

---
 fieldservice_sale_stock/models/sale_order.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fieldservice_sale_stock/models/sale_order.py b/fieldservice_sale_stock/models/sale_order.py
index eafbc6ea1a..e664683d03 100644
--- a/fieldservice_sale_stock/models/sale_order.py
+++ b/fieldservice_sale_stock/models/sale_order.py
@@ -1,6 +1,5 @@
 # Copyright (C) 2019 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from odoo import api, models
 
 
@@ -26,6 +25,6 @@ def _link_pickings_to_fsm(self):
     def _action_confirm(self):
         """ On SO confirmation, link the fsm order on the pickings
             created by the sale order """
-        result = super()._action_confirm()
+        res = super()._action_confirm()
         self._link_pickings_to_fsm()
-        return result
+        return res

From c567e2b686d604de7e7efe978eff50e98cc662b5 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 14 Jan 2020 16:24:05 +0000
Subject: [PATCH 524/631] fieldservice_sale_stock 12.0.1.0.2

---
 fieldservice_sale_stock/__manifest__.py |  2 +-
 fieldservice_sale_stock/i18n/pt_BR.po   | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_sale_stock/i18n/pt_BR.po

diff --git a/fieldservice_sale_stock/__manifest__.py b/fieldservice_sale_stock/__manifest__.py
index f171d3d74d..b6a9ba9f69 100644
--- a/fieldservice_sale_stock/__manifest__.py
+++ b/fieldservice_sale_stock/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sale Stock',
-    'version': '12.0.1.0.1',
+    'version': '12.0.1.0.2',
     'summary': 'Sell stockable items linked to field service orders.',
     'category': 'Field Service',
     'author': 'Brian McMaster, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale_stock/i18n/pt_BR.po b/fieldservice_sale_stock/i18n/pt_BR.po
new file mode 100644
index 0000000000..d6d2f519f4
--- /dev/null
+++ b/fieldservice_sale_stock/i18n/pt_BR.po
@@ -0,0 +1,20 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_sale_stock
+#
+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_stock
+#: model:ir.model,name:fieldservice_sale_stock.model_sale_order
+msgid "Sale Order"
+msgstr ""

From 4be6237b96143ede45298acf5341d562f1b27080 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 16 Jan 2020 11:39:15 -0600
Subject: [PATCH 525/631] [ADD] Spanish (es) translation

---
 fieldservice_sale_stock/i18n/es.po | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 fieldservice_sale_stock/i18n/es.po

diff --git a/fieldservice_sale_stock/i18n/es.po b/fieldservice_sale_stock/i18n/es.po
new file mode 100644
index 0000000000..bdb017307a
--- /dev/null
+++ b/fieldservice_sale_stock/i18n/es.po
@@ -0,0 +1,20 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_sale_stock
+#
+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: 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"
+
+#. module: fieldservice_sale_stock
+#: model:ir.model,name:fieldservice_sale_stock.model_sale_order
+msgid "Sale Order"
+msgstr ""

From bb25d322be26de6057e3a00a91c772fa5a8f5a97 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 3 Feb 2020 11:15:06 -0600
Subject: [PATCH 526/631] [IMP] fieldservice_sale_stock

---
 fieldservice_sale_stock/i18n/pt_BR.po        |  6 ++++--
 fieldservice_sale_stock/models/sale_order.py | 22 +++++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/fieldservice_sale_stock/i18n/pt_BR.po b/fieldservice_sale_stock/i18n/pt_BR.po
index d6d2f519f4..d4f8cb16eb 100644
--- a/fieldservice_sale_stock/i18n/pt_BR.po
+++ b/fieldservice_sale_stock/i18n/pt_BR.po
@@ -6,15 +6,17 @@ 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 11: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_stock
 #: model:ir.model,name:fieldservice_sale_stock.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Ordem de Venda"
diff --git a/fieldservice_sale_stock/models/sale_order.py b/fieldservice_sale_stock/models/sale_order.py
index e664683d03..4becb92aab 100644
--- a/fieldservice_sale_stock/models/sale_order.py
+++ b/fieldservice_sale_stock/models/sale_order.py
@@ -6,20 +6,32 @@
 class SaleOrder(models.Model):
     _inherit = 'sale.order'
 
+    def prepare_fsm_values_for_stock_move(self, fsm_order):
+        return {
+            'fsm_order_id': fsm_order.id,
+        }
+
+    def prepare_fsm_values_for_stock_picking(self, fsm_order):
+        return {
+            'fsm_order_id': fsm_order.id,
+        }
+
     @api.multi
     def _link_pickings_to_fsm(self):
-        for order in self:
+        for rec in self:
             # TODO: We may want to split the picking to have one picking
             #  per FSM order
             fsm_order = self.env['fsm.order'].search([
-                ('sale_id', '=', order.id),
+                ('sale_id', '=', rec.id),
                 ('sale_line_id', '=', False),
             ])
-            pickings = order.picking_ids
+            pickings = rec.picking_ids
             for picking in pickings:
-                picking.fsm_order_id = fsm_order.id
+                picking.write(
+                    rec.prepare_fsm_values_for_stock_picking(fsm_order))
                 for move in picking.move_lines:
-                    move.fsm_order_id = move.sale_line_id.fsm_order_id.id
+                    move.write(
+                        rec.prepare_fsm_values_for_stock_move(fsm_order))
 
     @api.multi
     def _action_confirm(self):

From 7995e0fbd8fbf61084ef1b4e92bc3bb33beb6956 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sun, 9 Feb 2020 21:36:05 +0000
Subject: [PATCH 527/631] fieldservice_sale_stock 12.0.1.0.3

---
 fieldservice_sale_stock/__manifest__.py | 2 +-
 fieldservice_sale_stock/i18n/es.po      | 6 ++++--
 fieldservice_sale_stock/i18n/pt_BR.po   | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fieldservice_sale_stock/__manifest__.py b/fieldservice_sale_stock/__manifest__.py
index b6a9ba9f69..9ac646b4c5 100644
--- a/fieldservice_sale_stock/__manifest__.py
+++ b/fieldservice_sale_stock/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sale Stock',
-    'version': '12.0.1.0.2',
+    'version': '12.0.1.0.3',
     'summary': 'Sell stockable items linked to field service orders.',
     'category': 'Field Service',
     'author': 'Brian McMaster, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale_stock/i18n/es.po b/fieldservice_sale_stock/i18n/es.po
index bdb017307a..9d18630450 100644
--- a/fieldservice_sale_stock/i18n/es.po
+++ b/fieldservice_sale_stock/i18n/es.po
@@ -6,15 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\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\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_stock
 #: model:ir.model,name:fieldservice_sale_stock.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Pedidos de Venta"
diff --git a/fieldservice_sale_stock/i18n/pt_BR.po b/fieldservice_sale_stock/i18n/pt_BR.po
index d4f8cb16eb..05e1e13821 100644
--- a/fieldservice_sale_stock/i18n/pt_BR.po
+++ b/fieldservice_sale_stock/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 11: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,4 +19,4 @@ msgstr ""
 #. module: fieldservice_sale_stock
 #: model:ir.model,name:fieldservice_sale_stock.model_sale_order
 msgid "Sale Order"
-msgstr "Ordem de Venda"
+msgstr "Pedido de Venda"

From 0e1414e141fa488b82f49bb271bd644c3aa3c0b0 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 11 May 2020 23:05:47 -0500
Subject: [PATCH 528/631] [FIX] fieldservice_sale_stock: Set the FSM order on
 the procurement group

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

diff --git a/fieldservice_sale_stock/models/sale_order.py b/fieldservice_sale_stock/models/sale_order.py
index 4becb92aab..0ad2dd21c9 100644
--- a/fieldservice_sale_stock/models/sale_order.py
+++ b/fieldservice_sale_stock/models/sale_order.py
@@ -25,8 +25,8 @@ def _link_pickings_to_fsm(self):
                 ('sale_id', '=', rec.id),
                 ('sale_line_id', '=', False),
             ])
-            pickings = rec.picking_ids
-            for picking in pickings:
+            rec.procurement_group_id.fsm_order_id = fsm_order.id or False
+            for picking in rec.picking_ids:
                 picking.write(
                     rec.prepare_fsm_values_for_stock_picking(fsm_order))
                 for move in picking.move_lines:

From d922b09c8c173198730ae4d705183a1e36cf188b Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 19 May 2020 21:09:17 -0500
Subject: [PATCH 529/631] [FIX] fieldservice_sale_stock

---
 fieldservice_sale_stock/models/sale_order.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fieldservice_sale_stock/models/sale_order.py b/fieldservice_sale_stock/models/sale_order.py
index 0ad2dd21c9..4353f7c6c5 100644
--- a/fieldservice_sale_stock/models/sale_order.py
+++ b/fieldservice_sale_stock/models/sale_order.py
@@ -25,7 +25,8 @@ def _link_pickings_to_fsm(self):
                 ('sale_id', '=', rec.id),
                 ('sale_line_id', '=', False),
             ])
-            rec.procurement_group_id.fsm_order_id = fsm_order.id or False
+            if rec.procurement_group_id:
+                rec.procurement_group_id.fsm_order_id = fsm_order.id or False
             for picking in rec.picking_ids:
                 picking.write(
                     rec.prepare_fsm_values_for_stock_picking(fsm_order))

From fed64dfc4c542866e530b3a60f799c820929da22 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 20 May 2020 15:11:59 +0000
Subject: [PATCH 530/631] fieldservice_sale_stock 12.0.1.0.4

---
 fieldservice_sale_stock/__manifest__.py | 2 +-
 fieldservice_sale_stock/i18n/es.po      | 4 ++--
 fieldservice_sale_stock/i18n/es_CL.po   | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fieldservice_sale_stock/__manifest__.py b/fieldservice_sale_stock/__manifest__.py
index 9ac646b4c5..bdf32b4bcd 100644
--- a/fieldservice_sale_stock/__manifest__.py
+++ b/fieldservice_sale_stock/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Sale Stock',
-    'version': '12.0.1.0.3',
+    'version': '12.0.1.0.4',
     'summary': 'Sell stockable items linked to field service orders.',
     'category': 'Field Service',
     'author': 'Brian McMaster, Odoo Community Association (OCA)',
diff --git a/fieldservice_sale_stock/i18n/es.po b/fieldservice_sale_stock/i18n/es.po
index 9d18630450..d770f84b27 100644
--- a/fieldservice_sale_stock/i18n/es.po
+++ b/fieldservice_sale_stock/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: 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\n"
@@ -19,4 +19,4 @@ msgstr ""
 #. module: fieldservice_sale_stock
 #: model:ir.model,name:fieldservice_sale_stock.model_sale_order
 msgid "Sale Order"
-msgstr "Pedidos de Venta"
+msgstr "Pedido de Venta"
diff --git a/fieldservice_sale_stock/i18n/es_CL.po b/fieldservice_sale_stock/i18n/es_CL.po
index 2dbbf3dec4..a7d49c435b 100644
--- a/fieldservice_sale_stock/i18n/es_CL.po
+++ b/fieldservice_sale_stock/i18n/es_CL.po
@@ -6,15 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\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"
 "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_stock
 #: model:ir.model,name:fieldservice_sale_stock.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Nota de Venta"

From 68b6809cc31f702451787292030de51f68e788ad Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Mon, 19 Apr 2021 10:51:06 +0530
Subject: [PATCH 531/631] [FIX] Travis

---
 fieldservice_sale_stock/__manifest__.py       | 34 +++++++++----------
 fieldservice_sale_stock/models/__init__.py    |  4 +--
 fieldservice_sale_stock/models/sale_order.py  | 26 +++++++-------
 .../odoo/addons/fieldservice_sale_stock       |  1 +
 setup/fieldservice_sale_stock/setup.py        |  6 ++++
 5 files changed, 38 insertions(+), 33 deletions(-)
 create mode 120000 setup/fieldservice_sale_stock/odoo/addons/fieldservice_sale_stock
 create mode 100644 setup/fieldservice_sale_stock/setup.py

diff --git a/fieldservice_sale_stock/__manifest__.py b/fieldservice_sale_stock/__manifest__.py
index bdf32b4bcd..ffb310a536 100644
--- a/fieldservice_sale_stock/__manifest__.py
+++ b/fieldservice_sale_stock/__manifest__.py
@@ -2,23 +2,23 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - Sale Stock',
-    'version': '12.0.1.0.4',
-    'summary': 'Sell stockable items linked to field service orders.',
-    'category': 'Field Service',
-    'author': 'Brian McMaster, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice_sale',
-        'fieldservice_stock',
+    "name": "Field Service - Sale Stock",
+    "version": "14.0.1.0.0",
+    "summary": "Sell stockable items linked to field service orders.",
+    "category": "Field Service",
+    "author": "Brian McMaster, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": [
+        "fieldservice_sale",
+        "fieldservice_stock",
     ],
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'wolfhall',
-        'max3903',
-        'brian10048',
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": [
+        "wolfhall",
+        "max3903",
+        "brian10048",
     ],
-    'installable': True,
-    'auto_install': True,
+    "installable": True,
+    "auto_install": True,
 }
diff --git a/fieldservice_sale_stock/models/__init__.py b/fieldservice_sale_stock/models/__init__.py
index e02b396f5b..db960b74e1 100644
--- a/fieldservice_sale_stock/models/__init__.py
+++ b/fieldservice_sale_stock/models/__init__.py
@@ -1,6 +1,4 @@
 # Copyright (C) 2019 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import (
-    sale_order
-)
+from . import sale_order
diff --git a/fieldservice_sale_stock/models/sale_order.py b/fieldservice_sale_stock/models/sale_order.py
index 4353f7c6c5..8a16403e4b 100644
--- a/fieldservice_sale_stock/models/sale_order.py
+++ b/fieldservice_sale_stock/models/sale_order.py
@@ -4,16 +4,16 @@
 
 
 class SaleOrder(models.Model):
-    _inherit = 'sale.order'
+    _inherit = "sale.order"
 
     def prepare_fsm_values_for_stock_move(self, fsm_order):
         return {
-            'fsm_order_id': fsm_order.id,
+            "fsm_order_id": fsm_order.id,
         }
 
     def prepare_fsm_values_for_stock_picking(self, fsm_order):
         return {
-            'fsm_order_id': fsm_order.id,
+            "fsm_order_id": fsm_order.id,
         }
 
     @api.multi
@@ -21,23 +21,23 @@ def _link_pickings_to_fsm(self):
         for rec in self:
             # TODO: We may want to split the picking to have one picking
             #  per FSM order
-            fsm_order = self.env['fsm.order'].search([
-                ('sale_id', '=', rec.id),
-                ('sale_line_id', '=', False),
-            ])
+            fsm_order = self.env["fsm.order"].search(
+                [
+                    ("sale_id", "=", rec.id),
+                    ("sale_line_id", "=", False),
+                ]
+            )
             if rec.procurement_group_id:
                 rec.procurement_group_id.fsm_order_id = fsm_order.id or False
             for picking in rec.picking_ids:
-                picking.write(
-                    rec.prepare_fsm_values_for_stock_picking(fsm_order))
+                picking.write(rec.prepare_fsm_values_for_stock_picking(fsm_order))
                 for move in picking.move_lines:
-                    move.write(
-                        rec.prepare_fsm_values_for_stock_move(fsm_order))
+                    move.write(rec.prepare_fsm_values_for_stock_move(fsm_order))
 
     @api.multi
     def _action_confirm(self):
-        """ On SO confirmation, link the fsm order on the pickings
-            created by the sale order """
+        """On SO confirmation, link the fsm order on the pickings
+        created by the sale order"""
         res = super()._action_confirm()
         self._link_pickings_to_fsm()
         return res
diff --git a/setup/fieldservice_sale_stock/odoo/addons/fieldservice_sale_stock b/setup/fieldservice_sale_stock/odoo/addons/fieldservice_sale_stock
new file mode 120000
index 0000000000..7285d6c925
--- /dev/null
+++ b/setup/fieldservice_sale_stock/odoo/addons/fieldservice_sale_stock
@@ -0,0 +1 @@
+../../../../fieldservice_sale_stock
\ No newline at end of file
diff --git a/setup/fieldservice_sale_stock/setup.py b/setup/fieldservice_sale_stock/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_sale_stock/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From f530c3ed4116d105b0a31c9928bd2b7035dad414 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Wed, 28 Jul 2021 20:27:09 +0200
Subject: [PATCH 532/631] [FIX] fieldservice_account: Restrict views to
 authorized groups

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_account/__manifest__.py        | 2 +-
 fieldservice_account/views/account_move.xml | 5 ++++-
 fieldservice_account/views/fsm_order.xml    | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fieldservice_account/__manifest__.py b/fieldservice_account/__manifest__.py
index 368e5b536c..618d038c4c 100644
--- a/fieldservice_account/__manifest__.py
+++ b/fieldservice_account/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Field Service - Accounting",
     "summary": "Track invoices linked to Field Service orders",
-    "version": "14.0.1.0.0",
+    "version": "14.0.1.1.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",
diff --git a/fieldservice_account/views/account_move.xml b/fieldservice_account/views/account_move.xml
index 66f015779a..53b02bc587 100644
--- a/fieldservice_account/views/account_move.xml
+++ b/fieldservice_account/views/account_move.xml
@@ -3,6 +3,7 @@
         <field name="name">FSM order.invoice.form</field>
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_move_form" />
+        <field name="groups_id" eval="[(4, ref('fieldservice.group_fsm_user'))]" />
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
                 <button
@@ -11,7 +12,6 @@
                     class="oe_stat_button"
                     icon="fa-map"
                     attrs="{'invisible': [('fsm_order_count', '=', 0)]}"
-                    groups="fieldservice.group_fsm_user"
                 >
                     <field
                         name="fsm_order_count"
@@ -27,6 +27,7 @@
         <field name="name">vendor.bill.tree.view.fso</field>
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_invoice_tree" />
+        <field name="groups_id" eval="[(4, ref('fieldservice.group_fsm_user'))]" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='invoice_origin']" position="after">
                 <field
@@ -42,6 +43,7 @@
         <field name="name">vendor.bill.form.view.fso</field>
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_move_form" />
+        <field name="groups_id" eval="[(4, ref('fieldservice.group_fsm_user'))]" />
         <field name="arch" type="xml">
             <xpath expr="//page[@name='other_info']" position="inside">
                 <group string="Field Service Orders">
@@ -55,6 +57,7 @@
         <field name="name">invoice.search.view.fso</field>
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_account_move_filter" />
+        <field name="groups_id" eval="[(4, ref('fieldservice.group_fsm_user'))]" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='partner_id']" position="after">
                 <field name="fsm_order_ids" string="FSM Orders" />
diff --git a/fieldservice_account/views/fsm_order.xml b/fieldservice_account/views/fsm_order.xml
index cddb09b058..3777343b2a 100644
--- a/fieldservice_account/views/fsm_order.xml
+++ b/fieldservice_account/views/fsm_order.xml
@@ -2,6 +2,7 @@
     <record id="view_fsm_order_form_inherit_account" 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('account.group_account_invoice'))]" />
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
                 <button

From 91721b39c03196ca0a63ba15e65e6971de10645b 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 533/631] [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..a34bdf914e 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.1.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 a1da19f361..7ae03a1718 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 d19728d8fe3deafa008f2115aff8c6c975a6887c Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 28 Jul 2021 18:39:10 +0000
Subject: [PATCH 534/631] [UPD] addons table in README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 25f7d22b43..a25add497f 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ addon | version | summary
 --- | --- | ---
 [base_territory](base_territory/) | 14.0.1.0.0 | This module allows you to define territories, branches, districts and regions to be used for Field Service operations or Sales.
 [fieldservice](fieldservice/) | 14.0.1.3.0 | Manage Field Service Locations, Workers and Orders
-[fieldservice_account](fieldservice_account/) | 14.0.1.0.0 | Track invoices linked to Field Service orders
+[fieldservice_account](fieldservice_account/) | 14.0.1.1.0 | Track invoices linked to Field Service orders
 [fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
 [fieldservice_account_payment](fieldservice_account_payment/) | 14.0.1.0.0 | Allow workers to collect payments from the order.
 [fieldservice_activity](fieldservice_activity/) | 14.0.1.0.0 | Field Service Activities are a set of actions that need to be performed on a service order
@@ -36,7 +36,7 @@ addon | version | summary
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
 [fieldservice_purchase](fieldservice_purchase/) | 14.0.1.0.0 | Manage FSM Purchases
 [fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
-[fieldservice_sale](fieldservice_sale/) | 14.0.1.0.0 | Sell field services.
+[fieldservice_sale](fieldservice_sale/) | 14.0.1.1.0 | Sell field services.
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills
 [fieldservice_stage_server_action](fieldservice_stage_server_action/) | 14.0.1.0.0 | Execute server actions when reaching a Field Service stage
 [fieldservice_stock](fieldservice_stock/) | 14.0.1.0.0 | Integrate the logistics operations with Field Service

From 4a6d935e4644575fbcd59387984e7936a48581ab Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 29 Jul 2021 07:17:33 +0000
Subject: [PATCH 535/631] fieldservice_sale 14.0.1.2.0

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

diff --git a/fieldservice_sale/__manifest__.py b/fieldservice_sale/__manifest__.py
index a34bdf914e..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.1.0",
+    "version": "14.0.1.2.0",
     "summary": "Sell field services.",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",

From c4a60c9bfca0aee1447279d854edda42e97f35a8 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 29 Jul 2021 07:17:38 +0000
Subject: [PATCH 536/631] [UPD] addons table in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a25add497f..58c349d940 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ addon | version | summary
 [fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
 [fieldservice_purchase](fieldservice_purchase/) | 14.0.1.0.0 | Manage FSM Purchases
 [fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
-[fieldservice_sale](fieldservice_sale/) | 14.0.1.1.0 | Sell field services.
+[fieldservice_sale](fieldservice_sale/) | 14.0.1.2.0 | Sell field services.
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills
 [fieldservice_stage_server_action](fieldservice_stage_server_action/) | 14.0.1.0.0 | Execute server actions when reaching a Field Service stage
 [fieldservice_stock](fieldservice_stock/) | 14.0.1.0.0 | Integrate the logistics operations with Field Service

From 5e552ab71d9151d95c28c9cdcbdd08ead215dc28 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Mon, 19 Apr 2021 11:06:47 +0530
Subject: [PATCH 537/631] [14.0][MIG] fieldservice_sale_stock

---
 fieldservice_sale_stock/README.rst            |  12 +-
 fieldservice_sale_stock/models/sale_order.py  |   4 +-
 .../readme/CONTRIBUTORS.rst                   |   2 +
 .../static/description/index.html             |   8 +-
 fieldservice_sale_stock/tests/__init__.py     |   5 +
 .../tests/test_fsm_sale_order.py              | 458 ++++++++++++++++++
 6 files changed, 478 insertions(+), 11 deletions(-)
 create mode 100644 fieldservice_sale_stock/tests/__init__.py
 create mode 100644 fieldservice_sale_stock/tests/test_fsm_sale_order.py

diff --git a/fieldservice_sale_stock/README.rst b/fieldservice_sale_stock/README.rst
index ef394251e2..5b271750fa 100644
--- a/fieldservice_sale_stock/README.rst
+++ b/fieldservice_sale_stock/README.rst
@@ -14,13 +14,13 @@ Field Service - Sale Stock
     :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_stock
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_sale_stock
     :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_stock
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_sale_stock
     :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| 
@@ -76,7 +76,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_stock%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_stock%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.
 
@@ -92,6 +92,8 @@ Contributors
 ~~~~~~~~~~~~
 
 * Brian McMaster <brian@mcmpest.com>
+* Ammar Officewala <aofficewala@opensourceintegrators.com>
+* Freni Patel <fpatel@opensourceintegrators.com>
 
 Maintainers
 ~~~~~~~~~~~
@@ -120,6 +122,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_stock>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_sale_stock>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_sale_stock/models/sale_order.py b/fieldservice_sale_stock/models/sale_order.py
index 8a16403e4b..7305e15f75 100644
--- a/fieldservice_sale_stock/models/sale_order.py
+++ b/fieldservice_sale_stock/models/sale_order.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2019 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import api, models
+from odoo import models
 
 
 class SaleOrder(models.Model):
@@ -16,7 +16,6 @@ def prepare_fsm_values_for_stock_picking(self, fsm_order):
             "fsm_order_id": fsm_order.id,
         }
 
-    @api.multi
     def _link_pickings_to_fsm(self):
         for rec in self:
             # TODO: We may want to split the picking to have one picking
@@ -34,7 +33,6 @@ def _link_pickings_to_fsm(self):
                 for move in picking.move_lines:
                     move.write(rec.prepare_fsm_values_for_stock_move(fsm_order))
 
-    @api.multi
     def _action_confirm(self):
         """On SO confirmation, link the fsm order on the pickings
         created by the sale order"""
diff --git a/fieldservice_sale_stock/readme/CONTRIBUTORS.rst b/fieldservice_sale_stock/readme/CONTRIBUTORS.rst
index 39ef3fa3d7..4af187d4e1 100644
--- a/fieldservice_sale_stock/readme/CONTRIBUTORS.rst
+++ b/fieldservice_sale_stock/readme/CONTRIBUTORS.rst
@@ -1 +1,3 @@
 * Brian McMaster <brian@mcmpest.com>
+* Ammar Officewala <aofficewala@opensourceintegrators.com>
+* Freni Patel <fpatel@opensourceintegrators.com>
diff --git a/fieldservice_sale_stock/static/description/index.html b/fieldservice_sale_stock/static/description/index.html
index 92a5f96904..f4f33e39a9 100644
--- a/fieldservice_sale_stock/static/description/index.html
+++ b/fieldservice_sale_stock/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Sale Stock</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_stock"><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_stock"><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><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_stock"><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_stock"><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>This module links pickings created by a sale order to the field
 service order created by the sale order.</p>
 <p><strong>Table of contents</strong></p>
@@ -426,7 +426,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_stock%0Aversion:%2012.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_stock%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">
@@ -441,6 +441,8 @@ <h2><a class="toc-backref" href="#id7">Authors</a></h2>
 <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
+<li>Ammar Officewala &lt;<a class="reference external" href="mailto:aofficewala&#64;opensourceintegrators.com">aofficewala&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Freni Patel &lt;<a class="reference external" href="mailto:fpatel&#64;opensourceintegrators.com">fpatel&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -452,7 +454,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/12.0/fieldservice_sale_stock">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/14.0/fieldservice_sale_stock">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_stock/tests/__init__.py b/fieldservice_sale_stock/tests/__init__.py
new file mode 100644
index 0000000000..06b87f7321
--- /dev/null
+++ b/fieldservice_sale_stock/tests/__init__.py
@@ -0,0 +1,5 @@
+# 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 test_fsm_sale_order
diff --git a/fieldservice_sale_stock/tests/test_fsm_sale_order.py b/fieldservice_sale_stock/tests/test_fsm_sale_order.py
new file mode 100644
index 0000000000..7898f60539
--- /dev/null
+++ b/fieldservice_sale_stock/tests/test_fsm_sale_order.py
@@ -0,0 +1,458 @@
+# 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 odoo.addons.fieldservice_sale.tests.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()
+        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
+        )
+        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": "product",
+                "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,
+            }
+        )
+        # 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.sale_order_1._create_invoices()
+        # 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.sale_order_2._create_invoices()
+        # 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
+        invoices = self.sale_order_3._create_invoices()
+        # 2 invoices created
+        self.assertEqual(
+            len(invoices.ids), 1, "FSM Sale: Sale Order 3 should create 1 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.
+        - One 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
+        invoices = self.sale_order_4._create_invoices()
+        # 3 invoices created
+        self.assertEqual(
+            len(invoices.ids), 1, "FSM Sale: Sale Order 4 should create 1 invoice"
+        )

From cc139fb54b71dc0eba2d75f35e47efc5e620ec45 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Tue, 3 Aug 2021 19:40:12 +0000
Subject: [PATCH 538/631] [UPD] Update fieldservice_sale_stock.pot

---
 .../i18n/fieldservice_sale_stock.pot          | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/fieldservice_sale_stock/i18n/fieldservice_sale_stock.pot b/fieldservice_sale_stock/i18n/fieldservice_sale_stock.pot
index 92e47bb20e..6570a9956a 100644
--- a/fieldservice_sale_stock/i18n/fieldservice_sale_stock.pot
+++ b/fieldservice_sale_stock/i18n/fieldservice_sale_stock.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_sale_stock
+# 	* fieldservice_sale_stock
 #
 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"
@@ -14,7 +14,21 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: fieldservice_sale_stock
-#: model:ir.model,name:fieldservice_sale_stock.model_sale_order
-msgid "Sale Order"
+#: model:ir.model.fields,field_description:fieldservice_sale_stock.field_sale_order__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_sale_stock
+#: model:ir.model.fields,field_description:fieldservice_sale_stock.field_sale_order__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_sale_stock
+#: model:ir.model.fields,field_description:fieldservice_sale_stock.field_sale_order____last_update
+msgid "Last Modified on"
 msgstr ""
 
+#. module: fieldservice_sale_stock
+#: model:ir.model,name:fieldservice_sale_stock.model_sale_order
+msgid "Sales Order"
+msgstr ""

From 59ec08849be26e0eda671c16837b7617fa983b35 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 3 Aug 2021 19:46:24 +0000
Subject: [PATCH 539/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 58c349d940..545a200e57 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ addon | version | summary
 [fieldservice_purchase](fieldservice_purchase/) | 14.0.1.0.0 | Manage FSM Purchases
 [fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
 [fieldservice_sale](fieldservice_sale/) | 14.0.1.2.0 | Sell field services.
+[fieldservice_sale_stock](fieldservice_sale_stock/) | 14.0.1.0.0 | Sell stockable items linked to field service orders.
 [fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills
 [fieldservice_stage_server_action](fieldservice_stage_server_action/) | 14.0.1.0.0 | Execute server actions when reaching a Field Service stage
 [fieldservice_stock](fieldservice_stock/) | 14.0.1.0.0 | Integrate the logistics operations with Field Service

From 23c51d26b326f3246a30d69b41833be24668ab1a Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 3 Aug 2021 19:46:28 +0000
Subject: [PATCH 540/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 9fe02c6306..27df65997f 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210727.1
\ No newline at end of file
+14.0.20210803.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index e9fcc67360..4bc8169648 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -26,6 +26,7 @@
         'odoo14-addon-fieldservice_purchase',
         'odoo14-addon-fieldservice_route',
         'odoo14-addon-fieldservice_sale',
+        'odoo14-addon-fieldservice_sale_stock',
         'odoo14-addon-fieldservice_skill',
         'odoo14-addon-fieldservice_stage_server_action',
         'odoo14-addon-fieldservice_stock',

From 28427c16791af3e8421305f70551d6314cba0013 Mon Sep 17 00:00:00 2001
From: Daniel Reis <dgreis@sapo.pt>
Date: Thu, 5 Aug 2021 07:18:41 +0000
Subject: [PATCH 541/631] Added translation using Weblate (Portuguese
 (Portugal))

---
 fieldservice/i18n/pt_PT.po | 3582 ++++++++++++++++++++++++++++++++++++
 1 file changed, 3582 insertions(+)
 create mode 100644 fieldservice/i18n/pt_PT.po

diff --git a/fieldservice/i18n/pt_PT.po b/fieldservice/i18n/pt_PT.po
new file mode 100644
index 0000000000..55d22bb5ce
--- /dev/null
+++ b/fieldservice/i18n/pt_PT.po
@@ -0,0 +1,3582 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice
+#
+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: pt_PT\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
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__meeting_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__meeting_count
+msgid "# Meetings"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__opportunity_count
+msgid "# Opportunities"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__task_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__task_count
+msgid "# Tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_invoice_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_invoice_count
+msgid "# Vendor Bills"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_count
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__owned_location_count
+#: model:ir.model.fields,field_description:fieldservice.field_res_users__owned_location_count
+msgid "# of Owned Locations"
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "%s is a holiday (%s)."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.report,print_report_name:fieldservice.action_report_fsm_order
+msgid "'Service Order - %s' % (object.name)"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "<i class=\"fa fa-ellipsis-v\" title=\"Manager\"/>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "<span class=\"oe_inline\"> ( On  </span>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "<span> : Lat : </span>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "<span> ;  Long:  </span>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "<span>Reporting</span>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "<span>View</span>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "<strong>Assigned To:</strong>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "<strong>Date Completed:</strong>"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "<strong>ETA:</strong>"
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/wizard/fsm_wizard.py:0
+#, python-format
+msgid "A Field Service Location related to that partner already exists."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/wizard/fsm_wizard.py:0
+#, python-format
+msgid "A Field Service Worker related to that partner already exists."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_payable_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_payable_id
+msgid "Account Payable"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_receivable_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_receivable_id
+msgid "Account Receivable"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_needaction
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_needaction
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_needaction
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_needaction
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__active
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__active
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__active
+msgid "Active"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__active_lang_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__active_lang_count
+msgid "Active Lang Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_exception_decoration
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_exception_decoration
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_exception_decoration
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_exception_decoration
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_state
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_state
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_state
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_state
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_type_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__date_end
+msgid "Actual End"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__date_start
+msgid "Actual Start"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__duration
+msgid "Actual duration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__duration
+msgid "Actual duration in hours"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_person
+msgid "Add Field Service Workers here."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_dash_equipment
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_equipment
+msgid "Add a Field Service Equipment here."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_category
+msgid "Add a Field Service Worker Category here."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
+msgid "Add a description..."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__additional_info
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__additional_info
+msgid "Additional info"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Address"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__type
+msgid "Address Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__state_name
+msgid ""
+"Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__agreement_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__agreement_ids
+msgid "Agreements"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "All"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_operation_order
+msgid "All Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_all_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_all_ids
+msgid "All relations with current partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
+msgid ""
+"All the emails and documents sent to this contact will be translated in this"
+" language."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_google_map
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Allow Field Service Google Map"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_web_timeline_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Allow Field Service Web Timeline View"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__location_id
+msgid "Assigned Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__person_id
+msgid "Assigned Operator"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__person_id
+msgid "Assigned To"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_attachment_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_attachment_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_attachment_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_attachment_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Auto-fill the equipments on the order"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Auto-fill the workers on the location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__auto_populate_equipments_on_order
+msgid "Auto-populate Equipments on Order based on Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__auto_populate_persons_on_location
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__auto_populate_persons_on_location
+msgid "Auto-populate Workers on Location based on Territory"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__auto_populate_equipments_on_order
+msgid "Auto-populate equipments on Order based on the Location"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid ""
+"Auto-populate the equipments on the order based on the location content"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid ""
+"Auto-populate the preferred workers of a location based on the territory"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid ""
+"Automatically creates a day route when an order is assigned and scheduled"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__receipt_reminder_email
+msgid ""
+"Automatically send a confirmation email to the vendor X days before the "
+"expected receipt date, asking him to confirm the exact date."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_account_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_account_count
+msgid "Bank"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__bank_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__bank_ids
+msgid "Banks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__barcode
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__barcode
+msgid "Barcode"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__is_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__is_blacklisted
+msgid "Blacklist"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__mobile_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__mobile_blacklisted
+msgid "Blacklisted Phone Is Mobile"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone_blacklisted
+msgid "Blacklisted Phone is Phone"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_bounce
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_bounce
+msgid "Bounce"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__branch_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__branch_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__branch_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Branch"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__branch_manager_id
+msgid "Branch Manager"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_crm
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "CRM"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.partner_wizard_view
+msgid "Cancel"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Cancel Order"
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_stage.py:0
+#, python-format
+msgid ""
+"Cannot create FSM Stage because it has the same Type and Sequence of an "
+"existing FSM Stage."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "Cannot move to completed from Kanban"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__category_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__category_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__category_ids
+#: model:ir.ui.menu,name:fieldservice.menu_hr_skill
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_category_tree_view
+msgid "Categories"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_category_form_view
+msgid "Category"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_category_name_uniq
+msgid "Category name already exists!"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_change_management
+msgid "Change Management"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__channel_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__channel_ids
+msgid "Channels"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Check collected payments"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__is_company
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__is_company
+msgid "Check if the contact is a company, otherwise it is a person"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Check inventory"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Check the amount collected by the worker during the route"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_route_account
+msgid "Check the amount collected during the route"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_route_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Check the inventory of the vehicle at the end of the route"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__employee
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__employee
+msgid "Check this box if this contact is an Employee."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__child_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+msgid "Children"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_template__team_id
+msgid "Choose a team to be set on orders of this template"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__city
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__city
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__city
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "City"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__tag_ids
+msgid "Classify and analyze your orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__custom_color
+msgid "Color Code"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__color
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__color
+msgid "Color Index"
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_stage.py:0
+#, python-format
+msgid "Color code should be Hex Code. Ex:-#FFFFFF"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__commercial_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__commercial_partner_id
+msgid "Commercial Entity"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__ref_company_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__ref_company_ids
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__company_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__company_id
+msgid "Company"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__company_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__company_name
+msgid "Company Name"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__commercial_company_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__commercial_company_name
+msgid "Company Name Entity"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__company_type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__company_type
+msgid "Company Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_gid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_gid
+msgid "Company database ID"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_category__company_id
+msgid "Company related to this category"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__company_id
+msgid "Company related to this equipment"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__company_id
+msgid "Company related to this order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_tag__company_id
+msgid "Company related to this tag"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__company_id
+msgid "Company related to this team"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_template__company_id
+msgid "Company related to this template"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Complete"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contact_address
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__contact_address
+msgid "Complete Address"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__complete_name
+msgid "Complete Name"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.config
+msgid "Configuration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_res_partner
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__child_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__contact_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__child_ids
+msgid "Contact"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Contacts"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contact_count
+msgid "Contacts Count"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.partner_wizard_view
+msgid "Convert"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.partner_fsm_action
+msgid "Convert to FSM Record"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.partner_wizard_view
+msgid "Convert to a Field Service Worker or Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__payment_token_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__payment_token_count
+msgid "Count Payment Token"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_bounce
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_bounce
+msgid "Counter of the number of bounced emails for this contact"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__country_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__country_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__country_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Country"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Create FSM Orders from Opportunities."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_customer
+msgid "Create a Customer."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_location
+msgid "Create a Service Location"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_stage
+msgid "Create a Stage."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_team_settings
+msgid "Create a new team"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_tag
+msgid "Create a tag."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_dash_order
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_operation_order
+msgid "Create an Order."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_template
+msgid "Create an order template"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Create multiple FSM Locations at once using Location Builder Wizard"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_location_person
+msgid "Create the linked locations of a worker."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid ""
+"Create vendor bills and customer invoices when completing service orders.\n"
+"                                    Track costs and revenues."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__create_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__create_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__credit_limit
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__credit_limit
+msgid "Credit Limit"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__current_date
+msgid "Current Date"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__current_location_id
+msgid "Current Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_customer
+msgid "Customer Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_term_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_term_id
+msgid "Customer Payment Terms"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__customer_rank
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__customer_rank
+msgid "Customer Rank"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_customer
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_customer
+msgid "Customers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.dashboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__date
+msgid "Date"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Days Before Receipt"
+msgstr ""
+
+#. module: fieldservice
+#: model:fsm.team,name:fieldservice.fsm_team_default
+msgid "Default Team"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
+msgid "Default duration in hours"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__trust
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__trust
+msgid "Degree of trust you have in this debtor"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_kanban_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_kanban_view
+msgid "Delete"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__description
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__description
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__description
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "Description"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__direction
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Directions"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_dispatcher
+msgid "Dispatcher"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__display_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Display locations and orders on a map with OpenStreetMap"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__district_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__district_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__district_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "District"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__district_manager_id
+msgid "District Manager"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "Done"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_kanban_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_kanban_view
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Due Within 30 Days"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Due Within 7 Days"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__duration
+msgid "Duration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__request_early
+msgid "Earliest Request Date"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_kanban_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_kanban_view
+msgid "Edit"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__partner_share
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__partner_share
+msgid ""
+"Either customer (not a user), either shared user. Indicated the current "
+"partner is a customer without access or with a limited access created for "
+"sharing data."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__email
+msgid "Email"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__employee
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__employee
+msgid "Employee"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__equipment_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__equipment_id
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_stage__stage_type__equipment
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_tree_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Equipment"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_equipment_name_uniq
+msgid "Equipment name already exists!"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_report_equipment
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__equipment_ids
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_dash_equipment
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_equipment
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_report_equipment
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_pivot_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Equipments"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_report_equipment
+msgid "Equipments Report"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Execution"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__legend_priority
+msgid ""
+"Explanation text to help users using the star and priority mechanism on "
+"stages or orders that are in this stage."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "FS Order #"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order_type__internal_type__fsm
+msgid "FSM"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+msgid "FSM Equipment Name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "FSM Location Builder"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_pivot_view
+msgid "FSM Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "FSM Order Name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_calendar_view
+msgid "FSM Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_person_calendar_filter
+msgid "FSM Person Calendar Filter"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_wizard
+msgid "FSM Record Conversion"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__fsm_person_id
+msgid "FSM Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.module.category,name:fieldservice.fsm
+#: model:ir.ui.menu,name:fieldservice.root
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_partner_fields
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Field Service"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_category
+msgid "Field Service Category"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_dash_equipment
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_equipment
+#: model:ir.model,name:fieldservice.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_location
+msgid "Field Service Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_location_person
+msgid "Field Service Location Person Info"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_template
+msgid "Field Service Order Template"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_order_type
+msgid "Field Service Order Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_stage
+msgid "Field Service Stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_tag
+msgid "Field Service Tag"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_team
+msgid "Field Service Team"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_person
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Field Service Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_fsm_category
+msgid "Field Service Worker Category"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_person
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__person_ids
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory__person_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_tree
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_territory_form_view_inherit
+msgid "Field Service Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_sanitized
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__phone_sanitized
+msgid ""
+"Field used to store sanitized phone number. Helps speeding up searches and "
+"comparisons."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_account_position_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_account_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__fold
+msgid "Folded in Kanban"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_follower_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_follower_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_follower_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_channel_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_channel_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_channel_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_partner_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_partner_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_partner_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__activity_type_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__email_formatted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__email_formatted
+msgid "Format email address \"Name <email@domain>\""
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__email_formatted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__email_formatted
+msgid "Formatted Email"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__full_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__full_name
+msgid "Full Name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Future Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "General Notes"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_latitude
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_latitude
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Geo Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_longitude
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_longitude
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Geolocate"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Geolocation"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__date_localization
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__date_localization
+msgid "Geolocation Date"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Group By"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__has_unreconciled_entries
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__has_unreconciled_entries
+msgid "Has Unreconciled Entries"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_type_id
+msgid "Has relation of type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_id
+msgid "Has relation with"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_partner_category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_partner_category_id
+msgid "Has relation with a partner in category"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__hide
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__hide
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__hide
+msgid "Hide"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__2
+msgid "High"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__id
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__im_status
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__im_status
+msgid "IM Status"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_exception_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_exception_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_exception_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_exception_icon
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_exception_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__activity_exception_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__activity_exception_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__activity_exception_icon
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_needaction
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_unread
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_needaction
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_unread
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_needaction
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_unread
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_needaction
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_unread
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_needaction
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_unread
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_has_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_has_sms_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_has_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_has_sms_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_has_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_has_sms_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_has_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_has_sms_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_has_error
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__team_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__team_id
+msgid ""
+"If set, this Sales Team will be used for sales and assignments related to "
+"this partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__is_blacklisted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__is_blacklisted
+msgid ""
+"If the email address is on the blacklist, the contact won't receive mass "
+"mailing anymore, from any list"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_sanitized_blacklisted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__phone_sanitized_blacklisted
+msgid ""
+"If the sanitized phone number is on the blacklist, the contact won't receive"
+" mass mailing sms anymore, from any list"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_1920
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_1920
+msgid "Image"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_1024
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_1024
+msgid "Image 1024"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_128
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_128
+msgid "Image 128"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_256
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_256
+msgid "Image 256"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__image_512
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__image_512
+msgid "Image 512"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__mobile_blacklisted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__mobile_blacklisted
+msgid ""
+"Indicates if a blacklisted sanitized phone number is a mobile number. Helps "
+"distinguish which number is blacklisted             when there is both a "
+"mobile and phone field in a model."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_blacklisted
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__phone_blacklisted
+msgid ""
+"Indicates if a blacklisted sanitized phone number is a phone number. Helps "
+"distinguish which number is blacklisted             when there is both a "
+"mobile and phone field in a model."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__industry_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__industry_id
+msgid "Industry"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__todo
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__instructions
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_template_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "Instructions"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__internal_type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__internal_type
+msgid "Internal Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_warn
+msgid "Invoice"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__type
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__type
+msgid ""
+"Invoice & Delivery addresses are used in sales orders. Private addresses are"
+" only visible by authorized users."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_account
+msgid "Invoice your FSM orders"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Invoice your Service Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_ids
+msgid "Invoices"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__is_button
+msgid "Is Button"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_is_follower
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_is_follower
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_is_follower
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_is_follower
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__is_company
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__is_company
+msgid "Is a Company"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fsm_location
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__fsm_location
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__fsm_location
+#: model:ir.model.fields,field_description:fieldservice.field_res_users__fsm_location
+msgid "Is a FS Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fsm_person
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__fsm_person
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__fsm_person
+#: model:ir.model.fields,field_description:fieldservice.field_res_users__fsm_person
+msgid "Is a FS Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__is_closed
+msgid "Is a close stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__is_default
+msgid "Is a default stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__function
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__function
+msgid "Job Position"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__journal_item_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__journal_item_count
+msgid "Journal Items"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__lang
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__lang
+msgid "Language"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_company____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner____last_update
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__write_uid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__write_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__calendar_last_notif_ack
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__calendar_last_notif_ack
+msgid "Last notification marked as read from base Calendar"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__last_time_entries_checked
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__last_time_entries_checked
+msgid ""
+"Last time the invoices & payments matching was performed for this partner. "
+"It is set either if there's not at least an unreconciled debit and an "
+"unreconciled credit or if you click the \"Done\" button."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__last_time_entries_checked
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__last_time_entries_checked
+msgid "Latest Invoices & Payments Matching Date"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__request_late
+msgid "Latest Request Date"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_repair
+msgid "Link FSM orders to MRP Repair orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_maintenance
+msgid "Link FSM orders to maintenance requests"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_fleet
+msgid "Link FSM vehicles to Fleet vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Link Field Service vehicles with Fleet vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Link to Fleet Vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Link your FSM orders to MRP repair orders"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Link your FSM orders to Projects and Project Tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Link your FSM orders to maintenance requests"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__location_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Linked Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__location_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__location_id
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_stage__stage_type__location
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_wizard__fsm_record_type__location
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
+msgid "Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__location_directions
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Location Directions"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__notes
+msgid "Location Notes"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_location_person
+msgid "Location Persons"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__phone
+msgid "Location Phone"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_report_location
+msgid "Location Reports."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_form_view
+msgid "Location Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_location_person
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_tree_view
+msgid "Location Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_report_location
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_config_location
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_fsm_location
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_report_location
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_tree_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__1
+msgid "Low"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "MRP Repair"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_main_attachment_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_main_attachment_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_main_attachment_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_main_attachment_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Maintenance"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Make sure to send the right worker with the appropriate skills"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_agreement
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Agreements"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__group_fsm_category
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Categories"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_distribution
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Distribution"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__group_fsm_equipment
+msgid "Manage Equipment"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Equipments"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_activity
+msgid "Manage FSM Activities"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_equipment
+msgid "Manage Field Service Equipment"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_template
+msgid "Manage Field Service Order Templates"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_tag
+msgid "Manage Field Service Tags"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_team
+msgid "Manage Field Service Teams"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_category
+msgid "Manage Field Service Worker Categories"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Order Activities"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Order Sizes"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Order Sub-Statuses"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Order Templates"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_recurring
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Recurring Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_skill
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Skills"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_substatus
+msgid "Manage Sub-Statuses"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__group_fsm_tag
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Tags"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__group_fsm_team
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Teams"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__group_fsm_template
+msgid "Manage Template"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage Vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage activities"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage agreements and contracts"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage different categories of Field Service workers"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage different teams of Field Service workers"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage equipments at the service location"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid ""
+"Manage inventory and stock operations.\n"
+"                                    Automatically activate Lots &amp; Serial Numbers."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage recurring orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_route
+msgid "Manage routes"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage routes of your workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_size
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage sizes for orders and locations"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage sub-statuses"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_purchase
+msgid "Manage subcontractors and their pricelists"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage subcontractors with pricelists"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage tags on service orders"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage templates"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Manage your distribution structure"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__managed_by_id
+msgid "Managed By"
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_manager
+msgid "Manager"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Mapping Tools"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.data
+msgid "Master Data"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person_calendar_filter__user_id
+msgid "Me"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__meeting_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__meeting_ids
+msgid "Meetings"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_has_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_has_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__invoice_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__invoice_warn_msg
+msgid "Message for Invoice"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn_msg
+msgid "Message for Purchase Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn_msg
+msgid "Message for Sales Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn_msg
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__mobile
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__mobile
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__mobile
+msgid "Mobile"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__my_activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "My Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order_type__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "Need Assigned"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "Need Scheduled"
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#: code:addons/fieldservice/models/fsm_order.py:0
+#: code:addons/fieldservice/models/fsm_order.py:0
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_date_deadline
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_summary
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_summary
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_summary
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_summary
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_type_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Next Stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__0
+msgid "Normal"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__email_normalized
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__email_normalized
+msgid "Normalized Email"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__notes
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__comment
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__comment
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+msgid "Notes"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_needaction_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_needaction_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_needaction_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__reminder_date_before_receipt
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__reminder_date_before_receipt
+msgid "Number of days to send reminder email before the promised receipt date"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_error_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_error_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_has_error_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_has_error_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_has_error_counter
+msgid "Number of errors"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_needaction_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_needaction_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_needaction_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_needaction_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_has_error_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_has_error_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_has_error_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_has_error_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__message_unread_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__message_unread_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__message_unread_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__message_unread_counter
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__calendar_id
+msgid "Office Hours"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__on_time_rate
+msgid "On-Time Delivery Rate"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.operations
+msgid "Operations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__opportunity_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__opportunity_ids
+msgid "Opportunities"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__opportunity_count
+msgid "Opportunity"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__display_name
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_stage__stage_type__order
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_assigned
+msgid "Order Assigned"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_cancelled
+msgid "Order Cancelled"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_completed
+msgid "Order Completed"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_confirmed
+msgid "Order Confirmed"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_new
+msgid "Order Created"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_enroute
+msgid "Order En Route"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_scheduled
+msgid "Order Scheduled"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,name:fieldservice.mt_order_started
+msgid "Order Started"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_form
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_tree
+msgid "Order Team"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_template
+msgid "Order Templates"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_order_type
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_order_type
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_type_tree_view
+msgid "Order Types"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_assigned
+msgid "Order assigned"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_cancelled
+msgid "Order cancelled"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_completed
+msgid "Order completed"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_confirmed
+msgid "Order confirmed"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_new
+msgid "Order created"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_enroute
+msgid "Order en route"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_scheduled
+msgid "Order scheduled"
+msgstr ""
+
+#. module: fieldservice
+#: model:mail.message.subtype,description:fieldservice.mt_order_started
+msgid "Order started"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_dash_order
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_operation_order
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_report_order
+#: model:ir.actions.act_window,name:fieldservice.fsm_order_action_from_dashboard
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__order_ids
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_config_order
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_dash_order
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_report_order
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_tree_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__order_count
+msgid "Orders Count"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.actions.act_window,help:fieldservice.action_fsm_report_order
+msgid "Orders Reports."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__order_need_assign_count
+msgid "Orders to Assign"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__order_need_schedule_count
+msgid "Orders to Schedule"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Others"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__on_time_rate
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__on_time_rate
+msgid ""
+"Over the past 12 months; the number of products received on time divided by "
+"the number of ordered products."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__owned_by_id
+msgid "Owned By"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owned_location_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__owned_location_ids
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__owned_location_ids
+#: model:ir.model.fields,field_description:fieldservice.field_res_users__owned_location_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_partner_fields
+msgid "Owned Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__owner_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
+msgid "Owner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_category__parent_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__parent_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__fsm_parent_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_tag__parent_id
+msgid "Parent"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__parent_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__parent_name
+msgid "Parent name"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contract_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__contract_ids
+msgid "Partner Contracts"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__same_vat_partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__same_vat_partner_id
+msgid "Partner with same Tax ID"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__debit_limit
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__debit_limit
+msgid "Payable Limit"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_payment_method_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_payment_method_id
+msgid "Payment Method"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__payment_token_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__payment_token_ids
+msgid "Payment Tokens"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__phone
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone
+msgid "Phone"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone_sanitized_blacklisted
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone_sanitized_blacklisted
+msgid "Phone Blacklisted"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Planning"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Preferred Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_payment_method_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_payment_method_id
+msgid ""
+"Preferred payment method when paying this vendor. This is used to filter "
+"vendor bills by preferred payment method to register payments in mass. Use "
+"cases: create bank files for batch wires, check runs."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Previous Stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_product_pricelist
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_product_pricelist
+msgid "Pricelist"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__territory_manager_id
+#: model:ir.model.fields,field_description:fieldservice.field_res_territory__person_id
+msgid "Primary Assignment"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__contact_id
+msgid "Primary Contact"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__service_location_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__service_location_id
+#: model:ir.model.fields,field_description:fieldservice.field_res_partner__service_location_id
+#: model:ir.model.fields,field_description:fieldservice.field_res_users__service_location_id
+msgid "Primary Service Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__priority
+msgid "Priority"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__legend_priority
+msgid "Priority Management Explanation"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Project and Tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_project
+msgid "Projects and Tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_line_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_line_ids
+msgid "Purchase Lines"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_warn
+msgid "Purchase Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__purchase_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__purchase_order_count
+msgid "Purchase Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__receipt_reminder_email
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__receipt_reminder_email
+msgid "Receipt Reminder"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_wizard__fsm_record_type
+msgid "Record Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__ref
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__ref
+msgid "Reference"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__region_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__region_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__region_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Region"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__region_manager_id
+msgid "Region Manager"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__parent_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__parent_id
+msgid "Related Company"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__owner_id
+msgid "Related Owner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_id
+msgid "Related Partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__relation_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__relation_count
+msgid "Relation Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__search_relation_date
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__search_relation_date
+msgid "Relation valid"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Request Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Requirements"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__resolution
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Resolution"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.report_fsm_order_document
+msgid "Resolution Notes"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__activity_user_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__activity_user_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__activity_user_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__activity_user_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Routes"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_has_sms_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_has_sms_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_has_sms_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_has_sms_error
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_count
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_count
+msgid "Sale Order Count"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_order_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_order_ids
+msgid "Sales Order"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__team_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__team_id
+msgid "Sales Team"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sale_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__sale_warn
+msgid "Sales Warnings"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_id
+msgid "Salesperson"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__phone_sanitized
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__phone_sanitized
+msgid "Sanitized Number"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_form
+msgid "Schedule Details"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__scheduled_date_end
+msgid "Scheduled End"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__scheduled_date_start
+msgid "Scheduled Start (ETA)"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__scheduled_duration
+msgid "Scheduled duration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__scheduled_duration
+msgid "Scheduled duration of the work in hours"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_search_view
+msgid "Search FSM Location"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_search_view
+msgid "Search FSM Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_company__search_on_complete_name
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__search_on_complete_name
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Search Location By Hierarchy"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_search_view
+msgid "Search Location Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Search Locations based on their full hierarchy name"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Select field services on sale orders."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.partner_wizard_view
+msgid ""
+"Select whether you want to convert this record to a Field\n"
+"                    Service Worker or Location."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__purchase_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__sale_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__invoice_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__picking_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__purchase_warn
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__sale_warn
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"Selecting \"Blocking Message\" will throw an exception with the message and "
+"block the flow. The Message has to be written in the next field."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__self
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__self
+msgid "Self"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_sale
+msgid "Sell FSM orders"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Sell Service Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__sequence
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__sequence
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__sequence
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_location
+msgid "Service Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.report,name:fieldservice.action_report_fsm_order
+msgid "Service Order"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_pivot_view
+msgid "Service Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__is_closed
+msgid "Services in this stage are considered as closed."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_config
+#: model:ir.ui.menu,name:fieldservice.settings
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "Settings"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__partner_share
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__partner_share
+msgid "Share Partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__signup_expiration
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__signup_expiration
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__signup_token
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__signup_token
+msgid "Signup Token"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__signup_type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__signup_type
+msgid "Signup Token Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__signup_valid
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__signup_valid
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__signup_url
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__signup_url
+msgid "Signup URL"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__stage_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__stage_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__stage_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__stage_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_tree_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
+msgid "Stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__custom_color
+msgid "Stage Color"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
+msgid "Stage Description and Tooltips"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__stage_name
+msgid "Stage Name"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_stage
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__stage_ids
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_stage
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_tree_view
+msgid "Stages"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__state_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__state_name
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__state_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "State"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_state
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__activity_state
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__activity_state
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__activity_state
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__picking_warn
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__picking_warn
+msgid "Stock Picking"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__street
+msgid "Street"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Street 2..."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Street..."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__street2
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__street2
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__street2
+msgid "Street2"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__sublocation_count
+msgid "Sub Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+msgid "Sub-Locations"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid "Supplier Currency"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__supplier_rank
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__supplier_rank
+msgid "Supplier Rank"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_tag_name_uniq
+msgid "Tag name already exists!"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_fsm_tag
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__category_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__tag_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__category_id
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_tag
+msgid "Tags"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__task_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__task_ids
+msgid "Tasks"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__vat
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__vat
+msgid "Tax ID"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__team_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__team_id
+msgid "Team"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_form
+msgid "Team Name"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_team_name_uniq
+msgid "Team name already exists!"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.actions.act_window,name:fieldservice.action_team_dashboard
+#: model:ir.actions.act_window,name:fieldservice.action_team_settings
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__team_ids
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_dash_team
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_team
+msgid "Teams"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__template_id
+msgid "Template"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_template
+msgid "Templates"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__territory_ids
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "Territories"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model,name:fieldservice.model_res_territory
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__territory_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__territory_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__territory_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Territory"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__vat
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__vat
+msgid ""
+"The Tax Identification Number. Complete it if the contact is subjected to "
+"government taxes. Used in some legal statements."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_account_position_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_account_position_id
+msgid ""
+"The fiscal position determines the taxes/accounts used for this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__country_name
+msgid "The full name of the country."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__user_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__user_id
+msgid "The internal user in charge of this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__has_unreconciled_entries
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__has_unreconciled_entries
+msgid ""
+"The partner has at least one unreconciled debit and credit since last time "
+"the invoices & payments matching was performed."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_customer
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_customer
+msgid ""
+"The stock location used as destination when sending goods to this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_stock_supplier
+msgid ""
+"The stock location used as source when receiving goods from this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_location_person_location_person_uniq
+msgid "The worker is already linked to this location."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_account_payable_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_account_payable_id
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_account_receivable_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_account_receivable_id
+msgid ""
+"This account will be used instead of the default one as the receivable "
+"account for the current partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_purchase_currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_purchase_currency_id
+msgid ""
+"This currency will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
+msgid ""
+"This field is used to search on email address as the primary email field can"
+" contain more than strictly an email address."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_supplier_payment_term_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_supplier_payment_term_id
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and vendor bills"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_payment_term_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_payment_term_id
+msgid ""
+"This payment term will be used instead of the default one for sales orders "
+"and customer invoices"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_product_pricelist
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_product_pricelist
+msgid ""
+"This pricelist will be used, instead of the default one, for sales to the "
+"current partner"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__fold
+msgid ""
+"This stage is folded in the kanban view when there are no record in that "
+"stage to display."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__tz
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__tz
+msgid "Timezone"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__tz_offset
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__tz_offset
+msgid "Timezone offset"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__title
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__title
+msgid "Title"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "To Assign"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "To Do"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.view_team_kanban
+msgid "To Schedule"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Today Orders"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__total_invoiced
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__total_invoiced
+msgid "Total Invoiced"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__debit
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__debit
+msgid "Total Payable"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__credit
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__credit
+msgid "Total Receivable"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__credit
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__credit
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__debit
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__debit
+msgid "Total amount you have to pay to this vendor."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_stage__stage_type
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_template__type_id
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_type_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_search_view
+msgid "Type"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__activity_exception_decoration
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__activity_exception_decoration
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__activity_exception_decoration
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__activity_exception_decoration
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Unassigned"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_unread
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_unread
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_unread
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_unread
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__message_unread_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__message_unread_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__message_unread_counter
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_order_search_view
+msgid "Unscheduled"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_order__priority__3
+msgid "Urgent"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_location_builder
+msgid "Use FSM Location Builder"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_geoengine
+msgid "Use GeoEngine"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Use GeoEngine with OpenStreetMap"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__custom_color
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__custom_color
+msgid "Use Hex Code only Ex:-#FFFFFF"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_res_config_settings__module_fieldservice_stock
+msgid "Use Odoo Logistics"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Use Odoo Purchase"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Use Odoo Stock Logistics"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__barcode
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__barcode
+msgid "Use a barcode to identify this contact."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__is_default
+msgid "Used a default stage"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_stage__sequence
+msgid "Used to order stages. Lower is better."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__sequence
+msgid "Used to sort teams. Lower is better."
+msgstr ""
+
+#. module: fieldservice
+#: model:res.groups,name:fieldservice.group_fsm_user
+msgid "User"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__user_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__user_ids
+msgid "Users"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__currency_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__currency_id
+msgid "Utility field to express amount currency"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Vehicles"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_stock_supplier
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_stock_supplier
+msgid "Vendor Location"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_supplier_payment_term_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_supplier_payment_term_id
+msgid "Vendor Payment Terms"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__website
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__website
+msgid "Website Link"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_equipment__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__website_message_ids
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_team__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_equipment__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_order__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__website_message_ids
+#: model:ir.model.fields,help:fieldservice.field_fsm_team__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__tz
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__tz
+msgid ""
+"When printing documents and exporting/importing data, time values are computed according to this timezone.\n"
+"If the timezone is not set, UTC (Coordinated Universal Time) is used.\n"
+"Anywhere else, time values are computed according to the time offset of your web client."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location_person__person_id
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_stage__stage_type__worker
+#: model:ir.model.fields.selection,name:fieldservice.selection__fsm_wizard__fsm_record_type__person
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_equipment_search_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_person_search_view
+msgid "Worker"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__person_phone
+msgid "Worker Phone"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__person_ids
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_config_person
+#: model:ir.ui.menu,name:fieldservice.menu_fsm_person
+#: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
+msgid "Workers"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__calendar_id
+msgid "Working Schedule"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_stage_form_view
+msgid ""
+"You can add a description to help your coworkers understand the meaning and "
+"purpose of the stage."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_location.py:0
+#, python-format
+msgid "You cannot create recursive location."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "You cannot delete this order."
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.constraint,message:fieldservice.constraint_fsm_person_calendar_filter_user_id_fsm_person_id_unique
+msgid "You cannot have the same worker twice."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "You must create an FSM order stage first."
+msgstr ""
+
+#. module: fieldservice
+#: code:addons/fieldservice/models/fsm_order.py:0
+#, python-format
+msgid "You must create an FSM team first."
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_location_form_view
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_person_form
+msgid "ZIP"
+msgstr ""
+
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__zip
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_order__zip
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__zip
+msgid "Zip"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_tag_form_view
+msgid "tag"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_tag_tree_view
+msgid "tags"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_template_form_view
+msgid "template"
+msgstr ""
+
+#. module: fieldservice
+#: model_terms:ir.ui.view,arch_db:fieldservice.fsm_template_tree_view
+msgid "templates"
+msgstr ""

From 172e60560d09626d91278cd3229c810c75d2aeff Mon Sep 17 00:00:00 2001
From: Sandip Mangukiya <smangukiya@ursainfosystems.com>
Date: Mon, 31 Dec 2018 05:34:35 -0800
Subject: [PATCH 542/631] [ADD] fieldservice_maintenance

---
 fieldservice_maintenance/README.rst           | 132 +++++
 fieldservice_maintenance/__init__.py          |   4 +
 fieldservice_maintenance/__manifest__.py      |  26 +
 fieldservice_maintenance/models/__init__.py   |   6 +
 .../models/fsm_equipment.py                   |  13 +
 fieldservice_maintenance/models/fsm_order.py  |  46 ++
 .../models/maintenance.py                     |  32 ++
 fieldservice_maintenance/readme/CONFIGURE.rst |   5 +
 .../readme/CONTRIBUTORS.rst                   |   1 +
 fieldservice_maintenance/readme/CREDITS.rst   |   3 +
 .../readme/DESCRIPTION.rst                    |   7 +
 fieldservice_maintenance/readme/INSTALL.rst   |   5 +
 fieldservice_maintenance/readme/ROADMAP.rst   |   2 +
 fieldservice_maintenance/readme/USAGE.rst     |   7 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 470 ++++++++++++++++++
 .../views/fsm_equipment_view.xml              |  15 +
 .../views/fsm_order_view.xml                  |  25 +
 .../views/maintenance_view.xml                |  33 ++
 19 files changed, 832 insertions(+)
 create mode 100644 fieldservice_maintenance/README.rst
 create mode 100644 fieldservice_maintenance/__init__.py
 create mode 100644 fieldservice_maintenance/__manifest__.py
 create mode 100644 fieldservice_maintenance/models/__init__.py
 create mode 100644 fieldservice_maintenance/models/fsm_equipment.py
 create mode 100644 fieldservice_maintenance/models/fsm_order.py
 create mode 100644 fieldservice_maintenance/models/maintenance.py
 create mode 100644 fieldservice_maintenance/readme/CONFIGURE.rst
 create mode 100644 fieldservice_maintenance/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_maintenance/readme/CREDITS.rst
 create mode 100644 fieldservice_maintenance/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_maintenance/readme/INSTALL.rst
 create mode 100644 fieldservice_maintenance/readme/ROADMAP.rst
 create mode 100644 fieldservice_maintenance/readme/USAGE.rst
 create mode 100644 fieldservice_maintenance/static/description/icon.png
 create mode 100644 fieldservice_maintenance/static/description/index.html
 create mode 100644 fieldservice_maintenance/views/fsm_equipment_view.xml
 create mode 100644 fieldservice_maintenance/views/fsm_order_view.xml
 create mode 100644 fieldservice_maintenance/views/maintenance_view.xml

diff --git a/fieldservice_maintenance/README.rst b/fieldservice_maintenance/README.rst
new file mode 100644
index 0000000000..fa3e01ee7b
--- /dev/null
+++ b/fieldservice_maintenance/README.rst
@@ -0,0 +1,132 @@
+===========================
+Field Service - Maintenance
+===========================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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_maintenance
+    :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_maintenance
+    :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| 
+
+Odoo Maintenance App does not support Field Service operations for equipments
+outside the company facilities. On the other hand, the Field Service App does
+not support a maintenance schedule generating preventive maintenance request.
+
+This module allows you to merge equipments from Field Service and Maintenance
+and have a maintenance schedule for FSM equipments as well as Field Service
+capabilities for maintenance equipments.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Installation
+============
+
+To install Field Service and have the mapping features,
+you need to install fieldservice_stock and maintenance
+
+Please refer to the installation instructions available at:
+https://github.com/OCA/field-service/tree/11.0/fieldservice_maintenance
+
+Configuration
+=============
+
+To use this module, you need to:
+
+* Go to Field Service > Master Data > Equipments or Maintenance > Equipments
+* Create or select an equipment
+* Specify the maintenance schedule
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Maintenance requests related to a FSM equipment will create a FSM order
+* Go to Field Service
+* Create or select a FSM order and select the type Maintenance.
+* Select the maintenance team, the equipment and the location
+* Upon saving, a maintenance request will be created with the information from the FSM order.
+
+Known issues / Roadmap
+======================
+
+The roadmap of the Field Service application is documented on
+`Github <https://github.com/OCA/field-service/issues/66>`_.
+
+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_maintenance%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
+~~~~~~~~~~~~
+
+* Sandip Mangukiya <smangukiya@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-smangukiya| image:: https://github.com/smangukiya.png?size=40px
+    :target: https://github.com/smangukiya
+    :alt: smangukiya
+.. |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-smangukiya| |maintainer-max3903| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_maintenance>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_maintenance/__init__.py b/fieldservice_maintenance/__init__.py
new file mode 100644
index 0000000000..631bd4893a
--- /dev/null
+++ b/fieldservice_maintenance/__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_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
new file mode 100644
index 0000000000..592d2d0a58
--- /dev/null
+++ b/fieldservice_maintenance/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - Maintenance',
+    'summary': 'Maintenance',
+    '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_stock',
+        'maintenance',
+    ],
+    'data': [
+        'views/maintenance_view.xml',
+        'views/fsm_equipment_view.xml',
+        'views/fsm_order_view.xml',
+    ],
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'smangukiya',
+        'max3903',
+    ],
+}
diff --git a/fieldservice_maintenance/models/__init__.py b/fieldservice_maintenance/models/__init__.py
new file mode 100644
index 0000000000..bac82e01f7
--- /dev/null
+++ b/fieldservice_maintenance/models/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import fsm_order
+from . import maintenance
+from . import fsm_equipment
diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
new file mode 100644
index 0000000000..49abfc91a7
--- /dev/null
+++ b/fieldservice_maintenance/models/fsm_equipment.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, models
+
+
+class FSMEquipment(models.Model):
+    _inherit = 'fsm.equipment'
+    _inherits = {'maintenance.equipment': 'maintenance_equipment_id'}
+    _description = 'FSM Maintenance equipment'
+
+    maintenance_equipment_id = fields.Many2one(
+        'maintenance.equipment', string='Maintenance Equipment')
diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
new file mode 100644
index 0000000000..4b668d0511
--- /dev/null
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -0,0 +1,46 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields
+from odoo.addons.base_geoengine import geo_model
+
+
+class FSMOrder(geo_model.GeoModel):
+    _inherit = 'fsm.order'
+    _description = 'Field Service Order Maintenance'
+
+    type = fields.Selection(selection_add=[('maintenance', 'Maintenance')])
+    request_id = fields.Many2one(
+        'maintenance.request', 'Maintenance Request')
+    maintenance_team_id = fields.Many2one('maintenance.team', string='Team')
+
+    @api.model
+    def create(self, vals):
+        # if FSM order with type maintenance is create then
+        # create maintenance request
+        order = super(FSMOrder, self).create(vals)
+        if order.type == 'maintenance':
+            employee_ids = self.env['hr.employee'].search(
+                [('user_id', '=', self.env.uid)])
+            if employee_ids:
+                employee_id = employee_ids[0]
+            if order.equipment_id:
+                equipment = order.equipment_id
+                request_id = self.env['maintenance.request'].create({
+                    'name': order.name or '',
+                    'employee_id': employee_id.id,
+                    'equipment_id':
+                        equipment.maintenance_equipment_id
+                        and equipment.maintenance_equipment_id.id or False,
+                    'category_id':
+                        equipment.category_id and
+                        equipment.category_id.id or False,
+                    'request_date': fields.Date.context_today(self),
+                    'maintenance_type': 'corrective',
+                    'maintenance_team_id':
+                        order.maintenance_team_id.id or False,
+                    'schedule_date': order.request_early,
+                    'description': order.description
+                })
+                order.request_id = request_id
+        return order
diff --git a/fieldservice_maintenance/models/maintenance.py b/fieldservice_maintenance/models/maintenance.py
new file mode 100644
index 0000000000..caa5df7841
--- /dev/null
+++ b/fieldservice_maintenance/models/maintenance.py
@@ -0,0 +1,32 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class MaintenanceEquipment(models.Model):
+    _inherit = 'maintenance.equipment'
+
+    is_fsm_equipment = fields.Boolean(string='Is a FSM Equipment')
+
+
+class MaintenanceRequest(models.Model):
+    _inherit = 'maintenance.request'
+
+    fsm_order_id = fields.Many2one('fsm.order', 'Field Service Order')
+
+    @api.model
+    def create(self, vals):
+        # create FSM order with type maintenance if selected equipment is
+        # enabled with boolean is_fsm_equipment
+        request = super(MaintenanceRequest, self).create(vals)
+        if request.equipment_id.is_fsm_equipment:
+            # Get the fsm equipment
+            fsm_equipment = self.env['fsm.equipment'].search(
+                'maintenance_equipment_id', '=', request.equipment_id)
+            fsm_order_id = self.env['fsm.order'].create({
+                'type': 'maintenance',
+                'equipment_id': fsm_equipment and fsm_equipment[0].id or False
+                })
+            request.fsm_order_id = fsm_order_id
+        return request
diff --git a/fieldservice_maintenance/readme/CONFIGURE.rst b/fieldservice_maintenance/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..94eb8eb084
--- /dev/null
+++ b/fieldservice_maintenance/readme/CONFIGURE.rst
@@ -0,0 +1,5 @@
+To use this module, you need to:
+
+* Go to Field Service > Master Data > Equipments or Maintenance > Equipments
+* Create or select an equipment
+* Specify the maintenance schedule
diff --git a/fieldservice_maintenance/readme/CONTRIBUTORS.rst b/fieldservice_maintenance/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..a76235f8a2
--- /dev/null
+++ b/fieldservice_maintenance/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Sandip Mangukiya <smangukiya@opensourceintegrators.com>
diff --git a/fieldservice_maintenance/readme/CREDITS.rst b/fieldservice_maintenance/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_maintenance/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_maintenance/readme/DESCRIPTION.rst b/fieldservice_maintenance/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..a8a98ee699
--- /dev/null
+++ b/fieldservice_maintenance/readme/DESCRIPTION.rst
@@ -0,0 +1,7 @@
+Odoo Maintenance App does not support Field Service operations for equipments
+outside the company facilities. On the other hand, the Field Service App does
+not support a maintenance schedule generating preventive maintenance request.
+
+This module allows you to merge equipments from Field Service and Maintenance
+and have a maintenance schedule for FSM equipments as well as Field Service
+capabilities for maintenance equipments.
\ No newline at end of file
diff --git a/fieldservice_maintenance/readme/INSTALL.rst b/fieldservice_maintenance/readme/INSTALL.rst
new file mode 100644
index 0000000000..43c27d0602
--- /dev/null
+++ b/fieldservice_maintenance/readme/INSTALL.rst
@@ -0,0 +1,5 @@
+To install Field Service and have the mapping features,
+you need to install fieldservice_stock and maintenance
+
+Please refer to the installation instructions available at:
+https://github.com/OCA/field-service/tree/11.0/fieldservice_maintenance
diff --git a/fieldservice_maintenance/readme/ROADMAP.rst b/fieldservice_maintenance/readme/ROADMAP.rst
new file mode 100644
index 0000000000..b0ff1e4854
--- /dev/null
+++ b/fieldservice_maintenance/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/66>`_.
diff --git a/fieldservice_maintenance/readme/USAGE.rst b/fieldservice_maintenance/readme/USAGE.rst
new file mode 100644
index 0000000000..e71b68687d
--- /dev/null
+++ b/fieldservice_maintenance/readme/USAGE.rst
@@ -0,0 +1,7 @@
+To use this module, you need to:
+
+* Maintenance requests related to a FSM equipment will create a FSM order
+* Go to Field Service
+* Create or select a FSM order and select the type Maintenance.
+* Select the maintenance team, the equipment and the location
+* Upon saving, a maintenance request will be created with the information from the FSM order.
diff --git a/fieldservice_maintenance/static/description/icon.png b/fieldservice_maintenance/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_maintenance/static/description/index.html b/fieldservice_maintenance/static/description/index.html
new file mode 100644
index 0000000000..f641896644
--- /dev/null
+++ b/fieldservice_maintenance/static/description/index.html
@@ -0,0 +1,470 @@
+<?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 - Maintenance</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-maintenance">
+<h1 class="title">Field Service - Maintenance</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_maintenance"><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_maintenance"><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>Odoo Maintenance App does not support Field Service operations for equipments
+outside the company facilities. On the other hand, the Field Service App does
+not support a maintenance schedule generating preventive maintenance request.</p>
+<p>This module allows you to merge equipments from Field Service and Maintenance
+and have a maintenance schedule for FSM equipments as well as Field Service
+capabilities for maintenance equipments.</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 fieldservice_stock and maintenance</p>
+<p>Please refer to the installation instructions available at:
+<a class="reference external" href="https://github.com/OCA/field-service/tree/11.0/fieldservice_maintenance">https://github.com/OCA/field-service/tree/11.0/fieldservice_maintenance</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; Equipments or Maintenance &gt; Equipments</li>
+<li>Create or select an equipment</li>
+<li>Specify the maintenance schedule</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>Maintenance requests related to a FSM equipment will create a FSM order</li>
+<li>Go to Field Service</li>
+<li>Create or select a FSM order and select the type Maintenance.</li>
+<li>Select the maintenance team, the equipment and the location</li>
+<li>Upon saving, a maintenance request will be created with the information from the FSM order.</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/66">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_maintenance%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>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#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/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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_maintenance">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_maintenance/views/fsm_equipment_view.xml b/fieldservice_maintenance/views/fsm_equipment_view.xml
new file mode 100644
index 0000000000..85e2ab1598
--- /dev/null
+++ b/fieldservice_maintenance/views/fsm_equipment_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Field Service maintenance Form View-->
+    <record id="fsm_equipment_form_view_maintenance" model="ir.ui.view">
+        <field name="name">fsm.equipment.form.maintenance</field>
+        <field name="model">fsm.equipment</field>
+        <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='current_location_id']" position="after">
+                <field name="maintenance_equipment_id"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_maintenance/views/fsm_order_view.xml b/fieldservice_maintenance/views/fsm_order_view.xml
new file mode 100644
index 0000000000..bcab7bc294
--- /dev/null
+++ b/fieldservice_maintenance/views/fsm_order_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<odoo>
+    <!-- Copyright 2018 Open Source Integrators
+         License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
+
+    <!-- Fields Service Orders Form View -->
+    <record id="fsm_order_maintenance_form" model="ir.ui.view">
+        <field name="name">fsm.order.maintenance.form</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
+        <field name="arch" type="xml">
+            <field name="location_id" position="after">
+                <field name="request_id"
+                    readonly="1"
+                    attrs="{'invisible': [('type', '!=', 'maintenance')]}"/>
+                <field name="maintenance_team_id"
+                    attrs="{'invisible': [('type', '!=', 'maintenance')]}"/>
+            </field>
+            <field name="equipment_id" position="attributes">
+                <attribute name="attrs">{'required': [('type', '=', 'maintenance')]}</attribute>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_maintenance/views/maintenance_view.xml b/fieldservice_maintenance/views/maintenance_view.xml
new file mode 100644
index 0000000000..d896c4216a
--- /dev/null
+++ b/fieldservice_maintenance/views/maintenance_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- equiment : views -->
+    <record id="hr_equipment_view_form" model="ir.ui.view">
+        <field name="name">equipment.form.fsm</field>
+        <field name="model">maintenance.equipment</field>
+        <field name="inherit_id" ref="maintenance.hr_equipment_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//notebook/page[3]" position="after">
+                <page string="Others">
+                    <group>
+                        <group>
+                            <field name="is_fsm_equipment"/>
+                        </group>
+                    </group>
+                </page>
+            </xpath>
+        </field>
+    </record>
+    
+    <!-- Field Service maintenance request Form View-->
+    <record id="hr_equipment_request_view_form_fsm" model="ir.ui.view">
+        <field name="name">equipment.request.form.fsm</field>
+        <field name="model">maintenance.request</field>
+        <field name="inherit_id" ref="maintenance.hr_equipment_request_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='equipment_id']" position="after">
+                <field name="fsm_order_id" attrs="{'invisible': [('fsm_order_id', '=', False)]}"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

From dc71d6ed997f4081c0756f093d8c76f0fbc16bb6 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 3 Jan 2019 14:37:55 -0600
Subject: [PATCH 543/631] [IMP] UI

---
 fieldservice_maintenance/models/fsm_order.py       |  7 +++++--
 fieldservice_maintenance/models/maintenance.py     |  5 ++++-
 .../views/fsm_equipment_view.xml                   | 14 +++++++++++---
 fieldservice_maintenance/views/fsm_order_view.xml  |  9 ++-------
 .../views/maintenance_view.xml                     |  3 +++
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index 4b668d0511..ddc2684a34 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -12,7 +12,6 @@ class FSMOrder(geo_model.GeoModel):
     type = fields.Selection(selection_add=[('maintenance', 'Maintenance')])
     request_id = fields.Many2one(
         'maintenance.request', 'Maintenance Request')
-    maintenance_team_id = fields.Many2one('maintenance.team', string='Team')
 
     @api.model
     def create(self, vals):
@@ -38,7 +37,11 @@ def create(self, vals):
                     'request_date': fields.Date.context_today(self),
                     'maintenance_type': 'corrective',
                     'maintenance_team_id':
-                        order.maintenance_team_id.id or False,
+                        equipment.maintenance_equipment_id and
+                        equipment.maintenance_equipment_id.maintenance_team_id
+                        and
+                        equipment.maintenance_equipment_id.maintenance_team_id.id
+                        or False,
                     'schedule_date': order.request_early,
                     'description': order.description
                 })
diff --git a/fieldservice_maintenance/models/maintenance.py b/fieldservice_maintenance/models/maintenance.py
index caa5df7841..1b16edfb89 100644
--- a/fieldservice_maintenance/models/maintenance.py
+++ b/fieldservice_maintenance/models/maintenance.py
@@ -26,7 +26,10 @@ def create(self, vals):
                 'maintenance_equipment_id', '=', request.equipment_id)
             fsm_order_id = self.env['fsm.order'].create({
                 'type': 'maintenance',
-                'equipment_id': fsm_equipment and fsm_equipment[0].id or False
+                'equipment_id': fsm_equipment and fsm_equipment[0].id or False,
+                'location_id':
+                    fsm_equipment and fsm_equipment[0].current_location_id.id
+                    or False
                 })
             request.fsm_order_id = fsm_order_id
         return request
diff --git a/fieldservice_maintenance/views/fsm_equipment_view.xml b/fieldservice_maintenance/views/fsm_equipment_view.xml
index 85e2ab1598..2f0bebc623 100644
--- a/fieldservice_maintenance/views/fsm_equipment_view.xml
+++ b/fieldservice_maintenance/views/fsm_equipment_view.xml
@@ -7,9 +7,17 @@
         <field name="model">fsm.equipment</field>
         <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='current_location_id']" position="after">
-                <field name="maintenance_equipment_id"/>
-            </xpath>
+            <notebook position="inside">
+                <page string="Maintenance">
+                    <group>
+                        <group id="maintenance-left">
+                            <field name="maintenance_equipment_id"/>
+                        </group>
+                        <group id="maintenance-right"/>
+                    </group>
+                </page>
+            </notebook>
         </field>
     </record>
+
 </odoo>
diff --git a/fieldservice_maintenance/views/fsm_order_view.xml b/fieldservice_maintenance/views/fsm_order_view.xml
index bcab7bc294..a03c5c76b8 100644
--- a/fieldservice_maintenance/views/fsm_order_view.xml
+++ b/fieldservice_maintenance/views/fsm_order_view.xml
@@ -9,16 +9,11 @@
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
-            <field name="location_id" position="after">
+            <xpath expr="//group[@id='others-right']" position="inside">
                 <field name="request_id"
                     readonly="1"
                     attrs="{'invisible': [('type', '!=', 'maintenance')]}"/>
-                <field name="maintenance_team_id"
-                    attrs="{'invisible': [('type', '!=', 'maintenance')]}"/>
-            </field>
-            <field name="equipment_id" position="attributes">
-                <attribute name="attrs">{'required': [('type', '=', 'maintenance')]}</attribute>
-            </field>
+            </xpath>
         </field>
     </record>
 
diff --git a/fieldservice_maintenance/views/maintenance_view.xml b/fieldservice_maintenance/views/maintenance_view.xml
index d896c4216a..e88eb67c05 100644
--- a/fieldservice_maintenance/views/maintenance_view.xml
+++ b/fieldservice_maintenance/views/maintenance_view.xml
@@ -7,6 +7,9 @@
         <field name="model">maintenance.equipment</field>
         <field name="inherit_id" ref="maintenance.hr_equipment_view_form"/>
         <field name="arch" type="xml">
+            <field name="maintenance_team_id" position="attributes">
+                <attribute name="required">True</attribute>
+            </field>
             <xpath expr="//notebook/page[3]" position="after">
                 <page string="Others">
                     <group>

From a4783aac53a051dd64784cefa4afe87497523773 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 3 Jan 2019 14:55:19 -0600
Subject: [PATCH 544/631] [FIX] PEP8 error

---
 fieldservice_maintenance/models/fsm_order.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index ddc2684a34..8cfe9228b5 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -25,6 +25,11 @@ def create(self, vals):
                 employee_id = employee_ids[0]
             if order.equipment_id:
                 equipment = order.equipment_id
+                t = equipment.maintenance_equipment_id and\
+                    equipment.maintenance_equipment_id.maintenance_team_id \
+                    and\
+                    equipment.maintenance_equipment_id.maintenance_team_id.id\
+                    or False,
                 request_id = self.env['maintenance.request'].create({
                     'name': order.name or '',
                     'employee_id': employee_id.id,
@@ -36,12 +41,7 @@ def create(self, vals):
                         equipment.category_id.id or False,
                     'request_date': fields.Date.context_today(self),
                     'maintenance_type': 'corrective',
-                    'maintenance_team_id':
-                        equipment.maintenance_equipment_id and
-                        equipment.maintenance_equipment_id.maintenance_team_id
-                        and
-                        equipment.maintenance_equipment_id.maintenance_team_id.id
-                        or False,
+                    'maintenance_team_id': t,
                     'schedule_date': order.request_early,
                     'description': order.description
                 })

From 9231f887b93748b680c67b37afebb155d6fe8589 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 4 Jan 2019 14:24:56 -0600
Subject: [PATCH 545/631] [FIX] Model

---
 fieldservice_maintenance/models/fsm_equipment.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index 49abfc91a7..04aa42c605 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -10,4 +10,5 @@ class FSMEquipment(models.Model):
     _description = 'FSM Maintenance equipment'
 
     maintenance_equipment_id = fields.Many2one(
-        'maintenance.equipment', string='Maintenance Equipment')
+        'maintenance.equipment', string='Maintenance Equipment', required=True,
+        ondelete='restrict', delegate=True, auto_join=True)

From 9daea6e879e9e4dc6697419867309b1dc4f577d5 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Tue, 8 Jan 2019 10:24:34 -0600
Subject: [PATCH 546/631] [FIX] PEP8 error

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

diff --git a/fieldservice_maintenance/readme/DESCRIPTION.rst b/fieldservice_maintenance/readme/DESCRIPTION.rst
index a8a98ee699..fd73d84ed7 100644
--- a/fieldservice_maintenance/readme/DESCRIPTION.rst
+++ b/fieldservice_maintenance/readme/DESCRIPTION.rst
@@ -4,4 +4,4 @@ not support a maintenance schedule generating preventive maintenance request.
 
 This module allows you to merge equipments from Field Service and Maintenance
 and have a maintenance schedule for FSM equipments as well as Field Service
-capabilities for maintenance equipments.
\ No newline at end of file
+capabilities for maintenance equipments.

From b3505488c1cfc3bd51f8571934ea82e0efbb45c5 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 9 Jan 2019 20:49:21 -0600
Subject: [PATCH 547/631] [ADD] stock.py

---
 fieldservice_maintenance/models/__init__.py |  9 ++++++---
 fieldservice_maintenance/models/stock.py    | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 fieldservice_maintenance/models/stock.py

diff --git a/fieldservice_maintenance/models/__init__.py b/fieldservice_maintenance/models/__init__.py
index bac82e01f7..6f21213b3c 100644
--- a/fieldservice_maintenance/models/__init__.py
+++ b/fieldservice_maintenance/models/__init__.py
@@ -1,6 +1,9 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import fsm_order
-from . import maintenance
-from . import fsm_equipment
+from . import (
+    fsm_order,
+    maintenance,
+    fsm_equipment,
+    stock,
+)
diff --git a/fieldservice_maintenance/models/stock.py b/fieldservice_maintenance/models/stock.py
new file mode 100644
index 0000000000..b9568497b9
--- /dev/null
+++ b/fieldservice_maintenance/models/stock.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2018 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class StockMove(models.Model):
+    _inherit = "stock.move"
+
+    def prepare_equipment_values(self, move_line):
+        res = super(StockMove, self).prepare_equipment_values(move_line)
+        vals = {'name': '%s (%s)' % (move_line.product_id.name,
+                                     move_line.lot_id.name),
+                'serial_no': move_line.lot_id.name,
+                'is_fsm_equipment': True}
+        equipment_id = self.env['maintenance.equipment'].create(vals)
+        res.update({'maintenance_equipment_id': equipment_id.id})
+        return res

From d638a5ba762eb3eea1082d791c9bf71481db7865 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 31 Jan 2019 12:42:17 -0600
Subject: [PATCH 548/631] [FIX] fieldservice_maintenance

---
 fieldservice_maintenance/__manifest__.py      |  2 +-
 .../models/fsm_equipment.py                   | 26 ++++++++++++++++---
 .../views/fsm_equipment_view.xml              |  2 +-
 .../views/fsm_order_view.xml                  |  4 +--
 .../views/maintenance_view.xml                |  2 +-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index 592d2d0a58..5cee0eaa39 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Maintenance',
     'summary': 'Maintenance',
-    'version': '11.0.0.0.1',
+    'version': '11.0.0.1.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index 04aa42c605..bb757ed8af 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -1,14 +1,32 @@
 # Copyright (C) 2018 - TODAY, 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 FSMEquipment(models.Model):
     _inherit = 'fsm.equipment'
     _inherits = {'maintenance.equipment': 'maintenance_equipment_id'}
-    _description = 'FSM Maintenance equipment'
 
     maintenance_equipment_id = fields.Many2one(
-        'maintenance.equipment', string='Maintenance Equipment', required=True,
-        ondelete='restrict', delegate=True, auto_join=True)
+        'maintenance.equipment', string='Related Maintenance Equipment',
+        required=True, ondelete='restrict', delegate=True, auto_join=True,
+        index=True)
+
+    @api.model
+    def create(self, vals):
+        maintenance_equipment_id = self.env['maintenance.equipment'].create({
+            'name': vals['name'],
+            'equipment_assign_to': 'other',
+            'maintenance_team_id': vals['maintenance_team_id'],
+            'is_fsm_equipment': True,
+            'note': vals['notes'] or False,
+            'serial_no':
+                vals['lot_id'] and
+                self.env['stock.production.lot'].browse(vals['lot_id']).name
+                or False})
+        if maintenance_equipment_id:
+            vals.update({
+                'maintenance_equipment_id': maintenance_equipment_id.id})
+        res = super(FSMEquipment, self).create(vals)
+        return res
diff --git a/fieldservice_maintenance/views/fsm_equipment_view.xml b/fieldservice_maintenance/views/fsm_equipment_view.xml
index 2f0bebc623..b49347e8e8 100644
--- a/fieldservice_maintenance/views/fsm_equipment_view.xml
+++ b/fieldservice_maintenance/views/fsm_equipment_view.xml
@@ -11,7 +11,7 @@
                 <page string="Maintenance">
                     <group>
                         <group id="maintenance-left">
-                            <field name="maintenance_equipment_id"/>
+                            <field name="maintenance_team_id" required="1"/>
                         </group>
                         <group id="maintenance-right"/>
                     </group>
diff --git a/fieldservice_maintenance/views/fsm_order_view.xml b/fieldservice_maintenance/views/fsm_order_view.xml
index a03c5c76b8..4e256c9e42 100644
--- a/fieldservice_maintenance/views/fsm_order_view.xml
+++ b/fieldservice_maintenance/views/fsm_order_view.xml
@@ -9,11 +9,11 @@
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@id='others-right']" position="inside">
+            <field name="template_id" position="after">
                 <field name="request_id"
                     readonly="1"
                     attrs="{'invisible': [('type', '!=', 'maintenance')]}"/>
-            </xpath>
+            </field>
         </field>
     </record>
 
diff --git a/fieldservice_maintenance/views/maintenance_view.xml b/fieldservice_maintenance/views/maintenance_view.xml
index e88eb67c05..f05f4c592e 100644
--- a/fieldservice_maintenance/views/maintenance_view.xml
+++ b/fieldservice_maintenance/views/maintenance_view.xml
@@ -14,7 +14,7 @@
                 <page string="Others">
                     <group>
                         <group>
-                            <field name="is_fsm_equipment"/>
+                            <field name="is_fsm_equipment" readonly="1"/>
                         </group>
                     </group>
                 </page>

From 178fff64c328ecadf57f02f9df1a792109f6510d Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 1 Feb 2019 19:05:17 -0600
Subject: [PATCH 549/631] [FIX] fieldservice_maintenance

---
 fieldservice_maintenance/__manifest__.py          | 2 +-
 fieldservice_maintenance/views/fsm_order_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index 5cee0eaa39..8f139c8d67 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Maintenance',
     'summary': 'Maintenance',
-    'version': '11.0.0.1.0',
+    'version': '11.0.0.2.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_maintenance/views/fsm_order_view.xml b/fieldservice_maintenance/views/fsm_order_view.xml
index 4e256c9e42..94642d72d0 100644
--- a/fieldservice_maintenance/views/fsm_order_view.xml
+++ b/fieldservice_maintenance/views/fsm_order_view.xml
@@ -9,7 +9,7 @@
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
-            <field name="template_id" position="after">
+            <field name="priority" position="before">
                 <field name="request_id"
                     readonly="1"
                     attrs="{'invisible': [('type', '!=', 'maintenance')]}"/>

From acaab8aba6f807884438903bdbfdfea68524537e Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 8 Feb 2019 00:10:23 -0600
Subject: [PATCH 550/631] [IMP] UI stuff

---
 .../views/fsm_equipment_view.xml              | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/fieldservice_maintenance/views/fsm_equipment_view.xml b/fieldservice_maintenance/views/fsm_equipment_view.xml
index b49347e8e8..49fc1d2bb0 100644
--- a/fieldservice_maintenance/views/fsm_equipment_view.xml
+++ b/fieldservice_maintenance/views/fsm_equipment_view.xml
@@ -7,16 +7,24 @@
         <field name="model">fsm.equipment</field>
         <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view"/>
         <field name="arch" type="xml">
-            <notebook position="inside">
-                <page string="Maintenance">
-                    <group>
-                        <group id="maintenance-left">
-                            <field name="maintenance_team_id" required="1"/>
-                        </group>
-                        <group id="maintenance-right"/>
-                    </group>
-                </page>
-            </notebook>
+            <group id="secondary" position="inside">
+                <group string="Maintenance">
+                    <field name="maintenance_team_id" required="1"/>
+                    <field name="category_id"/>
+                </group>
+            </group>
+        </field>
+    </record>
+
+    <record id="fsm_equipment_form_view_model" model="ir.ui.view">
+        <field name="name">fsm.equipment.model</field>
+        <field name="model">fsm.equipment</field>
+        <field name="inherit_id"
+               ref="fieldservice_stock.fsm_equipment_form_view_stock"/>
+        <field name="arch" type="xml">
+            <field name="product_id" position="after">
+                <field name="model"/>
+            </field>
         </field>
     </record>
 

From f98aa0ecc51e8075d3aa3d60d07935c8ba908b7b Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@ursainfosystems.com>
Date: Fri, 8 Mar 2019 13:19:47 -0800
Subject: [PATCH 551/631] [IMP] FSM Maintenance Bug Fix

---
 .../views/fsm_equipment_view.xml                     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/fieldservice_maintenance/views/fsm_equipment_view.xml b/fieldservice_maintenance/views/fsm_equipment_view.xml
index 49fc1d2bb0..5a8ec7ff4d 100644
--- a/fieldservice_maintenance/views/fsm_equipment_view.xml
+++ b/fieldservice_maintenance/views/fsm_equipment_view.xml
@@ -28,4 +28,16 @@
         </field>
     </record>
 
+    <record id="fsm_equipment_tree_view_model" model="ir.ui.view">
+        <field name="name">fsm.equipment.model</field>
+        <field name="model">fsm.equipment</field>
+        <field name="inherit_id"
+               ref="fieldservice.fsm_equipment_tree_view"/>
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="category_id"/>
+            </field>
+        </field>
+    </record>
+
 </odoo>

From 1268a213d27b8cd16f2b10f982d58494d24ed7ce Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Fri, 5 Apr 2019 20:30:17 +0530
Subject: [PATCH 552/631] [MIG][WIP][12.0] fieldservice_maintenance

---
 fieldservice_maintenance/README.rst            | 13 +++++++------
 fieldservice_maintenance/__manifest__.py       |  4 +++-
 fieldservice_maintenance/models/__init__.py    |  1 -
 .../models/fsm_equipment.py                    |  9 +++------
 fieldservice_maintenance/models/fsm_order.py   |  7 +++----
 fieldservice_maintenance/models/maintenance.py |  7 ++++---
 fieldservice_maintenance/models/stock.py       | 18 ------------------
 .../readme/CONTRIBUTORS.rst                    |  1 +
 fieldservice_maintenance/readme/INSTALL.rst    |  2 +-
 .../static/description/index.html              |  9 +++++----
 .../views/fsm_order_view.xml                   |  6 +++---
 .../views/maintenance_view.xml                 |  8 +++++---
 12 files changed, 35 insertions(+), 50 deletions(-)
 delete mode 100644 fieldservice_maintenance/models/stock.py

diff --git a/fieldservice_maintenance/README.rst b/fieldservice_maintenance/README.rst
index fa3e01ee7b..6ad9101c07 100644
--- a/fieldservice_maintenance/README.rst
+++ b/fieldservice_maintenance/README.rst
@@ -14,13 +14,13 @@ Field Service - Maintenance
     :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_maintenance
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance
     :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_maintenance
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_maintenance
     :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| 
@@ -45,7 +45,7 @@ To install Field Service and have the mapping features,
 you need to install fieldservice_stock and maintenance
 
 Please refer to the installation instructions available at:
-https://github.com/OCA/field-service/tree/11.0/fieldservice_maintenance
+https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance
 
 Configuration
 =============
@@ -79,7 +79,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_maintenance%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_maintenance%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.
 
@@ -95,6 +95,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -127,6 +128,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-smangukiya| |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_maintenance>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index 8f139c8d67..b9a574cc3a 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -4,13 +4,14 @@
 {
     'name': 'Field Service - Maintenance',
     'summary': 'Maintenance',
-    'version': '11.0.0.2.0',
+    'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice_stock',
         'maintenance',
+        'hr',
     ],
     'data': [
         'views/maintenance_view.xml',
@@ -23,4 +24,5 @@
         'smangukiya',
         'max3903',
     ],
+    'installable': True,
 }
diff --git a/fieldservice_maintenance/models/__init__.py b/fieldservice_maintenance/models/__init__.py
index 6f21213b3c..0410718458 100644
--- a/fieldservice_maintenance/models/__init__.py
+++ b/fieldservice_maintenance/models/__init__.py
@@ -5,5 +5,4 @@
     fsm_order,
     maintenance,
     fsm_equipment,
-    stock,
 )
diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index bb757ed8af..9913c57aaf 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -6,7 +6,6 @@
 
 class FSMEquipment(models.Model):
     _inherit = 'fsm.equipment'
-    _inherits = {'maintenance.equipment': 'maintenance_equipment_id'}
 
     maintenance_equipment_id = fields.Many2one(
         'maintenance.equipment', string='Related Maintenance Equipment',
@@ -16,11 +15,10 @@ class FSMEquipment(models.Model):
     @api.model
     def create(self, vals):
         maintenance_equipment_id = self.env['maintenance.equipment'].create({
-            'name': vals['name'],
+            'name': vals.get('name'),
             'equipment_assign_to': 'other',
-            'maintenance_team_id': vals['maintenance_team_id'],
             'is_fsm_equipment': True,
-            'note': vals['notes'] or False,
+            'note': vals.get('notes', False),
             'serial_no':
                 vals['lot_id'] and
                 self.env['stock.production.lot'].browse(vals['lot_id']).name
@@ -28,5 +26,4 @@ def create(self, vals):
         if maintenance_equipment_id:
             vals.update({
                 'maintenance_equipment_id': maintenance_equipment_id.id})
-        res = super(FSMEquipment, self).create(vals)
-        return res
+        return super(FSMEquipment, self).create(vals)
diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index 8cfe9228b5..8d0bb77118 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -1,11 +1,10 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields
-from odoo.addons.base_geoengine import geo_model
+from odoo import api, fields, models
 
 
-class FSMOrder(geo_model.GeoModel):
+class FSMOrder(models.Model):
     _inherit = 'fsm.order'
     _description = 'Field Service Order Maintenance'
 
@@ -23,7 +22,7 @@ def create(self, vals):
                 [('user_id', '=', self.env.uid)])
             if employee_ids:
                 employee_id = employee_ids[0]
-            if order.equipment_id:
+            if order.equipment_id and not order.equipment_id.is_fsm_equipment:
                 equipment = order.equipment_id
                 t = equipment.maintenance_equipment_id and\
                     equipment.maintenance_equipment_id.maintenance_team_id \
diff --git a/fieldservice_maintenance/models/maintenance.py b/fieldservice_maintenance/models/maintenance.py
index 1b16edfb89..e356965fed 100644
--- a/fieldservice_maintenance/models/maintenance.py
+++ b/fieldservice_maintenance/models/maintenance.py
@@ -23,12 +23,13 @@ def create(self, vals):
         if request.equipment_id.is_fsm_equipment:
             # Get the fsm equipment
             fsm_equipment = self.env['fsm.equipment'].search(
-                'maintenance_equipment_id', '=', request.equipment_id)
+                [('maintenance_equipment_id', '=', request.equipment_id.id)],
+                limit=1)
             fsm_order_id = self.env['fsm.order'].create({
                 'type': 'maintenance',
-                'equipment_id': fsm_equipment and fsm_equipment[0].id or False,
+                'equipment_id': fsm_equipment and fsm_equipment.id or False,
                 'location_id':
-                    fsm_equipment and fsm_equipment[0].current_location_id.id
+                    fsm_equipment and fsm_equipment.current_location_id.id
                     or False
                 })
             request.fsm_order_id = fsm_order_id
diff --git a/fieldservice_maintenance/models/stock.py b/fieldservice_maintenance/models/stock.py
deleted file mode 100644
index b9568497b9..0000000000
--- a/fieldservice_maintenance/models/stock.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import models
-
-
-class StockMove(models.Model):
-    _inherit = "stock.move"
-
-    def prepare_equipment_values(self, move_line):
-        res = super(StockMove, self).prepare_equipment_values(move_line)
-        vals = {'name': '%s (%s)' % (move_line.product_id.name,
-                                     move_line.lot_id.name),
-                'serial_no': move_line.lot_id.name,
-                'is_fsm_equipment': True}
-        equipment_id = self.env['maintenance.equipment'].create(vals)
-        res.update({'maintenance_equipment_id': equipment_id.id})
-        return res
diff --git a/fieldservice_maintenance/readme/CONTRIBUTORS.rst b/fieldservice_maintenance/readme/CONTRIBUTORS.rst
index a76235f8a2..373b2a6a28 100644
--- a/fieldservice_maintenance/readme/CONTRIBUTORS.rst
+++ b/fieldservice_maintenance/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_maintenance/readme/INSTALL.rst b/fieldservice_maintenance/readme/INSTALL.rst
index 43c27d0602..7fdfc47daf 100644
--- a/fieldservice_maintenance/readme/INSTALL.rst
+++ b/fieldservice_maintenance/readme/INSTALL.rst
@@ -2,4 +2,4 @@ To install Field Service and have the mapping features,
 you need to install fieldservice_stock and maintenance
 
 Please refer to the installation instructions available at:
-https://github.com/OCA/field-service/tree/11.0/fieldservice_maintenance
+https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance
diff --git a/fieldservice_maintenance/static/description/index.html b/fieldservice_maintenance/static/description/index.html
index f641896644..6cf73d7d6b 100644
--- a/fieldservice_maintenance/static/description/index.html
+++ b/fieldservice_maintenance/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Maintenance</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_maintenance"><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_maintenance"><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_maintenance"><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_maintenance"><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>Odoo Maintenance App does not support Field Service operations for equipments
 outside the company facilities. On the other hand, the Field Service App does
 not support a maintenance schedule generating preventive maintenance request.</p>
@@ -396,7 +396,7 @@ <h1><a class="toc-backref" href="#id1">Installation</a></h1>
 <p>To install Field Service and have the mapping features,
 you need to install fieldservice_stock and maintenance</p>
 <p>Please refer to the installation instructions available at:
-<a class="reference external" href="https://github.com/OCA/field-service/tree/11.0/fieldservice_maintenance">https://github.com/OCA/field-service/tree/11.0/fieldservice_maintenance</a></p>
+<a class="reference external" href="https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance">https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance</a></p>
 </div>
 <div class="section" id="configuration">
 <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
@@ -428,7 +428,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_maintenance%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_maintenance%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">
@@ -443,6 +443,7 @@ <h2><a class="toc-backref" href="#id7">Authors</a></h2>
 <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
 <li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#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">
@@ -461,7 +462,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/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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_maintenance">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_maintenance">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_maintenance/views/fsm_order_view.xml b/fieldservice_maintenance/views/fsm_order_view.xml
index 94642d72d0..2f60c96393 100644
--- a/fieldservice_maintenance/views/fsm_order_view.xml
+++ b/fieldservice_maintenance/views/fsm_order_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <!-- Copyright 2018 Open Source Integrators
          License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
@@ -11,8 +11,8 @@
         <field name="arch" type="xml">
             <field name="priority" position="before">
                 <field name="request_id"
-                    readonly="1"
-                    attrs="{'invisible': [('type', '!=', 'maintenance')]}"/>
+                       readonly="1"
+                       attrs="{'invisible': [('type', '!=', 'maintenance')]}"/>
             </field>
         </field>
     </record>
diff --git a/fieldservice_maintenance/views/maintenance_view.xml b/fieldservice_maintenance/views/maintenance_view.xml
index f05f4c592e..fd201f36ca 100644
--- a/fieldservice_maintenance/views/maintenance_view.xml
+++ b/fieldservice_maintenance/views/maintenance_view.xml
@@ -21,15 +21,17 @@
             </xpath>
         </field>
     </record>
-    
+
     <!-- Field Service maintenance request Form View-->
     <record id="hr_equipment_request_view_form_fsm" model="ir.ui.view">
         <field name="name">equipment.request.form.fsm</field>
         <field name="model">maintenance.request</field>
-        <field name="inherit_id" ref="maintenance.hr_equipment_request_view_form"/>
+        <field name="inherit_id"
+               ref="maintenance.hr_equipment_request_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='equipment_id']" position="after">
-                <field name="fsm_order_id" attrs="{'invisible': [('fsm_order_id', '=', False)]}"/>
+                <field name="fsm_order_id"
+                       attrs="{'invisible': [('fsm_order_id', '=', False)]}"/>
             </xpath>
         </field>
     </record>

From b4a4c87a2b98f2ae53e243759044a88c9b3614dc Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Tue, 30 Apr 2019 16:41:58 +0530
Subject: [PATCH 553/631] [FIX][12.0] Improved code.

---
 fieldservice_maintenance/models/fsm_order.py  | 42 ++++++++-----------
 .../models/maintenance.py                     | 17 ++++----
 2 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index 8d0bb77118..b2d8df3c78 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -18,31 +18,23 @@ def create(self, vals):
         # create maintenance request
         order = super(FSMOrder, self).create(vals)
         if order.type == 'maintenance':
-            employee_ids = self.env['hr.employee'].search(
-                [('user_id', '=', self.env.uid)])
-            if employee_ids:
-                employee_id = employee_ids[0]
-            if order.equipment_id and not order.equipment_id.is_fsm_equipment:
+            employee_rec = self.env['hr.employee'].search(
+                [('user_id', '=', self.env.uid)], limit=1)
+            if order.equipment_id and not order.request_id:
                 equipment = order.equipment_id
-                t = equipment.maintenance_equipment_id and\
-                    equipment.maintenance_equipment_id.maintenance_team_id \
-                    and\
-                    equipment.maintenance_equipment_id.maintenance_team_id.id\
-                    or False,
-                request_id = self.env['maintenance.request'].create({
-                    'name': order.name or '',
-                    'employee_id': employee_id.id,
-                    'equipment_id':
-                        equipment.maintenance_equipment_id
-                        and equipment.maintenance_equipment_id.id or False,
-                    'category_id':
-                        equipment.category_id and
-                        equipment.category_id.id or False,
-                    'request_date': fields.Date.context_today(self),
-                    'maintenance_type': 'corrective',
-                    'maintenance_team_id': t,
-                    'schedule_date': order.request_early,
-                    'description': order.description
-                })
+                team_id = equipment.maintenance_equipment_id and\
+                    equipment.maintenance_equipment_id.maintenance_team_id.id
+                request_id = self.env['maintenance.request'].with_context(
+                    fsm_order=True).create({
+                        'name': order.name or '',
+                        'employee_id': employee_rec.id,
+                        'equipment_id': equipment.maintenance_equipment_id.id,
+                        'category_id': equipment.category_id.id,
+                        'request_date': fields.Date.context_today(self),
+                        'maintenance_type': 'corrective',
+                        'maintenance_team_id': team_id,
+                        'schedule_date': order.request_early,
+                        'description': order.description
+                    })
                 order.request_id = request_id
         return order
diff --git a/fieldservice_maintenance/models/maintenance.py b/fieldservice_maintenance/models/maintenance.py
index e356965fed..2b0c1753ce 100644
--- a/fieldservice_maintenance/models/maintenance.py
+++ b/fieldservice_maintenance/models/maintenance.py
@@ -20,17 +20,18 @@ def create(self, vals):
         # create FSM order with type maintenance if selected equipment is
         # enabled with boolean is_fsm_equipment
         request = super(MaintenanceRequest, self).create(vals)
-        if request.equipment_id.is_fsm_equipment:
+        ctx = dict(self._context)
+        if request.equipment_id.is_fsm_equipment and "fsm_order" not in ctx:
             # Get the fsm equipment
             fsm_equipment = self.env['fsm.equipment'].search(
                 [('maintenance_equipment_id', '=', request.equipment_id.id)],
                 limit=1)
-            fsm_order_id = self.env['fsm.order'].create({
-                'type': 'maintenance',
-                'equipment_id': fsm_equipment and fsm_equipment.id or False,
-                'location_id':
-                    fsm_equipment and fsm_equipment.current_location_id.id
-                    or False
-                })
+            fsm_order_id = self.env['fsm.order'].create(
+                {'type': 'maintenance',
+                 'equipment_id': fsm_equipment.id,
+                 'location_id': fsm_equipment and
+                 fsm_equipment.current_location_id.id,
+                 'request_id': request.id
+                 })
             request.fsm_order_id = fsm_order_id
         return request

From 4d9d3d2e28e539011350b0b4881602c96271cd0e Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 27 Jun 2019 10:33:13 -0700
Subject: [PATCH 554/631] [IMP] Remove Create() Repair/Maintenance

---
 fieldservice_maintenance/models/fsm_order.py | 27 --------------------
 1 file changed, 27 deletions(-)

diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index b2d8df3c78..e78951e38f 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -11,30 +11,3 @@ class FSMOrder(models.Model):
     type = fields.Selection(selection_add=[('maintenance', 'Maintenance')])
     request_id = fields.Many2one(
         'maintenance.request', 'Maintenance Request')
-
-    @api.model
-    def create(self, vals):
-        # if FSM order with type maintenance is create then
-        # create maintenance request
-        order = super(FSMOrder, self).create(vals)
-        if order.type == 'maintenance':
-            employee_rec = self.env['hr.employee'].search(
-                [('user_id', '=', self.env.uid)], limit=1)
-            if order.equipment_id and not order.request_id:
-                equipment = order.equipment_id
-                team_id = equipment.maintenance_equipment_id and\
-                    equipment.maintenance_equipment_id.maintenance_team_id.id
-                request_id = self.env['maintenance.request'].with_context(
-                    fsm_order=True).create({
-                        'name': order.name or '',
-                        'employee_id': employee_rec.id,
-                        'equipment_id': equipment.maintenance_equipment_id.id,
-                        'category_id': equipment.category_id.id,
-                        'request_date': fields.Date.context_today(self),
-                        'maintenance_type': 'corrective',
-                        'maintenance_team_id': team_id,
-                        'schedule_date': order.request_early,
-                        'description': order.description
-                    })
-                order.request_id = request_id
-        return order

From 1477b9df6e03d5efacb666849bffd70be85f8e68 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 27 Jun 2019 10:40:06 -0700
Subject: [PATCH 555/631] [IMP] Create() Unused

---
 fieldservice_maintenance/models/fsm_order.py | 27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index e78951e38f..5eb0ae2c0d 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -11,3 +11,30 @@ class FSMOrder(models.Model):
     type = fields.Selection(selection_add=[('maintenance', 'Maintenance')])
     request_id = fields.Many2one(
         'maintenance.request', 'Maintenance Request')
+        
+    # @api.model
+    # def create(self, vals):
+    #     # if FSM order with type maintenance is create then
+    #     # create maintenance request
+    #     order = super(FSMOrder, self).create(vals)
+    #     if order.type == 'maintenance':
+    #         employee_rec = self.env['hr.employee'].search(
+    #             [('user_id', '=', self.env.uid)], limit=1)
+    #         if order.equipment_id and not order.request_id:
+    #             equipment = order.equipment_id
+    #             team_id = equipment.maintenance_equipment_id and\
+    #                 equipment.maintenance_equipment_id.maintenance_team_id.id
+    #             request_id = self.env['maintenance.request'].with_context(
+    #                 fsm_order=True).create({
+    #                     'name': order.name or '',
+    #                     'employee_id': employee_rec.id,
+    #                     'equipment_id': equipment.maintenance_equipment_id.id,
+    #                     'category_id': equipment.category_id.id,
+    #                     'request_date': fields.Date.context_today(self),
+    #                     'maintenance_type': 'corrective',
+    #                     'maintenance_team_id': team_id,
+    #                     'schedule_date': order.request_early,
+    #                     'description': order.description
+    #                 })
+    #             order.request_id = request_id
+    #     return order

From 15bde21228627c89a0b9561feae4722ef3a0ffdc Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 5 Jul 2019 14:16:06 -0500
Subject: [PATCH 556/631] [FIX] fieldservice_maintenance: formatting

---
 fieldservice_maintenance/models/fsm_order.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index 5eb0ae2c0d..e9ff4f4742 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -1,7 +1,8 @@
 # Copyright (C) 2018 - TODAY, 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
+# from odoo import api, fields, models
 
 
 class FSMOrder(models.Model):
@@ -9,9 +10,9 @@ class FSMOrder(models.Model):
     _description = 'Field Service Order Maintenance'
 
     type = fields.Selection(selection_add=[('maintenance', 'Maintenance')])
-    request_id = fields.Many2one(
-        'maintenance.request', 'Maintenance Request')
-        
+    request_id = fields.Many2one('maintenance.request',
+                                 string='Maintenance Request')
+
     # @api.model
     # def create(self, vals):
     #     # if FSM order with type maintenance is create then
@@ -28,7 +29,8 @@ class FSMOrder(models.Model):
     #                 fsm_order=True).create({
     #                     'name': order.name or '',
     #                     'employee_id': employee_rec.id,
-    #                     'equipment_id': equipment.maintenance_equipment_id.id,
+    #                     'equipment_id':
+    #                         equipment.maintenance_equipment_id.id,
     #                     'category_id': equipment.category_id.id,
     #                     'request_date': fields.Date.context_today(self),
     #                     'maintenance_type': 'corrective',

From de185d6eb4331f86e137cd6401261bcf4cb03b59 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Wed, 17 Jul 2019 14:07:15 -0500
Subject: [PATCH 557/631] [IMP] fieldservice_maintenance: Remove description

---
 fieldservice_maintenance/models/fsm_order.py           | 1 -
 fieldservice_maintenance/static/description/index.html | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index e9ff4f4742..213efa886c 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -7,7 +7,6 @@
 
 class FSMOrder(models.Model):
     _inherit = 'fsm.order'
-    _description = 'Field Service Order Maintenance'
 
     type = fields.Selection(selection_add=[('maintenance', 'Maintenance')])
     request_id = fields.Many2one('maintenance.request',
diff --git a/fieldservice_maintenance/static/description/index.html b/fieldservice_maintenance/static/description/index.html
index 6cf73d7d6b..83c622b811 100644
--- a/fieldservice_maintenance/static/description/index.html
+++ b/fieldservice_maintenance/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 - Maintenance</title>
 <style type="text/css">
 

From 8ee504bab574c021d1862b433f33ffb3dee2e55c Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 25 Sep 2019 10:58:27 -0700
Subject: [PATCH 558/631] [IMP] FSM Maintenance Type

---
 fieldservice_maintenance/__manifest__.py         | 1 +
 fieldservice_maintenance/data/fsm_order_type.xml | 8 ++++++++
 fieldservice_maintenance/models/fsm_order.py     | 1 -
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_maintenance/data/fsm_order_type.xml

diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index b9a574cc3a..afb7843843 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -14,6 +14,7 @@
         'hr',
     ],
     'data': [
+        'data/fsm_order_type.xml',
         'views/maintenance_view.xml',
         'views/fsm_equipment_view.xml',
         'views/fsm_order_view.xml',
diff --git a/fieldservice_maintenance/data/fsm_order_type.xml b/fieldservice_maintenance/data/fsm_order_type.xml
new file mode 100644
index 0000000000..864c47a762
--- /dev/null
+++ b/fieldservice_maintenance/data/fsm_order_type.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <record id="fsm_order_type_maintenance" model="fsm.order.type">
+        <field name="name">Maintenance</field>
+    </record>
+
+</odoo>
diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index 213efa886c..5aec871afa 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -8,7 +8,6 @@
 class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
-    type = fields.Selection(selection_add=[('maintenance', 'Maintenance')])
     request_id = fields.Many2one('maintenance.request',
                                  string='Maintenance Request')
 

From 60d33ef0dfd62f0281c4f0b5bfe28bfbc709d3ed Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@ursainfosystems.com>
Date: Thu, 10 Oct 2019 11:09:31 +0530
Subject: [PATCH 559/631] [12.0][RM] Unnecessary dependence on hr module

---
 fieldservice_maintenance/__manifest__.py      |  1 -
 fieldservice_maintenance/models/fsm_order.py  | 56 +++++++++----------
 .../readme/CONTRIBUTORS.rst                   |  1 +
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index afb7843843..54be52779f 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -11,7 +11,6 @@
     'depends': [
         'fieldservice_stock',
         'maintenance',
-        'hr',
     ],
     'data': [
         'data/fsm_order_type.xml',
diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index 5aec871afa..81278f222c 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -1,8 +1,7 @@
 # Copyright (C) 2018 - TODAY, 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
+from odoo import api, fields, models
 
 
 class FSMOrder(models.Model):
@@ -11,30 +10,29 @@ class FSMOrder(models.Model):
     request_id = fields.Many2one('maintenance.request',
                                  string='Maintenance Request')
 
-    # @api.model
-    # def create(self, vals):
-    #     # if FSM order with type maintenance is create then
-    #     # create maintenance request
-    #     order = super(FSMOrder, self).create(vals)
-    #     if order.type == 'maintenance':
-    #         employee_rec = self.env['hr.employee'].search(
-    #             [('user_id', '=', self.env.uid)], limit=1)
-    #         if order.equipment_id and not order.request_id:
-    #             equipment = order.equipment_id
-    #             team_id = equipment.maintenance_equipment_id and\
-    #                 equipment.maintenance_equipment_id.maintenance_team_id.id
-    #             request_id = self.env['maintenance.request'].with_context(
-    #                 fsm_order=True).create({
-    #                     'name': order.name or '',
-    #                     'employee_id': employee_rec.id,
-    #                     'equipment_id':
-    #                         equipment.maintenance_equipment_id.id,
-    #                     'category_id': equipment.category_id.id,
-    #                     'request_date': fields.Date.context_today(self),
-    #                     'maintenance_type': 'corrective',
-    #                     'maintenance_team_id': team_id,
-    #                     'schedule_date': order.request_early,
-    #                     'description': order.description
-    #                 })
-    #             order.request_id = request_id
-    #     return order
+    @api.model
+    def create(self, vals):
+        # if FSM order with type maintenance is create then
+        # create maintenance request
+        order = super(FSMOrder, self).create(vals)
+        maintenance = self.env.ref(
+            'fieldservice_maintenance.fsm_order_type_maintenance')
+        if order.type == maintenance:
+            if order.equipment_id and not order.request_id:
+                equipment = order.equipment_id
+                team_id = equipment.maintenance_equipment_id and\
+                    equipment.maintenance_equipment_id.maintenance_team_id.id
+                request_id = self.env['maintenance.request'].with_context(
+                    fsm_order=True).create({
+                        'name': order.name or '',
+                        'equipment_id':
+                            equipment.maintenance_equipment_id.id,
+                        'category_id': equipment.category_id.id,
+                        'request_date': fields.Date.context_today(self),
+                        'maintenance_type': 'corrective',
+                        'maintenance_team_id': team_id,
+                        'schedule_date': order.request_early,
+                        'description': order.description
+                    })
+                order.request_id = request_id
+        return order
diff --git a/fieldservice_maintenance/readme/CONTRIBUTORS.rst b/fieldservice_maintenance/readme/CONTRIBUTORS.rst
index 373b2a6a28..9ccba616bd 100644
--- a/fieldservice_maintenance/readme/CONTRIBUTORS.rst
+++ b/fieldservice_maintenance/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Bhavesh Odedra <bodedra@opensourceintegrators.com>

From a8c22efbb33865146eaec210e2154002232870e4 Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@ursainfosystems.com>
Date: Mon, 14 Oct 2019 21:28:07 +0530
Subject: [PATCH 560/631] [12.0][FIX] avoid to create maintenance request if
 equipment.maintenance_equipment_id is not set

---
 fieldservice_maintenance/models/fsm_order.py | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index 81278f222c..b8c95b2c1e 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -20,19 +20,19 @@ def create(self, vals):
         if order.type == maintenance:
             if order.equipment_id and not order.request_id:
                 equipment = order.equipment_id
-                team_id = equipment.maintenance_equipment_id and\
-                    equipment.maintenance_equipment_id.maintenance_team_id.id
-                request_id = self.env['maintenance.request'].with_context(
-                    fsm_order=True).create({
-                        'name': order.name or '',
-                        'equipment_id':
-                            equipment.maintenance_equipment_id.id,
-                        'category_id': equipment.category_id.id,
-                        'request_date': fields.Date.context_today(self),
-                        'maintenance_type': 'corrective',
-                        'maintenance_team_id': team_id,
-                        'schedule_date': order.request_early,
-                        'description': order.description
-                    })
-                order.request_id = request_id
+                maintenance_equipment_id = equipment.maintenance_equipment_id
+                if maintenance_equipment_id:
+                    team_id = maintenance_equipment_id.maintenance_team_id.id
+                    request_id = self.env['maintenance.request'].with_context(
+                        fsm_order=True).create({
+                            'name': order.name or '',
+                            'equipment_id': maintenance_equipment_id.id,
+                            'category_id': equipment.category_id.id,
+                            'request_date': fields.Date.context_today(self),
+                            'maintenance_type': 'corrective',
+                            'maintenance_team_id': team_id,
+                            'schedule_date': order.request_early,
+                            'description': order.description
+                        })
+                    order.request_id = request_id
         return order

From e9ab2b96483d694575d681d5728c4f2b5f16a173 Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@ursainfosystems.com>
Date: Mon, 14 Oct 2019 21:42:24 +0530
Subject: [PATCH 561/631] [IMP] code as per suggestion

---
 fieldservice_maintenance/models/fsm_equipment.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index 9913c57aaf..86ee984fcc 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -21,8 +21,7 @@ def create(self, vals):
             'note': vals.get('notes', False),
             'serial_no':
                 vals['lot_id'] and
-                self.env['stock.production.lot'].browse(vals['lot_id']).name
-                or False})
+                self.env['stock.production.lot'].browse(vals['lot_id']).name})
         if maintenance_equipment_id:
             vals.update({
                 'maintenance_equipment_id': maintenance_equipment_id.id})

From bce5c7f610c3c29729883226ccc866ad76e28626 Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@ursainfosystems.com>
Date: Mon, 14 Oct 2019 21:48:31 +0530
Subject: [PATCH 562/631] [12.0][RM] fieldservice_stock dependency

---
 fieldservice_maintenance/__manifest__.py            |  3 ++-
 .../views/fsm_equipment_view.xml                    | 13 +------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index 54be52779f..4814a2be4f 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -9,7 +9,7 @@
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
     'depends': [
-        'fieldservice_stock',
+        'fieldservice',
         'maintenance',
     ],
     'data': [
@@ -23,6 +23,7 @@
     'maintainers': [
         'smangukiya',
         'max3903',
+        'bodedra',
     ],
     'installable': True,
 }
diff --git a/fieldservice_maintenance/views/fsm_equipment_view.xml b/fieldservice_maintenance/views/fsm_equipment_view.xml
index 5a8ec7ff4d..9de9c220e1 100644
--- a/fieldservice_maintenance/views/fsm_equipment_view.xml
+++ b/fieldservice_maintenance/views/fsm_equipment_view.xml
@@ -11,23 +11,12 @@
                 <group string="Maintenance">
                     <field name="maintenance_team_id" required="1"/>
                     <field name="category_id"/>
+                    <field name="model"/>
                 </group>
             </group>
         </field>
     </record>
 
-    <record id="fsm_equipment_form_view_model" model="ir.ui.view">
-        <field name="name">fsm.equipment.model</field>
-        <field name="model">fsm.equipment</field>
-        <field name="inherit_id"
-               ref="fieldservice_stock.fsm_equipment_form_view_stock"/>
-        <field name="arch" type="xml">
-            <field name="product_id" position="after">
-                <field name="model"/>
-            </field>
-        </field>
-    </record>
-
     <record id="fsm_equipment_tree_view_model" model="ir.ui.view">
         <field name="name">fsm.equipment.model</field>
         <field name="model">fsm.equipment</field>

From 12d78a1807f14ccbde4b90ae788725c90d0e669c Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@ursainfosystems.com>
Date: Mon, 14 Oct 2019 22:07:19 +0530
Subject: [PATCH 563/631] [IMP] code as per suggestion

---
 fieldservice_maintenance/models/fsm_equipment.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index 86ee984fcc..b5bbf33b85 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -14,14 +14,14 @@ class FSMEquipment(models.Model):
 
     @api.model
     def create(self, vals):
+        lot_id = vals.get('lot_id', False)
         maintenance_equipment_id = self.env['maintenance.equipment'].create({
             'name': vals.get('name'),
             'equipment_assign_to': 'other',
             'is_fsm_equipment': True,
             'note': vals.get('notes', False),
-            'serial_no':
-                vals['lot_id'] and
-                self.env['stock.production.lot'].browse(vals['lot_id']).name})
+            'serial_no': lot_id and
+                         self.env['stock.production.lot'].browse(lot_id).name})
         if maintenance_equipment_id:
             vals.update({
                 'maintenance_equipment_id': maintenance_equipment_id.id})

From 27d2d7cfbc1a01e7a60f694b0b3561e70894f073 Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@ursainfosystems.com>
Date: Thu, 17 Oct 2019 19:03:56 +0530
Subject: [PATCH 564/631] [FIX] after unlink all, field is_fsm_equipment is not
 correctly set, code suggested by zbik2607

---
 fieldservice_maintenance/models/fsm_equipment.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index b5bbf33b85..3377985984 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -26,3 +26,14 @@ def create(self, vals):
             vals.update({
                 'maintenance_equipment_id': maintenance_equipment_id.id})
         return super(FSMEquipment, self).create(vals)
+
+    @api.multi
+    def unlink(self):
+        equipments = self.mapped('maintenance_equipment_id')
+        res = super(FSMEquipment, self).unlink()
+        for equipment in equipments:
+            other = self.env['fsm.equipment'].search(
+                [('maintenance_equipment_id', '=', equipment.id)])
+            if not other:
+                equipment.is_fsm_equipment = False
+        return res

From 514f5cf3d2a9b210dcd6e3883c34bdbe65aefbdd Mon Sep 17 00:00:00 2001
From: Bhavesh Odedra <bodedra@ursainfosystems.com>
Date: Sat, 19 Oct 2019 17:02:16 +0530
Subject: [PATCH 565/631] [FIX] test_flake8

---
 fieldservice_maintenance/README.rst                  |  6 +++++-
 fieldservice_maintenance/models/fsm_equipment.py     | 12 +++++-------
 .../static/description/index.html                    |  3 ++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/fieldservice_maintenance/README.rst b/fieldservice_maintenance/README.rst
index 6ad9101c07..d122790ea4 100644
--- a/fieldservice_maintenance/README.rst
+++ b/fieldservice_maintenance/README.rst
@@ -96,6 +96,7 @@ Contributors
 
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Bhavesh Odedra <bodedra@opensourceintegrators.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -123,10 +124,13 @@ promote its widespread use.
 .. |maintainer-max3903| image:: https://github.com/max3903.png?size=40px
     :target: https://github.com/max3903
     :alt: max3903
+.. |maintainer-bodedra| image:: https://github.com/bodedra.png?size=40px
+    :target: https://github.com/bodedra
+    :alt: bodedra
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-smangukiya| |maintainer-max3903| 
+|maintainer-smangukiya| |maintainer-max3903| |maintainer-bodedra| 
 
 This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance>`_ project on GitHub.
 
diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index 3377985984..3cc6c899f2 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -15,13 +15,11 @@ class FSMEquipment(models.Model):
     @api.model
     def create(self, vals):
         lot_id = vals.get('lot_id', False)
-        maintenance_equipment_id = self.env['maintenance.equipment'].create({
-            'name': vals.get('name'),
-            'equipment_assign_to': 'other',
-            'is_fsm_equipment': True,
-            'note': vals.get('notes', False),
-            'serial_no': lot_id and
-                         self.env['stock.production.lot'].browse(lot_id).name})
+        maintenance_equipment_id = self.env['maintenance.equipment'].create(
+            {'name': vals.get('name'), 'equipment_assign_to': 'other',
+             'is_fsm_equipment': True, 'note': vals.get('notes', False),
+             'serial_no': lot_id and self.env['stock.production.lot'].browse(
+                 lot_id).name})
         if maintenance_equipment_id:
             vals.update({
                 'maintenance_equipment_id': maintenance_equipment_id.id})
diff --git a/fieldservice_maintenance/static/description/index.html b/fieldservice_maintenance/static/description/index.html
index 83c622b811..d1fbc1b7cf 100644
--- a/fieldservice_maintenance/static/description/index.html
+++ b/fieldservice_maintenance/static/description/index.html
@@ -444,6 +444,7 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
 <li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#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>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -461,7 +462,7 @@ <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>
-<p><a class="reference external" href="https://github.com/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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><a class="reference external" href="https://github.com/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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/bodedra"><img alt="bodedra" src="https://github.com/bodedra.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_maintenance">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>

From be0e070d0b45591389c1788e517f4345d62b5bb0 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 11 Oct 2019 12:32:22 -0500
Subject: [PATCH 566/631] [FIX] fieldservice_maintenance

---
 fieldservice_maintenance/__manifest__.py        |  2 +-
 .../models/fsm_equipment.py                     | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index 4814a2be4f..5053a9db32 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Maintenance',
-    'summary': 'Maintenance',
+    'summary': 'Integrate Field Service orders with maintenance requests',
     'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index 3cc6c899f2..56326e9e5f 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -15,15 +15,20 @@ class FSMEquipment(models.Model):
     @api.model
     def create(self, vals):
         lot_id = vals.get('lot_id', False)
-        maintenance_equipment_id = self.env['maintenance.equipment'].create(
-            {'name': vals.get('name'), 'equipment_assign_to': 'other',
-             'is_fsm_equipment': True, 'note': vals.get('notes', False),
-             'serial_no': lot_id and self.env['stock.production.lot'].browse(
-                 lot_id).name})
+        maintenance_equipment_id = self.env['maintenance.equipment'].create({
+            'name': vals.get('name'),
+            'is_fsm_equipment': True,
+            'note': vals.get('notes', False),
+            'serial_no':
+                lot_id and
+                self.env['stock.production.lot'].browse(lot_id).name,
+            'maintenance_team_id':
+                vals.get('maintenance_team_id', False) or
+                self.env.ref('maintenance.equipment_team_maintenance').id})
         if maintenance_equipment_id:
             vals.update({
                 'maintenance_equipment_id': maintenance_equipment_id.id})
-        return super(FSMEquipment, self).create(vals)
+        return super().create(vals)
 
     @api.multi
     def unlink(self):

From 8f4c956f5b1a4d81c4c67a68572d8cc01d2b4372 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 11 Oct 2019 12:34:05 -0500
Subject: [PATCH 567/631] [IMP] fieldservice_vehicle_stock

---
 fieldservice_maintenance/i18n/de.po           | 60 +++++++++++++++++++
 fieldservice_maintenance/i18n/es_CL.po        | 60 +++++++++++++++++++
 .../i18n/fieldservice_maintenance.pot         | 58 ++++++++++++++++++
 fieldservice_maintenance/i18n/pt_BR.po        | 60 +++++++++++++++++++
 .../models/fsm_equipment.py                   |  3 +-
 5 files changed, 239 insertions(+), 2 deletions(-)
 create mode 100644 fieldservice_maintenance/i18n/de.po
 create mode 100644 fieldservice_maintenance/i18n/es_CL.po
 create mode 100644 fieldservice_maintenance/i18n/fieldservice_maintenance.pot
 create mode 100644 fieldservice_maintenance/i18n/pt_BR.po

diff --git a/fieldservice_maintenance/i18n/de.po b/fieldservice_maintenance/i18n/de.po
new file mode 100644
index 0000000000..ffe5c19376
--- /dev/null
+++ b/fieldservice_maintenance/i18n/de.po
@@ -0,0 +1,60 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_maintenance
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-26 17:58+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_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Service-Equipment"
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_order
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_request__fsm_order_id
+msgid "Field Service Order"
+msgstr "Field-Service-Auftrag"
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__is_fsm_equipment
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_equipment__is_fsm_equipment
+msgid "Is a FSM Equipment"
+msgstr "Service-Equipment"
+
+#. module: fieldservice_maintenance
+#: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.fsm_equipment_form_view_maintenance
+msgid "Maintenance"
+msgstr "Wartung"
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_maintenance_equipment
+msgid "Maintenance Equipment"
+msgstr "Wartungsequipment"
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_maintenance_request
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order__request_id
+msgid "Maintenance Request"
+msgstr "Wartungsauftrag"
+
+#. module: fieldservice_maintenance
+#: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.hr_equipment_view_form
+msgid "Others"
+msgstr ""
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__maintenance_equipment_id
+msgid "Related Maintenance Equipment"
+msgstr "zugehöriges Wartungsequipment"
diff --git a/fieldservice_maintenance/i18n/es_CL.po b/fieldservice_maintenance/i18n/es_CL.po
new file mode 100644
index 0000000000..4b43efe8ea
--- /dev/null
+++ b/fieldservice_maintenance/i18n/es_CL.po
@@ -0,0 +1,60 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_maintenance
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-01-16 22:38+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.10\n"
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Equipo de Servicio de Campo"
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_order
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_request__fsm_order_id
+msgid "Field Service Order"
+msgstr "Orden de servicio de campo"
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__is_fsm_equipment
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_equipment__is_fsm_equipment
+msgid "Is a FSM Equipment"
+msgstr "Es un equipo FSM"
+
+#. module: fieldservice_maintenance
+#: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.fsm_equipment_form_view_maintenance
+msgid "Maintenance"
+msgstr "Mantenimiento"
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_maintenance_equipment
+msgid "Maintenance Equipment"
+msgstr "Equipo de mantenimiento"
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_maintenance_request
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order__request_id
+msgid "Maintenance Request"
+msgstr "Peticion de mantenimiento"
+
+#. module: fieldservice_maintenance
+#: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.hr_equipment_view_form
+msgid "Others"
+msgstr "Otros"
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__maintenance_equipment_id
+msgid "Related Maintenance Equipment"
+msgstr "Equipos de mantenimiento relacionados"
diff --git a/fieldservice_maintenance/i18n/fieldservice_maintenance.pot b/fieldservice_maintenance/i18n/fieldservice_maintenance.pot
new file mode 100644
index 0000000000..769a70b8e8
--- /dev/null
+++ b/fieldservice_maintenance/i18n/fieldservice_maintenance.pot
@@ -0,0 +1,58 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_maintenance
+#
+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_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr ""
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_order
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_request__fsm_order_id
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__is_fsm_equipment
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_equipment__is_fsm_equipment
+msgid "Is a FSM Equipment"
+msgstr ""
+
+#. module: fieldservice_maintenance
+#: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.fsm_equipment_form_view_maintenance
+msgid "Maintenance"
+msgstr ""
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_maintenance_equipment
+msgid "Maintenance Equipment"
+msgstr ""
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_maintenance_request
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order__request_id
+msgid "Maintenance Request"
+msgstr ""
+
+#. module: fieldservice_maintenance
+#: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.hr_equipment_view_form
+msgid "Others"
+msgstr ""
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__maintenance_equipment_id
+msgid "Related Maintenance Equipment"
+msgstr ""
+
diff --git a/fieldservice_maintenance/i18n/pt_BR.po b/fieldservice_maintenance/i18n/pt_BR.po
new file mode 100644
index 0000000000..a1c408de32
--- /dev/null
+++ b/fieldservice_maintenance/i18n/pt_BR.po
@@ -0,0 +1,60 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_maintenance
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-02-05 11: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_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_equipment
+msgid "Field Service Equipment"
+msgstr "Equipamento de Serviço de Campo"
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_order
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_request__fsm_order_id
+msgid "Field Service Order"
+msgstr "Ordem de Serviço de Campo"
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__is_fsm_equipment
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_equipment__is_fsm_equipment
+msgid "Is a FSM Equipment"
+msgstr "É um equipamento FSM"
+
+#. module: fieldservice_maintenance
+#: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.fsm_equipment_form_view_maintenance
+msgid "Maintenance"
+msgstr "Manutenção"
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_maintenance_equipment
+msgid "Maintenance Equipment"
+msgstr "Equipamentos de Manutenção"
+
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_maintenance_request
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order__request_id
+msgid "Maintenance Request"
+msgstr "Solicitação de Manutenção"
+
+#. module: fieldservice_maintenance
+#: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.hr_equipment_view_form
+msgid "Others"
+msgstr "Outros"
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__maintenance_equipment_id
+msgid "Related Maintenance Equipment"
+msgstr "Equipamentos de Manutenção relacionados"
diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index 56326e9e5f..edd62961e9 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -1,6 +1,5 @@
-# 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 api, fields, models
 
 

From de7b76235e37bafdea5a5493060c2ded4709188e Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 19 Mar 2020 09:06:59 -0600
Subject: [PATCH 568/631] [FIX] fieldservice_maintenance: Split files and
 convert equipments

---
 fieldservice_maintenance/__init__.py          |  4 +-
 fieldservice_maintenance/__manifest__.py      |  4 +-
 fieldservice_maintenance/hooks.py             | 45 +++++++++++++++++++
 fieldservice_maintenance/models/__init__.py   |  3 +-
 .../models/maintenance_equipment.py           |  9 ++++
 ...{maintenance.py => maintenance_request.py} |  9 +---
 ...iew.xml => maintenance_equipment_view.xml} | 14 ------
 .../views/maintenance_request_view.xml        | 17 +++++++
 8 files changed, 79 insertions(+), 26 deletions(-)
 create mode 100644 fieldservice_maintenance/hooks.py
 create mode 100644 fieldservice_maintenance/models/maintenance_equipment.py
 rename fieldservice_maintenance/models/{maintenance.py => maintenance_request.py} (85%)
 rename fieldservice_maintenance/views/{maintenance_view.xml => maintenance_equipment_view.xml} (56%)
 create mode 100644 fieldservice_maintenance/views/maintenance_request_view.xml

diff --git a/fieldservice_maintenance/__init__.py b/fieldservice_maintenance/__init__.py
index 631bd4893a..726bcc73ab 100644
--- a/fieldservice_maintenance/__init__.py
+++ b/fieldservice_maintenance/__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
+from .hooks import pre_init_hook
diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index 5053a9db32..e4687733b6 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -14,10 +14,12 @@
     ],
     'data': [
         'data/fsm_order_type.xml',
-        'views/maintenance_view.xml',
+        'views/maintenance_equipment_view.xml',
+        'views/maintenance_request_view.xml',
         'views/fsm_equipment_view.xml',
         'views/fsm_order_view.xml',
     ],
+    'pre_init_hook': 'pre_init_hook',
     'license': 'AGPL-3',
     'development_status': 'Beta',
     'maintainers': [
diff --git a/fieldservice_maintenance/hooks.py b/fieldservice_maintenance/hooks.py
new file mode 100644
index 0000000000..60b1249815
--- /dev/null
+++ b/fieldservice_maintenance/hooks.py
@@ -0,0 +1,45 @@
+# Copyright (C) 2020 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+def pre_init_hook(cr):
+    # Check for existing fsm equipments
+    cr.execute('SELECT * FROM fsm_equipment')
+    equipments = []
+    equipments = cr.dictfetchall()
+    if equipments:
+        # Add new columns to hold values
+        cr.execute("""ALTER TABLE fsm_equipment
+        ADD maintenance_equipment_id INT;""")
+        cr.execute("""ALTER TABLE maintenance_equipment
+        ADD is_fsm_equipment BOOLEAN;""")
+
+        # Create a new Maintenance equipment for each FSM equipment
+        for equipment in equipments:
+            cr.execute("""INSERT INTO maintenance_equipment (
+                name,
+                equipment_assign_to,
+                maintenance_team_id,
+                is_fsm_equipment,
+                effective_date,
+                active)
+            VALUES (
+                %s,
+                'other',
+                1,
+                True,
+                %s,
+                True);""", (
+                equipment.get('name'),
+                equipment.get('create_date'))
+            )
+
+            # Set this new Maintenance equipment on the existing FSM equipment
+            cr.execute("""UPDATE fsm_equipment
+                SET maintenance_equipment_id = (
+                    SELECT id
+                    FROM maintenance_equipment
+                    ORDER BY id desc
+                    LIMIT 1)
+                WHERE id = %s;""",
+                       (equipment.get('id'),))
diff --git a/fieldservice_maintenance/models/__init__.py b/fieldservice_maintenance/models/__init__.py
index 0410718458..dccc713d76 100644
--- a/fieldservice_maintenance/models/__init__.py
+++ b/fieldservice_maintenance/models/__init__.py
@@ -3,6 +3,7 @@
 
 from . import (
     fsm_order,
-    maintenance,
+    maintenance_equipment,
+    maintenance_request,
     fsm_equipment,
 )
diff --git a/fieldservice_maintenance/models/maintenance_equipment.py b/fieldservice_maintenance/models/maintenance_equipment.py
new file mode 100644
index 0000000000..1e73fe76d4
--- /dev/null
+++ b/fieldservice_maintenance/models/maintenance_equipment.py
@@ -0,0 +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 MaintenanceEquipment(models.Model):
+    _inherit = 'maintenance.equipment'
+
+    is_fsm_equipment = fields.Boolean(string='Is a FSM Equipment')
diff --git a/fieldservice_maintenance/models/maintenance.py b/fieldservice_maintenance/models/maintenance_request.py
similarity index 85%
rename from fieldservice_maintenance/models/maintenance.py
rename to fieldservice_maintenance/models/maintenance_request.py
index 2b0c1753ce..3b467811d0 100644
--- a/fieldservice_maintenance/models/maintenance.py
+++ b/fieldservice_maintenance/models/maintenance_request.py
@@ -1,15 +1,8 @@
-# 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 api, fields, models
 
 
-class MaintenanceEquipment(models.Model):
-    _inherit = 'maintenance.equipment'
-
-    is_fsm_equipment = fields.Boolean(string='Is a FSM Equipment')
-
-
 class MaintenanceRequest(models.Model):
     _inherit = 'maintenance.request'
 
diff --git a/fieldservice_maintenance/views/maintenance_view.xml b/fieldservice_maintenance/views/maintenance_equipment_view.xml
similarity index 56%
rename from fieldservice_maintenance/views/maintenance_view.xml
rename to fieldservice_maintenance/views/maintenance_equipment_view.xml
index fd201f36ca..89a31219e5 100644
--- a/fieldservice_maintenance/views/maintenance_view.xml
+++ b/fieldservice_maintenance/views/maintenance_equipment_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <!-- equiment : views -->
@@ -22,17 +21,4 @@
         </field>
     </record>
 
-    <!-- Field Service maintenance request Form View-->
-    <record id="hr_equipment_request_view_form_fsm" model="ir.ui.view">
-        <field name="name">equipment.request.form.fsm</field>
-        <field name="model">maintenance.request</field>
-        <field name="inherit_id"
-               ref="maintenance.hr_equipment_request_view_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='equipment_id']" position="after">
-                <field name="fsm_order_id"
-                       attrs="{'invisible': [('fsm_order_id', '=', False)]}"/>
-            </xpath>
-        </field>
-    </record>
 </odoo>
diff --git a/fieldservice_maintenance/views/maintenance_request_view.xml b/fieldservice_maintenance/views/maintenance_request_view.xml
new file mode 100644
index 0000000000..70554d440c
--- /dev/null
+++ b/fieldservice_maintenance/views/maintenance_request_view.xml
@@ -0,0 +1,17 @@
+<odoo>
+
+    <!-- Field Service maintenance request Form View-->
+    <record id="hr_equipment_request_view_form_fsm" model="ir.ui.view">
+        <field name="name">equipment.request.form.fsm</field>
+        <field name="model">maintenance.request</field>
+        <field name="inherit_id"
+               ref="maintenance.hr_equipment_request_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='equipment_id']" position="after">
+                <field name="fsm_order_id"
+                       attrs="{'invisible': [('fsm_order_id', '=', False)]}"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

From 732043ca0e773e836b73390a5f46f3e85b80294e Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 13 Apr 2020 15:14:10 +0000
Subject: [PATCH 569/631] fieldservice_maintenance 12.0.1.1.0

---
 fieldservice_maintenance/__manifest__.py |  2 +-
 fieldservice_maintenance/i18n/pt_BR.po   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index e4687733b6..1fd56cb2d5 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Maintenance',
     'summary': 'Integrate Field Service orders with maintenance requests',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.1.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_maintenance/i18n/pt_BR.po b/fieldservice_maintenance/i18n/pt_BR.po
index a1c408de32..b0402780c0 100644
--- a/fieldservice_maintenance/i18n/pt_BR.po
+++ b/fieldservice_maintenance/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-05 11: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"
@@ -41,13 +41,13 @@ msgstr "Manutenção"
 #. module: fieldservice_maintenance
 #: model:ir.model,name:fieldservice_maintenance.model_maintenance_equipment
 msgid "Maintenance Equipment"
-msgstr "Equipamentos de Manutenção"
+msgstr "Equipamento de Manutenção"
 
 #. module: fieldservice_maintenance
 #: model:ir.model,name:fieldservice_maintenance.model_maintenance_request
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order__request_id
 msgid "Maintenance Request"
-msgstr "Solicitação de Manutenção"
+msgstr "Requisição de Manutenção"
 
 #. module: fieldservice_maintenance
 #: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.hr_equipment_view_form
@@ -57,4 +57,4 @@ msgstr "Outros"
 #. module: fieldservice_maintenance
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__maintenance_equipment_id
 msgid "Related Maintenance Equipment"
-msgstr "Equipamentos de Manutenção relacionados"
+msgstr "Equipamento de Manutenção Relacionado"

From 4cec18bd557975fcda9618d79ff05d4257303e57 Mon Sep 17 00:00:00 2001
From: Marcel Savegnago <marcel.savegnago@gmail.com>
Date: Tue, 23 Jun 2020 21:41:06 -0300
Subject: [PATCH 570/631] [12.0] fix type OS - fieldservice_maintenance

---
 fieldservice_maintenance/README.rst           |  5 ++--
 .../data/fsm_order_type.xml                   |  1 +
 fieldservice_maintenance/models/__init__.py   |  1 +
 .../models/fsm_equipment.py                   |  1 +
 fieldservice_maintenance/models/fsm_order.py  |  4 +---
 .../models/fsm_order_type.py                  | 14 +++++++++++
 .../models/maintenance_equipment.py           |  1 +
 .../models/maintenance_request.py             | 23 ++++++++++++-------
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../views/fsm_order_view.xml                  |  3 ++-
 10 files changed, 40 insertions(+), 14 deletions(-)
 create mode 100644 fieldservice_maintenance/models/fsm_order_type.py

diff --git a/fieldservice_maintenance/README.rst b/fieldservice_maintenance/README.rst
index d122790ea4..86567b2598 100644
--- a/fieldservice_maintenance/README.rst
+++ b/fieldservice_maintenance/README.rst
@@ -23,7 +23,7 @@ Field Service - Maintenance
     :target: https://runbot.odoo-community.org/runbot/264/12.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 Odoo Maintenance App does not support Field Service operations for equipments
 outside the company facilities. On the other hand, the Field Service App does
@@ -97,6 +97,7 @@ Contributors
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
+* Marcel Savegnago - Escodoo <marcel.savegnago@escodoo.com.br>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -130,7 +131,7 @@ promote its widespread use.
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-smangukiya| |maintainer-max3903| |maintainer-bodedra| 
+|maintainer-smangukiya| |maintainer-max3903| |maintainer-bodedra|
 
 This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance>`_ project on GitHub.
 
diff --git a/fieldservice_maintenance/data/fsm_order_type.xml b/fieldservice_maintenance/data/fsm_order_type.xml
index 864c47a762..eb9134f5ba 100644
--- a/fieldservice_maintenance/data/fsm_order_type.xml
+++ b/fieldservice_maintenance/data/fsm_order_type.xml
@@ -3,6 +3,7 @@
 
     <record id="fsm_order_type_maintenance" model="fsm.order.type">
         <field name="name">Maintenance</field>
+        <field name="internal_type">maintenance</field>
     </record>
 
 </odoo>
diff --git a/fieldservice_maintenance/models/__init__.py b/fieldservice_maintenance/models/__init__.py
index dccc713d76..8d21a5e2bd 100644
--- a/fieldservice_maintenance/models/__init__.py
+++ b/fieldservice_maintenance/models/__init__.py
@@ -7,3 +7,4 @@
     maintenance_request,
     fsm_equipment,
 )
+from . import fsm_order_type
diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index edd62961e9..e86b003a8e 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -1,5 +1,6 @@
 # Copyright (C) 2018 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
 from odoo import api, fields, models
 
 
diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index b8c95b2c1e..747014bdd7 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -15,9 +15,7 @@ def create(self, vals):
         # if FSM order with type maintenance is create then
         # create maintenance request
         order = super(FSMOrder, self).create(vals)
-        maintenance = self.env.ref(
-            'fieldservice_maintenance.fsm_order_type_maintenance')
-        if order.type == maintenance:
+        if order.type.internal_type == 'maintenance':
             if order.equipment_id and not order.request_id:
                 equipment = order.equipment_id
                 maintenance_equipment_id = equipment.maintenance_equipment_id
diff --git a/fieldservice_maintenance/models/fsm_order_type.py b/fieldservice_maintenance/models/fsm_order_type.py
new file mode 100644
index 0000000000..f483e61056
--- /dev/null
+++ b/fieldservice_maintenance/models/fsm_order_type.py
@@ -0,0 +1,14 @@
+# Copyright 2020 - TODAY Marcel Savegnago - Escodoo
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class FsmOrderType(models.Model):
+
+    _inherit = 'fsm.order.type'
+
+    internal_type = fields.Selection(
+        selection_add=[('maintenance',
+                        'Maintenance')],
+    )
diff --git a/fieldservice_maintenance/models/maintenance_equipment.py b/fieldservice_maintenance/models/maintenance_equipment.py
index 1e73fe76d4..48937c9dcb 100644
--- a/fieldservice_maintenance/models/maintenance_equipment.py
+++ b/fieldservice_maintenance/models/maintenance_equipment.py
@@ -1,5 +1,6 @@
 # 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_maintenance/models/maintenance_request.py b/fieldservice_maintenance/models/maintenance_request.py
index 3b467811d0..f3eb48c395 100644
--- a/fieldservice_maintenance/models/maintenance_request.py
+++ b/fieldservice_maintenance/models/maintenance_request.py
@@ -1,5 +1,6 @@
 # Copyright (C) 2018 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
 from odoo import api, fields, models
 
 
@@ -19,12 +20,18 @@ def create(self, vals):
             fsm_equipment = self.env['fsm.equipment'].search(
                 [('maintenance_equipment_id', '=', request.equipment_id.id)],
                 limit=1)
-            fsm_order_id = self.env['fsm.order'].create(
-                {'type': 'maintenance',
-                 'equipment_id': fsm_equipment.id,
-                 'location_id': fsm_equipment and
-                 fsm_equipment.current_location_id.id,
-                 'request_id': request.id
-                 })
-            request.fsm_order_id = fsm_order_id
+            fsm_order_type = self.env['fsm.order.type'].search(
+                [('internal_type', '=', 'maintenance')],
+                order="id desc", limit=1)
+            try:
+                fsm_order_id = self.env['fsm.order'].create(
+                    {'type': fsm_order_type.id,
+                     'equipment_id': fsm_equipment.id,
+                     'location_id': fsm_equipment and
+                     fsm_equipment.current_location_id.id,
+                     'request_id': request.id
+                     })
+                request.fsm_order_id = fsm_order_id
+            except:
+                pass
         return request
diff --git a/fieldservice_maintenance/readme/CONTRIBUTORS.rst b/fieldservice_maintenance/readme/CONTRIBUTORS.rst
index 9ccba616bd..0a558245eb 100644
--- a/fieldservice_maintenance/readme/CONTRIBUTORS.rst
+++ b/fieldservice_maintenance/readme/CONTRIBUTORS.rst
@@ -1,3 +1,4 @@
 * Sandip Mangukiya <smangukiya@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
+* Marcel Savegnago - Escodoo <marcel.savegnago@escodoo.com.br>
diff --git a/fieldservice_maintenance/views/fsm_order_view.xml b/fieldservice_maintenance/views/fsm_order_view.xml
index 2f60c96393..e88c34d48b 100644
--- a/fieldservice_maintenance/views/fsm_order_view.xml
+++ b/fieldservice_maintenance/views/fsm_order_view.xml
@@ -10,9 +10,10 @@
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
             <field name="priority" position="before">
+                <field name="internal_type" invisible="1"/>
                 <field name="request_id"
                        readonly="1"
-                       attrs="{'invisible': [('type', '!=', 'maintenance')]}"/>
+                       attrs="{'invisible': [('internal_type', '!=', 'maintenance')]}"/>
             </field>
         </field>
     </record>

From 1a443b0dee923d0874fef31470ed04a2b97de732 Mon Sep 17 00:00:00 2001
From: Marcel Savegnago <marcel.savegnago@gmail.com>
Date: Sun, 23 Aug 2020 16:03:01 -0300
Subject: [PATCH 571/631] [FIX] Fix Exceptions

---
 .../models/maintenance_request.py                  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/fieldservice_maintenance/models/maintenance_request.py b/fieldservice_maintenance/models/maintenance_request.py
index f3eb48c395..6c562d6526 100644
--- a/fieldservice_maintenance/models/maintenance_request.py
+++ b/fieldservice_maintenance/models/maintenance_request.py
@@ -1,7 +1,8 @@
 # Copyright (C) 2018 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 UserError
+from odoo import api, fields, models, _
 
 
 class MaintenanceRequest(models.Model):
@@ -32,6 +33,13 @@ def create(self, vals):
                      'request_id': request.id
                      })
                 request.fsm_order_id = fsm_order_id
-            except:
-                pass
+            except Exception:
+                if not fsm_equipment.current_location_id.id:
+                    raise UserError(_(
+                        'Missing current location on FSM equipment %s') % self.name)
+                else:
+                    raise UserError(_(
+                        'You cannot create the maintenance request. '
+                        'Please check the FSM equipment.'
+                    ))
         return request

From 06ec77e930f8edc4fe13066b8d9119eb6a27104a Mon Sep 17 00:00:00 2001
From: Marcel Savegnago <marcel.savegnago@escodoo.com.br>
Date: Mon, 14 Sep 2020 09:46:01 -0300
Subject: [PATCH 572/631] Update
 fieldservice_maintenance/models/maintenance_request.py

Co-authored-by: Daniel Reis <dgreis@sapo.pt>
---
 fieldservice_maintenance/README.rst           |  4 +--
 .../i18n/fieldservice_maintenance.pot         | 22 +++++++++++++++
 .../models/maintenance_request.py             | 28 +++++++------------
 .../static/description/index.html             |  1 +
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/fieldservice_maintenance/README.rst b/fieldservice_maintenance/README.rst
index 86567b2598..f94f379e4b 100644
--- a/fieldservice_maintenance/README.rst
+++ b/fieldservice_maintenance/README.rst
@@ -23,7 +23,7 @@ Field Service - Maintenance
     :target: https://runbot.odoo-community.org/runbot/264/12.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5|
+|badge1| |badge2| |badge3| |badge4| |badge5| 
 
 Odoo Maintenance App does not support Field Service operations for equipments
 outside the company facilities. On the other hand, the Field Service App does
@@ -131,7 +131,7 @@ promote its widespread use.
 
 Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-smangukiya| |maintainer-max3903| |maintainer-bodedra|
+|maintainer-smangukiya| |maintainer-max3903| |maintainer-bodedra| 
 
 This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance>`_ project on GitHub.
 
diff --git a/fieldservice_maintenance/i18n/fieldservice_maintenance.pot b/fieldservice_maintenance/i18n/fieldservice_maintenance.pot
index 769a70b8e8..e4990ef11c 100644
--- a/fieldservice_maintenance/i18n/fieldservice_maintenance.pot
+++ b/fieldservice_maintenance/i18n/fieldservice_maintenance.pot
@@ -13,6 +13,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
+msgid "FSM"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model:ir.model,name:fieldservice_maintenance.model_fsm_equipment
 msgid "Field Service Equipment"
@@ -24,6 +29,16 @@ msgstr ""
 msgid "Field Service Order"
 msgstr ""
 
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_order_type
+msgid "Field Service Order Type"
+msgstr ""
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order_type__internal_type
+msgid "Internal Type"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__is_fsm_equipment
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_equipment__is_fsm_equipment
@@ -31,6 +46,7 @@ msgid "Is a FSM Equipment"
 msgstr ""
 
 #. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
 #: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.fsm_equipment_form_view_maintenance
 msgid "Maintenance"
 msgstr ""
@@ -46,6 +62,12 @@ msgstr ""
 msgid "Maintenance Request"
 msgstr ""
 
+#. module: fieldservice_maintenance
+#: code:addons/fieldservice_maintenance/models/maintenance_request.py:28
+#, python-format
+msgid "Missing current location on FSM equipment %s"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.hr_equipment_view_form
 msgid "Others"
diff --git a/fieldservice_maintenance/models/maintenance_request.py b/fieldservice_maintenance/models/maintenance_request.py
index 6c562d6526..a9ef161124 100644
--- a/fieldservice_maintenance/models/maintenance_request.py
+++ b/fieldservice_maintenance/models/maintenance_request.py
@@ -24,22 +24,14 @@ def create(self, vals):
             fsm_order_type = self.env['fsm.order.type'].search(
                 [('internal_type', '=', 'maintenance')],
                 order="id desc", limit=1)
-            try:
-                fsm_order_id = self.env['fsm.order'].create(
-                    {'type': fsm_order_type.id,
-                     'equipment_id': fsm_equipment.id,
-                     'location_id': fsm_equipment and
-                     fsm_equipment.current_location_id.id,
-                     'request_id': request.id
-                     })
-                request.fsm_order_id = fsm_order_id
-            except Exception:
-                if not fsm_equipment.current_location_id.id:
-                    raise UserError(_(
-                        'Missing current location on FSM equipment %s') % self.name)
-                else:
-                    raise UserError(_(
-                        'You cannot create the maintenance request. '
-                        'Please check the FSM equipment.'
-                    ))
+            if not fsm_equipment.current_location_id.id:
+                raise UserError(_(
+                    'Missing current location on FSM equipment %s') % self.name)
+            fsm_order_id = self.env['fsm.order'].create(
+                {'type': fsm_order_type.id,
+                 'equipment_id': fsm_equipment.id,
+                 'location_id': fsm_equipment.current_location_id.id,
+                 'request_id': request.id
+                 })
+            request.fsm_order_id = fsm_order_id
         return request
diff --git a/fieldservice_maintenance/static/description/index.html b/fieldservice_maintenance/static/description/index.html
index d1fbc1b7cf..765d85b0f9 100644
--- a/fieldservice_maintenance/static/description/index.html
+++ b/fieldservice_maintenance/static/description/index.html
@@ -445,6 +445,7 @@ <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <li>Sandip Mangukiya &lt;<a class="reference external" href="mailto:smangukiya&#64;opensourceintegrators.com">smangukiya&#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>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Marcel Savegnago - Escodoo &lt;<a class="reference external" href="mailto:marcel.savegnago&#64;escodoo.com.br">marcel.savegnago&#64;escodoo.com.br</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">

From eac2c39849bb25bb69b55a7f2866a4a3f6e44518 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 21 Sep 2020 16:00:40 +0000
Subject: [PATCH 573/631] fieldservice_maintenance 12.0.1.2.0

---
 fieldservice_maintenance/__manifest__.py      |  2 +-
 fieldservice_maintenance/i18n/de.po           | 31 ++++++++++++++++++-
 fieldservice_maintenance/i18n/es_CL.po        | 31 ++++++++++++++++++-
 .../i18n/fieldservice_maintenance.pot         |  5 +++
 fieldservice_maintenance/i18n/pt_BR.po        | 31 ++++++++++++++++++-
 5 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index 1fd56cb2d5..92114b9754 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Maintenance',
     'summary': 'Integrate Field Service orders with maintenance requests',
-    'version': '12.0.1.1.0',
+    'version': '12.0.1.2.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_maintenance/i18n/de.po b/fieldservice_maintenance/i18n/de.po
index ffe5c19376..03bacbcb6f 100644
--- a/fieldservice_maintenance/i18n/de.po
+++ b/fieldservice_maintenance/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_maintenance
+# 	* fieldservice_maintenance
 #
 msgid ""
 msgstr ""
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.8\n"
 
+#. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
+msgid "FSM"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model:ir.model,name:fieldservice_maintenance.model_fsm_equipment
 msgid "Field Service Equipment"
@@ -27,6 +32,18 @@ msgstr "Service-Equipment"
 msgid "Field Service Order"
 msgstr "Field-Service-Auftrag"
 
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_order_type
+#, fuzzy
+#| msgid "Field Service Order"
+msgid "Field Service Order Type"
+msgstr "Field-Service-Auftrag"
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order_type__internal_type
+msgid "Internal Type"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__is_fsm_equipment
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_equipment__is_fsm_equipment
@@ -34,6 +51,7 @@ msgid "Is a FSM Equipment"
 msgstr "Service-Equipment"
 
 #. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
 #: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.fsm_equipment_form_view_maintenance
 msgid "Maintenance"
 msgstr "Wartung"
@@ -49,6 +67,12 @@ msgstr "Wartungsequipment"
 msgid "Maintenance Request"
 msgstr "Wartungsauftrag"
 
+#. module: fieldservice_maintenance
+#: code:addons/fieldservice_maintenance/models/maintenance_request.py:28
+#, python-format
+msgid "Missing current location on FSM equipment %s"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.hr_equipment_view_form
 msgid "Others"
@@ -58,3 +82,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__maintenance_equipment_id
 msgid "Related Maintenance Equipment"
 msgstr "zugehöriges Wartungsequipment"
+
+#. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
+msgid "Repair"
+msgstr ""
diff --git a/fieldservice_maintenance/i18n/es_CL.po b/fieldservice_maintenance/i18n/es_CL.po
index 4b43efe8ea..855475a471 100644
--- a/fieldservice_maintenance/i18n/es_CL.po
+++ b/fieldservice_maintenance/i18n/es_CL.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_maintenance
+# 	* fieldservice_maintenance
 #
 msgid ""
 msgstr ""
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
+msgid "FSM"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model:ir.model,name:fieldservice_maintenance.model_fsm_equipment
 msgid "Field Service Equipment"
@@ -27,6 +32,18 @@ msgstr "Equipo de Servicio de Campo"
 msgid "Field Service Order"
 msgstr "Orden de servicio de campo"
 
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_order_type
+#, fuzzy
+#| msgid "Field Service Order"
+msgid "Field Service Order Type"
+msgstr "Orden de servicio de campo"
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order_type__internal_type
+msgid "Internal Type"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__is_fsm_equipment
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_equipment__is_fsm_equipment
@@ -34,6 +51,7 @@ msgid "Is a FSM Equipment"
 msgstr "Es un equipo FSM"
 
 #. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
 #: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.fsm_equipment_form_view_maintenance
 msgid "Maintenance"
 msgstr "Mantenimiento"
@@ -49,6 +67,12 @@ msgstr "Equipo de mantenimiento"
 msgid "Maintenance Request"
 msgstr "Peticion de mantenimiento"
 
+#. module: fieldservice_maintenance
+#: code:addons/fieldservice_maintenance/models/maintenance_request.py:28
+#, python-format
+msgid "Missing current location on FSM equipment %s"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.hr_equipment_view_form
 msgid "Others"
@@ -58,3 +82,8 @@ msgstr "Otros"
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__maintenance_equipment_id
 msgid "Related Maintenance Equipment"
 msgstr "Equipos de mantenimiento relacionados"
+
+#. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
+msgid "Repair"
+msgstr ""
diff --git a/fieldservice_maintenance/i18n/fieldservice_maintenance.pot b/fieldservice_maintenance/i18n/fieldservice_maintenance.pot
index e4990ef11c..906211e79f 100644
--- a/fieldservice_maintenance/i18n/fieldservice_maintenance.pot
+++ b/fieldservice_maintenance/i18n/fieldservice_maintenance.pot
@@ -78,3 +78,8 @@ msgstr ""
 msgid "Related Maintenance Equipment"
 msgstr ""
 
+#. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
+msgid "Repair"
+msgstr ""
+
diff --git a/fieldservice_maintenance/i18n/pt_BR.po b/fieldservice_maintenance/i18n/pt_BR.po
index b0402780c0..3a1844f4c6 100644
--- a/fieldservice_maintenance/i18n/pt_BR.po
+++ b/fieldservice_maintenance/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_maintenance
+# 	* fieldservice_maintenance
 #
 msgid ""
 msgstr ""
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
+msgid "FSM"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model:ir.model,name:fieldservice_maintenance.model_fsm_equipment
 msgid "Field Service Equipment"
@@ -27,6 +32,18 @@ msgstr "Equipamento de Serviço de Campo"
 msgid "Field Service Order"
 msgstr "Ordem de Serviço de Campo"
 
+#. module: fieldservice_maintenance
+#: model:ir.model,name:fieldservice_maintenance.model_fsm_order_type
+#, fuzzy
+#| msgid "Field Service Order"
+msgid "Field Service Order Type"
+msgstr "Ordem de Serviço de Campo"
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order_type__internal_type
+msgid "Internal Type"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__is_fsm_equipment
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_equipment__is_fsm_equipment
@@ -34,6 +51,7 @@ msgid "Is a FSM Equipment"
 msgstr "É um equipamento FSM"
 
 #. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
 #: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.fsm_equipment_form_view_maintenance
 msgid "Maintenance"
 msgstr "Manutenção"
@@ -49,6 +67,12 @@ msgstr "Equipamento de Manutenção"
 msgid "Maintenance Request"
 msgstr "Requisição de Manutenção"
 
+#. module: fieldservice_maintenance
+#: code:addons/fieldservice_maintenance/models/maintenance_request.py:28
+#, python-format
+msgid "Missing current location on FSM equipment %s"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.hr_equipment_view_form
 msgid "Others"
@@ -58,3 +82,8 @@ msgstr "Outros"
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__maintenance_equipment_id
 msgid "Related Maintenance Equipment"
 msgstr "Equipamento de Manutenção Relacionado"
+
+#. module: fieldservice_maintenance
+#: selection:fsm.order.type,internal_type:0
+msgid "Repair"
+msgstr ""

From 9d5baad9bb2aa2cb06197dc213767e630ff1dab4 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sun, 18 Oct 2020 12:01:14 -0400
Subject: [PATCH 574/631] [IMP] fieldservice_maintenance

---
 fieldservice_maintenance/models/fsm_order.py           | 3 ++-
 fieldservice_maintenance/models/maintenance_request.py | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index 747014bdd7..9b4e28a42c 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -30,7 +30,8 @@ def create(self, vals):
                             'maintenance_type': 'corrective',
                             'maintenance_team_id': team_id,
                             'schedule_date': order.request_early,
-                            'description': order.description
+                            'description': order.description,
+                            'fsm_order_id': order.id,
                         })
                     order.request_id = request_id
         return order
diff --git a/fieldservice_maintenance/models/maintenance_request.py b/fieldservice_maintenance/models/maintenance_request.py
index a9ef161124..069b1d7025 100644
--- a/fieldservice_maintenance/models/maintenance_request.py
+++ b/fieldservice_maintenance/models/maintenance_request.py
@@ -26,12 +26,14 @@ def create(self, vals):
                 order="id desc", limit=1)
             if not fsm_equipment.current_location_id.id:
                 raise UserError(_(
-                    'Missing current location on FSM equipment %s') % self.name)
+                    'Missing current location on FSM equipment %s')
+                    % fsm_equipment.name)
             fsm_order_id = self.env['fsm.order'].create(
                 {'type': fsm_order_type.id,
                  'equipment_id': fsm_equipment.id,
                  'location_id': fsm_equipment.current_location_id.id,
-                 'request_id': request.id
+                 'request_id': request.id,
+                 'description': request.description,
                  })
             request.fsm_order_id = fsm_order_id
         return request

From e669c925c1c923ade849731d4124d3464fbf8c15 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sun, 18 Oct 2020 12:43:14 -0400
Subject: [PATCH 575/631] [IMP] fieldservice_maintenance: Add test case

---
 fieldservice_maintenance/README.rst           |  1 +
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../static/description/index.html             |  1 +
 fieldservice_maintenance/tests/__init__.py    |  4 +
 .../tests/test_fsm_maintenance.py             | 77 +++++++++++++++++++
 5 files changed, 84 insertions(+)
 create mode 100644 fieldservice_maintenance/tests/__init__.py
 create mode 100644 fieldservice_maintenance/tests/test_fsm_maintenance.py

diff --git a/fieldservice_maintenance/README.rst b/fieldservice_maintenance/README.rst
index f94f379e4b..0408bbe64b 100644
--- a/fieldservice_maintenance/README.rst
+++ b/fieldservice_maintenance/README.rst
@@ -98,6 +98,7 @@ Contributors
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
 * Marcel Savegnago - Escodoo <marcel.savegnago@escodoo.com.br>
+* Brian McMaster <brian@mcmpest.com>
 
 Other credits
 ~~~~~~~~~~~~~
diff --git a/fieldservice_maintenance/readme/CONTRIBUTORS.rst b/fieldservice_maintenance/readme/CONTRIBUTORS.rst
index 0a558245eb..740cffd4b8 100644
--- a/fieldservice_maintenance/readme/CONTRIBUTORS.rst
+++ b/fieldservice_maintenance/readme/CONTRIBUTORS.rst
@@ -2,3 +2,4 @@
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Bhavesh Odedra <bodedra@opensourceintegrators.com>
 * Marcel Savegnago - Escodoo <marcel.savegnago@escodoo.com.br>
+* Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_maintenance/static/description/index.html b/fieldservice_maintenance/static/description/index.html
index 765d85b0f9..9feb085ec8 100644
--- a/fieldservice_maintenance/static/description/index.html
+++ b/fieldservice_maintenance/static/description/index.html
@@ -446,6 +446,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>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Marcel Savegnago - Escodoo &lt;<a class="reference external" href="mailto:marcel.savegnago&#64;escodoo.com.br">marcel.savegnago&#64;escodoo.com.br</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">
diff --git a/fieldservice_maintenance/tests/__init__.py b/fieldservice_maintenance/tests/__init__.py
new file mode 100644
index 0000000000..016a00f007
--- /dev/null
+++ b/fieldservice_maintenance/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2020, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_fsm_maintenance
diff --git a/fieldservice_maintenance/tests/test_fsm_maintenance.py b/fieldservice_maintenance/tests/test_fsm_maintenance.py
new file mode 100644
index 0000000000..e10b3872a0
--- /dev/null
+++ b/fieldservice_maintenance/tests/test_fsm_maintenance.py
@@ -0,0 +1,77 @@
+# Copyright (C) 2020, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests.common import TransactionCase
+from odoo.exceptions import UserError
+
+
+class TestFSMMaintenance(TransactionCase):
+
+    def test_fsm_maintenance(self):
+        # Create FSM Location to use in test cases
+        partner = self.env["res.partner"].create({
+            "name": "Partner",
+        })
+        fsm_loc = self.env["fsm.location"].create({
+            "name": "Test Maintenance Location",
+            "owner_id": partner.id
+        })
+        # Create FSM equipment
+        fsm_equip_01 = self.env["fsm.equipment"].create({
+            "name": "Test FSM Equipment 01",
+            "current_location_id": fsm_loc.id,
+        })
+        maint_equip_01 = fsm_equip_01.maintenance_equipment_id
+        self.assertTrue(maint_equip_01)
+        # Create FSM Order of type maintenance and an equipment. This should
+        # create a maintenance request based on the FSM order
+        fsm_order_01 = self.env["fsm.order"].create({
+            "location_id": fsm_loc.id,
+            "type":  self.env.ref(
+                "fieldservice_maintenance.fsm_order_type_maintenance").id,
+            "equipment_id": fsm_equip_01.id,
+        })
+        # Verify Maintenance order was created for that equipment
+        maint_req_01 = self.env["maintenance.request"].search([
+            ("fsm_order_id", "=", fsm_order_01.id)
+        ])
+        self.assertEqual(maint_req_01.name, fsm_order_01.name)
+        self.assertEqual(maint_req_01.equipment_id,
+                         fsm_order_01.equipment_id.maintenance_equipment_id)
+        self.assertEqual(fsm_order_01.request_id, maint_req_01)
+
+        # Create a maintenance request for an FSM equipment. This should
+        # create FSM order for that equipment.
+        maint_req_02 = self.env["maintenance.request"].create({
+            "name": "Equip 01 Request for FSM",
+            "equipment_id": maint_equip_01.id,
+        })
+        # Test order was created for the request
+        fsm_order_02 = self.env["fsm.order"].search([
+            ("request_id", "=", maint_req_02.id)
+        ])
+        self.assertEqual(fsm_order_02.description, maint_req_02.description)
+        self.assertEqual(fsm_order_02.equipment_id.maintenance_equipment_id,
+                         maint_req_02.equipment_id)
+        self.assertEqual(maint_req_02.fsm_order_id, fsm_order_02)
+
+        # Catch user error for no location set on equipment when creating
+        # a maintenance request
+        fsm_equip_01.current_location_id = False
+        with self.assertRaises(UserError) as e:
+            self.env["maintenance.request"].create({
+                "name": "Equip 01 Request",
+                "equipment_id": maint_equip_01.id,
+            })
+        self.assertEqual(
+            e.exception.name,
+            (("Missing current location on FSM equipment %s")
+                % fsm_equip_01.name),
+            """FSM Maintenance: UserError not thrown when creating maintenance
+               request for equipment without FSM location"""
+        )
+
+        # Deleting the FSM Equipment
+        fsm_equip_01.unlink()
+        # Verfiy the maintenance equipment is no longer a FSM equipment
+        self.assertFalse(maint_equip_01.is_fsm_equipment)

From 40a154adec44196bb7b99ae75fef9abec5ef9d51 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 19 Oct 2020 22:19:06 +0000
Subject: [PATCH 576/631] fieldservice_maintenance 12.0.1.2.1

---
 fieldservice_maintenance/__manifest__.py | 2 +-
 fieldservice_maintenance/i18n/de.po      | 1 -
 fieldservice_maintenance/i18n/es_CL.po   | 1 -
 fieldservice_maintenance/i18n/pt_BR.po   | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index 92114b9754..be200016c2 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Maintenance',
     'summary': 'Integrate Field Service orders with maintenance requests',
-    'version': '12.0.1.2.0',
+    'version': '12.0.1.2.1',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_maintenance/i18n/de.po b/fieldservice_maintenance/i18n/de.po
index 03bacbcb6f..d49acf03e4 100644
--- a/fieldservice_maintenance/i18n/de.po
+++ b/fieldservice_maintenance/i18n/de.po
@@ -35,7 +35,6 @@ msgstr "Field-Service-Auftrag"
 #. module: fieldservice_maintenance
 #: model:ir.model,name:fieldservice_maintenance.model_fsm_order_type
 #, fuzzy
-#| msgid "Field Service Order"
 msgid "Field Service Order Type"
 msgstr "Field-Service-Auftrag"
 
diff --git a/fieldservice_maintenance/i18n/es_CL.po b/fieldservice_maintenance/i18n/es_CL.po
index 855475a471..c2aece185e 100644
--- a/fieldservice_maintenance/i18n/es_CL.po
+++ b/fieldservice_maintenance/i18n/es_CL.po
@@ -35,7 +35,6 @@ msgstr "Orden de servicio de campo"
 #. module: fieldservice_maintenance
 #: model:ir.model,name:fieldservice_maintenance.model_fsm_order_type
 #, fuzzy
-#| msgid "Field Service Order"
 msgid "Field Service Order Type"
 msgstr "Orden de servicio de campo"
 
diff --git a/fieldservice_maintenance/i18n/pt_BR.po b/fieldservice_maintenance/i18n/pt_BR.po
index 3a1844f4c6..d100f501f2 100644
--- a/fieldservice_maintenance/i18n/pt_BR.po
+++ b/fieldservice_maintenance/i18n/pt_BR.po
@@ -35,7 +35,6 @@ msgstr "Ordem de Serviço de Campo"
 #. module: fieldservice_maintenance
 #: model:ir.model,name:fieldservice_maintenance.model_fsm_order_type
 #, fuzzy
-#| msgid "Field Service Order"
 msgid "Field Service Order Type"
 msgstr "Ordem de Serviço de Campo"
 

From 0f51742875947e96513fc2b6b8e624f886df8767 Mon Sep 17 00:00:00 2001
From: Murtaza Mithaiwala <mmithaiwala@opensourceintegrators.com>
Date: Mon, 18 Jan 2021 17:23:12 +0530
Subject: [PATCH 577/631] [MIG] Migreted fieldservice_maintenance Module.

---
 fieldservice_maintenance/README.rst                  | 12 ++++++------
 fieldservice_maintenance/__manifest__.py             |  2 +-
 fieldservice_maintenance/hooks.py                    |  2 --
 fieldservice_maintenance/models/fsm_equipment.py     |  1 -
 fieldservice_maintenance/readme/INSTALL.rst          |  2 +-
 .../static/description/index.html                    | 10 +++++-----
 .../tests/test_fsm_maintenance.py                    |  2 +-
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/fieldservice_maintenance/README.rst b/fieldservice_maintenance/README.rst
index 0408bbe64b..3df8609915 100644
--- a/fieldservice_maintenance/README.rst
+++ b/fieldservice_maintenance/README.rst
@@ -14,13 +14,13 @@ Field Service - Maintenance
     :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_maintenance
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_maintenance
     :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_maintenance
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_maintenance
     :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| 
@@ -45,7 +45,7 @@ To install Field Service and have the mapping features,
 you need to install fieldservice_stock and maintenance
 
 Please refer to the installation instructions available at:
-https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance
+https://github.com/OCA/field-service/tree/14.0/fieldservice_maintenance
 
 Configuration
 =============
@@ -79,7 +79,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_maintenance%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_maintenance%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.
 
@@ -134,6 +134,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-smangukiya| |maintainer-max3903| |maintainer-bodedra| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_maintenance>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index be200016c2..bec343cda2 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Maintenance',
     'summary': 'Integrate Field Service orders with maintenance requests',
-    'version': '12.0.1.2.1',
+    'version': '14.0.1.0.0',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
diff --git a/fieldservice_maintenance/hooks.py b/fieldservice_maintenance/hooks.py
index 60b1249815..30d5005c7a 100644
--- a/fieldservice_maintenance/hooks.py
+++ b/fieldservice_maintenance/hooks.py
@@ -18,14 +18,12 @@ def pre_init_hook(cr):
         for equipment in equipments:
             cr.execute("""INSERT INTO maintenance_equipment (
                 name,
-                equipment_assign_to,
                 maintenance_team_id,
                 is_fsm_equipment,
                 effective_date,
                 active)
             VALUES (
                 %s,
-                'other',
                 1,
                 True,
                 %s,
diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index e86b003a8e..db2d58a74f 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -30,7 +30,6 @@ def create(self, vals):
                 'maintenance_equipment_id': maintenance_equipment_id.id})
         return super().create(vals)
 
-    @api.multi
     def unlink(self):
         equipments = self.mapped('maintenance_equipment_id')
         res = super(FSMEquipment, self).unlink()
diff --git a/fieldservice_maintenance/readme/INSTALL.rst b/fieldservice_maintenance/readme/INSTALL.rst
index 7fdfc47daf..a8bed85a7e 100644
--- a/fieldservice_maintenance/readme/INSTALL.rst
+++ b/fieldservice_maintenance/readme/INSTALL.rst
@@ -2,4 +2,4 @@ To install Field Service and have the mapping features,
 you need to install fieldservice_stock and maintenance
 
 Please refer to the installation instructions available at:
-https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance
+https://github.com/OCA/field-service/tree/14.0/fieldservice_maintenance
diff --git a/fieldservice_maintenance/static/description/index.html b/fieldservice_maintenance/static/description/index.html
index 9feb085ec8..922a857b3e 100644
--- a/fieldservice_maintenance/static/description/index.html
+++ b/fieldservice_maintenance/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 - Maintenance</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Maintenance</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_maintenance"><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_maintenance"><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><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_maintenance"><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_maintenance"><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>Odoo Maintenance App does not support Field Service operations for equipments
 outside the company facilities. On the other hand, the Field Service App does
 not support a maintenance schedule generating preventive maintenance request.</p>
@@ -396,7 +396,7 @@ <h1><a class="toc-backref" href="#id1">Installation</a></h1>
 <p>To install Field Service and have the mapping features,
 you need to install fieldservice_stock and maintenance</p>
 <p>Please refer to the installation instructions available at:
-<a class="reference external" href="https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance">https://github.com/OCA/field-service/tree/12.0/fieldservice_maintenance</a></p>
+<a class="reference external" href="https://github.com/OCA/field-service/tree/14.0/fieldservice_maintenance">https://github.com/OCA/field-service/tree/14.0/fieldservice_maintenance</a></p>
 </div>
 <div class="section" id="configuration">
 <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
@@ -428,7 +428,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_maintenance%0Aversion:%2012.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_maintenance%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">
@@ -465,7 +465,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/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.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/bodedra"><img alt="bodedra" src="https://github.com/bodedra.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_maintenance">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/14.0/fieldservice_maintenance">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_maintenance/tests/test_fsm_maintenance.py b/fieldservice_maintenance/tests/test_fsm_maintenance.py
index e10b3872a0..aa591a4dd5 100644
--- a/fieldservice_maintenance/tests/test_fsm_maintenance.py
+++ b/fieldservice_maintenance/tests/test_fsm_maintenance.py
@@ -64,7 +64,7 @@ def test_fsm_maintenance(self):
                 "equipment_id": maint_equip_01.id,
             })
         self.assertEqual(
-            e.exception.name,
+            e.exception.args[0],
             (("Missing current location on FSM equipment %s")
                 % fsm_equip_01.name),
             """FSM Maintenance: UserError not thrown when creating maintenance

From 7cad04523ee35396d51844897aff50e612945af4 Mon Sep 17 00:00:00 2001
From: Sandip Mangukiya <smangukiya@opensourceintegrators.com>
Date: Thu, 12 Aug 2021 09:06:33 -0700
Subject: [PATCH 578/631] [FIX]fieldservice_equipment_stock: Issue 829

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

diff --git a/fieldservice_equipment_stock/models/stock_move.py b/fieldservice_equipment_stock/models/stock_move.py
index 07657e8768..170b0dd8cb 100644
--- a/fieldservice_equipment_stock/models/stock_move.py
+++ b/fieldservice_equipment_stock/models/stock_move.py
@@ -17,8 +17,8 @@ def prepare_equipment_values(self, move_line):
             "current_stock_location_id": move_line.location_dest_id.id,
         }
 
-    def _action_done(self):
-        res = super()._action_done()
+    def _action_done(self, cancel_backorder=False):
+        res = super()._action_done(cancel_backorder)
         for rec in self:
             if (
                 rec.state == "done"

From c0cd707eabf9cb60f1b5e2aa9827df152a0a5e24 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 12 Aug 2021 16:49:03 +0000
Subject: [PATCH 579/631] fieldservice_equipment_stock 14.0.1.1.0

---
 fieldservice_equipment_stock/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_equipment_stock/__manifest__.py b/fieldservice_equipment_stock/__manifest__.py
index 6794d16b40..f982cacb41 100644
--- a/fieldservice_equipment_stock/__manifest__.py
+++ b/fieldservice_equipment_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Field Service - Stock Equipment",
     "summary": "Integrate stock operations with your field service equipments",
-    "version": "14.0.1.0.0",
+    "version": "14.0.1.1.0",
     "category": "Field Service",
     "author": "Open Source Integrators, "
     "Brian McMaster, "

From 29846bfe2ef88826febc0f224f47d3cad5db40e0 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 12 Aug 2021 16:49:08 +0000
Subject: [PATCH 580/631] [UPD] addons table in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 545a200e57..e6c338c554 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ addon | version | summary
 [fieldservice_calendar](fieldservice_calendar/) | 14.0.1.0.0 | Add calendar to FSM Orders
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
 [fieldservice_distribution](fieldservice_distribution/) | 14.0.1.0.0 | Manage your distribution structure
-[fieldservice_equipment_stock](fieldservice_equipment_stock/) | 14.0.1.0.0 | Integrate stock operations with your field service equipments
+[fieldservice_equipment_stock](fieldservice_equipment_stock/) | 14.0.1.1.0 | Integrate stock operations with your field service equipments
 [fieldservice_isp_account](fieldservice_isp_account/) | 14.0.1.0.0 | Invoice Field Service orders based on employee time or contractor costs
 [fieldservice_isp_flow](fieldservice_isp_flow/) | 14.0.1.0.0 | Field Service workflow for Internet Service Providers
 [fieldservice_partner_multi_relation](fieldservice_partner_multi_relation/) | 14.0.1.0.0 | Manage relations between contacts, companies and locations

From 3616774abeec81cd4ab317d6306674d8bd5025cf Mon Sep 17 00:00:00 2001
From: Murtaza Mithaiwala <mmithaiwala@opensourceintegrators.com>
Date: Mon, 18 Jan 2021 17:31:01 +0530
Subject: [PATCH 581/631] [IMP] Code after pre-commit.

---
 fieldservice_maintenance/__manifest__.py      | 46 +++++-----
 .../data/fsm_order_type.xml                   |  2 +-
 fieldservice_maintenance/hooks.py             | 28 +++---
 .../models/fsm_equipment.py                   | 43 +++++----
 fieldservice_maintenance/models/fsm_order.py  | 36 ++++----
 .../models/fsm_order_type.py                  |  6 +-
 .../models/maintenance_equipment.py           |  4 +-
 .../models/maintenance_request.py             | 41 +++++----
 .../tests/test_fsm_maintenance.py             | 92 +++++++++++--------
 .../views/fsm_equipment_view.xml              | 15 ++-
 .../views/fsm_order_view.xml                  | 14 +--
 .../views/maintenance_equipment_view.xml      |  4 +-
 .../views/maintenance_request_view.xml        |  9 +-
 .../odoo/addons/fieldservice_equipment_stock  |  1 -
 .../odoo/addons/fieldservice_maintenance      |  1 +
 .../setup.py                                  |  0
 16 files changed, 186 insertions(+), 156 deletions(-)
 delete mode 120000 setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock
 create mode 120000 setup/fieldservice_maintenance/odoo/addons/fieldservice_maintenance
 rename setup/{fieldservice_equipment_stock => fieldservice_maintenance}/setup.py (100%)

diff --git a/fieldservice_maintenance/__manifest__.py b/fieldservice_maintenance/__manifest__.py
index bec343cda2..fcffa6075e 100644
--- a/fieldservice_maintenance/__manifest__.py
+++ b/fieldservice_maintenance/__manifest__.py
@@ -2,30 +2,30 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - Maintenance',
-    'summary': 'Integrate Field Service orders with maintenance requests',
-    'version': '14.0.1.0.0',
-    'category': 'Field Service',
-    'author': 'Open Source Integrators, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice',
-        'maintenance',
+    "name": "Field Service - Maintenance",
+    "summary": "Integrate Field Service orders with maintenance requests",
+    "version": "14.0.1.0.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": [
+        "fieldservice",
+        "maintenance",
     ],
-    'data': [
-        'data/fsm_order_type.xml',
-        'views/maintenance_equipment_view.xml',
-        'views/maintenance_request_view.xml',
-        'views/fsm_equipment_view.xml',
-        'views/fsm_order_view.xml',
+    "data": [
+        "data/fsm_order_type.xml",
+        "views/maintenance_equipment_view.xml",
+        "views/maintenance_request_view.xml",
+        "views/fsm_equipment_view.xml",
+        "views/fsm_order_view.xml",
     ],
-    'pre_init_hook': 'pre_init_hook',
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'smangukiya',
-        'max3903',
-        'bodedra',
+    "pre_init_hook": "pre_init_hook",
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": [
+        "smangukiya",
+        "max3903",
+        "bodedra",
     ],
-    'installable': True,
+    "installable": True,
 }
diff --git a/fieldservice_maintenance/data/fsm_order_type.xml b/fieldservice_maintenance/data/fsm_order_type.xml
index eb9134f5ba..d93b5ee45f 100644
--- a/fieldservice_maintenance/data/fsm_order_type.xml
+++ b/fieldservice_maintenance/data/fsm_order_type.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
     <record id="fsm_order_type_maintenance" model="fsm.order.type">
diff --git a/fieldservice_maintenance/hooks.py b/fieldservice_maintenance/hooks.py
index 30d5005c7a..b2393fbdca 100644
--- a/fieldservice_maintenance/hooks.py
+++ b/fieldservice_maintenance/hooks.py
@@ -4,19 +4,24 @@
 
 def pre_init_hook(cr):
     # Check for existing fsm equipments
-    cr.execute('SELECT * FROM fsm_equipment')
+    cr.execute("SELECT * FROM fsm_equipment")
     equipments = []
     equipments = cr.dictfetchall()
     if equipments:
         # Add new columns to hold values
-        cr.execute("""ALTER TABLE fsm_equipment
-        ADD maintenance_equipment_id INT;""")
-        cr.execute("""ALTER TABLE maintenance_equipment
-        ADD is_fsm_equipment BOOLEAN;""")
+        cr.execute(
+            """ALTER TABLE fsm_equipment
+        ADD maintenance_equipment_id INT;"""
+        )
+        cr.execute(
+            """ALTER TABLE maintenance_equipment
+        ADD is_fsm_equipment BOOLEAN;"""
+        )
 
         # Create a new Maintenance equipment for each FSM equipment
         for equipment in equipments:
-            cr.execute("""INSERT INTO maintenance_equipment (
+            cr.execute(
+                """INSERT INTO maintenance_equipment (
                 name,
                 maintenance_team_id,
                 is_fsm_equipment,
@@ -27,17 +32,18 @@ def pre_init_hook(cr):
                 1,
                 True,
                 %s,
-                True);""", (
-                equipment.get('name'),
-                equipment.get('create_date'))
+                True);""",
+                (equipment.get("name"), equipment.get("create_date")),
             )
 
             # Set this new Maintenance equipment on the existing FSM equipment
-            cr.execute("""UPDATE fsm_equipment
+            cr.execute(
+                """UPDATE fsm_equipment
                 SET maintenance_equipment_id = (
                     SELECT id
                     FROM maintenance_equipment
                     ORDER BY id desc
                     LIMIT 1)
                 WHERE id = %s;""",
-                       (equipment.get('id'),))
+                (equipment.get("id"),),
+            )
diff --git a/fieldservice_maintenance/models/fsm_equipment.py b/fieldservice_maintenance/models/fsm_equipment.py
index db2d58a74f..389c95e6ed 100644
--- a/fieldservice_maintenance/models/fsm_equipment.py
+++ b/fieldservice_maintenance/models/fsm_equipment.py
@@ -5,37 +5,40 @@
 
 
 class FSMEquipment(models.Model):
-    _inherit = 'fsm.equipment'
+    _inherit = "fsm.equipment"
 
     maintenance_equipment_id = fields.Many2one(
-        'maintenance.equipment', string='Related Maintenance Equipment',
-        required=True, ondelete='restrict', delegate=True, auto_join=True,
-        index=True)
+        "maintenance.equipment",
+        string="Related Maintenance Equipment",
+        required=True,
+        ondelete="restrict",
+        delegate=True,
+        auto_join=True,
+        index=True,
+    )
 
     @api.model
     def create(self, vals):
-        lot_id = vals.get('lot_id', False)
-        maintenance_equipment_id = self.env['maintenance.equipment'].create({
-            'name': vals.get('name'),
-            'is_fsm_equipment': True,
-            'note': vals.get('notes', False),
-            'serial_no':
-                lot_id and
-                self.env['stock.production.lot'].browse(lot_id).name,
-            'maintenance_team_id':
-                vals.get('maintenance_team_id', False) or
-                self.env.ref('maintenance.equipment_team_maintenance').id})
+        maintenance_equipment_id = self.env["maintenance.equipment"].create(
+            {
+                "name": vals.get("name"),
+                "is_fsm_equipment": True,
+                "note": vals.get("notes", False),
+                "maintenance_team_id": vals.get("maintenance_team_id", False)
+                or self.env.ref("maintenance.equipment_team_maintenance").id,
+            }
+        )
         if maintenance_equipment_id:
-            vals.update({
-                'maintenance_equipment_id': maintenance_equipment_id.id})
+            vals.update({"maintenance_equipment_id": maintenance_equipment_id.id})
         return super().create(vals)
 
     def unlink(self):
-        equipments = self.mapped('maintenance_equipment_id')
+        equipments = self.mapped("maintenance_equipment_id")
         res = super(FSMEquipment, self).unlink()
         for equipment in equipments:
-            other = self.env['fsm.equipment'].search(
-                [('maintenance_equipment_id', '=', equipment.id)])
+            other = self.env["fsm.equipment"].search(
+                [("maintenance_equipment_id", "=", equipment.id)]
+            )
             if not other:
                 equipment.is_fsm_equipment = False
         return res
diff --git a/fieldservice_maintenance/models/fsm_order.py b/fieldservice_maintenance/models/fsm_order.py
index 9b4e28a42c..60723ae84b 100644
--- a/fieldservice_maintenance/models/fsm_order.py
+++ b/fieldservice_maintenance/models/fsm_order.py
@@ -5,33 +5,37 @@
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
-    request_id = fields.Many2one('maintenance.request',
-                                 string='Maintenance Request')
+    request_id = fields.Many2one("maintenance.request", string="Maintenance Request")
 
     @api.model
     def create(self, vals):
         # if FSM order with type maintenance is create then
         # create maintenance request
         order = super(FSMOrder, self).create(vals)
-        if order.type.internal_type == 'maintenance':
+        if order.type.internal_type == "maintenance":
             if order.equipment_id and not order.request_id:
                 equipment = order.equipment_id
                 maintenance_equipment_id = equipment.maintenance_equipment_id
                 if maintenance_equipment_id:
                     team_id = maintenance_equipment_id.maintenance_team_id.id
-                    request_id = self.env['maintenance.request'].with_context(
-                        fsm_order=True).create({
-                            'name': order.name or '',
-                            'equipment_id': maintenance_equipment_id.id,
-                            'category_id': equipment.category_id.id,
-                            'request_date': fields.Date.context_today(self),
-                            'maintenance_type': 'corrective',
-                            'maintenance_team_id': team_id,
-                            'schedule_date': order.request_early,
-                            'description': order.description,
-                            'fsm_order_id': order.id,
-                        })
+                    request_id = (
+                        self.env["maintenance.request"]
+                        .with_context(fsm_order=True)
+                        .create(
+                            {
+                                "name": order.name or "",
+                                "equipment_id": maintenance_equipment_id.id,
+                                "category_id": equipment.category_id.id,
+                                "request_date": fields.Date.context_today(self),
+                                "maintenance_type": "corrective",
+                                "maintenance_team_id": team_id,
+                                "schedule_date": order.request_early,
+                                "description": order.description,
+                                "fsm_order_id": order.id,
+                            }
+                        )
+                    )
                     order.request_id = request_id
         return order
diff --git a/fieldservice_maintenance/models/fsm_order_type.py b/fieldservice_maintenance/models/fsm_order_type.py
index f483e61056..ab2674e985 100644
--- a/fieldservice_maintenance/models/fsm_order_type.py
+++ b/fieldservice_maintenance/models/fsm_order_type.py
@@ -6,9 +6,9 @@
 
 class FsmOrderType(models.Model):
 
-    _inherit = 'fsm.order.type'
+    _inherit = "fsm.order.type"
 
     internal_type = fields.Selection(
-        selection_add=[('maintenance',
-                        'Maintenance')],
+        selection_add=[("maintenance", "Maintenance")],
+        ondelete={"maintenance": "cascade"},
     )
diff --git a/fieldservice_maintenance/models/maintenance_equipment.py b/fieldservice_maintenance/models/maintenance_equipment.py
index 48937c9dcb..45ad80b669 100644
--- a/fieldservice_maintenance/models/maintenance_equipment.py
+++ b/fieldservice_maintenance/models/maintenance_equipment.py
@@ -5,6 +5,6 @@
 
 
 class MaintenanceEquipment(models.Model):
-    _inherit = 'maintenance.equipment'
+    _inherit = "maintenance.equipment"
 
-    is_fsm_equipment = fields.Boolean(string='Is a FSM Equipment')
+    is_fsm_equipment = fields.Boolean(string="Is a FSM Equipment")
diff --git a/fieldservice_maintenance/models/maintenance_request.py b/fieldservice_maintenance/models/maintenance_request.py
index 069b1d7025..1f1b9d64aa 100644
--- a/fieldservice_maintenance/models/maintenance_request.py
+++ b/fieldservice_maintenance/models/maintenance_request.py
@@ -1,14 +1,14 @@
 # Copyright (C) 2018 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 UserError
-from odoo import api, fields, models, _
 
 
 class MaintenanceRequest(models.Model):
-    _inherit = 'maintenance.request'
+    _inherit = "maintenance.request"
 
-    fsm_order_id = fields.Many2one('fsm.order', 'Field Service Order')
+    fsm_order_id = fields.Many2one("fsm.order", "Field Service Order")
 
     @api.model
     def create(self, vals):
@@ -18,22 +18,25 @@ def create(self, vals):
         ctx = dict(self._context)
         if request.equipment_id.is_fsm_equipment and "fsm_order" not in ctx:
             # Get the fsm equipment
-            fsm_equipment = self.env['fsm.equipment'].search(
-                [('maintenance_equipment_id', '=', request.equipment_id.id)],
-                limit=1)
-            fsm_order_type = self.env['fsm.order.type'].search(
-                [('internal_type', '=', 'maintenance')],
-                order="id desc", limit=1)
+            fsm_equipment = self.env["fsm.equipment"].search(
+                [("maintenance_equipment_id", "=", request.equipment_id.id)], limit=1
+            )
+            fsm_order_type = self.env["fsm.order.type"].search(
+                [("internal_type", "=", "maintenance")], order="id desc", limit=1
+            )
             if not fsm_equipment.current_location_id.id:
-                raise UserError(_(
-                    'Missing current location on FSM equipment %s')
-                    % fsm_equipment.name)
-            fsm_order_id = self.env['fsm.order'].create(
-                {'type': fsm_order_type.id,
-                 'equipment_id': fsm_equipment.id,
-                 'location_id': fsm_equipment.current_location_id.id,
-                 'request_id': request.id,
-                 'description': request.description,
-                 })
+                raise UserError(
+                    _("Missing current location on FSM equipment %s")
+                    % fsm_equipment.name
+                )
+            fsm_order_id = self.env["fsm.order"].create(
+                {
+                    "type": fsm_order_type.id,
+                    "equipment_id": fsm_equipment.id,
+                    "location_id": fsm_equipment.current_location_id.id,
+                    "request_id": request.id,
+                    "description": request.description,
+                }
+            )
             request.fsm_order_id = fsm_order_id
         return request
diff --git a/fieldservice_maintenance/tests/test_fsm_maintenance.py b/fieldservice_maintenance/tests/test_fsm_maintenance.py
index aa591a4dd5..5395c0cf9b 100644
--- a/fieldservice_maintenance/tests/test_fsm_maintenance.py
+++ b/fieldservice_maintenance/tests/test_fsm_maintenance.py
@@ -1,74 +1,86 @@
 # Copyright (C) 2020, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo.tests.common import TransactionCase
 from odoo.exceptions import UserError
+from odoo.tests.common import TransactionCase
 
 
 class TestFSMMaintenance(TransactionCase):
-
     def test_fsm_maintenance(self):
         # Create FSM Location to use in test cases
-        partner = self.env["res.partner"].create({
-            "name": "Partner",
-        })
-        fsm_loc = self.env["fsm.location"].create({
-            "name": "Test Maintenance Location",
-            "owner_id": partner.id
-        })
+        partner = self.env["res.partner"].create(
+            {
+                "name": "Partner",
+            }
+        )
+        fsm_loc = self.env["fsm.location"].create(
+            {"name": "Test Maintenance Location", "owner_id": partner.id}
+        )
         # Create FSM equipment
-        fsm_equip_01 = self.env["fsm.equipment"].create({
-            "name": "Test FSM Equipment 01",
-            "current_location_id": fsm_loc.id,
-        })
+        fsm_equip_01 = self.env["fsm.equipment"].create(
+            {
+                "name": "Test FSM Equipment 01",
+                "current_location_id": fsm_loc.id,
+            }
+        )
         maint_equip_01 = fsm_equip_01.maintenance_equipment_id
         self.assertTrue(maint_equip_01)
         # Create FSM Order of type maintenance and an equipment. This should
         # create a maintenance request based on the FSM order
-        fsm_order_01 = self.env["fsm.order"].create({
-            "location_id": fsm_loc.id,
-            "type":  self.env.ref(
-                "fieldservice_maintenance.fsm_order_type_maintenance").id,
-            "equipment_id": fsm_equip_01.id,
-        })
+        fsm_order_01 = self.env["fsm.order"].create(
+            {
+                "location_id": fsm_loc.id,
+                "type": self.env.ref(
+                    "fieldservice_maintenance.fsm_order_type_maintenance"
+                ).id,
+                "equipment_id": fsm_equip_01.id,
+            }
+        )
         # Verify Maintenance order was created for that equipment
-        maint_req_01 = self.env["maintenance.request"].search([
-            ("fsm_order_id", "=", fsm_order_01.id)
-        ])
+        maint_req_01 = self.env["maintenance.request"].search(
+            [("fsm_order_id", "=", fsm_order_01.id)]
+        )
         self.assertEqual(maint_req_01.name, fsm_order_01.name)
-        self.assertEqual(maint_req_01.equipment_id,
-                         fsm_order_01.equipment_id.maintenance_equipment_id)
+        self.assertEqual(
+            maint_req_01.equipment_id,
+            fsm_order_01.equipment_id.maintenance_equipment_id,
+        )
         self.assertEqual(fsm_order_01.request_id, maint_req_01)
 
         # Create a maintenance request for an FSM equipment. This should
         # create FSM order for that equipment.
-        maint_req_02 = self.env["maintenance.request"].create({
-            "name": "Equip 01 Request for FSM",
-            "equipment_id": maint_equip_01.id,
-        })
+        maint_req_02 = self.env["maintenance.request"].create(
+            {
+                "name": "Equip 01 Request for FSM",
+                "equipment_id": maint_equip_01.id,
+            }
+        )
         # Test order was created for the request
-        fsm_order_02 = self.env["fsm.order"].search([
-            ("request_id", "=", maint_req_02.id)
-        ])
+        fsm_order_02 = self.env["fsm.order"].search(
+            [("request_id", "=", maint_req_02.id)]
+        )
         self.assertEqual(fsm_order_02.description, maint_req_02.description)
-        self.assertEqual(fsm_order_02.equipment_id.maintenance_equipment_id,
-                         maint_req_02.equipment_id)
+        self.assertEqual(
+            fsm_order_02.equipment_id.maintenance_equipment_id,
+            maint_req_02.equipment_id,
+        )
         self.assertEqual(maint_req_02.fsm_order_id, fsm_order_02)
 
         # Catch user error for no location set on equipment when creating
         # a maintenance request
         fsm_equip_01.current_location_id = False
         with self.assertRaises(UserError) as e:
-            self.env["maintenance.request"].create({
-                "name": "Equip 01 Request",
-                "equipment_id": maint_equip_01.id,
-            })
+            self.env["maintenance.request"].create(
+                {
+                    "name": "Equip 01 Request",
+                    "equipment_id": maint_equip_01.id,
+                }
+            )
         self.assertEqual(
             e.exception.args[0],
-            (("Missing current location on FSM equipment %s")
-                % fsm_equip_01.name),
+            (("Missing current location on FSM equipment %s") % fsm_equip_01.name),
             """FSM Maintenance: UserError not thrown when creating maintenance
-               request for equipment without FSM location"""
+               request for equipment without FSM location""",
         )
 
         # Deleting the FSM Equipment
diff --git a/fieldservice_maintenance/views/fsm_equipment_view.xml b/fieldservice_maintenance/views/fsm_equipment_view.xml
index 9de9c220e1..edeb8f51c4 100644
--- a/fieldservice_maintenance/views/fsm_equipment_view.xml
+++ b/fieldservice_maintenance/views/fsm_equipment_view.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <!-- Field Service maintenance Form View-->
     <record id="fsm_equipment_form_view_maintenance" model="ir.ui.view">
         <field name="name">fsm.equipment.form.maintenance</field>
         <field name="model">fsm.equipment</field>
-        <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_equipment_form_view" />
         <field name="arch" type="xml">
             <group id="secondary" position="inside">
                 <group string="Maintenance">
-                    <field name="maintenance_team_id" required="1"/>
-                    <field name="category_id"/>
-                    <field name="model"/>
+                    <field name="maintenance_team_id" required="0" />
+                    <field name="category_id" />
+                    <field name="model" />
                 </group>
             </group>
         </field>
@@ -20,11 +20,10 @@
     <record id="fsm_equipment_tree_view_model" model="ir.ui.view">
         <field name="name">fsm.equipment.model</field>
         <field name="model">fsm.equipment</field>
-        <field name="inherit_id"
-               ref="fieldservice.fsm_equipment_tree_view"/>
+        <field name="inherit_id" ref="fieldservice.fsm_equipment_tree_view" />
         <field name="arch" type="xml">
             <field name="name" position="after">
-                <field name="category_id"/>
+                <field name="category_id" />
             </field>
         </field>
     </record>
diff --git a/fieldservice_maintenance/views/fsm_order_view.xml b/fieldservice_maintenance/views/fsm_order_view.xml
index e88c34d48b..99a55fc64c 100644
--- a/fieldservice_maintenance/views/fsm_order_view.xml
+++ b/fieldservice_maintenance/views/fsm_order_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <!-- Copyright 2018 Open Source Integrators
          License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
@@ -7,13 +7,15 @@
     <record id="fsm_order_maintenance_form" model="ir.ui.view">
         <field name="name">fsm.order.maintenance.form</field>
         <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">
             <field name="priority" position="before">
-                <field name="internal_type" invisible="1"/>
-                <field name="request_id"
-                       readonly="1"
-                       attrs="{'invisible': [('internal_type', '!=', 'maintenance')]}"/>
+                <field name="internal_type" invisible="1" />
+                <field
+                    name="request_id"
+                    readonly="1"
+                    attrs="{'invisible': [('internal_type', '!=', 'maintenance')]}"
+                />
             </field>
         </field>
     </record>
diff --git a/fieldservice_maintenance/views/maintenance_equipment_view.xml b/fieldservice_maintenance/views/maintenance_equipment_view.xml
index 89a31219e5..0c58c95de7 100644
--- a/fieldservice_maintenance/views/maintenance_equipment_view.xml
+++ b/fieldservice_maintenance/views/maintenance_equipment_view.xml
@@ -4,7 +4,7 @@
     <record id="hr_equipment_view_form" model="ir.ui.view">
         <field name="name">equipment.form.fsm</field>
         <field name="model">maintenance.equipment</field>
-        <field name="inherit_id" ref="maintenance.hr_equipment_view_form"/>
+        <field name="inherit_id" ref="maintenance.hr_equipment_view_form" />
         <field name="arch" type="xml">
             <field name="maintenance_team_id" position="attributes">
                 <attribute name="required">True</attribute>
@@ -13,7 +13,7 @@
                 <page string="Others">
                     <group>
                         <group>
-                            <field name="is_fsm_equipment" readonly="1"/>
+                            <field name="is_fsm_equipment" readonly="1" />
                         </group>
                     </group>
                 </page>
diff --git a/fieldservice_maintenance/views/maintenance_request_view.xml b/fieldservice_maintenance/views/maintenance_request_view.xml
index 70554d440c..cd6c014162 100644
--- a/fieldservice_maintenance/views/maintenance_request_view.xml
+++ b/fieldservice_maintenance/views/maintenance_request_view.xml
@@ -4,12 +4,13 @@
     <record id="hr_equipment_request_view_form_fsm" model="ir.ui.view">
         <field name="name">equipment.request.form.fsm</field>
         <field name="model">maintenance.request</field>
-        <field name="inherit_id"
-               ref="maintenance.hr_equipment_request_view_form"/>
+        <field name="inherit_id" ref="maintenance.hr_equipment_request_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='equipment_id']" position="after">
-                <field name="fsm_order_id"
-                       attrs="{'invisible': [('fsm_order_id', '=', False)]}"/>
+                <field
+                    name="fsm_order_id"
+                    attrs="{'invisible': [('fsm_order_id', '=', False)]}"
+                />
             </xpath>
         </field>
     </record>
diff --git a/setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock b/setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock
deleted file mode 120000
index fa559f4884..0000000000
--- a/setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock
+++ /dev/null
@@ -1 +0,0 @@
-../../../../fieldservice_equipment_stock
\ No newline at end of file
diff --git a/setup/fieldservice_maintenance/odoo/addons/fieldservice_maintenance b/setup/fieldservice_maintenance/odoo/addons/fieldservice_maintenance
new file mode 120000
index 0000000000..97c63073dd
--- /dev/null
+++ b/setup/fieldservice_maintenance/odoo/addons/fieldservice_maintenance
@@ -0,0 +1 @@
+../../../../fieldservice_maintenance
\ No newline at end of file
diff --git a/setup/fieldservice_equipment_stock/setup.py b/setup/fieldservice_maintenance/setup.py
similarity index 100%
rename from setup/fieldservice_equipment_stock/setup.py
rename to setup/fieldservice_maintenance/setup.py

From b0d3c9fbc582d794fd4b89fff5c0cf7bc4c9508d Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Fri, 13 Aug 2021 17:51:03 +0000
Subject: [PATCH 582/631] [UPD] Update fieldservice_maintenance.pot

---
 .../i18n/fieldservice_maintenance.pot         | 46 +++++++++++++------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/fieldservice_maintenance/i18n/fieldservice_maintenance.pot b/fieldservice_maintenance/i18n/fieldservice_maintenance.pot
index 906211e79f..0e89c70ec5 100644
--- a/fieldservice_maintenance/i18n/fieldservice_maintenance.pot
+++ b/fieldservice_maintenance/i18n/fieldservice_maintenance.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_maintenance
+# 	* fieldservice_maintenance
 #
 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"
@@ -14,8 +14,11 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: fieldservice_maintenance
-#: selection:fsm.order.type,internal_type:0
-msgid "FSM"
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__display_name
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order_type__display_name
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_equipment__display_name
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_request__display_name
+msgid "Display Name"
 msgstr ""
 
 #. module: fieldservice_maintenance
@@ -34,6 +37,15 @@ msgstr ""
 msgid "Field Service Order Type"
 msgstr ""
 
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__id
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order_type__id
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_equipment__id
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_request__id
+msgid "ID"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order_type__internal_type
 msgid "Internal Type"
@@ -46,7 +58,16 @@ msgid "Is a FSM Equipment"
 msgstr ""
 
 #. module: fieldservice_maintenance
-#: selection:fsm.order.type,internal_type:0
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment____last_update
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order_type____last_update
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_equipment____last_update
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_maintenance_request____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_maintenance
+#: model:ir.model.fields.selection,name:fieldservice_maintenance.selection__fsm_order_type__internal_type__maintenance
 #: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.fsm_equipment_form_view_maintenance
 msgid "Maintenance"
 msgstr ""
@@ -63,11 +84,16 @@ msgid "Maintenance Request"
 msgstr ""
 
 #. module: fieldservice_maintenance
-#: code:addons/fieldservice_maintenance/models/maintenance_request.py:28
+#: code:addons/fieldservice_maintenance/models/maintenance_request.py:0
 #, python-format
 msgid "Missing current location on FSM equipment %s"
 msgstr ""
 
+#. module: fieldservice_maintenance
+#: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_maintenance
 #: model_terms:ir.ui.view,arch_db:fieldservice_maintenance.hr_equipment_view_form
 msgid "Others"
@@ -77,9 +103,3 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_maintenance.field_fsm_equipment__maintenance_equipment_id
 msgid "Related Maintenance Equipment"
 msgstr ""
-
-#. module: fieldservice_maintenance
-#: selection:fsm.order.type,internal_type:0
-msgid "Repair"
-msgstr ""
-

From bb018edc16e471da1ee192177e2b1fd065884a7d Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 13 Aug 2021 17:57:26 +0000
Subject: [PATCH 583/631] [UPD] addons table in README.md

---
 README.md | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index e6c338c554..555f3f979b 100644
--- a/README.md
+++ b/README.md
@@ -17,32 +17,33 @@ TODO: add repo description.
 
 Available addons
 ----------------
-addon | version | summary
---- | --- | ---
-[base_territory](base_territory/) | 14.0.1.0.0 | This module allows you to define territories, branches, districts and regions to be used for Field Service operations or Sales.
-[fieldservice](fieldservice/) | 14.0.1.3.0 | Manage Field Service Locations, Workers and Orders
-[fieldservice_account](fieldservice_account/) | 14.0.1.1.0 | Track invoices linked to Field Service orders
-[fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | Track analytic accounts on Field Service locations and orders
-[fieldservice_account_payment](fieldservice_account_payment/) | 14.0.1.0.0 | Allow workers to collect payments from the order.
-[fieldservice_activity](fieldservice_activity/) | 14.0.1.0.0 | Field Service Activities are a set of actions that need to be performed on a service order
-[fieldservice_agreement](fieldservice_agreement/) | 14.0.1.0.0 | Manage Field Service agreements and contracts
-[fieldservice_calendar](fieldservice_calendar/) | 14.0.1.0.0 | Add calendar to FSM Orders
-[fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | Create Field Service orders from the CRM
-[fieldservice_distribution](fieldservice_distribution/) | 14.0.1.0.0 | Manage your distribution structure
-[fieldservice_equipment_stock](fieldservice_equipment_stock/) | 14.0.1.1.0 | Integrate stock operations with your field service equipments
-[fieldservice_isp_account](fieldservice_isp_account/) | 14.0.1.0.0 | Invoice Field Service orders based on employee time or contractor costs
-[fieldservice_isp_flow](fieldservice_isp_flow/) | 14.0.1.0.0 | Field Service workflow for Internet Service Providers
-[fieldservice_partner_multi_relation](fieldservice_partner_multi_relation/) | 14.0.1.0.0 | Manage relations between contacts, companies and locations
-[fieldservice_project](fieldservice_project/) | 14.0.1.0.0 | Create field service orders from a project or project task
-[fieldservice_purchase](fieldservice_purchase/) | 14.0.1.0.0 | Manage FSM Purchases
-[fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | Organize the routes of each day.
-[fieldservice_sale](fieldservice_sale/) | 14.0.1.2.0 | Sell field services.
-[fieldservice_sale_stock](fieldservice_sale_stock/) | 14.0.1.0.0 | Sell stockable items linked to field service orders.
-[fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | Manage your Field Service workers skills
-[fieldservice_stage_server_action](fieldservice_stage_server_action/) | 14.0.1.0.0 | Execute server actions when reaching a Field Service stage
-[fieldservice_stock](fieldservice_stock/) | 14.0.1.0.0 | Integrate the logistics operations with Field Service
-[fieldservice_substatus](fieldservice_substatus/) | 14.0.1.0.0 | Add sub-statuses to Field Service orders
-[fieldservice_timeline](fieldservice_timeline/) | 14.0.1.1.1 | This module is a display timeline view of the Field Service order in Odoo.
+addon | version | maintainers | summary
+--- | --- | --- | ---
+[base_territory](base_territory/) | 14.0.1.0.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | This module allows you to define territories, branches, districts and regions to be used for Field Service operations or Sales.
+[fieldservice](fieldservice/) | 14.0.1.3.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Manage Field Service Locations, Workers and Orders
+[fieldservice_account](fieldservice_account/) | 14.0.1.1.0 | [![osimallen](https://github.com/osimallen.png?size=30px)](https://github.com/osimallen) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) | Track invoices linked to Field Service orders
+[fieldservice_account_analytic](fieldservice_account_analytic/) | 14.0.1.0.0 | [![osimallen](https://github.com/osimallen.png?size=30px)](https://github.com/osimallen) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) | Track analytic accounts on Field Service locations and orders
+[fieldservice_account_payment](fieldservice_account_payment/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Allow workers to collect payments from the order.
+[fieldservice_activity](fieldservice_activity/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![osi-scampbell](https://github.com/osi-scampbell.png?size=30px)](https://github.com/osi-scampbell) | Field Service Activities are a set of actions that need to be performed on a service order
+[fieldservice_agreement](fieldservice_agreement/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) [![smangukiya](https://github.com/smangukiya.png?size=30px)](https://github.com/smangukiya) [![osi-scampbell](https://github.com/osi-scampbell.png?size=30px)](https://github.com/osi-scampbell) [![patrickrwilson](https://github.com/patrickrwilson.png?size=30px)](https://github.com/patrickrwilson) | Manage Field Service agreements and contracts
+[fieldservice_calendar](fieldservice_calendar/) | 14.0.1.0.0 | [![hparfr](https://github.com/hparfr.png?size=30px)](https://github.com/hparfr) | Add calendar to FSM Orders
+[fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | [![patrickrwilson](https://github.com/patrickrwilson.png?size=30px)](https://github.com/patrickrwilson) | Create Field Service orders from the CRM
+[fieldservice_distribution](fieldservice_distribution/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Manage your distribution structure
+[fieldservice_equipment_stock](fieldservice_equipment_stock/) | 14.0.1.1.0 | [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![smangukiya](https://github.com/smangukiya.png?size=30px)](https://github.com/smangukiya) | Integrate stock operations with your field service equipments
+[fieldservice_isp_account](fieldservice_isp_account/) | 14.0.1.0.0 | [![osimallen](https://github.com/osimallen.png?size=30px)](https://github.com/osimallen) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) | Invoice Field Service orders based on employee time or contractor costs
+[fieldservice_isp_flow](fieldservice_isp_flow/) | 14.0.1.0.0 | [![osi-scampbell](https://github.com/osi-scampbell.png?size=30px)](https://github.com/osi-scampbell) | Field Service workflow for Internet Service Providers
+[fieldservice_maintenance](fieldservice_maintenance/) | 14.0.1.0.0 | [![smangukiya](https://github.com/smangukiya.png?size=30px)](https://github.com/smangukiya) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) | Integrate Field Service orders with maintenance requests
+[fieldservice_partner_multi_relation](fieldservice_partner_multi_relation/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Manage relations between contacts, companies and locations
+[fieldservice_project](fieldservice_project/) | 14.0.1.0.0 |  | Create field service orders from a project or project task
+[fieldservice_purchase](fieldservice_purchase/) | 14.0.1.0.0 | [![osi-scampbell](https://github.com/osi-scampbell.png?size=30px)](https://github.com/osi-scampbell) | Manage FSM Purchases
+[fieldservice_route](fieldservice_route/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Organize the routes of each day.
+[fieldservice_sale](fieldservice_sale/) | 14.0.1.2.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | Sell field services.
+[fieldservice_sale_stock](fieldservice_sale_stock/) | 14.0.1.0.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) | Sell stockable items linked to field service orders.
+[fieldservice_skill](fieldservice_skill/) | 14.0.1.0.0 | [![osi-scampbell](https://github.com/osi-scampbell.png?size=30px)](https://github.com/osi-scampbell) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Manage your Field Service workers skills
+[fieldservice_stage_server_action](fieldservice_stage_server_action/) | 14.0.1.0.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![osi-scampbell](https://github.com/osi-scampbell.png?size=30px)](https://github.com/osi-scampbell) | Execute server actions when reaching a Field Service stage
+[fieldservice_stock](fieldservice_stock/) | 14.0.1.0.0 | [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![smangukiya](https://github.com/smangukiya.png?size=30px)](https://github.com/smangukiya) | Integrate the logistics operations with Field Service
+[fieldservice_substatus](fieldservice_substatus/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) | Add sub-statuses to Field Service orders
+[fieldservice_timeline](fieldservice_timeline/) | 14.0.1.1.1 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | This module is a display timeline view of the Field Service order in Odoo.
 
 [//]: # (end addons)
 

From ab5af590a73f2961fc8a04bbbddcae10a2e4a67a Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 13 Aug 2021 17:57:30 +0000
Subject: [PATCH 584/631] [UPD] README.rst

---
 fieldservice_maintenance/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_maintenance/static/description/index.html b/fieldservice_maintenance/static/description/index.html
index 922a857b3e..65ca007237 100644
--- a/fieldservice_maintenance/static/description/index.html
+++ b/fieldservice_maintenance/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: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Field Service - Maintenance</title>
 <style type="text/css">
 

From 28d9818d583349b0f38552f8b19abf8c36a65097 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 13 Aug 2021 17:57:30 +0000
Subject: [PATCH 585/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt                              | 2 +-
 setup/_metapackage/setup.py                                 | 1 +
 .../odoo/addons/fieldservice_equipment_stock                | 1 +
 setup/fieldservice_equipment_stock/setup.py                 | 6 ++++++
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 120000 setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock
 create mode 100644 setup/fieldservice_equipment_stock/setup.py

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 27df65997f..9c0cd9103f 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210803.0
\ No newline at end of file
+14.0.20210813.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 4bc8169648..6774476451 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -21,6 +21,7 @@
         'odoo14-addon-fieldservice_equipment_stock',
         'odoo14-addon-fieldservice_isp_account',
         'odoo14-addon-fieldservice_isp_flow',
+        'odoo14-addon-fieldservice_maintenance',
         'odoo14-addon-fieldservice_partner_multi_relation',
         'odoo14-addon-fieldservice_project',
         'odoo14-addon-fieldservice_purchase',
diff --git a/setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock b/setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock
new file mode 120000
index 0000000000..fa559f4884
--- /dev/null
+++ b/setup/fieldservice_equipment_stock/odoo/addons/fieldservice_equipment_stock
@@ -0,0 +1 @@
+../../../../fieldservice_equipment_stock
\ No newline at end of file
diff --git a/setup/fieldservice_equipment_stock/setup.py b/setup/fieldservice_equipment_stock/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_equipment_stock/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From b1eb6e67805540af3ab4b83f3f8067fb33c58563 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Mon, 16 Aug 2021 20:59:01 +0000
Subject: [PATCH 586/631] [UPD] Update fieldservice_vehicle.pot

---
 fieldservice_vehicle/i18n/fieldservice_vehicle.pot | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/fieldservice_vehicle/i18n/fieldservice_vehicle.pot b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
index 81e71270ca..a304bf216b 100644
--- a/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
+++ b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 13.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -39,6 +39,7 @@ msgid "Default Vehicle"
 msgstr ""
 
 #. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__display_name
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
 msgid "Display Name"
 msgstr ""
@@ -64,11 +65,15 @@ msgid "Field Service Worker"
 msgstr ""
 
 #. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__id
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
 msgid "ID"
 msgstr ""
 
 #. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person____last_update
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -93,6 +98,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
 #. module: fieldservice_vehicle
 #: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_form_view

From 7ed9352daae64071fc8838f8b622217c0eb234cc Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 16 Aug 2021 21:05:28 +0000
Subject: [PATCH 587/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 555f3f979b..d1d212ed51 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ addon | version | maintainers | summary
 [fieldservice_stock](fieldservice_stock/) | 14.0.1.0.0 | [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![smangukiya](https://github.com/smangukiya.png?size=30px)](https://github.com/smangukiya) | Integrate the logistics operations with Field Service
 [fieldservice_substatus](fieldservice_substatus/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) | Add sub-statuses to Field Service orders
 [fieldservice_timeline](fieldservice_timeline/) | 14.0.1.1.1 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | This module is a display timeline view of the Field Service order in Odoo.
+[fieldservice_vehicle](fieldservice_vehicle/) | 14.0.1.0.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Manage Field Service vehicles and assign drivers
 
 [//]: # (end addons)
 

From 76faf95101266965b69ac43313cf1bbf87527279 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 16 Aug 2021 21:05:31 +0000
Subject: [PATCH 588/631] [UPD] README.rst

---
 fieldservice_vehicle/README.rst                    | 10 +++++-----
 fieldservice_vehicle/static/description/index.html |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fieldservice_vehicle/README.rst b/fieldservice_vehicle/README.rst
index 1823a5fa68..70d68a6409 100644
--- a/fieldservice_vehicle/README.rst
+++ b/fieldservice_vehicle/README.rst
@@ -14,13 +14,13 @@ Field Service Vehicles
     :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/13.0/fieldservice_vehicle
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_vehicle
     :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-13-0/field-service-13-0-fieldservice_vehicle
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_vehicle
     :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/13.0
+    :target: https://runbot.odoo-community.org/runbot/264/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -69,7 +69,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/field-service/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_vehicle%0Aversion:%2013.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_vehicle%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.
 
@@ -123,6 +123,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/13.0/fieldservice_vehicle>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_vehicle>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_vehicle/static/description/index.html b/fieldservice_vehicle/static/description/index.html
index 6adec909c9..5f3a1aba5c 100644
--- a/fieldservice_vehicle/static/description/index.html
+++ b/fieldservice_vehicle/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service Vehicles</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/13.0/fieldservice_vehicle"><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-13-0/field-service-13-0-fieldservice_vehicle"><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/13.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/14.0/fieldservice_vehicle"><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_vehicle"><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>This module allows you to manage your vehicles and assign them to a worker.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -419,7 +419,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_vehicle%0Aversion:%2013.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_vehicle%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">
@@ -458,7 +458,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/13.0/fieldservice_vehicle">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/14.0/fieldservice_vehicle">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 ad64c7d1ddf1725d70ab1c4e233668f9c3049468 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 16 Aug 2021 21:05:32 +0000
Subject: [PATCH 589/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index 9c0cd9103f..fa5c7e2442 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210813.0
\ No newline at end of file
+14.0.20210816.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index 6774476451..ea1c19c9b1 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -33,6 +33,7 @@
         'odoo14-addon-fieldservice_stock',
         'odoo14-addon-fieldservice_substatus',
         'odoo14-addon-fieldservice_timeline',
+        'odoo14-addon-fieldservice_vehicle',
     ],
     classifiers=[
         'Programming Language :: Python',

From 4d996720d0f4088688f54b2f4b0fc4c13c0f1f90 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 14 Dec 2018 17:38:40 -0600
Subject: [PATCH 590/631] [ADD] fieldservice_delivery

---
 fieldservice_delivery/README.rst              | 121 +++++
 fieldservice_delivery/__init__.py             |   4 +
 fieldservice_delivery/__manifest__.py         |  26 +
 fieldservice_delivery/models/__init__.py      |   4 +
 fieldservice_delivery/models/fsm_order.py     |  12 +
 fieldservice_delivery/readme/CONFIGURE.rst    |   4 +
 fieldservice_delivery/readme/CONTRIBUTORS.rst |   1 +
 fieldservice_delivery/readme/CREDITS.rst      |   3 +
 fieldservice_delivery/readme/DESCRIPTION.rst  |   2 +
 fieldservice_delivery/readme/INSTALL.rst      |   4 +
 fieldservice_delivery/readme/ROADMAP.rst      |   2 +
 fieldservice_delivery/readme/USAGE.rst        |   6 +
 .../static/description/icon.png               | Bin 0 -> 17808 bytes
 .../static/description/index.html             | 463 ++++++++++++++++++
 fieldservice_delivery/views/fsm_order.xml     |  29 ++
 15 files changed, 681 insertions(+)
 create mode 100644 fieldservice_delivery/README.rst
 create mode 100644 fieldservice_delivery/__init__.py
 create mode 100644 fieldservice_delivery/__manifest__.py
 create mode 100644 fieldservice_delivery/models/__init__.py
 create mode 100644 fieldservice_delivery/models/fsm_order.py
 create mode 100644 fieldservice_delivery/readme/CONFIGURE.rst
 create mode 100644 fieldservice_delivery/readme/CONTRIBUTORS.rst
 create mode 100644 fieldservice_delivery/readme/CREDITS.rst
 create mode 100644 fieldservice_delivery/readme/DESCRIPTION.rst
 create mode 100644 fieldservice_delivery/readme/INSTALL.rst
 create mode 100644 fieldservice_delivery/readme/ROADMAP.rst
 create mode 100644 fieldservice_delivery/readme/USAGE.rst
 create mode 100644 fieldservice_delivery/static/description/icon.png
 create mode 100644 fieldservice_delivery/static/description/index.html
 create mode 100644 fieldservice_delivery/views/fsm_order.xml

diff --git a/fieldservice_delivery/README.rst b/fieldservice_delivery/README.rst
new file mode 100644
index 0000000000..5adfcbf059
--- /dev/null
+++ b/fieldservice_delivery/README.rst
@@ -0,0 +1,121 @@
+========================
+Field Service - Delivery
+========================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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_delivery
+    :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_delivery
+    :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| 
+
+This module is an add-on for the Field Service application in Odoo.
+It provides delivery capabilities on the field service orders.
+
+**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 configure this module, you need to:
+
+* Go to Inventory > Configuration > Delivery Methods
+* Review the existing delivery methods or create new ones
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Create a new service order
+* Under the Inventory tab, select the warehouse, the delivery method and add
+  products with quantity
+* Confirm the order to create the delivery orders with the selected method
+
+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_delivery%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
+~~~~~~~~~~~~
+
+* Maxime Chambreuil <mchambreuil@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-max3903| image:: https://github.com/max3903.png?size=40px
+    :target: https://github.com/max3903
+    :alt: max3903
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-max3903| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_delivery>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_delivery/__init__.py b/fieldservice_delivery/__init__.py
new file mode 100644
index 0000000000..da2feecfe9
--- /dev/null
+++ b/fieldservice_delivery/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_delivery/__manifest__.py b/fieldservice_delivery/__manifest__.py
new file mode 100644
index 0000000000..7bd3494fe1
--- /dev/null
+++ b/fieldservice_delivery/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Field Service - Delivery',
+    'summary': 'Delivery and Carriers for Field Services',
+    '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_stock',
+        'delivery',
+    ],
+    'data': [
+        'views/fsm_order.xml',
+    ],
+    'installable': True,
+    'auto_install': True,
+    'license': 'AGPL-3',
+    'development_status': 'Beta',
+    'maintainers': [
+        'max3903',
+    ],
+}
diff --git a/fieldservice_delivery/models/__init__.py b/fieldservice_delivery/models/__init__.py
new file mode 100644
index 0000000000..fb450db8c7
--- /dev/null
+++ b/fieldservice_delivery/models/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import fsm_order
diff --git a/fieldservice_delivery/models/fsm_order.py b/fieldservice_delivery/models/fsm_order.py
new file mode 100644
index 0000000000..5ef5ce10ed
--- /dev/null
+++ b/fieldservice_delivery/models/fsm_order.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# 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'
+
+    carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method")
diff --git a/fieldservice_delivery/readme/CONFIGURE.rst b/fieldservice_delivery/readme/CONFIGURE.rst
new file mode 100644
index 0000000000..b429b63eee
--- /dev/null
+++ b/fieldservice_delivery/readme/CONFIGURE.rst
@@ -0,0 +1,4 @@
+To configure this module, you need to:
+
+* Go to Inventory > Configuration > Delivery Methods
+* Review the existing delivery methods or create new ones
diff --git a/fieldservice_delivery/readme/CONTRIBUTORS.rst b/fieldservice_delivery/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..ab792860d8
--- /dev/null
+++ b/fieldservice_delivery/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
diff --git a/fieldservice_delivery/readme/CREDITS.rst b/fieldservice_delivery/readme/CREDITS.rst
new file mode 100644
index 0000000000..0eff0acf4e
--- /dev/null
+++ b/fieldservice_delivery/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_delivery/readme/DESCRIPTION.rst b/fieldservice_delivery/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..1715819530
--- /dev/null
+++ b/fieldservice_delivery/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module is an add-on for the Field Service application in Odoo.
+It provides delivery capabilities on the field service orders.
diff --git a/fieldservice_delivery/readme/INSTALL.rst b/fieldservice_delivery/readme/INSTALL.rst
new file mode 100644
index 0000000000..c010f8f6a2
--- /dev/null
+++ b/fieldservice_delivery/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_delivery/readme/ROADMAP.rst b/fieldservice_delivery/readme/ROADMAP.rst
new file mode 100644
index 0000000000..f607015959
--- /dev/null
+++ b/fieldservice_delivery/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_delivery/readme/USAGE.rst b/fieldservice_delivery/readme/USAGE.rst
new file mode 100644
index 0000000000..e0b17ff885
--- /dev/null
+++ b/fieldservice_delivery/readme/USAGE.rst
@@ -0,0 +1,6 @@
+To use this module, you need to:
+
+* Create a new service order
+* Under the Inventory tab, select the warehouse, the delivery method and add
+  products with quantity
+* Confirm the order to create the delivery orders with the selected method
diff --git a/fieldservice_delivery/static/description/icon.png b/fieldservice_delivery/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_delivery/static/description/index.html b/fieldservice_delivery/static/description/index.html
new file mode 100644
index 0000000000..f34a4c0451
--- /dev/null
+++ b/fieldservice_delivery/static/description/index.html
@@ -0,0 +1,463 @@
+<?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 - Delivery</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-delivery">
+<h1 class="title">Field Service - Delivery</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_delivery"><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_delivery"><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 an add-on for the Field Service application in Odoo.
+It provides delivery capabilities on the 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="#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 Inventory &gt; Configuration &gt; Delivery Methods</li>
+<li>Review the existing delivery methods or create new ones</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>Create a new service order</li>
+<li>Under the Inventory tab, select the warehouse, the delivery method and add
+products with quantity</li>
+<li>Confirm the order to create the delivery orders with the selected method</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_delivery%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>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#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">maintainer</a>:</p>
+<p><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_delivery">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_delivery/views/fsm_order.xml b/fieldservice_delivery/views/fsm_order.xml
new file mode 100644
index 0000000000..6f58d6228b
--- /dev/null
+++ b/fieldservice_delivery/views/fsm_order.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Field Service / Orders -->
+    <record id="view_fsm_order_form_delivery" model="ir.ui.view">
+        <field name="name">fsm.order.form.stock</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id"
+               ref="fieldservice_stock.view_fsm_order_form_inherit_stock"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@id='stock-right']" position="inside">
+                <field name="carrier_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- Inventory / Operations / FSM Orders -->
+    <record id="stock_fsm_order_form" model="ir.ui.view">
+        <field name="name">fsm.order.form</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice_stock.stock_fsm_order_form"/>
+        <field name="arch" type="xml">
+            <field name="warehouse_id" position="after">
+                <field name="carrier_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>

From beda91e597b3bf6c44def9d8746477ab5f915487 Mon Sep 17 00:00:00 2001
From: Murtuza Saleh <m.saleh.serpentcs@gmail.com>
Date: Thu, 4 Apr 2019 21:01:53 +0530
Subject: [PATCH 591/631] [MIG][WIP][12.0] fieldservice_delivery

---
 fieldservice_delivery/README.rst                    | 13 +++++++------
 fieldservice_delivery/__manifest__.py               |  2 +-
 fieldservice_delivery/models/fsm_order.py           |  6 ++----
 fieldservice_delivery/readme/CONTRIBUTORS.rst       |  1 +
 fieldservice_delivery/readme/INSTALL.rst            |  2 +-
 fieldservice_delivery/static/description/index.html |  9 +++++----
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/fieldservice_delivery/README.rst b/fieldservice_delivery/README.rst
index 5adfcbf059..15f3c3e63c 100644
--- a/fieldservice_delivery/README.rst
+++ b/fieldservice_delivery/README.rst
@@ -14,13 +14,13 @@ Field Service - Delivery
     :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_delivery
+    :target: https://github.com/OCA/field-service/tree/12.0/fieldservice_delivery
     :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_delivery
+    :target: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_delivery
     :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| 
@@ -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/11.0/base_geoengine
+https://github.com/OCA/geospatial/tree/12.0/base_geoengine
 
 Configuration
 =============
@@ -71,7 +71,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_delivery%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_delivery%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.
 
@@ -87,6 +87,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -116,6 +117,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/11.0/fieldservice_delivery>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_delivery>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_delivery/__manifest__.py b/fieldservice_delivery/__manifest__.py
index 7bd3494fe1..c9c9663fc3 100644
--- a/fieldservice_delivery/__manifest__.py
+++ b/fieldservice_delivery/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service - Delivery',
     'summary': 'Delivery and Carriers for Field Services',
-    'version': '11.0.0.0.1',
+    'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Odoo Community Association (OCA)",
diff --git a/fieldservice_delivery/models/fsm_order.py b/fieldservice_delivery/models/fsm_order.py
index 5ef5ce10ed..1189a8a4eb 100644
--- a/fieldservice_delivery/models/fsm_order.py
+++ b/fieldservice_delivery/models/fsm_order.py
@@ -1,12 +1,10 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # 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'
 
     carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method")
diff --git a/fieldservice_delivery/readme/CONTRIBUTORS.rst b/fieldservice_delivery/readme/CONTRIBUTORS.rst
index ab792860d8..64881b41a3 100644
--- a/fieldservice_delivery/readme/CONTRIBUTORS.rst
+++ b/fieldservice_delivery/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/fieldservice_delivery/readme/INSTALL.rst b/fieldservice_delivery/readme/INSTALL.rst
index c010f8f6a2..8571f65376 100644
--- a/fieldservice_delivery/readme/INSTALL.rst
+++ b/fieldservice_delivery/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_delivery/static/description/index.html b/fieldservice_delivery/static/description/index.html
index f34a4c0451..a350fb0fec 100644
--- a/fieldservice_delivery/static/description/index.html
+++ b/fieldservice_delivery/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Delivery</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_delivery"><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_delivery"><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_delivery"><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_delivery"><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>This module is an add-on for the Field Service application in Odoo.
 It provides delivery capabilities on the field service orders.</p>
 <p><strong>Table of contents</strong></p>
@@ -391,7 +391,7 @@ <h1 class="title">Field Service - Delivery</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>
@@ -421,7 +421,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_delivery%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_delivery%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">
@@ -436,6 +436,7 @@ <h2><a class="toc-backref" href="#id7">Authors</a></h2>
 <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
 <li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#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">
@@ -454,7 +455,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">maintainer</a>:</p>
 <p><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_delivery">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_delivery">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 151584ec1b5626d2b6afd8c8d11c514acdd41167 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 1 May 2019 15:17:50 -0700
Subject: [PATCH 592/631] [IMP] #97 Fedex Dist. Menu/Mobile Fix

---
 fieldservice_delivery/models/fsm_order.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/fieldservice_delivery/models/fsm_order.py b/fieldservice_delivery/models/fsm_order.py
index 1189a8a4eb..3f6a8fcd18 100644
--- a/fieldservice_delivery/models/fsm_order.py
+++ b/fieldservice_delivery/models/fsm_order.py
@@ -7,4 +7,25 @@
 class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
-    carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method")
+    carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method",
+                                 compute="_compute_carrier_id")
+
+    #Note: This function only works if the user has configured their
+    #      Delivery Methods to have 'Fedex Ground', 'Fedex Standard-
+    #      Overnight', and 'Fedex Priority-Overnight'
+    def _compute_carrier_id(self):
+        if self.priority == '0' or self.priority == '1':
+            fedex = self.env['delivery.carrier'].\
+                search([('name', '=', 'Fedex Ground')])
+            if fedex:
+                self.carrier_id = fedex
+        elif self.priority == '2':
+            fedex = self.env['delivery.carrier'].\
+                search([('name', '=', 'Fedex Standard-Overnight')])
+            if fedex:
+                self.carrier_id = fedex
+        elif self.priority == '3':
+            fedex = self.env['delivery.carrier'].\
+                search([('name', '=', 'Fedex Priority-Overnight')])
+            if fedex:
+                self.carrier_id = fedex

From 60b6d0794a6f69a3e7e2f5ab0ea128d47d1885e1 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Tue, 7 May 2019 14:22:11 -0700
Subject: [PATCH 593/631] [IMP] Flake8 Errors

---
 fieldservice_delivery/models/fsm_order.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fieldservice_delivery/models/fsm_order.py b/fieldservice_delivery/models/fsm_order.py
index 3f6a8fcd18..bcff0f1044 100644
--- a/fieldservice_delivery/models/fsm_order.py
+++ b/fieldservice_delivery/models/fsm_order.py
@@ -10,9 +10,9 @@ class FSMOrder(models.Model):
     carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method",
                                  compute="_compute_carrier_id")
 
-    #Note: This function only works if the user has configured their
-    #      Delivery Methods to have 'Fedex Ground', 'Fedex Standard-
-    #      Overnight', and 'Fedex Priority-Overnight'
+    """ Note: This function only works if the user has configured their
+        Delivery Methods to have 'Fedex Ground', 'Fedex Standard-
+        Overnight', and 'Fedex Priority-Overnight'"""
     def _compute_carrier_id(self):
         if self.priority == '0' or self.priority == '1':
             fedex = self.env['delivery.carrier'].\

From e2ae689097788f8ae6a11f841bc3b6a8ab180cb4 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 10 May 2019 19:33:07 -0500
Subject: [PATCH 594/631] Update fsm_order.xml

---
 fieldservice_delivery/views/fsm_order.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/fieldservice_delivery/views/fsm_order.xml b/fieldservice_delivery/views/fsm_order.xml
index 6f58d6228b..b8d1368ac7 100644
--- a/fieldservice_delivery/views/fsm_order.xml
+++ b/fieldservice_delivery/views/fsm_order.xml
@@ -14,16 +14,4 @@
         </field>
     </record>
 
-    <!-- Inventory / Operations / FSM Orders -->
-    <record id="stock_fsm_order_form" model="ir.ui.view">
-        <field name="name">fsm.order.form</field>
-        <field name="model">fsm.order</field>
-        <field name="inherit_id" ref="fieldservice_stock.stock_fsm_order_form"/>
-        <field name="arch" type="xml">
-            <field name="warehouse_id" position="after">
-                <field name="carrier_id"/>
-            </field>
-        </field>
-    </record>
-
 </odoo>

From 54eb644cee527900dcf077e64d56dd62236f0a12 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 5 Jul 2019 10:48:23 -0500
Subject: [PATCH 595/631] [FIX] fieldservice_delivery: Add carrier_id to
 procurement

---
 fieldservice_delivery/models/__init__.py      |  6 ++++-
 fieldservice_delivery/models/fsm_order.py     | 23 +------------------
 fieldservice_delivery/models/stock.py         | 10 ++++++++
 fieldservice_delivery/models/stock_request.py | 17 ++++++++++++++
 4 files changed, 33 insertions(+), 23 deletions(-)
 create mode 100644 fieldservice_delivery/models/stock.py
 create mode 100644 fieldservice_delivery/models/stock_request.py

diff --git a/fieldservice_delivery/models/__init__.py b/fieldservice_delivery/models/__init__.py
index fb450db8c7..e06f2f6fc2 100644
--- a/fieldservice_delivery/models/__init__.py
+++ b/fieldservice_delivery/models/__init__.py
@@ -1,4 +1,8 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import fsm_order
+from . import (
+    fsm_order,
+    stock,
+    stock_request,
+)
diff --git a/fieldservice_delivery/models/fsm_order.py b/fieldservice_delivery/models/fsm_order.py
index bcff0f1044..1189a8a4eb 100644
--- a/fieldservice_delivery/models/fsm_order.py
+++ b/fieldservice_delivery/models/fsm_order.py
@@ -7,25 +7,4 @@
 class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
-    carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method",
-                                 compute="_compute_carrier_id")
-
-    """ Note: This function only works if the user has configured their
-        Delivery Methods to have 'Fedex Ground', 'Fedex Standard-
-        Overnight', and 'Fedex Priority-Overnight'"""
-    def _compute_carrier_id(self):
-        if self.priority == '0' or self.priority == '1':
-            fedex = self.env['delivery.carrier'].\
-                search([('name', '=', 'Fedex Ground')])
-            if fedex:
-                self.carrier_id = fedex
-        elif self.priority == '2':
-            fedex = self.env['delivery.carrier'].\
-                search([('name', '=', 'Fedex Standard-Overnight')])
-            if fedex:
-                self.carrier_id = fedex
-        elif self.priority == '3':
-            fedex = self.env['delivery.carrier'].\
-                search([('name', '=', 'Fedex Priority-Overnight')])
-            if fedex:
-                self.carrier_id = fedex
+    carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method")
diff --git a/fieldservice_delivery/models/stock.py b/fieldservice_delivery/models/stock.py
new file mode 100644
index 0000000000..5ae7eb1d23
--- /dev/null
+++ b/fieldservice_delivery/models/stock.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class ProcurementGroup(models.Model):
+    _inherit = 'procurement.group'
+
+    carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method")
diff --git a/fieldservice_delivery/models/stock_request.py b/fieldservice_delivery/models/stock_request.py
new file mode 100644
index 0000000000..67c46359f4
--- /dev/null
+++ b/fieldservice_delivery/models/stock_request.py
@@ -0,0 +1,17 @@
+# Copyright (C) 2018 - TODAY, Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class StockRequest(models.Model):
+    _inherit = 'stock.request'
+
+    carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method")
+
+    def _prepare_procurement_values(self, group_id=False):
+        res = self.super()._prepare_procurement_values(group_id=group_id)
+        res.update({
+            'carrier_id': self.fsm_order_id.carrier_id.id or False,
+        })
+        return res

From 19827e1a54971487ad8e618e0fb6a1c9362086d0 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 5 Jul 2019 21:19:37 -0500
Subject: [PATCH 596/631] [FIX] fieldservice_delivery: Set the carrier

---
 fieldservice_delivery/models/stock.py               | 9 +++++++++
 fieldservice_delivery/models/stock_request.py       | 2 +-
 fieldservice_delivery/static/description/index.html | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/fieldservice_delivery/models/stock.py b/fieldservice_delivery/models/stock.py
index 5ae7eb1d23..177fa56b48 100644
--- a/fieldservice_delivery/models/stock.py
+++ b/fieldservice_delivery/models/stock.py
@@ -4,6 +4,15 @@
 from odoo import fields, models
 
 
+class StockMove(models.Model):
+    _inherit = 'stock.move'
+
+    def _get_new_picking_values(self):
+        vals = super(StockMove, self)._get_new_picking_values()
+        vals['carrier_id'] = self.fsm_order_id.carrier_id.id
+        return vals
+
+
 class ProcurementGroup(models.Model):
     _inherit = 'procurement.group'
 
diff --git a/fieldservice_delivery/models/stock_request.py b/fieldservice_delivery/models/stock_request.py
index 67c46359f4..6a8985e00d 100644
--- a/fieldservice_delivery/models/stock_request.py
+++ b/fieldservice_delivery/models/stock_request.py
@@ -10,7 +10,7 @@ class StockRequest(models.Model):
     carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method")
 
     def _prepare_procurement_values(self, group_id=False):
-        res = self.super()._prepare_procurement_values(group_id=group_id)
+        res = super()._prepare_procurement_values(group_id=group_id)
         res.update({
             'carrier_id': self.fsm_order_id.carrier_id.id or False,
         })
diff --git a/fieldservice_delivery/static/description/index.html b/fieldservice_delivery/static/description/index.html
index a350fb0fec..59589f511d 100644
--- a/fieldservice_delivery/static/description/index.html
+++ b/fieldservice_delivery/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 - Delivery</title>
 <style type="text/css">
 

From a7299090d917ada967b516f242289cedf0e859ad Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 11 Oct 2019 12:31:49 -0500
Subject: [PATCH 597/631] [IMP] fieldservice_delivery

---
 fieldservice_delivery/__manifest__.py         |  2 +-
 fieldservice_delivery/i18n/de.po              | 44 +++++++++++++++++++
 fieldservice_delivery/i18n/es.po              | 44 +++++++++++++++++++
 fieldservice_delivery/i18n/es_AR.po           | 44 +++++++++++++++++++
 fieldservice_delivery/i18n/es_CL.po           | 44 +++++++++++++++++++
 .../i18n/fieldservice_delivery.pot            | 42 ++++++++++++++++++
 fieldservice_delivery/i18n/pt_BR.po           | 44 +++++++++++++++++++
 7 files changed, 263 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_delivery/i18n/de.po
 create mode 100644 fieldservice_delivery/i18n/es.po
 create mode 100644 fieldservice_delivery/i18n/es_AR.po
 create mode 100644 fieldservice_delivery/i18n/es_CL.po
 create mode 100644 fieldservice_delivery/i18n/fieldservice_delivery.pot
 create mode 100644 fieldservice_delivery/i18n/pt_BR.po

diff --git a/fieldservice_delivery/__manifest__.py b/fieldservice_delivery/__manifest__.py
index c9c9663fc3..e1f9ffb5d5 100644
--- a/fieldservice_delivery/__manifest__.py
+++ b/fieldservice_delivery/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Delivery',
-    'summary': 'Delivery and Carriers for Field Services',
+    'summary': 'Select delivery methods and carriers on Field Service orders',
     'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
diff --git a/fieldservice_delivery/i18n/de.po b/fieldservice_delivery/i18n/de.po
new file mode 100644
index 0000000000..472d8dc28a
--- /dev/null
+++ b/fieldservice_delivery/i18n/de.po
@@ -0,0 +1,44 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_delivery
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-26 17:58+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_delivery
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_fsm_order__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_procurement_group__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_stock_request__carrier_id
+msgid "Delivery Method"
+msgstr "Liefermethode"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_fsm_order
+msgid "Field Service Order"
+msgstr "Field-Service-Auftrag"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_procurement_group
+msgid "Procurement Group"
+msgstr "Beschaffungsgruppe"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Lagerbewegung"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_request
+msgid "Stock Request"
+msgstr ""
diff --git a/fieldservice_delivery/i18n/es.po b/fieldservice_delivery/i18n/es.po
new file mode 100644
index 0000000000..fbe7559b8d
--- /dev/null
+++ b/fieldservice_delivery/i18n/es.po
@@ -0,0 +1,44 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_delivery
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-21 20:35+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.8\n"
+
+#. module: fieldservice_delivery
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_fsm_order__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_procurement_group__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_stock_request__carrier_id
+msgid "Delivery Method"
+msgstr "Método de Despacho"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_fsm_order
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_procurement_group
+msgid "Procurement Group"
+msgstr "Grupo de Adquisiciones"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de Stock"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_request
+msgid "Stock Request"
+msgstr "Solicitud de Stock"
diff --git a/fieldservice_delivery/i18n/es_AR.po b/fieldservice_delivery/i18n/es_AR.po
new file mode 100644
index 0000000000..3ce30275ea
--- /dev/null
+++ b/fieldservice_delivery/i18n/es_AR.po
@@ -0,0 +1,44 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_delivery
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-07-21 05:19+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 3.10\n"
+
+#. module: fieldservice_delivery
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_fsm_order__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_procurement_group__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_stock_request__carrier_id
+msgid "Delivery Method"
+msgstr "Método de Entrega"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_fsm_order
+msgid "Field Service Order"
+msgstr "Pedido de Servicio de Campo"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_procurement_group
+msgid "Procurement Group"
+msgstr "Grupo de Adquisiciones"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de Inventario"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_request
+msgid "Stock Request"
+msgstr "Solicitud de Inventario"
diff --git a/fieldservice_delivery/i18n/es_CL.po b/fieldservice_delivery/i18n/es_CL.po
new file mode 100644
index 0000000000..7d7f2951f6
--- /dev/null
+++ b/fieldservice_delivery/i18n/es_CL.po
@@ -0,0 +1,44 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_delivery
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-21 20:35+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.8\n"
+
+#. module: fieldservice_delivery
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_fsm_order__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_procurement_group__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_stock_request__carrier_id
+msgid "Delivery Method"
+msgstr "Método de Despacho"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_fsm_order
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_procurement_group
+msgid "Procurement Group"
+msgstr "Grupo de Adquisiciones"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de Stock"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_request
+msgid "Stock Request"
+msgstr "Solicitud de Stock"
diff --git a/fieldservice_delivery/i18n/fieldservice_delivery.pot b/fieldservice_delivery/i18n/fieldservice_delivery.pot
new file mode 100644
index 0000000000..8cb731b786
--- /dev/null
+++ b/fieldservice_delivery/i18n/fieldservice_delivery.pot
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_delivery
+#
+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_delivery
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_fsm_order__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_procurement_group__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_stock_request__carrier_id
+msgid "Delivery Method"
+msgstr ""
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_procurement_group
+msgid "Procurement Group"
+msgstr ""
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_request
+msgid "Stock Request"
+msgstr ""
+
diff --git a/fieldservice_delivery/i18n/pt_BR.po b/fieldservice_delivery/i18n/pt_BR.po
new file mode 100644
index 0000000000..7695d91926
--- /dev/null
+++ b/fieldservice_delivery/i18n/pt_BR.po
@@ -0,0 +1,44 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_delivery
+#
+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"
+"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_delivery
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_fsm_order__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_procurement_group__carrier_id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_stock_request__carrier_id
+msgid "Delivery Method"
+msgstr "Método de Envio"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_fsm_order
+msgid "Field Service Order"
+msgstr "Ordem de Serviço de Campo"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_procurement_group
+msgid "Procurement Group"
+msgstr "Grupo de Aquisições"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimentação de Estoque"
+
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_request
+msgid "Stock Request"
+msgstr "Requisição de Estoque"

From 8478dbb954e93c18b546e70ec57e73d407689c56 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Mon, 15 Feb 2021 19:15:48 +0530
Subject: [PATCH 598/631] [14.0][MIG]fieldservice_delivery

---
 fieldservice_delivery/__init__.py             |  2 +-
 fieldservice_delivery/__manifest__.py         | 38 +++++++++----------
 fieldservice_delivery/models/__init__.py      |  3 +-
 fieldservice_delivery/models/fsm_order.py     |  6 +--
 fieldservice_delivery/models/stock.py         | 10 ++---
 fieldservice_delivery/models/stock_request.py | 17 ---------
 fieldservice_delivery/views/fsm_order.xml     | 10 +++--
 .../odoo/addons/fieldservice_delivery         |  1 +
 setup/fieldservice_delivery/setup.py          |  6 +++
 9 files changed, 42 insertions(+), 51 deletions(-)
 delete mode 100644 fieldservice_delivery/models/stock_request.py
 create mode 120000 setup/fieldservice_delivery/odoo/addons/fieldservice_delivery
 create mode 100644 setup/fieldservice_delivery/setup.py

diff --git a/fieldservice_delivery/__init__.py b/fieldservice_delivery/__init__.py
index da2feecfe9..e2a511ea6f 100644
--- a/fieldservice_delivery/__init__.py
+++ b/fieldservice_delivery/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
+# Copyright (C) 2021 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
diff --git a/fieldservice_delivery/__manifest__.py b/fieldservice_delivery/__manifest__.py
index e1f9ffb5d5..7d17045994 100644
--- a/fieldservice_delivery/__manifest__.py
+++ b/fieldservice_delivery/__manifest__.py
@@ -1,26 +1,26 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
+# Copyright (C) 2021 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service - Delivery',
-    'summary': 'Select delivery methods and carriers on Field Service orders',
-    'version': '12.0.1.0.0',
-    'category': 'Field Service',
-    'author': "Open Source Integrators, "
-              "Odoo Community Association (OCA)",
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice_stock',
-        'delivery',
+    "name": "Field Service - Delivery",
+    "summary": "Select delivery methods and carriers on Field Service orders",
+    "version": "14.0.1.0.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, " "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": [
+        "fieldservice_stock",
+        "delivery",
+        "stock_request",
     ],
-    'data': [
-        'views/fsm_order.xml',
+    "data": [
+        "views/fsm_order.xml",
     ],
-    'installable': True,
-    'auto_install': True,
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'max3903',
+    "installable": True,
+    "auto_install": True,
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": [
+        "max3903",
     ],
 }
diff --git a/fieldservice_delivery/models/__init__.py b/fieldservice_delivery/models/__init__.py
index e06f2f6fc2..bad63d4fc9 100644
--- a/fieldservice_delivery/models/__init__.py
+++ b/fieldservice_delivery/models/__init__.py
@@ -1,8 +1,7 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
+# Copyright (C) 2021 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
     fsm_order,
     stock,
-    stock_request,
 )
diff --git a/fieldservice_delivery/models/fsm_order.py b/fieldservice_delivery/models/fsm_order.py
index 1189a8a4eb..c42deb69c8 100644
--- a/fieldservice_delivery/models/fsm_order.py
+++ b/fieldservice_delivery/models/fsm_order.py
@@ -1,10 +1,10 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
+# Copyright (C) 2021 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
-    carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method")
+    carrier_id = fields.Many2one("delivery.carrier", string="Delivery Method")
diff --git a/fieldservice_delivery/models/stock.py b/fieldservice_delivery/models/stock.py
index 177fa56b48..6fd3e8031f 100644
--- a/fieldservice_delivery/models/stock.py
+++ b/fieldservice_delivery/models/stock.py
@@ -1,19 +1,19 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
+# Copyright (C) 2021 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models
 
 
 class StockMove(models.Model):
-    _inherit = 'stock.move'
+    _inherit = "stock.move"
 
     def _get_new_picking_values(self):
         vals = super(StockMove, self)._get_new_picking_values()
-        vals['carrier_id'] = self.fsm_order_id.carrier_id.id
+        vals["carrier_id"] = self.fsm_order_id.carrier_id.id
         return vals
 
 
 class ProcurementGroup(models.Model):
-    _inherit = 'procurement.group'
+    _inherit = "procurement.group"
 
-    carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method")
+    carrier_id = fields.Many2one("delivery.carrier", string="Delivery Method")
diff --git a/fieldservice_delivery/models/stock_request.py b/fieldservice_delivery/models/stock_request.py
deleted file mode 100644
index 6a8985e00d..0000000000
--- a/fieldservice_delivery/models/stock_request.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import fields, models
-
-
-class StockRequest(models.Model):
-    _inherit = 'stock.request'
-
-    carrier_id = fields.Many2one('delivery.carrier', string="Delivery Method")
-
-    def _prepare_procurement_values(self, group_id=False):
-        res = super()._prepare_procurement_values(group_id=group_id)
-        res.update({
-            'carrier_id': self.fsm_order_id.carrier_id.id or False,
-        })
-        return res
diff --git a/fieldservice_delivery/views/fsm_order.xml b/fieldservice_delivery/views/fsm_order.xml
index b8d1368ac7..b8c32f9a8f 100644
--- a/fieldservice_delivery/views/fsm_order.xml
+++ b/fieldservice_delivery/views/fsm_order.xml
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <!-- Field Service / Orders -->
     <record id="view_fsm_order_form_delivery" model="ir.ui.view">
         <field name="name">fsm.order.form.stock</field>
         <field name="model">fsm.order</field>
-        <field name="inherit_id"
-               ref="fieldservice_stock.view_fsm_order_form_inherit_stock"/>
+        <field
+            name="inherit_id"
+            ref="fieldservice_stock.view_fsm_order_form_inherit_stock"
+        />
         <field name="arch" type="xml">
             <xpath expr="//group[@id='stock-right']" position="inside">
-                <field name="carrier_id"/>
+                <field name="carrier_id" />
             </xpath>
         </field>
     </record>
diff --git a/setup/fieldservice_delivery/odoo/addons/fieldservice_delivery b/setup/fieldservice_delivery/odoo/addons/fieldservice_delivery
new file mode 120000
index 0000000000..f65dadd9b6
--- /dev/null
+++ b/setup/fieldservice_delivery/odoo/addons/fieldservice_delivery
@@ -0,0 +1 @@
+../../../../fieldservice_delivery
\ No newline at end of file
diff --git a/setup/fieldservice_delivery/setup.py b/setup/fieldservice_delivery/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_delivery/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From fc1933431e28092ae8588f209b048a34a9887754 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Tue, 17 Aug 2021 15:00:16 +0000
Subject: [PATCH 599/631] [UPD] Update fieldservice.pot

---
 fieldservice/i18n/fieldservice.pot | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/fieldservice/i18n/fieldservice.pot b/fieldservice/i18n/fieldservice.pot
index ae2698c30b..119a3fc0c9 100644
--- a/fieldservice/i18n/fieldservice.pot
+++ b/fieldservice/i18n/fieldservice.pot
@@ -890,6 +890,12 @@ msgstr ""
 msgid "Default Team"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Default delivery method used in sales orders."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
 msgid "Default duration in hours"
@@ -907,6 +913,12 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Delivery Method"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description

From 2a6aa6d0ae19583f10b2a48c15629a822287193c Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Tue, 17 Aug 2021 15:00:24 +0000
Subject: [PATCH 600/631] [UPD] Update fieldservice_delivery.pot

---
 .../i18n/fieldservice_delivery.pot            | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/fieldservice_delivery/i18n/fieldservice_delivery.pot b/fieldservice_delivery/i18n/fieldservice_delivery.pot
index 8cb731b786..dc394bb7a2 100644
--- a/fieldservice_delivery/i18n/fieldservice_delivery.pot
+++ b/fieldservice_delivery/i18n/fieldservice_delivery.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_delivery
+# 	* fieldservice_delivery
 #
 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"
@@ -16,27 +16,45 @@ msgstr ""
 #. module: fieldservice_delivery
 #: model:ir.model.fields,field_description:fieldservice_delivery.field_fsm_order__carrier_id
 #: model:ir.model.fields,field_description:fieldservice_delivery.field_procurement_group__carrier_id
-#: model:ir.model.fields,field_description:fieldservice_delivery.field_stock_request__carrier_id
 msgid "Delivery Method"
 msgstr ""
 
+#. module: fieldservice_delivery
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_procurement_group__display_name
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_stock_move__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_delivery
 #: model:ir.model,name:fieldservice_delivery.model_fsm_order
 msgid "Field Service Order"
 msgstr ""
 
 #. module: fieldservice_delivery
-#: model:ir.model,name:fieldservice_delivery.model_procurement_group
-msgid "Procurement Group"
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_procurement_group__id
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_stock_move__id
+msgid "ID"
 msgstr ""
 
 #. module: fieldservice_delivery
-#: model:ir.model,name:fieldservice_delivery.model_stock_move
-msgid "Stock Move"
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_procurement_group____last_update
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_stock_move____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_delivery
+#: model:ir.model.fields,field_description:fieldservice_delivery.field_fsm_order__display_name
+msgid "Order"
 msgstr ""
 
 #. module: fieldservice_delivery
-#: model:ir.model,name:fieldservice_delivery.model_stock_request
-msgid "Stock Request"
+#: model:ir.model,name:fieldservice_delivery.model_procurement_group
+msgid "Procurement Group"
 msgstr ""
 
+#. module: fieldservice_delivery
+#: model:ir.model,name:fieldservice_delivery.model_stock_move
+msgid "Stock Move"
+msgstr ""

From b0ea264bef5a0299d0f4c02c4cb5650529a9554f Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 17 Aug 2021 15:09:59 +0000
Subject: [PATCH 601/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d1d212ed51..f5907b637e 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ addon | version | maintainers | summary
 [fieldservice_agreement](fieldservice_agreement/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) [![smangukiya](https://github.com/smangukiya.png?size=30px)](https://github.com/smangukiya) [![osi-scampbell](https://github.com/osi-scampbell.png?size=30px)](https://github.com/osi-scampbell) [![patrickrwilson](https://github.com/patrickrwilson.png?size=30px)](https://github.com/patrickrwilson) | Manage Field Service agreements and contracts
 [fieldservice_calendar](fieldservice_calendar/) | 14.0.1.0.0 | [![hparfr](https://github.com/hparfr.png?size=30px)](https://github.com/hparfr) | Add calendar to FSM Orders
 [fieldservice_crm](fieldservice_crm/) | 14.0.1.0.0 | [![patrickrwilson](https://github.com/patrickrwilson.png?size=30px)](https://github.com/patrickrwilson) | Create Field Service orders from the CRM
+[fieldservice_delivery](fieldservice_delivery/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Select delivery methods and carriers on Field Service orders
 [fieldservice_distribution](fieldservice_distribution/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Manage your distribution structure
 [fieldservice_equipment_stock](fieldservice_equipment_stock/) | 14.0.1.1.0 | [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![smangukiya](https://github.com/smangukiya.png?size=30px)](https://github.com/smangukiya) | Integrate stock operations with your field service equipments
 [fieldservice_isp_account](fieldservice_isp_account/) | 14.0.1.0.0 | [![osimallen](https://github.com/osimallen.png?size=30px)](https://github.com/osimallen) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) | Invoice Field Service orders based on employee time or contractor costs

From 6974e934ef71e04fd5e5d1edc0c3cea2ac52ec33 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 17 Aug 2021 15:10:03 +0000
Subject: [PATCH 602/631] [UPD] README.rst

---
 fieldservice_delivery/README.rst                    | 10 +++++-----
 fieldservice_delivery/static/description/index.html |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fieldservice_delivery/README.rst b/fieldservice_delivery/README.rst
index 15f3c3e63c..82ba229e8f 100644
--- a/fieldservice_delivery/README.rst
+++ b/fieldservice_delivery/README.rst
@@ -14,13 +14,13 @@ Field Service - Delivery
     :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_delivery
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_delivery
     :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_delivery
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_delivery
     :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| 
@@ -71,7 +71,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_delivery%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_delivery%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.
 
@@ -117,6 +117,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_delivery>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_delivery>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_delivery/static/description/index.html b/fieldservice_delivery/static/description/index.html
index 59589f511d..87aba0af5a 100644
--- a/fieldservice_delivery/static/description/index.html
+++ b/fieldservice_delivery/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service - Delivery</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_delivery"><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_delivery"><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><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_delivery"><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_delivery"><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>This module is an add-on for the Field Service application in Odoo.
 It provides delivery capabilities on the field service orders.</p>
 <p><strong>Table of contents</strong></p>
@@ -421,7 +421,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_delivery%0Aversion:%2012.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_delivery%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">
@@ -455,7 +455,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">maintainer</a>:</p>
 <p><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_delivery">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/14.0/fieldservice_delivery">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 12dcb9892f3ab51a968c70cf6ba28fcd50e8c461 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 17 Aug 2021 15:10:04 +0000
Subject: [PATCH 603/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index fa5c7e2442..f3683d2e6c 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210816.0
\ No newline at end of file
+14.0.20210817.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index ea1c19c9b1..d2d09e09f4 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -17,6 +17,7 @@
         'odoo14-addon-fieldservice_agreement',
         'odoo14-addon-fieldservice_calendar',
         'odoo14-addon-fieldservice_crm',
+        'odoo14-addon-fieldservice_delivery',
         'odoo14-addon-fieldservice_distribution',
         'odoo14-addon-fieldservice_equipment_stock',
         'odoo14-addon-fieldservice_isp_account',

From d1537d2b1c3b27ac97bc0cfcf88a3a2be705975f Mon Sep 17 00:00:00 2001
From: OCA Transbot <transbot@odoo-community.org>
Date: Tue, 17 Aug 2021 15:10:13 +0000
Subject: [PATCH 604/631] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-14.0/field-service-14.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice/
---
 fieldservice/i18n/de.po    | 12 +++++++++++
 fieldservice/i18n/es.po    | 15 ++++++++++---
 fieldservice/i18n/es_AR.po | 12 +++++++++++
 fieldservice/i18n/es_CL.po | 15 ++++++++++---
 fieldservice/i18n/fr.po    | 12 +++++++++++
 fieldservice/i18n/fr_FR.po | 12 +++++++++++
 fieldservice/i18n/pt_BR.po | 15 ++++++++++---
 fieldservice/i18n/pt_PT.po | 43 ++++++++++++++++++++++++--------------
 fieldservice/i18n/tr.po    | 12 +++++++++++
 9 files changed, 123 insertions(+), 25 deletions(-)

diff --git a/fieldservice/i18n/de.po b/fieldservice/i18n/de.po
index f8755eafea..9ac82c93f0 100644
--- a/fieldservice/i18n/de.po
+++ b/fieldservice/i18n/de.po
@@ -896,6 +896,12 @@ msgstr ""
 msgid "Default Team"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Default delivery method used in sales orders."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
 msgid "Default duration in hours"
@@ -913,6 +919,12 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Delivery Method"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description
diff --git a/fieldservice/i18n/es.po b/fieldservice/i18n/es.po
index 3f02faeeed..b4d4f40e02 100644
--- a/fieldservice/i18n/es.po
+++ b/fieldservice/i18n/es.po
@@ -912,6 +912,12 @@ msgstr ""
 msgid "Default Team"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Default delivery method used in sales orders."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
 msgid "Default duration in hours"
@@ -929,6 +935,12 @@ msgstr "Grado de confianza que tiene en este deudor"
 msgid "Delete"
 msgstr "Borrar"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Delivery Method"
+msgstr "Método de Despacho"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description
@@ -3722,9 +3734,6 @@ msgstr "plantillas"
 #~ msgid "Definition"
 #~ msgstr "Definición"
 
-#~ msgid "Delivery Method"
-#~ msgstr "Método de Despacho"
-
 #~ msgid "Districts"
 #~ msgstr "Distritos"
 
diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index c02f58c98f..5c7ed2ecd1 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -916,6 +916,12 @@ msgstr "Días Antes de la Recepción"
 msgid "Default Team"
 msgstr "Equipo Predeterminado"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Default delivery method used in sales orders."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
 msgid "Default duration in hours"
@@ -933,6 +939,12 @@ msgstr "Grado de confianza en este deudor"
 msgid "Delete"
 msgstr "Borrar"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Delivery Method"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description
diff --git a/fieldservice/i18n/es_CL.po b/fieldservice/i18n/es_CL.po
index 285d3d6983..36e98e630c 100644
--- a/fieldservice/i18n/es_CL.po
+++ b/fieldservice/i18n/es_CL.po
@@ -912,6 +912,12 @@ msgstr ""
 msgid "Default Team"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Default delivery method used in sales orders."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
 msgid "Default duration in hours"
@@ -929,6 +935,12 @@ msgstr "Grado de confianza que tiene en este deudor"
 msgid "Delete"
 msgstr "Borrar"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Delivery Method"
+msgstr "Método de Despacho"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description
@@ -3722,9 +3734,6 @@ msgstr "plantillas"
 #~ msgid "Definition"
 #~ msgstr "Definición"
 
-#~ msgid "Delivery Method"
-#~ msgstr "Método de Despacho"
-
 #~ msgid "Districts"
 #~ msgstr "Distritos"
 
diff --git a/fieldservice/i18n/fr.po b/fieldservice/i18n/fr.po
index 9b209e6f7a..5975ae4bcb 100644
--- a/fieldservice/i18n/fr.po
+++ b/fieldservice/i18n/fr.po
@@ -913,6 +913,12 @@ msgstr ""
 msgid "Default Team"
 msgstr "Equipe par défaut"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Default delivery method used in sales orders."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
 msgid "Default duration in hours"
@@ -931,6 +937,12 @@ msgstr "Degré de confiance que vous avez dans ce débiteur"
 msgid "Delete"
 msgstr "Supprimer"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Delivery Method"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description
diff --git a/fieldservice/i18n/fr_FR.po b/fieldservice/i18n/fr_FR.po
index abe7b8f434..032ba02f32 100644
--- a/fieldservice/i18n/fr_FR.po
+++ b/fieldservice/i18n/fr_FR.po
@@ -916,6 +916,12 @@ msgstr ""
 msgid "Default Team"
 msgstr "Équipe par défaut"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Default delivery method used in sales orders."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
 msgid "Default duration in hours"
@@ -933,6 +939,12 @@ msgstr ""
 msgid "Delete"
 msgstr "Supprimer"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Delivery Method"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description
diff --git a/fieldservice/i18n/pt_BR.po b/fieldservice/i18n/pt_BR.po
index c8a61f094c..da8e571aba 100644
--- a/fieldservice/i18n/pt_BR.po
+++ b/fieldservice/i18n/pt_BR.po
@@ -907,6 +907,12 @@ msgstr ""
 msgid "Default Team"
 msgstr "Equipe Padrão"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Default delivery method used in sales orders."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
 msgid "Default duration in hours"
@@ -924,6 +930,12 @@ msgstr "Grau de confiança que você tem neste devedor"
 msgid "Delete"
 msgstr "Excluir"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Delivery Method"
+msgstr "Método de Envio"
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description
@@ -3728,9 +3740,6 @@ msgstr "modelos"
 #~ msgid "Definition"
 #~ msgstr "Definição"
 
-#~ msgid "Delivery Method"
-#~ msgstr "Método de Envio"
-
 #~ msgid "Districts"
 #~ msgstr "Cidades"
 
diff --git a/fieldservice/i18n/pt_PT.po b/fieldservice/i18n/pt_PT.po
index 55d22bb5ce..65ad3bd6ef 100644
--- a/fieldservice/i18n/pt_PT.po
+++ b/fieldservice/i18n/pt_PT.po
@@ -274,8 +274,8 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__lang
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__lang
 msgid ""
-"All the emails and documents sent to this contact will be translated in this"
-" language."
+"All the emails and documents sent to this contact will be translated in this "
+"language."
 msgstr ""
 
 #. module: fieldservice
@@ -342,8 +342,7 @@ msgstr ""
 
 #. module: fieldservice
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
-msgid ""
-"Auto-populate the equipments on the order based on the location content"
+msgid "Auto-populate the equipments on the order based on the location content"
 msgstr ""
 
 #. module: fieldservice
@@ -891,6 +890,12 @@ msgstr ""
 msgid "Default Team"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Default delivery method used in sales orders."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
 msgid "Default duration in hours"
@@ -908,6 +913,12 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Delivery Method"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description
@@ -1459,8 +1470,8 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__phone_sanitized_blacklisted
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__phone_sanitized_blacklisted
 msgid ""
-"If the sanitized phone number is on the blacklist, the contact won't receive"
-" mass mailing sms anymore, from any list"
+"If the sanitized phone number is on the blacklist, the contact won't receive "
+"mass mailing sms anymore, from any list"
 msgstr ""
 
 #. module: fieldservice
@@ -1542,8 +1553,8 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__type
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__type
 msgid ""
-"Invoice & Delivery addresses are used in sales orders. Private addresses are"
-" only visible by authorized users."
+"Invoice & Delivery addresses are used in sales orders. Private addresses are "
+"only visible by authorized users."
 msgstr ""
 
 #. module: fieldservice
@@ -1988,7 +1999,8 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fieldservice.res_config_settings_view_form
 msgid ""
 "Manage inventory and stock operations.\n"
-"                                    Automatically activate Lots &amp; Serial Numbers."
+"                                    Automatically activate Lots &amp; Serial "
+"Numbers."
 msgstr ""
 
 #. module: fieldservice
@@ -2167,9 +2179,6 @@ msgstr ""
 
 #. module: fieldservice
 #: code:addons/fieldservice/models/fsm_order.py:0
-#: code:addons/fieldservice/models/fsm_order.py:0
-#: code:addons/fieldservice/models/fsm_order.py:0
-#: code:addons/fieldservice/models/fsm_order.py:0
 #, python-format
 msgid "New"
 msgstr ""
@@ -3206,8 +3215,8 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__email_normalized
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__email_normalized
 msgid ""
-"This field is used to search on email address as the primary email field can"
-" contain more than strictly an email address."
+"This field is used to search on email address as the primary email field can "
+"contain more than strictly an email address."
 msgstr ""
 
 #. module: fieldservice
@@ -3480,9 +3489,11 @@ msgstr ""
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__tz
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__tz
 msgid ""
-"When printing documents and exporting/importing data, time values are computed according to this timezone.\n"
+"When printing documents and exporting/importing data, time values are "
+"computed according to this timezone.\n"
 "If the timezone is not set, UTC (Coordinated Universal Time) is used.\n"
-"Anywhere else, time values are computed according to the time offset of your web client."
+"Anywhere else, time values are computed according to the time offset of your "
+"web client."
 msgstr ""
 
 #. module: fieldservice
diff --git a/fieldservice/i18n/tr.po b/fieldservice/i18n/tr.po
index 19a9f409c1..d8ec7f07a1 100644
--- a/fieldservice/i18n/tr.po
+++ b/fieldservice/i18n/tr.po
@@ -892,6 +892,12 @@ msgstr ""
 msgid "Default Team"
 msgstr "Varsayılan Takım"
 
+#. module: fieldservice
+#: model:ir.model.fields,help:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,help:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Default delivery method used in sales orders."
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
 msgid "Default duration in hours"
@@ -909,6 +915,12 @@ msgstr ""
 msgid "Delete"
 msgstr "Sil"
 
+#. module: fieldservice
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_delivery_carrier_id
+msgid "Delivery Method"
+msgstr ""
+
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__description

From f7220dd67a434d6a8fd1856e0dd7ccf8fb440033 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 11 Oct 2019 12:34:05 -0500
Subject: [PATCH 605/631] [IMP] fieldservice_vehicle_stock

Currently translated at 100.0% (15 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/es_CL/

Currently translated at 33.3% (5 of 15 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/de/
---
 fieldservice_vehicle_stock/__manifest__.py    |  2 +-
 fieldservice_vehicle_stock/i18n/de.po         | 93 +++++++++++++++++++
 fieldservice_vehicle_stock/i18n/es_CL.po      | 93 +++++++++++++++++++
 .../i18n/fieldservice_vehicle_stock.pot       | 91 ++++++++++++++++++
 4 files changed, 278 insertions(+), 1 deletion(-)
 create mode 100644 fieldservice_vehicle_stock/i18n/de.po
 create mode 100644 fieldservice_vehicle_stock/i18n/es_CL.po
 create mode 100644 fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index 594536418f..f314106958 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service Vehicles - Stock',
-    'summary': 'Inventory Operations for Field Service with Vehicles',
+    'summary': 'Track inventory of Field Service vehicles',
     'version': '12.0.1.0.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
diff --git a/fieldservice_vehicle_stock/i18n/de.po b/fieldservice_vehicle_stock/i18n/de.po
new file mode 100644
index 0000000000..f1584b659c
--- /dev/null
+++ b/fieldservice_vehicle_stock/i18n/de.po
@@ -0,0 +1,93 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_vehicle_stock
+#
+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"
+"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_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Check Availability"
+msgstr "Verfügbarkeit prüfen"
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Deliver"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Service-Fahrzeug"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_vehicle__inventory_location_id
+msgid "Inventory Location"
+msgstr "Lagerort"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_location
+msgid "Location Delivery"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_location_to_vehicle
+msgid "Location Pickup"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_location_return
+msgid "Location Return"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Register lots, packs, location"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
+msgid "Stock Request"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
+msgid "Stock to Vehicle to Location"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle
+msgid "Vehicle Loading"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_input
+msgid "Vehicle Returns"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_vehicle_to_location
+msgid "Vehicle → Location"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.stock_rule_vehicle_to_input
+msgid "Vehicle → Warehouse"
+msgstr "Fahrzeug → Lager"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_location_to_vehicle
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_output_to_vehicle
+msgid "Warehouse → Vehicle"
+msgstr "Lager → Fahrzeug"
diff --git a/fieldservice_vehicle_stock/i18n/es_CL.po b/fieldservice_vehicle_stock/i18n/es_CL.po
new file mode 100644
index 0000000000..8a6e758d3a
--- /dev/null
+++ b/fieldservice_vehicle_stock/i18n/es_CL.po
@@ -0,0 +1,93 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_vehicle_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-22 04:35+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.8\n"
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Check Availability"
+msgstr "Consultar Disponibilidad"
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Deliver"
+msgstr "Despachar"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Vehículo de Servicio de Campo"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_vehicle__inventory_location_id
+msgid "Inventory Location"
+msgstr "Ubicación de Inventario"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_location
+msgid "Location Delivery"
+msgstr "Entrega de Ubicación"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_location_to_vehicle
+msgid "Location Pickup"
+msgstr "Ubicación de Recogida"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_location_return
+msgid "Location Return"
+msgstr "Ubicación de Retorno"
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Register lots, packs, location"
+msgstr "Registrar lotes, paquetes, ubicación"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
+msgid "Stock Request"
+msgstr "Solicitud de Stock"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
+msgid "Stock to Vehicle to Location"
+msgstr "Stock a Vehículo a Ubicación"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle
+msgid "Vehicle Loading"
+msgstr "Carga del Vehículo"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_input
+msgid "Vehicle Returns"
+msgstr "Devoluciones de Vehículos"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_vehicle_to_location
+msgid "Vehicle → Location"
+msgstr "Vehículo → Ubicación"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.stock_rule_vehicle_to_input
+msgid "Vehicle → Warehouse"
+msgstr "Vehículo → Bodega"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_location_to_vehicle
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_output_to_vehicle
+msgid "Warehouse → Vehicle"
+msgstr "Bodega → Vehículo"
diff --git a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
new file mode 100644
index 0000000000..ef43cc6007
--- /dev/null
+++ b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
@@ -0,0 +1,91 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_vehicle_stock
+#
+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_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Check Availability"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Deliver"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_vehicle__inventory_location_id
+msgid "Inventory Location"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_location
+msgid "Location Delivery"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_location_to_vehicle
+msgid "Location Pickup"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_location_return
+msgid "Location Return"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Register lots, packs, location"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
+msgid "Stock Request"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
+msgid "Stock to Vehicle to Location"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle
+msgid "Vehicle Loading"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_input
+msgid "Vehicle Returns"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_vehicle_to_location
+msgid "Vehicle → Location"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.stock_rule_vehicle_to_input
+msgid "Vehicle → Warehouse"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_location_to_vehicle
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_output_to_vehicle
+msgid "Warehouse → Vehicle"
+msgstr ""
+

From a1ca75fd2e35967b34f5ff7e241a4973b3ff1c3d Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sun, 22 Dec 2019 10:56:22 -0600
Subject: [PATCH 606/631] [IMP] fieldservice_vehicle_stock

---
 .../data/fsm_stock_data.xml                   | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/fieldservice_vehicle_stock/data/fsm_stock_data.xml b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
index e2c02ec3c3..b7deb9c184 100644
--- a/fieldservice_vehicle_stock/data/fsm_stock_data.xml
+++ b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
@@ -54,6 +54,7 @@
                    ref="stock_location_vehicle"/>
         </record>
 
+        <!-- Route: Stock to Vehicle to Location -->
         <record id="route_stock_to_vehicle_to_location"
                 model='stock.location.route'>
             <field name="name">Stock to Vehicle to Location</field>
@@ -86,14 +87,14 @@
                    ref="picking_type_output_to_vehicle"/>
         </record>
 
-        <!-- Location Return Operations -->
+        <!-- Route: Location Return Operations -->
         <record id="route_location_return" model='stock.location.route'>
             <field name="name">Location Return</field>
             <field name="sequence">3</field>
             <field name="company_id"></field>
         </record>
 
-        <!-- Location Return to Vehicle operations -->
+        <!-- Location Pickup operations -->
         <record id="seq_picking_type_location_to_vehicle" model="ir.sequence">
             <field name="name">Location Pickup</field>
             <field name="prefix">LP</field>
@@ -106,10 +107,12 @@
             <field name="name">Location Pickup</field>
             <field name="sequence_id"
                    ref="seq_picking_type_location_to_vehicle"/>
-            <field name="code">internal</field>
+            <field name="code">incoming</field>
             <field name="warehouse_id" eval="False"/>
             <field name="default_location_dest_id"
                    ref="stock_location_vehicle"/>
+            <field name="return_picking_type_id"
+                   ref="picking_type_vehicle_to_location"/>
         </record>
 
         <record id="procurement_rule_location_to_vehicle"
@@ -124,7 +127,6 @@
                    ref="picking_type_location_to_vehicle"/>
         </record>
 
-
         <!-- Vehicle to Input -->
         <record id="seq_picking_type_vehicle_to_input" model="ir.sequence">
             <field name="name">Vehicle Returns</field>
@@ -142,6 +144,8 @@
                    ref="stock_location_vehicle"/>
             <field name="default_location_dest_id"
                    ref="stock.stock_location_stock"/>
+            <field name="return_picking_type_id"
+                   ref="picking_type_output_to_vehicle"/>
         </record>
 
         <record id="stock_rule_vehicle_to_input"
@@ -155,5 +159,16 @@
             <field name="route_id" ref="route_location_return"/>
         </record>
 
+        <!-- Picking Types: set the return type -->
+        <record id="picking_type_output_to_vehicle" model="stock.picking.type">
+            <field name="return_picking_type_id"
+                   ref="picking_type_vehicle_to_input"/>
+        </record>
+
+        <record id="picking_type_vehicle_to_location" model="stock.picking.type">
+            <field name="return_picking_type_id"
+                   ref="picking_type_location_to_vehicle"/>
+        </record>
+
     </data>
 </odoo>

From 455169f9fd41f7985415fa29b212325ecc6f588d Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 2 Jan 2020 09:54:07 -0600
Subject: [PATCH 607/631] [IMP] fieldservice_vehicle_stock: Add putaway
 strategy for vehicles

---
 fieldservice_vehicle_stock/__manifest__.py    |  3 ++-
 .../data/fsm_stock_data.xml                   |  1 +
 fieldservice_vehicle_stock/models/__init__.py |  3 ++-
 .../models/product_putaway.py                 | 26 +++++++++++++++++++
 .../models/stock_move.py                      | 14 ++++++++++
 5 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 fieldservice_vehicle_stock/models/product_putaway.py
 create mode 100644 fieldservice_vehicle_stock/models/stock_move.py

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index f314106958..50f6a70de2 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
+# Copyright (C) 2018 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
@@ -13,6 +13,7 @@
     'depends': [
         'fieldservice_vehicle',
         'fieldservice_stock',
+        'stock_putaway_method',
     ],
     'data': [
         'security/ir.model.access.csv',
diff --git a/fieldservice_vehicle_stock/data/fsm_stock_data.xml b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
index b7deb9c184..3c5069d391 100644
--- a/fieldservice_vehicle_stock/data/fsm_stock_data.xml
+++ b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
@@ -11,6 +11,7 @@
         <field name="usage">internal</field>
         <field name="location_id" ref="stock_location_vehicle"/>
         <field name="company_id" ref="base.main_company"/>
+        <field name="putaway_strategy_id">vehicle</field>
     </record>
 
     <data noupdate="1">
diff --git a/fieldservice_vehicle_stock/models/__init__.py b/fieldservice_vehicle_stock/models/__init__.py
index 1cd7f6d75d..b266305d55 100644
--- a/fieldservice_vehicle_stock/models/__init__.py
+++ b/fieldservice_vehicle_stock/models/__init__.py
@@ -1,7 +1,8 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
+# Copyright (C) 2018 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
     fsm_vehicle,
     stock_request,
+    product_putaway,
 )
diff --git a/fieldservice_vehicle_stock/models/product_putaway.py b/fieldservice_vehicle_stock/models/product_putaway.py
new file mode 100644
index 0000000000..b77203c2c1
--- /dev/null
+++ b/fieldservice_vehicle_stock/models/product_putaway.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import api, models
+
+
+class PutAwayStrategy(models.Model):
+    _inherit = 'product.putaway'
+
+    @api.model
+    def _get_putaway_options(self):
+        res = super()._get_putaway_options()
+        res.append(('vehicle', 'Location of the vehicle'))
+        return res
+
+    def putaway_apply(self, product):
+        if self.method == 'vehicle':
+            return self.get_vehicle_location()
+        return super().putaway_apply(product)
+
+    @api.model
+    def get_vehicle_location(self):
+        if self.env.context.get('vehicle_id'):
+            return self.env['fsm.vehicle'].browse(
+                self.env.context.get('vehicle_id')
+            ).inventory_location_id
+        return self.env['stock.location']
diff --git a/fieldservice_vehicle_stock/models/stock_move.py b/fieldservice_vehicle_stock/models/stock_move.py
new file mode 100644
index 0000000000..211355ca16
--- /dev/null
+++ b/fieldservice_vehicle_stock/models/stock_move.py
@@ -0,0 +1,14 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import models
+
+
+class StockMove(models.Model):
+    _inherit = 'stock.move'
+
+    def _prepare_move_line_vals(self, quantity=None, reserved_quant=None):
+        if self.picking_id.fsm_order_ids:
+            self = self.with_context(
+                vehicle_id=self.picking_id.fsm_order_ids[0].vehicle_id.id)
+        return super()._prepare_move_line_vals(
+            quantity, reserved_quant)

From f9aeee0cb33d53bd72347ceb3827fab1772ca0eb Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 6 Jan 2020 17:38:11 -0600
Subject: [PATCH 608/631] [FIX] fieldservice_vehicle_stock

---
 fieldservice_vehicle_stock/__manifest__.py    |  1 +
 .../data/fsm_stock_data.xml                   |  8 +++++-
 fieldservice_vehicle_stock/models/__init__.py |  1 +
 .../models/stock_move.py                      | 14 ----------
 .../models/stock_picking.py                   | 27 +++++++++++++++++++
 .../views/stock_picking.xml                   | 14 ++++++++++
 6 files changed, 50 insertions(+), 15 deletions(-)
 delete mode 100644 fieldservice_vehicle_stock/models/stock_move.py
 create mode 100644 fieldservice_vehicle_stock/models/stock_picking.py
 create mode 100644 fieldservice_vehicle_stock/views/stock_picking.xml

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index 50f6a70de2..847274c6c5 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -20,6 +20,7 @@
         'data/fsm_stock_data.xml',
         'views/fsm_vehicle.xml',
         'views/fsm_order.xml',
+        'views/stock_picking.xml',
     ],
     'installable': True,
     'auto_install': True,
diff --git a/fieldservice_vehicle_stock/data/fsm_stock_data.xml b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
index 3c5069d391..6ac2635a52 100644
--- a/fieldservice_vehicle_stock/data/fsm_stock_data.xml
+++ b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
@@ -1,5 +1,11 @@
 <odoo>
 
+    <!-- Putaway Strategy -->
+    <record id="putaway_vehicle" model="product.putaway">
+        <field name="name">Vehicle Assignment</field>
+        <field name="method">vehicle</field>
+    </record>
+
     <record id="stock_location_vehicle" model="stock.location">
         <field name="name">Vehicles</field>
         <field name="usage">view</field>
@@ -11,7 +17,7 @@
         <field name="usage">internal</field>
         <field name="location_id" ref="stock_location_vehicle"/>
         <field name="company_id" ref="base.main_company"/>
-        <field name="putaway_strategy_id">vehicle</field>
+        <field name="putaway_strategy_id" ref="putaway_vehicle"/>
     </record>
 
     <data noupdate="1">
diff --git a/fieldservice_vehicle_stock/models/__init__.py b/fieldservice_vehicle_stock/models/__init__.py
index b266305d55..b912415e63 100644
--- a/fieldservice_vehicle_stock/models/__init__.py
+++ b/fieldservice_vehicle_stock/models/__init__.py
@@ -5,4 +5,5 @@
     fsm_vehicle,
     stock_request,
     product_putaway,
+    stock_picking,
 )
diff --git a/fieldservice_vehicle_stock/models/stock_move.py b/fieldservice_vehicle_stock/models/stock_move.py
deleted file mode 100644
index 211355ca16..0000000000
--- a/fieldservice_vehicle_stock/models/stock_move.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2019 Open Source Integrators
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import models
-
-
-class StockMove(models.Model):
-    _inherit = 'stock.move'
-
-    def _prepare_move_line_vals(self, quantity=None, reserved_quant=None):
-        if self.picking_id.fsm_order_ids:
-            self = self.with_context(
-                vehicle_id=self.picking_id.fsm_order_ids[0].vehicle_id.id)
-        return super()._prepare_move_line_vals(
-            quantity, reserved_quant)
diff --git a/fieldservice_vehicle_stock/models/stock_picking.py b/fieldservice_vehicle_stock/models/stock_picking.py
new file mode 100644
index 0000000000..4fdba8b2fd
--- /dev/null
+++ b/fieldservice_vehicle_stock/models/stock_picking.py
@@ -0,0 +1,27 @@
+# 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.exceptions import UserError
+
+
+class StockPicking(models.Model):
+    _inherit = 'stock.picking'
+
+    fsm_vehicle_id = fields.Many2one('fsm.vehicle', string='Vehicle')
+
+    def action_assign(self):
+        if self.picking_type_id in (
+            # Vehicle Loading
+            self.env.ref(
+                'fieldservice_vehicle_stock.picking_type_output_to_vehicle'),
+            # Location Pickup
+            self.env.ref(
+                'fieldservice_vehicle_stock.picking_type_location_to_vehicle')
+        ):
+            if self.fsm_vehicle_id:
+                picking = self.with_context(vehicle_id=self.fsm_vehicle_id.id)
+                return super(StockPicking, picking).action_assign()
+            else:
+                raise UserError(_(
+                    "You must provide the vehicle for this picking type."))
+        return super().action_assign()
diff --git a/fieldservice_vehicle_stock/views/stock_picking.xml b/fieldservice_vehicle_stock/views/stock_picking.xml
new file mode 100644
index 0000000000..3c16b61c41
--- /dev/null
+++ b/fieldservice_vehicle_stock/views/stock_picking.xml
@@ -0,0 +1,14 @@
+<odoo>
+
+    <record id="fsm_vehicle_stock_picking_view" model="ir.ui.view">
+        <field name="model">stock.picking.fsm_vehicle_id</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <field name="carrier_id" position="before">
+                <field name="fsm_vehicle_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>

From 87a931de926c0124dbf50236533607bc49436a48 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 9 Jan 2020 08:10:12 -0800
Subject: [PATCH 609/631] [IMP] fieldservice_vehicle_stock

---
 .../i18n/fieldservice_vehicle_stock.pot       | 26 +++++++++++++++++++
 fieldservice_vehicle_stock/models/__init__.py |  1 +
 .../models/fsm_order.py                       | 22 ++++++++++++++++
 .../models/fsm_vehicle.py                     |  2 +-
 .../models/stock_picking.py                   | 11 +++++++-
 .../views/stock_picking.xml                   | 13 +++++++++-
 6 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 fieldservice_vehicle_stock/models/fsm_order.py

diff --git a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
index ef43cc6007..0064d66a46 100644
--- a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
+++ b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
@@ -23,6 +23,11 @@ msgstr ""
 msgid "Deliver"
 msgstr ""
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
 msgid "Field Service Vehicle"
@@ -48,6 +53,11 @@ msgstr ""
 msgid "Location Return"
 msgstr ""
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_product_putaway
+msgid "Put Away Strategy"
+msgstr ""
+
 #. module: fieldservice_vehicle_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
 msgid "Register lots, packs, location"
@@ -63,6 +73,16 @@ msgstr ""
 msgid "Stock to Vehicle to Location"
 msgstr ""
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__fsm_vehicle_id
+msgid "Vehicle"
+msgstr ""
+
 #. module: fieldservice_vehicle_stock
 #: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle
 msgid "Vehicle Loading"
@@ -89,3 +109,9 @@ msgstr ""
 msgid "Warehouse → Vehicle"
 msgstr ""
 
+#. module: fieldservice_vehicle_stock
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:25
+#, python-format
+msgid "You must provide the vehicle for this picking type."
+msgstr ""
+
diff --git a/fieldservice_vehicle_stock/models/__init__.py b/fieldservice_vehicle_stock/models/__init__.py
index b912415e63..b891b36d39 100644
--- a/fieldservice_vehicle_stock/models/__init__.py
+++ b/fieldservice_vehicle_stock/models/__init__.py
@@ -3,6 +3,7 @@
 
 from . import (
     fsm_vehicle,
+    fsm_order,
     stock_request,
     product_putaway,
     stock_picking,
diff --git a/fieldservice_vehicle_stock/models/fsm_order.py b/fieldservice_vehicle_stock/models/fsm_order.py
new file mode 100644
index 0000000000..33e9b3950c
--- /dev/null
+++ b/fieldservice_vehicle_stock/models/fsm_order.py
@@ -0,0 +1,22 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import api, models
+
+
+class FSMOrder(models.Model):
+    _inherit = 'fsm.order'
+
+    @api.multi
+    def assign_vehicle_to_pickings(self):
+        for rec in self:
+            for picking in rec.picking_ids:
+                if picking.state in ('waiting', 'confirmed', 'assigned'):
+                    picking.fsm_vehicle_id = self.vehicle_id.id or False
+
+    @api.multi
+    def write(self, vals):
+        res = super().write(vals)
+        for rec in self:
+            if vals.get('vehicle_id', False):
+                rec.assign_vehicle_to_pickings()
+        return res
diff --git a/fieldservice_vehicle_stock/models/fsm_vehicle.py b/fieldservice_vehicle_stock/models/fsm_vehicle.py
index 56a4747458..5c56a4137e 100644
--- a/fieldservice_vehicle_stock/models/fsm_vehicle.py
+++ b/fieldservice_vehicle_stock/models/fsm_vehicle.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
+# Copyright (C) 2018 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models
diff --git a/fieldservice_vehicle_stock/models/stock_picking.py b/fieldservice_vehicle_stock/models/stock_picking.py
index 4fdba8b2fd..62fccfad0b 100644
--- a/fieldservice_vehicle_stock/models/stock_picking.py
+++ b/fieldservice_vehicle_stock/models/stock_picking.py
@@ -1,6 +1,6 @@
 # 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, _
 from odoo.exceptions import UserError
 
 
@@ -25,3 +25,12 @@ def action_assign(self):
                 raise UserError(_(
                     "You must provide the vehicle for this picking type."))
         return super().action_assign()
+
+    @api.multi
+    def write(self, vals):
+        if vals.get('fsm_order_id', False):
+            order = self.env['fsm.order'].browse(vals.get('fsm_order_id'))
+            vals.update({
+                'fsm_vehicle_id': order.vehicle_id.id or False,
+            })
+        return super().write(vals)
diff --git a/fieldservice_vehicle_stock/views/stock_picking.xml b/fieldservice_vehicle_stock/views/stock_picking.xml
index 3c16b61c41..427d70b002 100644
--- a/fieldservice_vehicle_stock/views/stock_picking.xml
+++ b/fieldservice_vehicle_stock/views/stock_picking.xml
@@ -1,7 +1,7 @@
 <odoo>
 
     <record id="fsm_vehicle_stock_picking_view" model="ir.ui.view">
-        <field name="model">stock.picking.fsm_vehicle_id</field>
+        <field name="model">stock.picking.fsm_vehicle_id.form</field>
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="stock.view_picking_form"/>
         <field name="arch" type="xml">
@@ -11,4 +11,15 @@
         </field>
     </record>
 
+    <record id="fsm_vehicle_stock_picking_tree" model="ir.ui.view">
+        <field name="model">stock.picking.fsm_vehicle_id.tree</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.vpicktree"/>
+        <field name="arch" type="xml">
+            <field name="location_dest_id" position="after">
+                <field name="fsm_vehicle_id"/>
+            </field>
+        </field>
+    </record>
+
 </odoo>

From 27a0ac10e8eba4e0cf310b563c078f531ce1f614 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 14 Jan 2020 18:37:49 +0000
Subject: [PATCH 610/631] fieldservice_vehicle_stock 12.0.1.1.0

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/
---
 fieldservice_vehicle_stock/__manifest__.py |   2 +-
 fieldservice_vehicle_stock/i18n/de.po      |  30 ++++-
 fieldservice_vehicle_stock/i18n/es.po      | 123 +++++++++++++++++++++
 fieldservice_vehicle_stock/i18n/es_CL.po   |  32 +++++-
 fieldservice_vehicle_stock/i18n/pt_BR.po   | 117 ++++++++++++++++++++
 5 files changed, 301 insertions(+), 3 deletions(-)
 create mode 100644 fieldservice_vehicle_stock/i18n/es.po
 create mode 100644 fieldservice_vehicle_stock/i18n/pt_BR.po

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index 847274c6c5..c135aa9bf7 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles - Stock',
     'summary': 'Track inventory of Field Service vehicles',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.1.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_vehicle_stock/i18n/de.po b/fieldservice_vehicle_stock/i18n/de.po
index f1584b659c..6bc28feacb 100644
--- a/fieldservice_vehicle_stock/i18n/de.po
+++ b/fieldservice_vehicle_stock/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_vehicle_stock
+# 	* fieldservice_vehicle_stock
 #
 msgid ""
 msgstr ""
@@ -26,6 +26,13 @@ msgstr "Verfügbarkeit prüfen"
 msgid "Deliver"
 msgstr ""
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
+#, fuzzy
+#| msgid "Field Service Vehicle"
+msgid "Field Service Order"
+msgstr "Service-Fahrzeug"
+
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
 msgid "Field Service Vehicle"
@@ -51,6 +58,11 @@ msgstr ""
 msgid "Location Return"
 msgstr ""
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_product_putaway
+msgid "Put Away Strategy"
+msgstr ""
+
 #. module: fieldservice_vehicle_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
 msgid "Register lots, packs, location"
@@ -66,6 +78,16 @@ msgstr ""
 msgid "Stock to Vehicle to Location"
 msgstr ""
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__fsm_vehicle_id
+msgid "Vehicle"
+msgstr ""
+
 #. module: fieldservice_vehicle_stock
 #: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle
 msgid "Vehicle Loading"
@@ -91,3 +113,9 @@ msgstr "Fahrzeug → Lager"
 #: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_output_to_vehicle
 msgid "Warehouse → Vehicle"
 msgstr "Lager → Fahrzeug"
+
+#. module: fieldservice_vehicle_stock
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:25
+#, python-format
+msgid "You must provide the vehicle for this picking type."
+msgstr ""
diff --git a/fieldservice_vehicle_stock/i18n/es.po b/fieldservice_vehicle_stock/i18n/es.po
new file mode 100644
index 0000000000..63e72da59d
--- /dev/null
+++ b/fieldservice_vehicle_stock/i18n/es.po
@@ -0,0 +1,123 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_vehicle_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-11-22 04:35+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.8\n"
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Check Availability"
+msgstr "Consultar Disponibilidad"
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Deliver"
+msgstr "Despachar"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
+#, fuzzy
+#| msgid "Field Service Vehicle"
+msgid "Field Service Order"
+msgstr "Vehículo de Servicio de Campo"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Vehículo de Servicio de Campo"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_vehicle__inventory_location_id
+msgid "Inventory Location"
+msgstr "Ubicación de Inventario"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_location
+msgid "Location Delivery"
+msgstr "Entrega de Ubicación"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_location_to_vehicle
+msgid "Location Pickup"
+msgstr "Ubicación de Recogida"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_location_return
+msgid "Location Return"
+msgstr "Ubicación de Retorno"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_product_putaway
+msgid "Put Away Strategy"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Register lots, packs, location"
+msgstr "Registrar lotes, paquetes, ubicación"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
+msgid "Stock Request"
+msgstr "Solicitud de Stock"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
+msgid "Stock to Vehicle to Location"
+msgstr "Stock a Vehículo a Ubicación"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__fsm_vehicle_id
+#, fuzzy
+#| msgid "Vehicle Loading"
+msgid "Vehicle"
+msgstr "Carga del Vehículo"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle
+msgid "Vehicle Loading"
+msgstr "Carga del Vehículo"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_input
+msgid "Vehicle Returns"
+msgstr "Devoluciones de Vehículos"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_vehicle_to_location
+msgid "Vehicle → Location"
+msgstr "Vehículo → Ubicación"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.stock_rule_vehicle_to_input
+msgid "Vehicle → Warehouse"
+msgstr "Vehículo → Bodega"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_location_to_vehicle
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_output_to_vehicle
+msgid "Warehouse → Vehicle"
+msgstr "Bodega → Vehículo"
+
+#. module: fieldservice_vehicle_stock
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:25
+#, python-format
+msgid "You must provide the vehicle for this picking type."
+msgstr ""
diff --git a/fieldservice_vehicle_stock/i18n/es_CL.po b/fieldservice_vehicle_stock/i18n/es_CL.po
index 8a6e758d3a..90e599edea 100644
--- a/fieldservice_vehicle_stock/i18n/es_CL.po
+++ b/fieldservice_vehicle_stock/i18n/es_CL.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_vehicle_stock
+# 	* fieldservice_vehicle_stock
 #
 msgid ""
 msgstr ""
@@ -26,6 +26,13 @@ msgstr "Consultar Disponibilidad"
 msgid "Deliver"
 msgstr "Despachar"
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
+#, fuzzy
+#| msgid "Field Service Vehicle"
+msgid "Field Service Order"
+msgstr "Vehículo de Servicio de Campo"
+
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
 msgid "Field Service Vehicle"
@@ -51,6 +58,11 @@ msgstr "Ubicación de Recogida"
 msgid "Location Return"
 msgstr "Ubicación de Retorno"
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_product_putaway
+msgid "Put Away Strategy"
+msgstr ""
+
 #. module: fieldservice_vehicle_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
 msgid "Register lots, packs, location"
@@ -66,6 +78,18 @@ msgstr "Solicitud de Stock"
 msgid "Stock to Vehicle to Location"
 msgstr "Stock a Vehículo a Ubicación"
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__fsm_vehicle_id
+#, fuzzy
+#| msgid "Vehicle Loading"
+msgid "Vehicle"
+msgstr "Carga del Vehículo"
+
 #. module: fieldservice_vehicle_stock
 #: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle
 msgid "Vehicle Loading"
@@ -91,3 +115,9 @@ msgstr "Vehículo → Bodega"
 #: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_output_to_vehicle
 msgid "Warehouse → Vehicle"
 msgstr "Bodega → Vehículo"
+
+#. module: fieldservice_vehicle_stock
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:25
+#, python-format
+msgid "You must provide the vehicle for this picking type."
+msgstr ""
diff --git a/fieldservice_vehicle_stock/i18n/pt_BR.po b/fieldservice_vehicle_stock/i18n/pt_BR.po
new file mode 100644
index 0000000000..e596ee3cb5
--- /dev/null
+++ b/fieldservice_vehicle_stock/i18n/pt_BR.po
@@ -0,0 +1,117 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_vehicle_stock
+#
+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_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Check Availability"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Deliver"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_vehicle__inventory_location_id
+msgid "Inventory Location"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_location
+msgid "Location Delivery"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_location_to_vehicle
+msgid "Location Pickup"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_location_return
+msgid "Location Return"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_product_putaway
+msgid "Put Away Strategy"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Register lots, packs, location"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
+msgid "Stock Request"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
+msgid "Stock to Vehicle to Location"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__fsm_vehicle_id
+msgid "Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle
+msgid "Vehicle Loading"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_input
+msgid "Vehicle Returns"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_vehicle_to_location
+msgid "Vehicle → Location"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.stock_rule_vehicle_to_input
+msgid "Vehicle → Warehouse"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_location_to_vehicle
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_output_to_vehicle
+msgid "Warehouse → Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:25
+#, python-format
+msgid "You must provide the vehicle for this picking type."
+msgstr ""

From 0a1194b616edb50f3eca689548c0c7c08778444b Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sat, 1 Feb 2020 19:15:43 -0600
Subject: [PATCH 611/631] [FIX] fieldservice_vehicle_stock

Currently translated at 90.0% (18 of 20 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/es/
---
 fieldservice_vehicle_stock/i18n/es.po         | 10 +++---
 .../models/stock_picking.py                   | 33 ++++++++++---------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/fieldservice_vehicle_stock/i18n/es.po b/fieldservice_vehicle_stock/i18n/es.po
index 63e72da59d..78f89d0338 100644
--- a/fieldservice_vehicle_stock/i18n/es.po
+++ b/fieldservice_vehicle_stock/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-11-22 04:35+0000\n"
+"PO-Revision-Date: 2020-02-02 16:47+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.8\n"
+"X-Generator: Weblate 3.10\n"
 
 #. module: fieldservice_vehicle_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
@@ -61,7 +61,7 @@ msgstr "Ubicación de Retorno"
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_product_putaway
 msgid "Put Away Strategy"
-msgstr ""
+msgstr "Estrategia de Traslado"
 
 #. module: fieldservice_vehicle_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
@@ -81,7 +81,7 @@ msgstr "Stock a Vehículo a Ubicación"
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_stock_picking
 msgid "Transfer"
-msgstr ""
+msgstr "Transferir"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__fsm_vehicle_id
@@ -120,4 +120,4 @@ msgstr "Bodega → Vehículo"
 #: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:25
 #, python-format
 msgid "You must provide the vehicle for this picking type."
-msgstr ""
+msgstr "Debe proporcionar el vehículo para este tipo de picking."
diff --git a/fieldservice_vehicle_stock/models/stock_picking.py b/fieldservice_vehicle_stock/models/stock_picking.py
index 62fccfad0b..6b9df0091d 100644
--- a/fieldservice_vehicle_stock/models/stock_picking.py
+++ b/fieldservice_vehicle_stock/models/stock_picking.py
@@ -9,22 +9,25 @@ class StockPicking(models.Model):
 
     fsm_vehicle_id = fields.Many2one('fsm.vehicle', string='Vehicle')
 
+    @api.multi
     def action_assign(self):
-        if self.picking_type_id in (
-            # Vehicle Loading
-            self.env.ref(
-                'fieldservice_vehicle_stock.picking_type_output_to_vehicle'),
-            # Location Pickup
-            self.env.ref(
-                'fieldservice_vehicle_stock.picking_type_location_to_vehicle')
-        ):
-            if self.fsm_vehicle_id:
-                picking = self.with_context(vehicle_id=self.fsm_vehicle_id.id)
-                return super(StockPicking, picking).action_assign()
-            else:
-                raise UserError(_(
-                    "You must provide the vehicle for this picking type."))
-        return super().action_assign()
+        for rec in self:
+            if rec.picking_type_id in (
+                # Vehicle Loading
+                self.env.ref(
+                    'fieldservice_vehicle_stock.picking_type_output_to_vehicle'),
+                # Location Pickup
+                self.env.ref(
+                    'fieldservice_vehicle_stock.picking_type_location_to_vehicle')
+            ):
+                if rec.fsm_vehicle_id:
+                    picking = rec.with_context(vehicle_id=self.fsm_vehicle_id.id)
+                    return super(StockPicking, picking).action_assign()
+                else:
+                    raise UserError(_(
+                        "You must provide the vehicle for this picking type."))
+            res = super().action_assign()
+        return res
 
     @api.multi
     def write(self, vals):

From a27268e78358c867304a893f881636203a01fa34 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Mon, 3 Feb 2020 11:15:26 -0600
Subject: [PATCH 612/631] [IMP] fieldservice_vehicle_stock

---
 .../i18n/fieldservice_vehicle_stock.pot       |  2 +-
 .../models/stock_picking.py                   | 23 +++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
index 0064d66a46..84e20a9a3f 100644
--- a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
+++ b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
@@ -110,7 +110,7 @@ msgid "Warehouse → Vehicle"
 msgstr ""
 
 #. module: fieldservice_vehicle_stock
-#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:25
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:30
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr ""
diff --git a/fieldservice_vehicle_stock/models/stock_picking.py b/fieldservice_vehicle_stock/models/stock_picking.py
index 6b9df0091d..8876e338a0 100644
--- a/fieldservice_vehicle_stock/models/stock_picking.py
+++ b/fieldservice_vehicle_stock/models/stock_picking.py
@@ -15,13 +15,16 @@ def action_assign(self):
             if rec.picking_type_id in (
                 # Vehicle Loading
                 self.env.ref(
-                    'fieldservice_vehicle_stock.picking_type_output_to_vehicle'),
+                    'fieldservice_vehicle_stock.'
+                    'picking_type_output_to_vehicle'),
                 # Location Pickup
                 self.env.ref(
-                    'fieldservice_vehicle_stock.picking_type_location_to_vehicle')
+                    'fieldservice_vehicle_stock.'
+                    'picking_type_location_to_vehicle')
             ):
                 if rec.fsm_vehicle_id:
-                    picking = rec.with_context(vehicle_id=self.fsm_vehicle_id.id)
+                    picking = \
+                        rec.with_context(vehicle_id=self.fsm_vehicle_id.id)
                     return super(StockPicking, picking).action_assign()
                 else:
                     raise UserError(_(
@@ -29,11 +32,17 @@ def action_assign(self):
             res = super().action_assign()
         return res
 
+    def prepare_fsm_values(self, fsm_order):
+        res = {}
+        if fsm_order:
+            res.update({
+                'fsm_vehicle_id': fsm_order.vehicle_id.id or False,
+            })
+        return res
+
     @api.multi
     def write(self, vals):
         if vals.get('fsm_order_id', False):
-            order = self.env['fsm.order'].browse(vals.get('fsm_order_id'))
-            vals.update({
-                'fsm_vehicle_id': order.vehicle_id.id or False,
-            })
+            fsm_order = self.env['fsm.order'].browse(vals.get('fsm_order_id'))
+            vals.update(self.prepare_fsm_values(fsm_order))
         return super().write(vals)

From 6cfc01e33b4d711b22206c43b58d2a01eb6599e6 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 6 Feb 2020 21:41:26 +0000
Subject: [PATCH 613/631] fieldservice_vehicle_stock 12.0.1.1.1

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/
---
 fieldservice_vehicle_stock/__manifest__.py | 2 +-
 fieldservice_vehicle_stock/i18n/de.po      | 2 +-
 fieldservice_vehicle_stock/i18n/es.po      | 2 +-
 fieldservice_vehicle_stock/i18n/es_CL.po   | 2 +-
 fieldservice_vehicle_stock/i18n/pt_BR.po   | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index c135aa9bf7..f49af41f54 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles - Stock',
     'summary': 'Track inventory of Field Service vehicles',
-    'version': '12.0.1.1.0',
+    'version': '12.0.1.1.1',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_vehicle_stock/i18n/de.po b/fieldservice_vehicle_stock/i18n/de.po
index 6bc28feacb..228eac7ecc 100644
--- a/fieldservice_vehicle_stock/i18n/de.po
+++ b/fieldservice_vehicle_stock/i18n/de.po
@@ -115,7 +115,7 @@ msgid "Warehouse → Vehicle"
 msgstr "Lager → Fahrzeug"
 
 #. module: fieldservice_vehicle_stock
-#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:25
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:30
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr ""
diff --git a/fieldservice_vehicle_stock/i18n/es.po b/fieldservice_vehicle_stock/i18n/es.po
index 78f89d0338..0fee441603 100644
--- a/fieldservice_vehicle_stock/i18n/es.po
+++ b/fieldservice_vehicle_stock/i18n/es.po
@@ -117,7 +117,7 @@ msgid "Warehouse → Vehicle"
 msgstr "Bodega → Vehículo"
 
 #. module: fieldservice_vehicle_stock
-#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:25
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:30
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr "Debe proporcionar el vehículo para este tipo de picking."
diff --git a/fieldservice_vehicle_stock/i18n/es_CL.po b/fieldservice_vehicle_stock/i18n/es_CL.po
index 90e599edea..ff7fae46ba 100644
--- a/fieldservice_vehicle_stock/i18n/es_CL.po
+++ b/fieldservice_vehicle_stock/i18n/es_CL.po
@@ -117,7 +117,7 @@ msgid "Warehouse → Vehicle"
 msgstr "Bodega → Vehículo"
 
 #. module: fieldservice_vehicle_stock
-#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:25
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:30
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr ""
diff --git a/fieldservice_vehicle_stock/i18n/pt_BR.po b/fieldservice_vehicle_stock/i18n/pt_BR.po
index e596ee3cb5..48418b0d08 100644
--- a/fieldservice_vehicle_stock/i18n/pt_BR.po
+++ b/fieldservice_vehicle_stock/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_vehicle_stock
+# 	* fieldservice_vehicle_stock
 #
 msgid ""
 msgstr ""
@@ -111,7 +111,7 @@ msgid "Warehouse → Vehicle"
 msgstr ""
 
 #. module: fieldservice_vehicle_stock
-#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:25
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:30
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr ""

From d15b924d572b3562f8db467414b8b9c30264b004 Mon Sep 17 00:00:00 2001
From: Marcel Savegnago <marcel.savegnago@gmail.com>
Date: Mon, 10 Feb 2020 13:31:24 -0300
Subject: [PATCH 614/631] [FIX] Correcao de dependencias

---
 fieldservice_vehicle_stock/__manifest__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index f49af41f54..cc5c61777c 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -13,6 +13,7 @@
     'depends': [
         'fieldservice_vehicle',
         'fieldservice_stock',
+        'fieldservice_delivery',
         'stock_putaway_method',
     ],
     'data': [

From 348f01c535e7794506af391d8297bbc8f5fa354a Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 17 Feb 2020 16:32:22 +0000
Subject: [PATCH 615/631] fieldservice_vehicle_stock 12.0.1.2.0

---
 fieldservice_vehicle_stock/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index cc5c61777c..8b7a1b1014 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles - Stock',
     'summary': 'Track inventory of Field Service vehicles',
-    'version': '12.0.1.1.1',
+    'version': '12.0.1.2.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "

From 799d1a9519b2ca687a99d0cc9e96118dcb4740a8 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 21 Feb 2020 15:43:57 -0600
Subject: [PATCH 616/631] [FIX] fieldservice_vehicle_stock: Expected singleton:
 stock.picking

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

diff --git a/fieldservice_vehicle_stock/models/stock_picking.py b/fieldservice_vehicle_stock/models/stock_picking.py
index 8876e338a0..40ce0404e3 100644
--- a/fieldservice_vehicle_stock/models/stock_picking.py
+++ b/fieldservice_vehicle_stock/models/stock_picking.py
@@ -24,7 +24,7 @@ def action_assign(self):
             ):
                 if rec.fsm_vehicle_id:
                     picking = \
-                        rec.with_context(vehicle_id=self.fsm_vehicle_id.id)
+                        rec.with_context(vehicle_id=rec.fsm_vehicle_id.id)
                     return super(StockPicking, picking).action_assign()
                 else:
                     raise UserError(_(

From d45785333dd10cbeeffeee41b9d97b3f05c8d3d9 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 26 Feb 2020 22:21:49 +0000
Subject: [PATCH 617/631] fieldservice_vehicle_stock 12.0.1.2.1

Currently translated at 100.0% (20 of 20 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/es/
---
 fieldservice_vehicle_stock/__manifest__.py |  2 +-
 fieldservice_vehicle_stock/i18n/es.po      | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index 8b7a1b1014..ddf39b56e1 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles - Stock',
     'summary': 'Track inventory of Field Service vehicles',
-    'version': '12.0.1.2.0',
+    'version': '12.0.1.2.1',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_vehicle_stock/i18n/es.po b/fieldservice_vehicle_stock/i18n/es.po
index 0fee441603..d8d5eec804 100644
--- a/fieldservice_vehicle_stock/i18n/es.po
+++ b/fieldservice_vehicle_stock/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: 2020-02-02 16:47+0000\n"
+"PO-Revision-Date: 2020-03-04 00:14+0000\n"
 "Last-Translator: Nelson Ramírez Sánchez <info@konos.cl>\n"
 "Language-Team: none\n"
 "Language: es\n"
@@ -28,10 +28,8 @@ msgstr "Despachar"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
-#, fuzzy
-#| msgid "Field Service Vehicle"
 msgid "Field Service Order"
-msgstr "Vehículo de Servicio de Campo"
+msgstr "Pedidos de Servicio de Campo"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
@@ -85,10 +83,8 @@ msgstr "Transferir"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__fsm_vehicle_id
-#, fuzzy
-#| msgid "Vehicle Loading"
 msgid "Vehicle"
-msgstr "Carga del Vehículo"
+msgstr "Vehículo"
 
 #. module: fieldservice_vehicle_stock
 #: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle

From d6945cd825cce665d68cef0431a37fedaf4f0f6b Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Thu, 26 Mar 2020 19:45:07 -0600
Subject: [PATCH 618/631] [FIX] fieldservice_vehicle_stock

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

diff --git a/fieldservice_vehicle_stock/models/stock_picking.py b/fieldservice_vehicle_stock/models/stock_picking.py
index 40ce0404e3..bc488c5b47 100644
--- a/fieldservice_vehicle_stock/models/stock_picking.py
+++ b/fieldservice_vehicle_stock/models/stock_picking.py
@@ -25,11 +25,11 @@ def action_assign(self):
                 if rec.fsm_vehicle_id:
                     picking = \
                         rec.with_context(vehicle_id=rec.fsm_vehicle_id.id)
-                    return super(StockPicking, picking).action_assign()
+                    res = super(StockPicking, picking).action_assign()
                 else:
                     raise UserError(_(
                         "You must provide the vehicle for this picking type."))
-            res = super().action_assign()
+            res = super(StockPicking, rec).action_assign()
         return res
 
     def prepare_fsm_values(self, fsm_order):

From 8c2b2d13f7ae6f7e70bf1aad907f77094cca8045 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Fri, 27 Mar 2020 21:11:43 -0600
Subject: [PATCH 619/631] [FIX] fieldservice_vehicle_stock

---
 fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot | 1 +
 fieldservice_vehicle_stock/models/stock_picking.py             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
index 84e20a9a3f..6fd5df858f 100644
--- a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
+++ b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
@@ -111,6 +111,7 @@ msgstr ""
 
 #. module: fieldservice_vehicle_stock
 #: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:30
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:31
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr ""
diff --git a/fieldservice_vehicle_stock/models/stock_picking.py b/fieldservice_vehicle_stock/models/stock_picking.py
index bc488c5b47..d7801251a2 100644
--- a/fieldservice_vehicle_stock/models/stock_picking.py
+++ b/fieldservice_vehicle_stock/models/stock_picking.py
@@ -11,6 +11,7 @@ class StockPicking(models.Model):
 
     @api.multi
     def action_assign(self):
+        res = {}
         for rec in self:
             if rec.picking_type_id in (
                 # Vehicle Loading

From 4162ac000db9aabfa7356f48ac49e5cfbb78ddaf Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 1 Apr 2020 07:16:41 +0000
Subject: [PATCH 620/631] fieldservice_vehicle_stock 12.0.1.2.2

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/

Currently translated at 100.0% (20 of 20 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/es_CL/

Currently translated at 100.0% (20 of 20 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/pt_BR/

Currently translated at 100.0% (20 of 20 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/pt_PT/

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/
---
 fieldservice_vehicle_stock/__manifest__.py    |   2 +-
 fieldservice_vehicle_stock/i18n/de.po         |   3 +-
 fieldservice_vehicle_stock/i18n/es.po         |   2 +-
 fieldservice_vehicle_stock/i18n/es_CL.po      |  20 ++-
 .../i18n/fieldservice_vehicle_stock.pot       |   1 -
 fieldservice_vehicle_stock/i18n/pt_BR.po      |  46 +++----
 fieldservice_vehicle_stock/i18n/pt_PT.po      | 119 ++++++++++++++++++
 7 files changed, 154 insertions(+), 39 deletions(-)
 create mode 100644 fieldservice_vehicle_stock/i18n/pt_PT.po

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index ddf39b56e1..bed2f17238 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles - Stock',
     'summary': 'Track inventory of Field Service vehicles',
-    'version': '12.0.1.2.1',
+    'version': '12.0.1.2.2',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_vehicle_stock/i18n/de.po b/fieldservice_vehicle_stock/i18n/de.po
index 228eac7ecc..afb974132f 100644
--- a/fieldservice_vehicle_stock/i18n/de.po
+++ b/fieldservice_vehicle_stock/i18n/de.po
@@ -29,7 +29,6 @@ msgstr ""
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
 #, fuzzy
-#| msgid "Field Service Vehicle"
 msgid "Field Service Order"
 msgstr "Service-Fahrzeug"
 
@@ -115,7 +114,7 @@ msgid "Warehouse → Vehicle"
 msgstr "Lager → Fahrzeug"
 
 #. module: fieldservice_vehicle_stock
-#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:30
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:31
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr ""
diff --git a/fieldservice_vehicle_stock/i18n/es.po b/fieldservice_vehicle_stock/i18n/es.po
index d8d5eec804..9e3c4ae756 100644
--- a/fieldservice_vehicle_stock/i18n/es.po
+++ b/fieldservice_vehicle_stock/i18n/es.po
@@ -113,7 +113,7 @@ msgid "Warehouse → Vehicle"
 msgstr "Bodega → Vehículo"
 
 #. module: fieldservice_vehicle_stock
-#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:30
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:31
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr "Debe proporcionar el vehículo para este tipo de picking."
diff --git a/fieldservice_vehicle_stock/i18n/es_CL.po b/fieldservice_vehicle_stock/i18n/es_CL.po
index ff7fae46ba..0515cc82e4 100644
--- a/fieldservice_vehicle_stock/i18n/es_CL.po
+++ b/fieldservice_vehicle_stock/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-11-22 04:35+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"
@@ -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.8\n"
+"X-Generator: Weblate 3.10\n"
 
 #. module: fieldservice_vehicle_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
@@ -28,10 +28,8 @@ msgstr "Despachar"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
-#, fuzzy
-#| msgid "Field Service Vehicle"
 msgid "Field Service Order"
-msgstr "Vehículo de Servicio de Campo"
+msgstr "Pedido de Servicio de Campo"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
@@ -61,7 +59,7 @@ msgstr "Ubicación de Retorno"
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_product_putaway
 msgid "Put Away Strategy"
-msgstr ""
+msgstr "Estrategia de Removida"
 
 #. module: fieldservice_vehicle_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
@@ -81,14 +79,12 @@ msgstr "Stock a Vehículo a Ubicación"
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_stock_picking
 msgid "Transfer"
-msgstr ""
+msgstr "Transferir"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__fsm_vehicle_id
-#, fuzzy
-#| msgid "Vehicle Loading"
 msgid "Vehicle"
-msgstr "Carga del Vehículo"
+msgstr "Vehículo"
 
 #. module: fieldservice_vehicle_stock
 #: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle
@@ -117,7 +113,7 @@ msgid "Warehouse → Vehicle"
 msgstr "Bodega → Vehículo"
 
 #. module: fieldservice_vehicle_stock
-#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:30
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:31
 #, python-format
 msgid "You must provide the vehicle for this picking type."
-msgstr ""
+msgstr "Debe proporcionar el vehículo para este tipo de picking."
diff --git a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
index 6fd5df858f..87d33b130c 100644
--- a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
+++ b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
@@ -110,7 +110,6 @@ msgid "Warehouse → Vehicle"
 msgstr ""
 
 #. module: fieldservice_vehicle_stock
-#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:30
 #: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:31
 #, python-format
 msgid "You must provide the vehicle for this picking type."
diff --git a/fieldservice_vehicle_stock/i18n/pt_BR.po b/fieldservice_vehicle_stock/i18n/pt_BR.po
index 48418b0d08..985d34090a 100644
--- a/fieldservice_vehicle_stock/i18n/pt_BR.po
+++ b/fieldservice_vehicle_stock/i18n/pt_BR.po
@@ -6,112 +6,114 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2020-06-17 16:19+0000\n"
+"Last-Translator: Fernando Colus <fcolus1@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_vehicle_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
 msgid "Check Availability"
-msgstr ""
+msgstr "Checar Disponibilidade"
 
 #. module: fieldservice_vehicle_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
 msgid "Deliver"
-msgstr ""
+msgstr "Entregar"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Pedido do Serviço de Campo"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
 msgid "Field Service Vehicle"
-msgstr ""
+msgstr "Veículo do Serviço de Campo"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_vehicle__inventory_location_id
 msgid "Inventory Location"
-msgstr ""
+msgstr "Localização do Inventário"
 
 #. module: fieldservice_vehicle_stock
 #: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_location
 msgid "Location Delivery"
-msgstr ""
+msgstr "Localização da Entrega"
 
 #. module: fieldservice_vehicle_stock
 #: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_location_to_vehicle
 msgid "Location Pickup"
-msgstr ""
+msgstr "Localização da Coleta"
 
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_location_return
 msgid "Location Return"
-msgstr ""
+msgstr "Retorno da Localização"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_product_putaway
 msgid "Put Away Strategy"
-msgstr ""
+msgstr "Estratégia de Descarte"
 
 #. module: fieldservice_vehicle_stock
 #: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
 msgid "Register lots, packs, location"
-msgstr ""
+msgstr "Registrar lotes, pacotes, localização"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
 msgid "Stock Request"
-msgstr ""
+msgstr "Requisição de Estoque"
 
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
-msgstr ""
+msgstr "Estoque em veículo para localização"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_stock_picking
 msgid "Transfer"
-msgstr ""
+msgstr "Transferir"
 
 #. module: fieldservice_vehicle_stock
 #: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__fsm_vehicle_id
 msgid "Vehicle"
-msgstr ""
+msgstr "Veículo"
 
 #. module: fieldservice_vehicle_stock
 #: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle
 msgid "Vehicle Loading"
-msgstr ""
+msgstr "Carregamento de veículo"
 
 #. module: fieldservice_vehicle_stock
 #: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_input
 msgid "Vehicle Returns"
-msgstr ""
+msgstr "Retorno do Veículo"
 
 #. module: fieldservice_vehicle_stock
 #: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_vehicle_to_location
 msgid "Vehicle → Location"
-msgstr ""
+msgstr "Veículo → Localização"
 
 #. module: fieldservice_vehicle_stock
 #: model:stock.rule,name:fieldservice_vehicle_stock.stock_rule_vehicle_to_input
 msgid "Vehicle → Warehouse"
-msgstr ""
+msgstr "Veículo → Armazém"
 
 #. module: fieldservice_vehicle_stock
 #: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_location_to_vehicle
 #: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_output_to_vehicle
 msgid "Warehouse → Vehicle"
-msgstr ""
+msgstr "Armazém → Veículo"
 
 #. module: fieldservice_vehicle_stock
-#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:30
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:31
 #, python-format
 msgid "You must provide the vehicle for this picking type."
-msgstr ""
+msgstr "Você deve fornecer o veículo para esse tipo de coleta."
diff --git a/fieldservice_vehicle_stock/i18n/pt_PT.po b/fieldservice_vehicle_stock/i18n/pt_PT.po
new file mode 100644
index 0000000000..eb4d6bf5b4
--- /dev/null
+++ b/fieldservice_vehicle_stock/i18n/pt_PT.po
@@ -0,0 +1,119 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fieldservice_vehicle_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-07-21 10:19+0000\n"
+"Last-Translator: Daniel Reis <dgreis@sapo.pt>\n"
+"Language-Team: none\n"
+"Language: pt_PT\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_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Check Availability"
+msgstr "Verificar Disponibilidade"
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Deliver"
+msgstr "Entregar"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
+msgid "Field Service Order"
+msgstr "Ordem de Serviço de Campo"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Veículo de Serviço"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_vehicle__inventory_location_id
+msgid "Inventory Location"
+msgstr "Localização do Inventário"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_location
+msgid "Location Delivery"
+msgstr "Localização da Entrega"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_location_to_vehicle
+msgid "Location Pickup"
+msgstr "Localização da Recolha"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_location_return
+msgid "Location Return"
+msgstr "Localização de Retorno"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_product_putaway
+msgid "Put Away Strategy"
+msgstr "Estratégia de Descarte"
+
+#. module: fieldservice_vehicle_stock
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
+msgid "Register lots, packs, location"
+msgstr "Registar lotes, pacotes, localização"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
+msgid "Stock Request"
+msgstr "Requisição de Stock"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
+msgid "Stock to Vehicle to Location"
+msgstr "Stock para Veículo para Localização"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_picking
+msgid "Transfer"
+msgstr "Transferir"
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__fsm_vehicle_id
+msgid "Vehicle"
+msgstr "Veículo"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_output_to_vehicle
+msgid "Vehicle Loading"
+msgstr "Carregamento do Veículo"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_input
+msgid "Vehicle Returns"
+msgstr "Devoluções do Veículo"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_vehicle_to_location
+msgid "Vehicle → Location"
+msgstr "Veículo → Localização"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.stock_rule_vehicle_to_input
+msgid "Vehicle → Warehouse"
+msgstr "Veículo → Armazém"
+
+#. module: fieldservice_vehicle_stock
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_location_to_vehicle
+#: model:stock.rule,name:fieldservice_vehicle_stock.procurement_rule_output_to_vehicle
+msgid "Warehouse → Vehicle"
+msgstr "Armazém → Veículo"
+
+#. module: fieldservice_vehicle_stock
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:31
+#, python-format
+msgid "You must provide the vehicle for this picking type."
+msgstr "Você deve fornecer o veículo para esse tipo de picking."

From ed87c6748f7e856ce7ec78f552b62299b78fbd48 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Sat, 21 Nov 2020 15:44:49 -0500
Subject: [PATCH 621/631] [IMP] fieldservice_vehicle_stock

Minimize dependency on stock_request

[UPD] README.rst
---
 fieldservice_vehicle_stock/README.rst         | 24 +-------
 .../i18n/fieldservice_vehicle_stock.pot       |  5 --
 fieldservice_vehicle_stock/models/__init__.py |  1 -
 .../models/stock_request.py                   | 33 -----------
 .../readme/DESCRIPTION.rst                    |  3 +-
 fieldservice_vehicle_stock/readme/INSTALL.rst |  6 --
 fieldservice_vehicle_stock/readme/USAGE.rst   |  7 ---
 .../static/description/index.html             | 57 ++++++-------------
 .../views/fsm_order.xml                       | 29 ----------
 9 files changed, 22 insertions(+), 143 deletions(-)
 delete mode 100644 fieldservice_vehicle_stock/models/stock_request.py
 delete mode 100644 fieldservice_vehicle_stock/readme/INSTALL.rst
 delete mode 100644 fieldservice_vehicle_stock/readme/USAGE.rst
 delete mode 100644 fieldservice_vehicle_stock/views/fsm_order.xml

diff --git a/fieldservice_vehicle_stock/README.rst b/fieldservice_vehicle_stock/README.rst
index c92cc7fb7e..bbc92fcdcf 100644
--- a/fieldservice_vehicle_stock/README.rst
+++ b/fieldservice_vehicle_stock/README.rst
@@ -26,23 +26,14 @@ Field Service Vehicles - Stock
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
 This module is an add-on for the Field Service application in Odoo.
-It provides inventory and stock operations.
+It allows you to establish stock locations for field service vehicles
+and process stock moves with field service vehicles.
 
 **Table of contents**
 
 .. contents::
    :local:
 
-Installation
-============
-
-You will first need to install:
-
-* fieldservice
-
-Then go to Field Service > Configuration > Settings
-Enable the 'Use Odoo Stock Logistics' option under Integrations
-
 Configuration
 =============
 
@@ -51,17 +42,6 @@ To configure this module, you need to:
 * Set Inventory Locations for FSM Locations and FSM Vehicles
 * Verify procurement routes
 
-Usage
-=====
-
-To use this module, you need to:
-
-* Create a new field service order
-* Under the Materials tab, add products with quantity
-* Confirm an order to create stock moves
-* Validate stock moves in the Inventory app
-* Quantities Delivered on FSM Order Line will be updated based on move
-
 Known issues / Roadmap
 ======================
 
diff --git a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
index 87d33b130c..636ccf721f 100644
--- a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
+++ b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
@@ -63,11 +63,6 @@ msgstr ""
 msgid "Register lots, packs, location"
 msgstr ""
 
-#. module: fieldservice_vehicle_stock
-#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
-msgid "Stock Request"
-msgstr ""
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
diff --git a/fieldservice_vehicle_stock/models/__init__.py b/fieldservice_vehicle_stock/models/__init__.py
index b891b36d39..8d1605815c 100644
--- a/fieldservice_vehicle_stock/models/__init__.py
+++ b/fieldservice_vehicle_stock/models/__init__.py
@@ -4,7 +4,6 @@
 from . import (
     fsm_vehicle,
     fsm_order,
-    stock_request,
     product_putaway,
     stock_picking,
 )
diff --git a/fieldservice_vehicle_stock/models/stock_request.py b/fieldservice_vehicle_stock/models/stock_request.py
deleted file mode 100644
index 30db152c62..0000000000
--- a/fieldservice_vehicle_stock/models/stock_request.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2018 - TODAY, Brian McMaster
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, models
-
-
-class StockRequest(models.Model):
-    _inherit = 'stock.request'
-
-    @api.multi
-    def action_assign(self):
-        for rec in self:
-            for move in rec.move_ids:
-                if move.picking_id.picking_type_id == self.env.ref(
-                        'fieldservice_vehicle_stock.'
-                        'picking_type_vehicle_to_location'):
-                    return move.picking_id.action_assign()
-
-    @api.multi
-    def action_deliver(self):
-        for rec in self:
-            for move in rec.move_ids:
-                if move.picking_id.picking_type_id == self.env.ref(
-                        'fieldservice_vehicle_stock.'
-                        'picking_type_vehicle_to_location'):
-                    return move.picking_id.action_done()
-
-    def action_show_details(self):
-        for move in self.move_ids:
-            if move.picking_id.picking_type_id == self.env.ref(
-                    'fieldservice_vehicle_stock.'
-                    'picking_type_vehicle_to_location'):
-                return move.action_show_details()
diff --git a/fieldservice_vehicle_stock/readme/DESCRIPTION.rst b/fieldservice_vehicle_stock/readme/DESCRIPTION.rst
index 978a9f3b33..d0b753c7c0 100644
--- a/fieldservice_vehicle_stock/readme/DESCRIPTION.rst
+++ b/fieldservice_vehicle_stock/readme/DESCRIPTION.rst
@@ -1,2 +1,3 @@
 This module is an add-on for the Field Service application in Odoo.
-It provides inventory and stock operations.
+It allows you to establish stock locations for field service vehicles
+and process stock moves with field service vehicles.
diff --git a/fieldservice_vehicle_stock/readme/INSTALL.rst b/fieldservice_vehicle_stock/readme/INSTALL.rst
deleted file mode 100644
index a7c9f727b2..0000000000
--- a/fieldservice_vehicle_stock/readme/INSTALL.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-You will first need to install:
-
-* fieldservice
-
-Then go to Field Service > Configuration > Settings
-Enable the 'Use Odoo Stock Logistics' option under Integrations
diff --git a/fieldservice_vehicle_stock/readme/USAGE.rst b/fieldservice_vehicle_stock/readme/USAGE.rst
deleted file mode 100644
index 2934857b2b..0000000000
--- a/fieldservice_vehicle_stock/readme/USAGE.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-To use this module, you need to:
-
-* Create a new field service order
-* Under the Materials tab, add products with quantity
-* Confirm an order to create stock moves
-* Validate stock moves in the Inventory app
-* Quantities Delivered on FSM Order Line will be updated based on move
diff --git a/fieldservice_vehicle_stock/static/description/index.html b/fieldservice_vehicle_stock/static/description/index.html
index fa18fa81fe..692f4d7567 100644
--- a/fieldservice_vehicle_stock/static/description/index.html
+++ b/fieldservice_vehicle_stock/static/description/index.html
@@ -369,59 +369,38 @@ <h1 class="title">Field Service Vehicles - Stock</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_vehicle_stock"><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_vehicle_stock"><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>This module is an add-on for the Field Service application in Odoo.
-It provides inventory and stock operations.</p>
+It allows you to establish stock locations for field service vehicles
+and process stock moves with field service vehicles.</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>
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id2">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id7">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
-<div class="section" id="installation">
-<h1><a class="toc-backref" href="#id1">Installation</a></h1>
-<p>You will first need to install:</p>
-<ul class="simple">
-<li>fieldservice</li>
-</ul>
-<p>Then go to Field Service &gt; Configuration &gt; Settings
-Enable the ‘Use Odoo Stock Logistics’ option under Integrations</p>
-</div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#id2">Configuration</a></h1>
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
 <p>To configure this module, you need to:</p>
 <ul class="simple">
 <li>Set Inventory Locations for FSM Locations and FSM Vehicles</li>
 <li>Verify procurement routes</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>Create a new field service order</li>
-<li>Under the Materials tab, add products with quantity</li>
-<li>Confirm an order to create stock moves</li>
-<li>Validate stock moves in the Inventory app</li>
-<li>Quantities Delivered on FSM Order Line will be updated based on move</li>
-</ul>
-</div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id4">Known issues / Roadmap</a></h1>
+<h1><a class="toc-backref" href="#id2">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>
+<h1><a class="toc-backref" href="#id3">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
@@ -429,30 +408,30 @@ <h1><a class="toc-backref" href="#id5">Bug Tracker</a></h1>
 <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>
+<h1><a class="toc-backref" href="#id4">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id7">Authors</a></h2>
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
 <ul class="simple">
 <li>Open Source Integrators</li>
 <li>Brian McMaster</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id8">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.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">
-<h2><a class="toc-backref" href="#id9">Other credits</a></h2>
+<h2><a class="toc-backref" href="#id7">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="#id8">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_vehicle_stock/views/fsm_order.xml b/fieldservice_vehicle_stock/views/fsm_order.xml
deleted file mode 100644
index 519f17ae08..0000000000
--- a/fieldservice_vehicle_stock/views/fsm_order.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<odoo>
-
-    <record id="fsm_order_form_view" model="ir.ui.view">
-        <field name="name">fsm.order.stock.vehicle</field>
-        <field name="model">fsm.order</field>
-        <field name="inherit_id"
-               ref="fieldservice_stock.view_fsm_order_form_inherit_stock"/>
-        <field name="arch" type="xml">
-            <field name="qty_done" position="before">
-                 <button name="action_assign"
-                         string="Check Availability"
-                         type="object"
-                         icon="fa-unlock-alt"
-                         attrs="{'invisible': [('route_id', '!=', %(fieldservice_vehicle_stock.route_stock_to_vehicle_to_location)d)]}"/>
-                 <button name="action_show_details"
-                         string="Register lots, packs, location"
-                         type="object"
-                         icon="fa-list"
-                         attrs="{'invisible': [('route_id', '!=', %(fieldservice_vehicle_stock.route_stock_to_vehicle_to_location)d)]}"/>
-                 <button name="action_deliver"
-                         string="Deliver"
-                         type="object"
-                         icon="fa-arrow-right"
-                         attrs="{'invisible': [('route_id', '!=', %(fieldservice_vehicle_stock.route_stock_to_vehicle_to_location)d)]}"/>
-            </field>
-        </field>
-    </record>
-
-</odoo>

From fd7245e7e0bf35106d7826e2101cee60fac863a4 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 9 Mar 2021 22:54:08 +0000
Subject: [PATCH 622/631] fieldservice_vehicle_stock 12.0.2.0.0

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/
---
 fieldservice_vehicle_stock/__manifest__.py |  2 +-
 fieldservice_vehicle_stock/i18n/de.po      |  5 -----
 fieldservice_vehicle_stock/i18n/es.po      |  8 +++-----
 fieldservice_vehicle_stock/i18n/es_CL.po   |  8 +++-----
 fieldservice_vehicle_stock/i18n/pt_BR.po   |  8 +++-----
 fieldservice_vehicle_stock/i18n/pt_PT.po   | 10 ++++------
 6 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index bed2f17238..01e5f69116 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles - Stock',
     'summary': 'Track inventory of Field Service vehicles',
-    'version': '12.0.1.2.2',
+    'version': '12.0.2.0.0',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_vehicle_stock/i18n/de.po b/fieldservice_vehicle_stock/i18n/de.po
index afb974132f..7157da9962 100644
--- a/fieldservice_vehicle_stock/i18n/de.po
+++ b/fieldservice_vehicle_stock/i18n/de.po
@@ -67,11 +67,6 @@ msgstr ""
 msgid "Register lots, packs, location"
 msgstr ""
 
-#. module: fieldservice_vehicle_stock
-#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
-msgid "Stock Request"
-msgstr ""
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
diff --git a/fieldservice_vehicle_stock/i18n/es.po b/fieldservice_vehicle_stock/i18n/es.po
index 9e3c4ae756..e4df97e9d5 100644
--- a/fieldservice_vehicle_stock/i18n/es.po
+++ b/fieldservice_vehicle_stock/i18n/es.po
@@ -66,11 +66,6 @@ msgstr "Estrategia de Traslado"
 msgid "Register lots, packs, location"
 msgstr "Registrar lotes, paquetes, ubicación"
 
-#. module: fieldservice_vehicle_stock
-#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
-msgid "Stock Request"
-msgstr "Solicitud de Stock"
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
@@ -117,3 +112,6 @@ msgstr "Bodega → Vehículo"
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr "Debe proporcionar el vehículo para este tipo de picking."
+
+#~ msgid "Stock Request"
+#~ msgstr "Solicitud de Stock"
diff --git a/fieldservice_vehicle_stock/i18n/es_CL.po b/fieldservice_vehicle_stock/i18n/es_CL.po
index 0515cc82e4..3d9a70e30b 100644
--- a/fieldservice_vehicle_stock/i18n/es_CL.po
+++ b/fieldservice_vehicle_stock/i18n/es_CL.po
@@ -66,11 +66,6 @@ msgstr "Estrategia de Removida"
 msgid "Register lots, packs, location"
 msgstr "Registrar lotes, paquetes, ubicación"
 
-#. module: fieldservice_vehicle_stock
-#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
-msgid "Stock Request"
-msgstr "Solicitud de Stock"
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
@@ -117,3 +112,6 @@ msgstr "Bodega → Vehículo"
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr "Debe proporcionar el vehículo para este tipo de picking."
+
+#~ msgid "Stock Request"
+#~ msgstr "Solicitud de Stock"
diff --git a/fieldservice_vehicle_stock/i18n/pt_BR.po b/fieldservice_vehicle_stock/i18n/pt_BR.po
index 985d34090a..a8788587e8 100644
--- a/fieldservice_vehicle_stock/i18n/pt_BR.po
+++ b/fieldservice_vehicle_stock/i18n/pt_BR.po
@@ -66,11 +66,6 @@ msgstr "Estratégia de Descarte"
 msgid "Register lots, packs, location"
 msgstr "Registrar lotes, pacotes, localização"
 
-#. module: fieldservice_vehicle_stock
-#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
-msgid "Stock Request"
-msgstr "Requisição de Estoque"
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
@@ -117,3 +112,6 @@ msgstr "Armazém → Veículo"
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr "Você deve fornecer o veículo para esse tipo de coleta."
+
+#~ msgid "Stock Request"
+#~ msgstr "Requisição de Estoque"
diff --git a/fieldservice_vehicle_stock/i18n/pt_PT.po b/fieldservice_vehicle_stock/i18n/pt_PT.po
index eb4d6bf5b4..81552b48cd 100644
--- a/fieldservice_vehicle_stock/i18n/pt_PT.po
+++ b/fieldservice_vehicle_stock/i18n/pt_PT.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_vehicle_stock
+# 	* fieldservice_vehicle_stock
 #
 msgid ""
 msgstr ""
@@ -66,11 +66,6 @@ msgstr "Estratégia de Descarte"
 msgid "Register lots, packs, location"
 msgstr "Registar lotes, pacotes, localização"
 
-#. module: fieldservice_vehicle_stock
-#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_request
-msgid "Stock Request"
-msgstr "Requisição de Stock"
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
@@ -117,3 +112,6 @@ msgstr "Armazém → Veículo"
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr "Você deve fornecer o veículo para esse tipo de picking."
+
+#~ msgid "Stock Request"
+#~ msgstr "Requisição de Stock"

From f8fa09122c1888e72343a8a637e84171f4b6ee20 Mon Sep 17 00:00:00 2001
From: Brian McMaster <brian@mcmpest.com>
Date: Wed, 10 Mar 2021 11:14:30 -0500
Subject: [PATCH 623/631] [FIX] fieldservice_vehicle_stock

File was moved in #675
---
 fieldservice_vehicle_stock/__manifest__.py        |  1 -
 .../i18n/fieldservice_vehicle_stock.pot           | 15 ---------------
 2 files changed, 16 deletions(-)

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index 01e5f69116..a5ba717d12 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -20,7 +20,6 @@
         'security/ir.model.access.csv',
         'data/fsm_stock_data.xml',
         'views/fsm_vehicle.xml',
-        'views/fsm_order.xml',
         'views/stock_picking.xml',
     ],
     'installable': True,
diff --git a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
index 636ccf721f..bf57c64f3d 100644
--- a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
+++ b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
@@ -13,16 +13,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Check Availability"
-msgstr ""
-
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Deliver"
-msgstr ""
-
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
 msgid "Field Service Order"
@@ -58,11 +48,6 @@ msgstr ""
 msgid "Put Away Strategy"
 msgstr ""
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Register lots, packs, location"
-msgstr ""
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"

From 0b330bb8fd64bb5d3f1e99a72af72502934d7ad3 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 10 Mar 2021 22:18:23 +0000
Subject: [PATCH 624/631] fieldservice_vehicle_stock 12.0.2.0.1

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice_vehicle_stock
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice_vehicle_stock/
---
 fieldservice_vehicle_stock/__manifest__.py |  2 +-
 fieldservice_vehicle_stock/i18n/de.po      | 18 +++-------------
 fieldservice_vehicle_stock/i18n/es.po      | 24 ++++++++--------------
 fieldservice_vehicle_stock/i18n/es_CL.po   | 24 ++++++++--------------
 fieldservice_vehicle_stock/i18n/pt_BR.po   | 24 ++++++++--------------
 fieldservice_vehicle_stock/i18n/pt_PT.po   | 24 ++++++++--------------
 6 files changed, 40 insertions(+), 76 deletions(-)

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index a5ba717d12..0dcf22b9a7 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Field Service Vehicles - Stock',
     'summary': 'Track inventory of Field Service vehicles',
-    'version': '12.0.2.0.0',
+    'version': '12.0.2.0.1',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
               "Brian McMaster, "
diff --git a/fieldservice_vehicle_stock/i18n/de.po b/fieldservice_vehicle_stock/i18n/de.po
index 7157da9962..3c48590c3f 100644
--- a/fieldservice_vehicle_stock/i18n/de.po
+++ b/fieldservice_vehicle_stock/i18n/de.po
@@ -16,16 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.8\n"
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Check Availability"
-msgstr "Verfügbarkeit prüfen"
-
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Deliver"
-msgstr ""
-
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
 #, fuzzy
@@ -62,11 +52,6 @@ msgstr ""
 msgid "Put Away Strategy"
 msgstr ""
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Register lots, packs, location"
-msgstr ""
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
@@ -113,3 +98,6 @@ msgstr "Lager → Fahrzeug"
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr ""
+
+#~ msgid "Check Availability"
+#~ msgstr "Verfügbarkeit prüfen"
diff --git a/fieldservice_vehicle_stock/i18n/es.po b/fieldservice_vehicle_stock/i18n/es.po
index e4df97e9d5..91bdb03611 100644
--- a/fieldservice_vehicle_stock/i18n/es.po
+++ b/fieldservice_vehicle_stock/i18n/es.po
@@ -16,16 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Check Availability"
-msgstr "Consultar Disponibilidad"
-
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Deliver"
-msgstr "Despachar"
-
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
 msgid "Field Service Order"
@@ -61,11 +51,6 @@ msgstr "Ubicación de Retorno"
 msgid "Put Away Strategy"
 msgstr "Estrategia de Traslado"
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Register lots, packs, location"
-msgstr "Registrar lotes, paquetes, ubicación"
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
@@ -113,5 +98,14 @@ msgstr "Bodega → Vehículo"
 msgid "You must provide the vehicle for this picking type."
 msgstr "Debe proporcionar el vehículo para este tipo de picking."
 
+#~ msgid "Check Availability"
+#~ msgstr "Consultar Disponibilidad"
+
+#~ msgid "Deliver"
+#~ msgstr "Despachar"
+
+#~ msgid "Register lots, packs, location"
+#~ msgstr "Registrar lotes, paquetes, ubicación"
+
 #~ msgid "Stock Request"
 #~ msgstr "Solicitud de Stock"
diff --git a/fieldservice_vehicle_stock/i18n/es_CL.po b/fieldservice_vehicle_stock/i18n/es_CL.po
index 3d9a70e30b..b0edf83568 100644
--- a/fieldservice_vehicle_stock/i18n/es_CL.po
+++ b/fieldservice_vehicle_stock/i18n/es_CL.po
@@ -16,16 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Check Availability"
-msgstr "Consultar Disponibilidad"
-
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Deliver"
-msgstr "Despachar"
-
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
 msgid "Field Service Order"
@@ -61,11 +51,6 @@ msgstr "Ubicación de Retorno"
 msgid "Put Away Strategy"
 msgstr "Estrategia de Removida"
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Register lots, packs, location"
-msgstr "Registrar lotes, paquetes, ubicación"
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
@@ -113,5 +98,14 @@ msgstr "Bodega → Vehículo"
 msgid "You must provide the vehicle for this picking type."
 msgstr "Debe proporcionar el vehículo para este tipo de picking."
 
+#~ msgid "Check Availability"
+#~ msgstr "Consultar Disponibilidad"
+
+#~ msgid "Deliver"
+#~ msgstr "Despachar"
+
+#~ msgid "Register lots, packs, location"
+#~ msgstr "Registrar lotes, paquetes, ubicación"
+
 #~ msgid "Stock Request"
 #~ msgstr "Solicitud de Stock"
diff --git a/fieldservice_vehicle_stock/i18n/pt_BR.po b/fieldservice_vehicle_stock/i18n/pt_BR.po
index a8788587e8..52f872b1e4 100644
--- a/fieldservice_vehicle_stock/i18n/pt_BR.po
+++ b/fieldservice_vehicle_stock/i18n/pt_BR.po
@@ -16,16 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10\n"
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Check Availability"
-msgstr "Checar Disponibilidade"
-
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Deliver"
-msgstr "Entregar"
-
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
 msgid "Field Service Order"
@@ -61,11 +51,6 @@ msgstr "Retorno da Localização"
 msgid "Put Away Strategy"
 msgstr "Estratégia de Descarte"
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Register lots, packs, location"
-msgstr "Registrar lotes, pacotes, localização"
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
@@ -113,5 +98,14 @@ msgstr "Armazém → Veículo"
 msgid "You must provide the vehicle for this picking type."
 msgstr "Você deve fornecer o veículo para esse tipo de coleta."
 
+#~ msgid "Check Availability"
+#~ msgstr "Checar Disponibilidade"
+
+#~ msgid "Deliver"
+#~ msgstr "Entregar"
+
+#~ msgid "Register lots, packs, location"
+#~ msgstr "Registrar lotes, pacotes, localização"
+
 #~ msgid "Stock Request"
 #~ msgstr "Requisição de Estoque"
diff --git a/fieldservice_vehicle_stock/i18n/pt_PT.po b/fieldservice_vehicle_stock/i18n/pt_PT.po
index 81552b48cd..9ae09d7afc 100644
--- a/fieldservice_vehicle_stock/i18n/pt_PT.po
+++ b/fieldservice_vehicle_stock/i18n/pt_PT.po
@@ -16,16 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10\n"
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Check Availability"
-msgstr "Verificar Disponibilidade"
-
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Deliver"
-msgstr "Entregar"
-
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
 msgid "Field Service Order"
@@ -61,11 +51,6 @@ msgstr "Localização de Retorno"
 msgid "Put Away Strategy"
 msgstr "Estratégia de Descarte"
 
-#. module: fieldservice_vehicle_stock
-#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle_stock.fsm_order_form_view
-msgid "Register lots, packs, location"
-msgstr "Registar lotes, pacotes, localização"
-
 #. module: fieldservice_vehicle_stock
 #: model:stock.location.route,name:fieldservice_vehicle_stock.route_stock_to_vehicle_to_location
 msgid "Stock to Vehicle to Location"
@@ -113,5 +98,14 @@ msgstr "Armazém → Veículo"
 msgid "You must provide the vehicle for this picking type."
 msgstr "Você deve fornecer o veículo para esse tipo de picking."
 
+#~ msgid "Check Availability"
+#~ msgstr "Verificar Disponibilidade"
+
+#~ msgid "Deliver"
+#~ msgstr "Entregar"
+
+#~ msgid "Register lots, packs, location"
+#~ msgstr "Registar lotes, pacotes, localização"
+
 #~ msgid "Stock Request"
 #~ msgstr "Requisição de Stock"

From 99b488367b54127dd960bec99379cb24a8411601 Mon Sep 17 00:00:00 2001
From: Reed Hayashikawa <rhayashikawa@opensourceintegrators.com>
Date: Tue, 6 Jul 2021 14:25:17 -0700
Subject: [PATCH 625/631] [IMP] fieldservice_vehicle_stock: black, isort,
 prettier

---
 fieldservice_vehicle_stock/__manifest__.py    |  52 +++----
 .../data/fsm_stock_data.xml                   | 132 ++++++++----------
 .../models/fsm_order.py                       |   6 +-
 .../models/fsm_vehicle.py                     |   8 +-
 .../models/product_putaway.py                 |  18 +--
 .../models/stock_picking.py                   |  34 ++---
 .../views/fsm_vehicle.xml                     |   9 +-
 .../views/stock_picking.xml                   |   8 +-
 .../odoo/addons/fieldservice_vehicle_stock    |   1 +
 setup/fieldservice_vehicle_stock/setup.py     |   6 +
 10 files changed, 134 insertions(+), 140 deletions(-)
 create mode 120000 setup/fieldservice_vehicle_stock/odoo/addons/fieldservice_vehicle_stock
 create mode 100644 setup/fieldservice_vehicle_stock/setup.py

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index 0dcf22b9a7..bcf4e37e54 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -2,33 +2,33 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Field Service Vehicles - Stock',
-    'summary': 'Track inventory of Field Service vehicles',
-    'version': '12.0.2.0.1',
-    'category': 'Field Service',
-    'author': "Open Source Integrators, "
-              "Brian McMaster, "
-              "Odoo Community Association (OCA)",
-    'website': 'https://github.com/OCA/field-service',
-    'depends': [
-        'fieldservice_vehicle',
-        'fieldservice_stock',
-        'fieldservice_delivery',
-        'stock_putaway_method',
+    "name": "Field Service Vehicles - Stock",
+    "summary": "Track inventory of Field Service vehicles",
+    "version": "12.0.2.0.1",
+    "category": "Field Service",
+    "author": "Open Source Integrators, "
+    "Brian McMaster, "
+    "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": [
+        "fieldservice_vehicle",
+        "fieldservice_stock",
+        "fieldservice_delivery",
+        "stock_putaway_method",
     ],
-    'data': [
-        'security/ir.model.access.csv',
-        'data/fsm_stock_data.xml',
-        'views/fsm_vehicle.xml',
-        'views/stock_picking.xml',
+    "data": [
+        "security/ir.model.access.csv",
+        "data/fsm_stock_data.xml",
+        "views/fsm_vehicle.xml",
+        "views/stock_picking.xml",
     ],
-    'installable': True,
-    'auto_install': True,
-    'license': 'AGPL-3',
-    'development_status': 'Beta',
-    'maintainers': [
-        'brian10048',
-        'wolfhall',
-        'max3903',
+    "installable": True,
+    "auto_install": True,
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": [
+        "brian10048",
+        "wolfhall",
+        "max3903",
     ],
 }
diff --git a/fieldservice_vehicle_stock/data/fsm_stock_data.xml b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
index 6ac2635a52..c5197afba1 100644
--- a/fieldservice_vehicle_stock/data/fsm_stock_data.xml
+++ b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
@@ -9,15 +9,15 @@
     <record id="stock_location_vehicle" model="stock.location">
         <field name="name">Vehicles</field>
         <field name="usage">view</field>
-        <field name="company_id"></field>
+        <field name="company_id" />
     </record>
 
     <record id="stock_location_vehicle_storage" model="stock.location">
         <field name="name">Storage</field>
         <field name="usage">internal</field>
-        <field name="location_id" ref="stock_location_vehicle"/>
-        <field name="company_id" ref="base.main_company"/>
-        <field name="putaway_strategy_id" ref="putaway_vehicle"/>
+        <field name="location_id" ref="stock_location_vehicle" />
+        <field name="company_id" ref="base.main_company" />
+        <field name="putaway_strategy_id" ref="putaway_vehicle" />
     </record>
 
     <data noupdate="1">
@@ -27,19 +27,16 @@
             <field name="name">Vehicle Loading</field>
             <field name="prefix">VL</field>
             <field name="padding">5</field>
-            <field name="company_id"></field>
+            <field name="company_id" />
         </record>
 
         <record id="picking_type_output_to_vehicle" model="stock.picking.type">
             <field name="name">Vehicle Loading</field>
-            <field name="sequence_id"
-                   ref="seq_picking_type_output_to_vehicle"/>
+            <field name="sequence_id" ref="seq_picking_type_output_to_vehicle" />
             <field name="code">internal</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id"
-                   ref="stock.stock_location_stock"/>
-            <field name="default_location_dest_id"
-                   ref="stock_location_vehicle"/>
+            <field name="warehouse_id" eval="False" />
+            <field name="default_location_src_id" ref="stock.stock_location_stock" />
+            <field name="default_location_dest_id" ref="stock_location_vehicle" />
         </record>
 
         <!-- Vehicle to Location operations -->
@@ -47,58 +44,49 @@
             <field name="name">Location Delivery</field>
             <field name="prefix">LD</field>
             <field name="padding">5</field>
-            <field name="company_id"></field>
+            <field name="company_id" />
         </record>
 
-        <record id="picking_type_vehicle_to_location"
-                model="stock.picking.type">
+        <record id="picking_type_vehicle_to_location" model="stock.picking.type">
             <field name="name">Location Delivery</field>
-            <field name="sequence_id"
-                   ref="seq_picking_type_vehicle_to_location"/>
+            <field name="sequence_id" ref="seq_picking_type_vehicle_to_location" />
             <field name="code">outgoing</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id"
-                   ref="stock_location_vehicle"/>
+            <field name="warehouse_id" eval="False" />
+            <field name="default_location_src_id" ref="stock_location_vehicle" />
         </record>
 
         <!-- Route: Stock to Vehicle to Location -->
-        <record id="route_stock_to_vehicle_to_location"
-                model='stock.location.route'>
+        <record id="route_stock_to_vehicle_to_location" model='stock.location.route'>
             <field name="name">Stock to Vehicle to Location</field>
             <field name="sequence">3</field>
-            <field name="company_id"></field>
+            <field name="company_id" />
         </record>
 
-        <record id="procurement_rule_vehicle_to_location"
-                model="stock.rule">
+        <record id="procurement_rule_vehicle_to_location" model="stock.rule">
             <field name="name">Vehicle → Location</field>
             <field name="action">pull</field>
-            <field name="location_id" ref="stock.stock_location_customers"/>
-            <field name="location_src_id"
-                   ref="stock_location_vehicle_storage"/>
+            <field name="location_id" ref="stock.stock_location_customers" />
+            <field name="location_src_id" ref="stock_location_vehicle_storage" />
             <field name="procure_method">make_to_order</field>
-            <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
-            <field name="picking_type_id"
-                   ref="picking_type_vehicle_to_location"/>
+            <field name="route_id" ref="route_stock_to_vehicle_to_location" />
+            <field name="picking_type_id" ref="picking_type_vehicle_to_location" />
         </record>
 
-        <record id="procurement_rule_output_to_vehicle"
-                model="stock.rule">
+        <record id="procurement_rule_output_to_vehicle" model="stock.rule">
             <field name="name">Warehouse → Vehicle</field>
             <field name="action">pull</field>
-            <field name="location_id" ref="stock_location_vehicle_storage"/>
-            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="location_id" ref="stock_location_vehicle_storage" />
+            <field name="location_src_id" ref="stock.stock_location_stock" />
             <field name="procure_method">make_to_stock</field>
-            <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
-            <field name="picking_type_id"
-                   ref="picking_type_output_to_vehicle"/>
+            <field name="route_id" ref="route_stock_to_vehicle_to_location" />
+            <field name="picking_type_id" ref="picking_type_output_to_vehicle" />
         </record>
 
         <!-- Route: Location Return Operations -->
         <record id="route_location_return" model='stock.location.route'>
             <field name="name">Location Return</field>
             <field name="sequence">3</field>
-            <field name="company_id"></field>
+            <field name="company_id" />
         </record>
 
         <!-- Location Pickup operations -->
@@ -106,32 +94,29 @@
             <field name="name">Location Pickup</field>
             <field name="prefix">LP</field>
             <field name="padding">5</field>
-            <field name="company_id"></field>
+            <field name="company_id" />
         </record>
 
-        <record id="picking_type_location_to_vehicle"
-                model="stock.picking.type">
+        <record id="picking_type_location_to_vehicle" model="stock.picking.type">
             <field name="name">Location Pickup</field>
-            <field name="sequence_id"
-                   ref="seq_picking_type_location_to_vehicle"/>
+            <field name="sequence_id" ref="seq_picking_type_location_to_vehicle" />
             <field name="code">incoming</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_dest_id"
-                   ref="stock_location_vehicle"/>
-            <field name="return_picking_type_id"
-                   ref="picking_type_vehicle_to_location"/>
+            <field name="warehouse_id" eval="False" />
+            <field name="default_location_dest_id" ref="stock_location_vehicle" />
+            <field
+                name="return_picking_type_id"
+                ref="picking_type_vehicle_to_location"
+            />
         </record>
 
-        <record id="procurement_rule_location_to_vehicle"
-                model="stock.rule">
+        <record id="procurement_rule_location_to_vehicle" model="stock.rule">
             <field name="name">Warehouse → Vehicle</field>
             <field name="action">pull</field>
-            <field name="location_id" ref="stock_location_vehicle"/>
-            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="location_id" ref="stock_location_vehicle" />
+            <field name="location_src_id" ref="stock.stock_location_stock" />
             <field name="procure_method">make_to_stock</field>
-            <field name="route_id" ref="route_location_return"/>
-            <field name="picking_type_id"
-                   ref="picking_type_location_to_vehicle"/>
+            <field name="route_id" ref="route_location_return" />
+            <field name="picking_type_id" ref="picking_type_location_to_vehicle" />
         </record>
 
         <!-- Vehicle to Input -->
@@ -139,42 +124,39 @@
             <field name="name">Vehicle Returns</field>
             <field name="prefix">VR</field>
             <field name="padding">5</field>
-            <field name="company_id"></field>
+            <field name="company_id" />
         </record>
 
         <record id="picking_type_vehicle_to_input" model="stock.picking.type">
             <field name="name">Vehicle Returns</field>
-            <field name="sequence_id" ref="seq_picking_type_vehicle_to_input"/>
+            <field name="sequence_id" ref="seq_picking_type_vehicle_to_input" />
             <field name="code">internal</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id"
-                   ref="stock_location_vehicle"/>
-            <field name="default_location_dest_id"
-                   ref="stock.stock_location_stock"/>
-            <field name="return_picking_type_id"
-                   ref="picking_type_output_to_vehicle"/>
+            <field name="warehouse_id" eval="False" />
+            <field name="default_location_src_id" ref="stock_location_vehicle" />
+            <field name="default_location_dest_id" ref="stock.stock_location_stock" />
+            <field name="return_picking_type_id" ref="picking_type_output_to_vehicle" />
         </record>
 
-        <record id="stock_rule_vehicle_to_input"
-                model="stock.rule">
+        <record id="stock_rule_vehicle_to_input" model="stock.rule">
             <field name="name">Vehicle → Warehouse</field>
             <field name="action">push</field>
-            <field name="location_src_id" ref="stock_location_vehicle"/>
-            <field name="location_id" ref="stock.stock_location_stock"/>
+            <field name="location_src_id" ref="stock_location_vehicle" />
+            <field name="location_id" ref="stock.stock_location_stock" />
             <field name="auto">manual</field>
-            <field name="picking_type_id" ref="picking_type_vehicle_to_input"/>
-            <field name="route_id" ref="route_location_return"/>
+            <field name="picking_type_id" ref="picking_type_vehicle_to_input" />
+            <field name="route_id" ref="route_location_return" />
         </record>
 
         <!-- Picking Types: set the return type -->
         <record id="picking_type_output_to_vehicle" model="stock.picking.type">
-            <field name="return_picking_type_id"
-                   ref="picking_type_vehicle_to_input"/>
+            <field name="return_picking_type_id" ref="picking_type_vehicle_to_input" />
         </record>
 
         <record id="picking_type_vehicle_to_location" model="stock.picking.type">
-            <field name="return_picking_type_id"
-                   ref="picking_type_location_to_vehicle"/>
+            <field
+                name="return_picking_type_id"
+                ref="picking_type_location_to_vehicle"
+            />
         </record>
 
     </data>
diff --git a/fieldservice_vehicle_stock/models/fsm_order.py b/fieldservice_vehicle_stock/models/fsm_order.py
index 33e9b3950c..718166ace9 100644
--- a/fieldservice_vehicle_stock/models/fsm_order.py
+++ b/fieldservice_vehicle_stock/models/fsm_order.py
@@ -4,19 +4,19 @@
 
 
 class FSMOrder(models.Model):
-    _inherit = 'fsm.order'
+    _inherit = "fsm.order"
 
     @api.multi
     def assign_vehicle_to_pickings(self):
         for rec in self:
             for picking in rec.picking_ids:
-                if picking.state in ('waiting', 'confirmed', 'assigned'):
+                if picking.state in ("waiting", "confirmed", "assigned"):
                     picking.fsm_vehicle_id = self.vehicle_id.id or False
 
     @api.multi
     def write(self, vals):
         res = super().write(vals)
         for rec in self:
-            if vals.get('vehicle_id', False):
+            if vals.get("vehicle_id", False):
                 rec.assign_vehicle_to_pickings()
         return res
diff --git a/fieldservice_vehicle_stock/models/fsm_vehicle.py b/fieldservice_vehicle_stock/models/fsm_vehicle.py
index 5c56a4137e..73d9f1f655 100644
--- a/fieldservice_vehicle_stock/models/fsm_vehicle.py
+++ b/fieldservice_vehicle_stock/models/fsm_vehicle.py
@@ -5,8 +5,8 @@
 
 
 class FSMVehicle(models.Model):
-    _inherit = 'fsm.vehicle'
+    _inherit = "fsm.vehicle"
 
-    inventory_location_id = fields.Many2one('stock.location',
-                                            string='Inventory Location',
-                                            required=True)
+    inventory_location_id = fields.Many2one(
+        "stock.location", string="Inventory Location", required=True
+    )
diff --git a/fieldservice_vehicle_stock/models/product_putaway.py b/fieldservice_vehicle_stock/models/product_putaway.py
index b77203c2c1..77190cfa48 100644
--- a/fieldservice_vehicle_stock/models/product_putaway.py
+++ b/fieldservice_vehicle_stock/models/product_putaway.py
@@ -4,23 +4,25 @@
 
 
 class PutAwayStrategy(models.Model):
-    _inherit = 'product.putaway'
+    _inherit = "product.putaway"
 
     @api.model
     def _get_putaway_options(self):
         res = super()._get_putaway_options()
-        res.append(('vehicle', 'Location of the vehicle'))
+        res.append(("vehicle", "Location of the vehicle"))
         return res
 
     def putaway_apply(self, product):
-        if self.method == 'vehicle':
+        if self.method == "vehicle":
             return self.get_vehicle_location()
         return super().putaway_apply(product)
 
     @api.model
     def get_vehicle_location(self):
-        if self.env.context.get('vehicle_id'):
-            return self.env['fsm.vehicle'].browse(
-                self.env.context.get('vehicle_id')
-            ).inventory_location_id
-        return self.env['stock.location']
+        if self.env.context.get("vehicle_id"):
+            return (
+                self.env["fsm.vehicle"]
+                .browse(self.env.context.get("vehicle_id"))
+                .inventory_location_id
+            )
+        return self.env["stock.location"]
diff --git a/fieldservice_vehicle_stock/models/stock_picking.py b/fieldservice_vehicle_stock/models/stock_picking.py
index d7801251a2..7016e3445f 100644
--- a/fieldservice_vehicle_stock/models/stock_picking.py
+++ b/fieldservice_vehicle_stock/models/stock_picking.py
@@ -1,13 +1,13 @@
 # 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 UserError
 
 
 class StockPicking(models.Model):
-    _inherit = 'stock.picking'
+    _inherit = "stock.picking"
 
-    fsm_vehicle_id = fields.Many2one('fsm.vehicle', string='Vehicle')
+    fsm_vehicle_id = fields.Many2one("fsm.vehicle", string="Vehicle")
 
     @api.multi
     def action_assign(self):
@@ -16,34 +16,36 @@ def action_assign(self):
             if rec.picking_type_id in (
                 # Vehicle Loading
                 self.env.ref(
-                    'fieldservice_vehicle_stock.'
-                    'picking_type_output_to_vehicle'),
+                    "fieldservice_vehicle_stock." "picking_type_output_to_vehicle"
+                ),
                 # Location Pickup
                 self.env.ref(
-                    'fieldservice_vehicle_stock.'
-                    'picking_type_location_to_vehicle')
+                    "fieldservice_vehicle_stock." "picking_type_location_to_vehicle"
+                ),
             ):
                 if rec.fsm_vehicle_id:
-                    picking = \
-                        rec.with_context(vehicle_id=rec.fsm_vehicle_id.id)
+                    picking = rec.with_context(vehicle_id=rec.fsm_vehicle_id.id)
                     res = super(StockPicking, picking).action_assign()
                 else:
-                    raise UserError(_(
-                        "You must provide the vehicle for this picking type."))
+                    raise UserError(
+                        _("You must provide the vehicle for this picking type.")
+                    )
             res = super(StockPicking, rec).action_assign()
         return res
 
     def prepare_fsm_values(self, fsm_order):
         res = {}
         if fsm_order:
-            res.update({
-                'fsm_vehicle_id': fsm_order.vehicle_id.id or False,
-            })
+            res.update(
+                {
+                    "fsm_vehicle_id": fsm_order.vehicle_id.id or False,
+                }
+            )
         return res
 
     @api.multi
     def write(self, vals):
-        if vals.get('fsm_order_id', False):
-            fsm_order = self.env['fsm.order'].browse(vals.get('fsm_order_id'))
+        if vals.get("fsm_order_id", False):
+            fsm_order = self.env["fsm.order"].browse(vals.get("fsm_order_id"))
             vals.update(self.prepare_fsm_values(fsm_order))
         return super().write(vals)
diff --git a/fieldservice_vehicle_stock/views/fsm_vehicle.xml b/fieldservice_vehicle_stock/views/fsm_vehicle.xml
index 2eab6a289a..9e5a43290c 100644
--- a/fieldservice_vehicle_stock/views/fsm_vehicle.xml
+++ b/fieldservice_vehicle_stock/views/fsm_vehicle.xml
@@ -2,12 +2,13 @@
 
     <record id="fsm_vehicle_stock_form_view" model="ir.ui.view">
         <field name="model">fsm.vehicle</field>
-        <field name="inherit_id"
-               ref="fieldservice_vehicle.fsm_vehicle_form_view"/>
+        <field name="inherit_id" ref="fieldservice_vehicle.fsm_vehicle_form_view" />
         <field name="arch" type="xml">
             <xpath expr="//form/sheet/group/group[2]" position="inside">
-                <field name="inventory_location_id"
-                       domain="[('usage', '=', 'internal')]"/>
+                <field
+                    name="inventory_location_id"
+                    domain="[('usage', '=', 'internal')]"
+                />
             </xpath>
         </field>
     </record>
diff --git a/fieldservice_vehicle_stock/views/stock_picking.xml b/fieldservice_vehicle_stock/views/stock_picking.xml
index 427d70b002..4ef7c644ff 100644
--- a/fieldservice_vehicle_stock/views/stock_picking.xml
+++ b/fieldservice_vehicle_stock/views/stock_picking.xml
@@ -3,10 +3,10 @@
     <record id="fsm_vehicle_stock_picking_view" model="ir.ui.view">
         <field name="model">stock.picking.fsm_vehicle_id.form</field>
         <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="inherit_id" ref="stock.view_picking_form" />
         <field name="arch" type="xml">
             <field name="carrier_id" position="before">
-                <field name="fsm_vehicle_id"/>
+                <field name="fsm_vehicle_id" />
             </field>
         </field>
     </record>
@@ -14,10 +14,10 @@
     <record id="fsm_vehicle_stock_picking_tree" model="ir.ui.view">
         <field name="model">stock.picking.fsm_vehicle_id.tree</field>
         <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.vpicktree"/>
+        <field name="inherit_id" ref="stock.vpicktree" />
         <field name="arch" type="xml">
             <field name="location_dest_id" position="after">
-                <field name="fsm_vehicle_id"/>
+                <field name="fsm_vehicle_id" />
             </field>
         </field>
     </record>
diff --git a/setup/fieldservice_vehicle_stock/odoo/addons/fieldservice_vehicle_stock b/setup/fieldservice_vehicle_stock/odoo/addons/fieldservice_vehicle_stock
new file mode 120000
index 0000000000..160d6964da
--- /dev/null
+++ b/setup/fieldservice_vehicle_stock/odoo/addons/fieldservice_vehicle_stock
@@ -0,0 +1 @@
+../../../../fieldservice_vehicle_stock
\ No newline at end of file
diff --git a/setup/fieldservice_vehicle_stock/setup.py b/setup/fieldservice_vehicle_stock/setup.py
new file mode 100644
index 0000000000..28c57bb640
--- /dev/null
+++ b/setup/fieldservice_vehicle_stock/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From c28f2ae8768d6ac4647eb48746fd57f2e68172b8 Mon Sep 17 00:00:00 2001
From: Reed Hayashikawa <rhayashikawa@opensourceintegrators.com>
Date: Mon, 12 Jul 2021 08:35:03 -0700
Subject: [PATCH 626/631] [MIG] fieldservice_vehicle_stock: Migration to 14.0

---
 fieldservice_vehicle_stock/__manifest__.py    |  2 +-
 .../data/fsm_stock_data.xml                   | 30 ++-----
 .../models/fsm_order.py                       |  4 +-
 .../models/product_putaway.py                 |  9 +-
 .../models/stock_picking.py                   |  4 +-
 fieldservice_vehicle_stock/tests/__init__.py  |  6 ++
 .../tests/test_fsm_order.py                   | 90 +++++++++++++++++++
 .../tests/test_product_putaway.py             | 82 +++++++++++++++++
 .../tests/test_stock_picking.py               | 84 +++++++++++++++++
 9 files changed, 274 insertions(+), 37 deletions(-)
 create mode 100644 fieldservice_vehicle_stock/tests/__init__.py
 create mode 100644 fieldservice_vehicle_stock/tests/test_fsm_order.py
 create mode 100644 fieldservice_vehicle_stock/tests/test_product_putaway.py
 create mode 100644 fieldservice_vehicle_stock/tests/test_stock_picking.py

diff --git a/fieldservice_vehicle_stock/__manifest__.py b/fieldservice_vehicle_stock/__manifest__.py
index bcf4e37e54..899819ad75 100644
--- a/fieldservice_vehicle_stock/__manifest__.py
+++ b/fieldservice_vehicle_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Field Service Vehicles - Stock",
     "summary": "Track inventory of Field Service vehicles",
-    "version": "12.0.2.0.1",
+    "version": "14.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, "
     "Brian McMaster, "
diff --git a/fieldservice_vehicle_stock/data/fsm_stock_data.xml b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
index c5197afba1..4fafba48f2 100644
--- a/fieldservice_vehicle_stock/data/fsm_stock_data.xml
+++ b/fieldservice_vehicle_stock/data/fsm_stock_data.xml
@@ -1,11 +1,5 @@
 <odoo>
 
-    <!-- Putaway Strategy -->
-    <record id="putaway_vehicle" model="product.putaway">
-        <field name="name">Vehicle Assignment</field>
-        <field name="method">vehicle</field>
-    </record>
-
     <record id="stock_location_vehicle" model="stock.location">
         <field name="name">Vehicles</field>
         <field name="usage">view</field>
@@ -17,7 +11,6 @@
         <field name="usage">internal</field>
         <field name="location_id" ref="stock_location_vehicle" />
         <field name="company_id" ref="base.main_company" />
-        <field name="putaway_strategy_id" ref="putaway_vehicle" />
     </record>
 
     <data noupdate="1">
@@ -34,7 +27,8 @@
             <field name="name">Vehicle Loading</field>
             <field name="sequence_id" ref="seq_picking_type_output_to_vehicle" />
             <field name="code">internal</field>
-            <field name="warehouse_id" eval="False" />
+            <field name="sequence_code">PICK</field>
+            <!-- <field name="warehouse_id" eval="False" /> -->
             <field name="default_location_src_id" ref="stock.stock_location_stock" />
             <field name="default_location_dest_id" ref="stock_location_vehicle" />
         </record>
@@ -51,6 +45,7 @@
             <field name="name">Location Delivery</field>
             <field name="sequence_id" ref="seq_picking_type_vehicle_to_location" />
             <field name="code">outgoing</field>
+            <field name="sequence_code">OUT</field>
             <field name="warehouse_id" eval="False" />
             <field name="default_location_src_id" ref="stock_location_vehicle" />
         </record>
@@ -101,7 +96,8 @@
             <field name="name">Location Pickup</field>
             <field name="sequence_id" ref="seq_picking_type_location_to_vehicle" />
             <field name="code">incoming</field>
-            <field name="warehouse_id" eval="False" />
+            <field name="sequence_code">IN</field>
+            <!-- <field name="warehouse_id" eval="False" /> -->
             <field name="default_location_dest_id" ref="stock_location_vehicle" />
             <field
                 name="return_picking_type_id"
@@ -131,7 +127,8 @@
             <field name="name">Vehicle Returns</field>
             <field name="sequence_id" ref="seq_picking_type_vehicle_to_input" />
             <field name="code">internal</field>
-            <field name="warehouse_id" eval="False" />
+            <field name="sequence_code">PICK</field>
+            <!-- <field name="warehouse_id" eval="False" /> -->
             <field name="default_location_src_id" ref="stock_location_vehicle" />
             <field name="default_location_dest_id" ref="stock.stock_location_stock" />
             <field name="return_picking_type_id" ref="picking_type_output_to_vehicle" />
@@ -146,18 +143,5 @@
             <field name="picking_type_id" ref="picking_type_vehicle_to_input" />
             <field name="route_id" ref="route_location_return" />
         </record>
-
-        <!-- Picking Types: set the return type -->
-        <record id="picking_type_output_to_vehicle" model="stock.picking.type">
-            <field name="return_picking_type_id" ref="picking_type_vehicle_to_input" />
-        </record>
-
-        <record id="picking_type_vehicle_to_location" model="stock.picking.type">
-            <field
-                name="return_picking_type_id"
-                ref="picking_type_location_to_vehicle"
-            />
-        </record>
-
     </data>
 </odoo>
diff --git a/fieldservice_vehicle_stock/models/fsm_order.py b/fieldservice_vehicle_stock/models/fsm_order.py
index 718166ace9..826b6cac00 100644
--- a/fieldservice_vehicle_stock/models/fsm_order.py
+++ b/fieldservice_vehicle_stock/models/fsm_order.py
@@ -1,19 +1,17 @@
 # Copyright (C) 2019 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import api, models
+from odoo import models
 
 
 class FSMOrder(models.Model):
     _inherit = "fsm.order"
 
-    @api.multi
     def assign_vehicle_to_pickings(self):
         for rec in self:
             for picking in rec.picking_ids:
                 if picking.state in ("waiting", "confirmed", "assigned"):
                     picking.fsm_vehicle_id = self.vehicle_id.id or False
 
-    @api.multi
     def write(self, vals):
         res = super().write(vals)
         for rec in self:
diff --git a/fieldservice_vehicle_stock/models/product_putaway.py b/fieldservice_vehicle_stock/models/product_putaway.py
index 77190cfa48..fb796782dc 100644
--- a/fieldservice_vehicle_stock/models/product_putaway.py
+++ b/fieldservice_vehicle_stock/models/product_putaway.py
@@ -3,8 +3,8 @@
 from odoo import api, models
 
 
-class PutAwayStrategy(models.Model):
-    _inherit = "product.putaway"
+class StockPutawayRule(models.Model):
+    _inherit = "stock.putaway.rule"
 
     @api.model
     def _get_putaway_options(self):
@@ -12,11 +12,6 @@ def _get_putaway_options(self):
         res.append(("vehicle", "Location of the vehicle"))
         return res
 
-    def putaway_apply(self, product):
-        if self.method == "vehicle":
-            return self.get_vehicle_location()
-        return super().putaway_apply(product)
-
     @api.model
     def get_vehicle_location(self):
         if self.env.context.get("vehicle_id"):
diff --git a/fieldservice_vehicle_stock/models/stock_picking.py b/fieldservice_vehicle_stock/models/stock_picking.py
index 7016e3445f..e5a6bab8ae 100644
--- a/fieldservice_vehicle_stock/models/stock_picking.py
+++ b/fieldservice_vehicle_stock/models/stock_picking.py
@@ -1,6 +1,6 @@
 # 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
 from odoo.exceptions import UserError
 
 
@@ -9,7 +9,6 @@ class StockPicking(models.Model):
 
     fsm_vehicle_id = fields.Many2one("fsm.vehicle", string="Vehicle")
 
-    @api.multi
     def action_assign(self):
         res = {}
         for rec in self:
@@ -43,7 +42,6 @@ def prepare_fsm_values(self, fsm_order):
             )
         return res
 
-    @api.multi
     def write(self, vals):
         if vals.get("fsm_order_id", False):
             fsm_order = self.env["fsm.order"].browse(vals.get("fsm_order_id"))
diff --git a/fieldservice_vehicle_stock/tests/__init__.py b/fieldservice_vehicle_stock/tests/__init__.py
new file mode 100644
index 0000000000..1e8e6a7f13
--- /dev/null
+++ b/fieldservice_vehicle_stock/tests/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_fsm_order
+from . import test_product_putaway
+from . import test_stock_picking
diff --git a/fieldservice_vehicle_stock/tests/test_fsm_order.py b/fieldservice_vehicle_stock/tests/test_fsm_order.py
new file mode 100644
index 0000000000..61c5fbb104
--- /dev/null
+++ b/fieldservice_vehicle_stock/tests/test_fsm_order.py
@@ -0,0 +1,90 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests.common import TransactionCase
+
+
+class TestFSMOrder(TransactionCase):
+    def setUp(self):
+        super(TestFSMOrder, self).setUp()
+        self.FsmOrder = self.env["fsm.order"]
+        self.test_location = self.env.ref("fieldservice.test_location")
+
+        currency = self.env["res.currency"].create(
+            {
+                "name": "Currency 1",
+                "symbol": "$",
+            }
+        )
+        partner = self.env["res.partner"].create(
+            {
+                "name": "Partner 1",
+            }
+        )
+        self.company1 = self.env["res.company"].create(
+            {
+                "name": "Company 1",
+                "currency_id": currency.id,
+                "partner_id": partner.id,
+            }
+        )
+        self.warehouse = self.env["stock.warehouse"].search(
+            [("company_id", "=", self.company1.id)], limit=1
+        )
+        self.test_team = self.env["fsm.team"].create(
+            {"name": "Test FSM Team", "company_id": self.company1.id}
+        )
+        self.product1 = self.env["product.product"].create(
+            {
+                "name": "Product A",
+                "type": "product",
+                "tracking": "serial",
+            }
+        )
+        self.new_pick_type = self.env["stock.picking.type"].create(
+            {
+                "name": "Stock Picking Type 1",
+                "code": "incoming",
+                "sequence_code": "SRO",
+                "warehouse_id": self.warehouse.id,
+                "company_id": self.company1.id,
+            }
+        )
+        self.picking = (
+            self.env["stock.picking"]
+            .with_context(company_id=self.company1.id)
+            .create(
+                {
+                    "name": "Stock Picking",
+                    "location_id": self.test_location.id,
+                    "location_dest_id": self.test_location.id,
+                    "move_type": "direct",
+                    "picking_type_id": self.new_pick_type.id,
+                }
+            )
+        )
+        self.vehicle = self.env["fsm.vehicle"].create(
+            {
+                "name": "Vehicle 1",
+                "inventory_location_id": self.test_location.id,
+            }
+        )
+
+    def test_assign_vehicle_to_pickings(self):
+        order = self.FsmOrder.create(
+            {
+                "name": "FSM Order 1",
+                "location_id": self.test_location.id,
+                "company_id": self.company1.id,
+                "warehouse_id": self.warehouse.id,
+                "team_id": self.test_team.id,
+                "inventory_location_id": self.test_location.id,
+                "vehicle_id": self.vehicle.id,
+                "picking_ids": self.picking.ids,
+            }
+        )
+
+        self.picking.state = "waiting"
+        order.assign_vehicle_to_pickings()
+        for pick in order.picking_ids:
+            self.assertEqual(order.vehicle_id.id, pick.fsm_vehicle_id.id)
diff --git a/fieldservice_vehicle_stock/tests/test_product_putaway.py b/fieldservice_vehicle_stock/tests/test_product_putaway.py
new file mode 100644
index 0000000000..f3670cd24f
--- /dev/null
+++ b/fieldservice_vehicle_stock/tests/test_product_putaway.py
@@ -0,0 +1,82 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests.common import TransactionCase
+
+
+class TestStockPutawayRule(TransactionCase):
+    def setUp(self):
+        super(TestStockPutawayRule, self).setUp()
+
+        self.StockPutawayRule = self.env["stock.putaway.rule"]
+
+        currency = self.env["res.currency"].create(
+            {
+                "name": "Currency 1",
+                "symbol": "$",
+            }
+        )
+        partner = self.env["res.partner"].create(
+            {
+                "name": "Partner 1",
+            }
+        )
+        self.company1 = self.env["res.company"].create(
+            {
+                "name": "Company 1",
+                "currency_id": currency.id,
+                "partner_id": partner.id,
+            }
+        )
+        self.location_in = self.env["stock.location"].create(
+            {
+                "name": "Location In",
+                "usage": "internal",
+                "company_id": self.company1.id,
+            }
+        )
+        self.location_out = self.env["stock.location"].create(
+            {
+                "name": "Location Out",
+                "usage": "internal",
+                "company_id": self.company1.id,
+            }
+        )
+        self.vehicle_location = self.env["stock.location"].create(
+            {
+                "name": "Vehicle Location",
+                "usage": "internal",
+                "company_id": self.company1.id,
+            }
+        )
+        self.vehicle_id = self.env["fsm.vehicle"].create(
+            {
+                "name": "Vehicle 1",
+                "inventory_location_id": self.vehicle_location.id,
+            }
+        )
+        self.stock_putaway_rule = self.StockPutawayRule.create(
+            {
+                "company_id": self.company1.id,
+                "location_in_id": self.location_in.id,
+                "location_out_id": self.location_out.id,
+                "method": "fixed",
+            }
+        )
+
+    def test_get_putaway_options(self):
+        res = self.stock_putaway_rule._get_putaway_options()
+
+        self.assertEqual(res[0][0], "fixed")
+        self.assertEqual(res[0][1], "Fixed Location")
+        self.assertEqual(res[1][0], "vehicle")
+        self.assertEqual(res[1][1], "Location of the vehicle")
+
+    def test_get_vehicle_location(self):
+        res = self.stock_putaway_rule.get_vehicle_location()
+        self.assertEqual(res, self.env["stock.location"])
+
+        res = self.stock_putaway_rule.with_context(
+            {"vehicle_id": self.vehicle_id.id}
+        ).get_vehicle_location()
+        self.assertEqual(res, self.vehicle_location)
diff --git a/fieldservice_vehicle_stock/tests/test_stock_picking.py b/fieldservice_vehicle_stock/tests/test_stock_picking.py
new file mode 100644
index 0000000000..97a883476d
--- /dev/null
+++ b/fieldservice_vehicle_stock/tests/test_stock_picking.py
@@ -0,0 +1,84 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import timedelta
+
+from odoo import fields
+from odoo.tests.common import Form, TransactionCase
+
+
+class TestStockPicking(TransactionCase):
+    def setUp(self):
+        super(TestStockPicking, self).setUp()
+
+        self.Order = self.env["fsm.order"]
+        self.test_location = self.env.ref("fieldservice.test_location")
+        self.uom_kg = self.env.ref("uom.product_uom_kgm")
+        self.stock_location = self.env.ref("stock.stock_location_stock")
+        self.customer_location = self.env.ref("stock.stock_location_customers")
+
+        self.product = self.env["product.product"].create(
+            {
+                "name": "Product KG",
+                "uom_id": self.uom_kg.id,
+                "uom_po_id": self.uom_kg.id,
+                "type": "product",
+            }
+        )
+        self.picking_type_id = self.env.ref(
+            "fieldservice_vehicle_stock.picking_type_output_to_vehicle"
+        )
+        self.fsm_vehicle_id = self.env["fsm.vehicle"].create(
+            {
+                "name": "Vehicle 1",
+                "inventory_location_id": self.stock_location.id,
+            }
+        )
+        self.fsm_vehicle2_id = self.env["fsm.vehicle"].create(
+            {
+                "name": "Vehicle 2",
+                "inventory_location_id": self.stock_location.id,
+            }
+        )
+        self.picking_out = self.env["stock.picking"].create(
+            {
+                "picking_type_id": self.picking_type_id.id,
+                "location_id": self.stock_location.id,
+                "location_dest_id": self.customer_location.id,
+                "fsm_vehicle_id": self.fsm_vehicle_id.id,
+            }
+        )
+
+        self.move = self.env["stock.move"].create(
+            {
+                "name": self.product.name,
+                "product_id": self.product.id,
+                "product_uom_qty": 2.5,
+                "product_uom": self.product.uom_id.id,
+                "picking_id": self.picking_out.id,
+                "location_id": self.stock_location.id,
+                "location_dest_id": self.customer_location.id,
+            }
+        )
+
+    def test_action_assign(self):
+        self.picking_out.action_confirm()
+        self.picking_out.action_assign()
+        for move in self.picking_out.move_lines:
+            self.assertEqual(move.state, "confirmed")
+
+    def test_prepare_fsm_values(self):
+
+        # Create an Orders
+        view_id = "fieldservice.fsm_order_form"
+        hours_diff = 100
+        with Form(self.Order, view=view_id) as f:
+            f.location_id = self.test_location
+            f.date_start = fields.Datetime.today()
+            f.date_end = f.date_start + timedelta(hours=hours_diff)
+            f.request_early = fields.Datetime.today()
+            f.vehicle_id = self.fsm_vehicle2_id
+        order = f.save()
+
+        res = self.picking_out.prepare_fsm_values(order)
+        self.assertEqual(res["fsm_vehicle_id"], self.fsm_vehicle2_id.id)

From e8797b265b2c9bcae752da3282c207654dbe9fbb Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Thu, 19 Aug 2021 15:15:10 +0000
Subject: [PATCH 627/631] [UPD] Update fieldservice_vehicle_stock.pot

---
 .../i18n/fieldservice_vehicle_stock.pot       | 41 +++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
index bf57c64f3d..91184180ff 100644
--- a/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
+++ b/fieldservice_vehicle_stock/i18n/fieldservice_vehicle_stock.pot
@@ -1,18 +1,25 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* fieldservice_vehicle_stock
+# 	* fieldservice_vehicle_stock
 #
 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"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_vehicle__display_name
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__display_name
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_putaway_rule__display_name
+msgid "Display Name"
+msgstr ""
+
 #. module: fieldservice_vehicle_stock
 #: model:ir.model,name:fieldservice_vehicle_stock.model_fsm_order
 msgid "Field Service Order"
@@ -23,11 +30,27 @@ msgstr ""
 msgid "Field Service Vehicle"
 msgstr ""
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_order__id
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_vehicle__id
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking__id
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_putaway_rule__id
+msgid "ID"
+msgstr ""
+
 #. module: fieldservice_vehicle_stock
 #: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_vehicle__inventory_location_id
 msgid "Inventory Location"
 msgstr ""
 
+#. module: fieldservice_vehicle_stock
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_order____last_update
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_vehicle____last_update
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_picking____last_update
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_stock_putaway_rule____last_update
+msgid "Last Modified on"
+msgstr ""
+
 #. module: fieldservice_vehicle_stock
 #: model:stock.picking.type,name:fieldservice_vehicle_stock.picking_type_vehicle_to_location
 msgid "Location Delivery"
@@ -44,8 +67,13 @@ msgid "Location Return"
 msgstr ""
 
 #. module: fieldservice_vehicle_stock
-#: model:ir.model,name:fieldservice_vehicle_stock.model_product_putaway
-msgid "Put Away Strategy"
+#: model:ir.model.fields,field_description:fieldservice_vehicle_stock.field_fsm_order__display_name
+msgid "Order"
+msgstr ""
+
+#. module: fieldservice_vehicle_stock
+#: model:ir.model,name:fieldservice_vehicle_stock.model_stock_putaway_rule
+msgid "Putaway Rule"
 msgstr ""
 
 #. module: fieldservice_vehicle_stock
@@ -90,8 +118,7 @@ msgid "Warehouse → Vehicle"
 msgstr ""
 
 #. module: fieldservice_vehicle_stock
-#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:31
+#: code:addons/fieldservice_vehicle_stock/models/stock_picking.py:0
 #, python-format
 msgid "You must provide the vehicle for this picking type."
 msgstr ""
-

From 1f04082274e0e77efe0cee3c057e9140251c77c2 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 19 Aug 2021 15:21:49 +0000
Subject: [PATCH 628/631] [UPD] addons table in README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f5907b637e..d96d84b0b8 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@ addon | version | maintainers | summary
 [fieldservice_substatus](fieldservice_substatus/) | 14.0.1.0.0 | [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) | Add sub-statuses to Field Service orders
 [fieldservice_timeline](fieldservice_timeline/) | 14.0.1.1.1 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | This module is a display timeline view of the Field Service order in Odoo.
 [fieldservice_vehicle](fieldservice_vehicle/) | 14.0.1.0.0 | [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Manage Field Service vehicles and assign drivers
+[fieldservice_vehicle_stock](fieldservice_vehicle_stock/) | 14.0.1.0.0 | [![brian10048](https://github.com/brian10048.png?size=30px)](https://github.com/brian10048) [![wolfhall](https://github.com/wolfhall.png?size=30px)](https://github.com/wolfhall) [![max3903](https://github.com/max3903.png?size=30px)](https://github.com/max3903) | Track inventory of Field Service vehicles
 
 [//]: # (end addons)
 

From 128e677dc9f7e070ca46f08a660c1b2e488b094f Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 19 Aug 2021 15:21:53 +0000
Subject: [PATCH 629/631] [UPD] README.rst

---
 fieldservice_vehicle_stock/README.rst                  | 10 +++++-----
 .../static/description/index.html                      |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fieldservice_vehicle_stock/README.rst b/fieldservice_vehicle_stock/README.rst
index bbc92fcdcf..bd4a657fc1 100644
--- a/fieldservice_vehicle_stock/README.rst
+++ b/fieldservice_vehicle_stock/README.rst
@@ -14,13 +14,13 @@ Field Service Vehicles - Stock
     :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_vehicle_stock
+    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_vehicle_stock
     :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_vehicle_stock
+    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_vehicle_stock
     :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| 
@@ -54,7 +54,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_vehicle_stock%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_vehicle_stock%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.
 
@@ -107,6 +107,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-brian10048| |maintainer-wolfhall| |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/12.0/fieldservice_vehicle_stock>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_vehicle_stock>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_vehicle_stock/static/description/index.html b/fieldservice_vehicle_stock/static/description/index.html
index 692f4d7567..21362d14a4 100644
--- a/fieldservice_vehicle_stock/static/description/index.html
+++ b/fieldservice_vehicle_stock/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Field Service Vehicles - Stock</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_vehicle_stock"><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_vehicle_stock"><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><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_vehicle_stock"><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_vehicle_stock"><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>This module is an add-on for the Field Service application in Odoo.
 It allows you to establish stock locations for field service vehicles
 and process stock moves with field service vehicles.</p>
@@ -404,7 +404,7 @@ <h1><a class="toc-backref" href="#id3">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_vehicle_stock%0Aversion:%2012.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_vehicle_stock%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">
@@ -439,7 +439,7 @@ <h2><a class="toc-backref" href="#id8">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/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <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_vehicle_stock">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/14.0/fieldservice_vehicle_stock">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 1461330e943844302e9935e2f954312c00162208 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 19 Aug 2021 15:21:53 +0000
Subject: [PATCH 630/631] [ADD] setup.py

---
 setup/_metapackage/VERSION.txt | 2 +-
 setup/_metapackage/setup.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
index f3683d2e6c..6f30aabd4a 100644
--- a/setup/_metapackage/VERSION.txt
+++ b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210817.0
\ No newline at end of file
+14.0.20210819.0
\ No newline at end of file
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
index d2d09e09f4..8bf89d9c13 100644
--- a/setup/_metapackage/setup.py
+++ b/setup/_metapackage/setup.py
@@ -35,6 +35,7 @@
         'odoo14-addon-fieldservice_substatus',
         'odoo14-addon-fieldservice_timeline',
         'odoo14-addon-fieldservice_vehicle',
+        'odoo14-addon-fieldservice_vehicle_stock',
     ],
     classifiers=[
         'Programming Language :: Python',

From ab766cfde353d6485371807eb0c2811ad8cb03dc Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Sun, 29 Aug 2021 20:23:44 +0000
Subject: [PATCH 631/631] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (568 of 568 strings)

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

diff --git a/fieldservice/i18n/es_AR.po b/fieldservice/i18n/es_AR.po
index 5c7ed2ecd1..bed06d6f39 100644
--- a/fieldservice/i18n/es_AR.po
+++ b/fieldservice/i18n/es_AR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-07-24 18:49+0000\n"
+"PO-Revision-Date: 2021-08-29 22:50+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_AR\n"
@@ -920,7 +920,7 @@ msgstr "Equipo Predeterminado"
 #: model:ir.model.fields,help:fieldservice.field_fsm_location__property_delivery_carrier_id
 #: model:ir.model.fields,help:fieldservice.field_fsm_person__property_delivery_carrier_id
 msgid "Default delivery method used in sales orders."
-msgstr ""
+msgstr "Método de entrega predeterminado utilizado en pedidos de venta."
 
 #. module: fieldservice
 #: model:ir.model.fields,help:fieldservice.field_fsm_template__duration
@@ -943,7 +943,7 @@ msgstr "Borrar"
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_location__property_delivery_carrier_id
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_person__property_delivery_carrier_id
 msgid "Delivery Method"
-msgstr ""
+msgstr "Método de Entrega"
 
 #. module: fieldservice
 #: model:ir.model.fields,field_description:fieldservice.field_fsm_category__description