From 1e8da045f19f7ecca16bd012cb17e0ab0913bb02 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Tue, 26 Nov 2019 16:59:14 -0500
Subject: [PATCH 01/37] [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 77f50def2b0aeda07dedfa09a034a453111eb98a Mon Sep 17 00:00:00 2001
From: hparfr <raph@hpar.fr>
Date: Wed, 27 Nov 2019 15:30:48 +0100
Subject: [PATCH 02/37] 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 9117b0136f4afbcbfe5113d8a5c36338e9b0eada Mon Sep 17 00:00:00 2001
From: hparfr <raph@hpar.fr>
Date: Wed, 27 Nov 2019 15:31:46 +0100
Subject: [PATCH 03/37] 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 3c393c82a1dfe57240907ebd19ced6c8ba9b489c Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Mon, 2 Dec 2019 17:32:47 -0500
Subject: [PATCH 04/37] [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 901e1e30bf9204f6d3799860c28a5176da5da802 Mon Sep 17 00:00:00 2001
From: brian10048 <brian@mcmpest.com>
Date: Thu, 5 Dec 2019 13:28:31 -0500
Subject: [PATCH 05/37] [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 c64b1715eeff6ba4e87da0d00b21e52fb7438304 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 06/37] 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 6e650bfc2b3beb5302eaecca4902389f92acfa3a Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 11 Dec 2019 15:28:09 -0800
Subject: [PATCH 07/37] [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 1bacb33baeb5deffc192c0ca64600218467a7425 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 08/37] 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 1dca679ea16b75915df8439d07d0bd6f95419c4d 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 09/37] [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 5beab0c1923be8693a8eb7de07d67909b1dacb1e 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 10/37] 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 61beaefd120751fcb27d9088c5d6c4f5ec0170ce Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Wed, 15 Jan 2020 17:35:01 -0800
Subject: [PATCH 11/37] [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 a37db54f106151e8fbfd1d0e6eaaf7b73728adf8 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 12/37] 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 04887ef774cf24ac7735a68dd30590d9b2904397 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Fri, 31 Jan 2020 14:49:43 -0800
Subject: [PATCH 13/37] [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 55aedb6b9cf7b9ae57a786c24de1f7e5bd028dc7 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 14/37] 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 dce4fddfebd4fdf71ca4e240aadc3f654c1059c5 Mon Sep 17 00:00:00 2001
From: scampbell <scampbell@opensourceintegrators.com>
Date: Thu, 16 Jan 2020 15:33:27 -0800
Subject: [PATCH 15/37] [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 af13621da15ae20f56f81569db74153b25127984 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 16/37] 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 1335a81c5b1ef1b8dbe00aad1621837296ca68a4 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 17/37] [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 299a75f3331ac89ac7eb04fa7545b24641eaec9b 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 18/37] [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 b264a411b1ba52a6cd7bada3f40a3f44a01db9c8 Mon Sep 17 00:00:00 2001
From: Freni-OSI <fpatel@opensourceintegrators.com>
Date: Thu, 15 Apr 2021 17:59:44 +0530
Subject: [PATCH 19/37] [14.0][MIG] fieldservice_account_analytic

---
 fieldservice_account_analytic/README.rst      |  15 +--
 fieldservice_account_analytic/__manifest__.py |  18 ++-
 fieldservice_account_analytic/i18n/es.po      |  54 +++++++--
 fieldservice_account_analytic/i18n/es_AR.po   |  56 +++++++--
 fieldservice_account_analytic/i18n/es_CL.po   |  49 +++++++-
 .../i18n/fieldservice_account_analytic.pot    |  56 +++++++--
 fieldservice_account_analytic/i18n/pt_BR.po   |  54 +++++++--
 fieldservice_account_analytic/i18n/pt_PT.po   |  51 ++++++--
 .../migrations/14.0.1.0.0/post-migration.py   |   9 ++
 .../models/fsm_order.py                       |   6 +-
 .../static/description/index.html             |  34 +++---
 .../tests/test_fsm_account_wizard.py          | 114 +++++++++++++++++-
 12 files changed, 431 insertions(+), 85 deletions(-)
 create mode 100644 fieldservice_account_analytic/migrations/14.0.1.0.0/post-migration.py

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/__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/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/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 ""
-
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"
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/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>
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,
+                }
+            )

From 8e299b2f6bf257da94c38bd00d9c146c19f94c92 Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 18:40:53 +0000
Subject: [PATCH 20/37] 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 2f65cdbe3e51397354706352018ed4e97e79bd72 Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Fri, 9 Jul 2021 19:00:06 +0000
Subject: [PATCH 21/37] 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 9a82c0c41fa25a97905f1c4692ebac65e6de110d Mon Sep 17 00:00:00 2001
From: Ediz Duman <neps1192@gmail.com>
Date: Fri, 9 Jul 2021 19:22:33 +0000
Subject: [PATCH 22/37] 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 ddba71ea388b618932a42df788512406edaa4d92 Mon Sep 17 00:00:00 2001
From: marcos-mendez <mendez.foto@gmail.com>
Date: Wed, 8 Dec 2021 20:42:48 +0000
Subject: [PATCH 23/37] Translated using Weblate (Portuguese (Brazil))

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/pt_BR/
---
 fieldservice_account_analytic/i18n/pt_BR.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/fieldservice_account_analytic/i18n/pt_BR.po b/fieldservice_account_analytic/i18n/pt_BR.po
index 09078d656a..7ed33ebdce 100644
--- a/fieldservice_account_analytic/i18n/pt_BR.po
+++ b/fieldservice_account_analytic/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-06-17 16:19+0000\n"
-"Last-Translator: Fernando Colus <fcolus1@gmail.com>\n"
+"PO-Revision-Date: 2021-12-08 22:39+0000\n"
+"Last-Translator: marcos-mendez <mendez.foto@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10\n"
+"X-Generator: Weblate 4.3.2\n"
 
 #. module: fieldservice_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 "Nome exibido"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
@@ -124,12 +124,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 "Item de diário"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line____last_update
@@ -140,7 +140,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 modificação em"
 
 #. module: fieldservice_account_analytic
 #: code:addons/fieldservice_account_analytic/models/account_move.py:0
@@ -152,7 +152,7 @@ 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 ""
+msgstr "Pedido"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id

From 695524055410ac84be64b8829b6c324fc01f0a8e Mon Sep 17 00:00:00 2001
From: Freni Patel <fpatel@opensourceintegrators.com>
Date: Fri, 28 Jan 2022 11:09:10 +0530
Subject: [PATCH 24/37] [15.0][FIX] Travis

---
 fieldservice_account_analytic/__manifest__.py     | 2 +-
 fieldservice_account_analytic/models/fsm_order.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index 95133c0ccd..2c8153cc5a 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": "14.0.1.0.0",
+    "version": "15.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_analytic/models/fsm_order.py b/fieldservice_account_analytic/models/fsm_order.py
index 7bc208986f..86227e69be 100644
--- a/fieldservice_account_analytic/models/fsm_order.py
+++ b/fieldservice_account_analytic/models/fsm_order.py
@@ -7,10 +7,9 @@
 class FSMOrder(models.Model):
     _inherit = "fsm.order"
 
-    total_cost = fields.Float(compute="_compute_total_cost", string="Total Cost")
+    total_cost = fields.Float(compute="_compute_total_cost")
     bill_to = fields.Selection(
         [("location", "Bill Location"), ("contact", "Bill Contact")],
-        string="Bill to",
         required=True,
         default="location",
     )
@@ -23,7 +22,7 @@ class FSMOrder(models.Model):
     )
 
     def _compute_total_cost(self):
-        """ To be overridden as needed from other modules """
+        """To be overridden as needed from other modules"""
         for order in self:
             order.total_cost = 0.0
 

From 0db81c427e93e5eed7f1ac873befb284cef2fb07 Mon Sep 17 00:00:00 2001
From: Freni Patel <fpatel@opensourceintegrators.com>
Date: Thu, 10 Feb 2022 17:21:45 +0530
Subject: [PATCH 25/37] [15.0][MIG] fieldservice_account_analytic

---
 fieldservice_account_analytic/README.rst      | 11 ++-
 fieldservice_account_analytic/i18n/es.po      | 45 ++-------
 fieldservice_account_analytic/i18n/es_AR.po   | 57 ++++--------
 fieldservice_account_analytic/i18n/es_CL.po   | 40 +-------
 .../i18n/fieldservice_account_analytic.pot    | 42 +--------
 fieldservice_account_analytic/i18n/pt_BR.po   | 57 ++++--------
 fieldservice_account_analytic/i18n/pt_PT.po   | 40 +-------
 fieldservice_account_analytic/i18n/tr.po      | 52 +++--------
 .../post-migration.py                         |  0
 .../models/__init__.py                        |  1 +
 .../models/account_move.py                    | 21 +++--
 .../models/analytic_account.py                |  3 +-
 .../models/fsm_location.py                    | 28 ++++++
 .../models/fsm_order.py                       | 30 +-----
 .../models/res_company.py                     |  8 +-
 .../models/res_partner.py                     | 39 ++++++++
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../static/description/index.html             |  7 +-
 .../tests/test_fsm_account_wizard.py          | 91 ++++++++++++++++---
 .../views/fsm_order.xml                       |  5 +-
 20 files changed, 239 insertions(+), 339 deletions(-)
 rename fieldservice_account_analytic/migrations/{14.0.1.0.0 => 15.0.1.0.0}/post-migration.py (100%)
 create mode 100644 fieldservice_account_analytic/models/res_partner.py

diff --git a/fieldservice_account_analytic/README.rst b/fieldservice_account_analytic/README.rst
index 2fcd8a1ad6..108e7bc2ef 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/14.0/fieldservice_account_analytic
+    :target: https://github.com/OCA/field-service/tree/15.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-14-0/field-service-14-0-fieldservice_account_analytic
+    :target: https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-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/14.0
+    :target: https://runbot.odoo-community.org/runbot/264/15.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_account_analytic%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_account_analytic%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -72,6 +72,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
 ~~~~~~~~~~~~~
@@ -107,6 +108,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/14.0/fieldservice_account_analytic>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/15.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/i18n/es.po b/fieldservice_account_analytic/i18n/es.po
index 8af92bf989..84edf6730a 100644
--- a/fieldservice_account_analytic/i18n/es.po
+++ b/fieldservice_account_analytic/i18n/es.po
@@ -44,8 +44,8 @@ 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 "Facturar a"
+msgid "Bill To"
+msgstr ""
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
@@ -63,6 +63,7 @@ msgid "Config Settings"
 msgstr ""
 
 #. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_partner
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
 msgstr "Contacto"
@@ -72,16 +73,6 @@ 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"
@@ -114,33 +105,11 @@ msgstr ""
 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
@@ -148,11 +117,6 @@ msgstr ""
 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"
@@ -163,6 +127,9 @@ msgstr "Tipo de Tiempo"
 msgid "Total Cost"
 msgstr "Coste Total"
 
+#~ msgid "Bill to"
+#~ msgstr "Facturar a"
+
 #~ msgid "Invoice Line"
 #~ msgstr "Línea de factura"
 
diff --git a/fieldservice_account_analytic/i18n/es_AR.po b/fieldservice_account_analytic/i18n/es_AR.po
index b229a143e8..1c7d3d34cf 100644
--- a/fieldservice_account_analytic/i18n/es_AR.po
+++ b/fieldservice_account_analytic/i18n/es_AR.po
@@ -44,8 +44,8 @@ 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"
+msgid "Bill To"
+msgstr ""
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
@@ -63,6 +63,7 @@ msgid "Config Settings"
 msgstr "Configurar Ajustes"
 
 #. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_partner
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
 msgstr "Contacto"
@@ -72,16 +73,6 @@ 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 "Mostrar Nombre"
-
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
@@ -114,33 +105,11 @@ msgstr "Filtrar Contactos con Ubicación"
 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.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 "ID"
-
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
 msgid "Journal Item"
 msgstr "Apunte Contable"
 
-#. 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 "Última Modificación el"
-
 #. module: fieldservice_account_analytic
 #: code:addons/fieldservice_account_analytic/models/account_move.py:0
 #: code:addons/fieldservice_account_analytic/models/analytic_account.py:0
@@ -148,11 +117,6 @@ msgstr "Última Modificación el"
 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 "Pedido"
-
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
 msgid "Time Type"
@@ -163,5 +127,20 @@ msgstr "Tipo de Tiempo"
 msgid "Total Cost"
 msgstr "Costo Total"
 
+#~ msgid "Bill to"
+#~ msgstr "Facturar a"
+
+#~ msgid "Display Name"
+#~ msgstr "Mostrar Nombre"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Última Modificación el"
+
+#~ msgid "Order"
+#~ msgstr "Pedido"
+
 #~ 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 9c04323013..10662a32c6 100644
--- a/fieldservice_account_analytic/i18n/es_CL.po
+++ b/fieldservice_account_analytic/i18n/es_CL.po
@@ -44,7 +44,7 @@ msgstr ""
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
-msgid "Bill to"
+msgid "Bill To"
 msgstr ""
 
 #. module: fieldservice_account_analytic
@@ -63,6 +63,7 @@ msgid "Config Settings"
 msgstr ""
 
 #. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_partner
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
 msgstr ""
@@ -72,16 +73,6 @@ 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"
@@ -114,33 +105,11 @@ msgstr ""
 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
@@ -148,11 +117,6 @@ msgstr ""
 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/fieldservice_account_analytic.pot b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
index 1c3f16e196..53dfcb6407 100644
--- a/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
+++ b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -41,7 +41,7 @@ msgstr ""
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
-msgid "Bill to"
+msgid "Bill To"
 msgstr ""
 
 #. module: fieldservice_account_analytic
@@ -60,6 +60,7 @@ msgid "Config Settings"
 msgstr ""
 
 #. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_partner
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
 msgstr ""
@@ -69,16 +70,6 @@ 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"
@@ -111,33 +102,11 @@ msgstr ""
 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
@@ -145,11 +114,6 @@ msgstr ""
 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 7ed33ebdce..cfc97d6735 100644
--- a/fieldservice_account_analytic/i18n/pt_BR.po
+++ b/fieldservice_account_analytic/i18n/pt_BR.po
@@ -44,8 +44,8 @@ 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 "Conta para"
+msgid "Bill To"
+msgstr ""
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
@@ -63,6 +63,7 @@ msgid "Config Settings"
 msgstr "Definições de configuração"
 
 #. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_partner
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
 msgstr "Contato"
@@ -72,16 +73,6 @@ 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 "Nome exibido"
-
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__fsm_order_id
 msgid "FSM Order"
@@ -115,33 +106,11 @@ 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.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 "ID"
-
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
 msgid "Journal Item"
 msgstr "Item de diário"
 
-#. 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 "Última modificação em"
-
 #. module: fieldservice_account_analytic
 #: code:addons/fieldservice_account_analytic/models/account_move.py:0
 #: code:addons/fieldservice_account_analytic/models/analytic_account.py:0
@@ -149,11 +118,6 @@ msgstr "Última modificação em"
 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 "Pedido"
-
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
 msgid "Time Type"
@@ -164,5 +128,20 @@ msgstr "Tipo de Tempo"
 msgid "Total Cost"
 msgstr "Custo Total"
 
+#~ msgid "Bill to"
+#~ msgstr "Conta para"
+
+#~ msgid "Display Name"
+#~ msgstr "Nome exibido"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Última modificação em"
+
+#~ msgid "Order"
+#~ msgstr "Pedido"
+
 #~ 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 f1c685c519..ba1dac8f52 100644
--- a/fieldservice_account_analytic/i18n/pt_PT.po
+++ b/fieldservice_account_analytic/i18n/pt_PT.po
@@ -44,7 +44,7 @@ msgstr ""
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
-msgid "Bill to"
+msgid "Bill To"
 msgstr ""
 
 #. module: fieldservice_account_analytic
@@ -63,6 +63,7 @@ msgid "Config Settings"
 msgstr ""
 
 #. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_partner
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
 msgstr ""
@@ -72,16 +73,6 @@ 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"
@@ -114,33 +105,11 @@ msgstr ""
 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
@@ -148,11 +117,6 @@ msgstr ""
 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/tr.po b/fieldservice_account_analytic/i18n/tr.po
index e0fa2a1d4c..be54cd349f 100644
--- a/fieldservice_account_analytic/i18n/tr.po
+++ b/fieldservice_account_analytic/i18n/tr.po
@@ -44,7 +44,7 @@ msgstr "Fatura Konum"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
-msgid "Bill to"
+msgid "Bill To"
 msgstr ""
 
 #. module: fieldservice_account_analytic
@@ -63,6 +63,7 @@ msgid "Config Settings"
 msgstr "Yapılandırma Ayarları"
 
 #. module: fieldservice_account_analytic
+#: model:ir.model,name:fieldservice_account_analytic.model_res_partner
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
 msgstr "Kontak"
@@ -72,16 +73,6 @@ msgstr "Kontak"
 msgid "Customer"
 msgstr "Müşteri"
 
-#. 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 "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"
@@ -114,33 +105,11 @@ msgstr ""
 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 "ID"
-
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
 msgid "Journal Item"
 msgstr "Yevmiye Öğesi"
 
-#. 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 "Son Düzenlenme"
-
 #. module: fieldservice_account_analytic
 #: code:addons/fieldservice_account_analytic/models/account_move.py:0
 #: code:addons/fieldservice_account_analytic/models/analytic_account.py:0
@@ -148,11 +117,6 @@ msgstr "Son Düzenlenme"
 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 "Sipariş"
-
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_account_analytic_line__product_id
 msgid "Time Type"
@@ -162,3 +126,15 @@ msgstr ""
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
 msgid "Total Cost"
 msgstr "Toplam Tutar"
+
+#~ msgid "Display Name"
+#~ msgstr "Görünüm Adı"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Son Düzenlenme"
+
+#~ msgid "Order"
+#~ msgstr "Sipariş"
diff --git a/fieldservice_account_analytic/migrations/14.0.1.0.0/post-migration.py b/fieldservice_account_analytic/migrations/15.0.1.0.0/post-migration.py
similarity index 100%
rename from fieldservice_account_analytic/migrations/14.0.1.0.0/post-migration.py
rename to fieldservice_account_analytic/migrations/15.0.1.0.0/post-migration.py
diff --git a/fieldservice_account_analytic/models/__init__.py b/fieldservice_account_analytic/models/__init__.py
index b1e4a7d50d..28a8ed802c 100644
--- a/fieldservice_account_analytic/models/__init__.py
+++ b/fieldservice_account_analytic/models/__init__.py
@@ -7,4 +7,5 @@
     fsm_order,
     res_company,
     res_config_settings,
+    res_partner,
 )
diff --git a/fieldservice_account_analytic/models/account_move.py b/fieldservice_account_analytic/models/account_move.py
index a9a2c29247..b3d637c7ab 100644
--- a/fieldservice_account_analytic/models/account_move.py
+++ b/fieldservice_account_analytic/models/account_move.py
@@ -11,14 +11,15 @@ class AccountMoveLine(models.Model):
     @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.")
-                    )
+            if vals.get("fsm_order_ids") and vals.get("fsm_order_ids")[0][2]:
+                fsm_orders = vals.get("fsm_order_ids")[0][2]
+                for order in self.env["fsm.order"].browse(fsm_orders).exists():
+                    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/analytic_account.py b/fieldservice_account_analytic/models/analytic_account.py
index 149b82fe81..a5b83cbb22 100644
--- a/fieldservice_account_analytic/models/analytic_account.py
+++ b/fieldservice_account_analytic/models/analytic_account.py
@@ -25,5 +25,4 @@ def create(self, vals):
 
     @api.onchange("product_id")
     def onchange_product_id(self):
-        if self.product_id:
-            self.name = self.product_id.name
+        self.name = self.product_id.name if self.product_id else False
diff --git a/fieldservice_account_analytic/models/fsm_location.py b/fieldservice_account_analytic/models/fsm_location.py
index 40dbba9199..dd74960eb8 100644
--- a/fieldservice_account_analytic/models/fsm_location.py
+++ b/fieldservice_account_analytic/models/fsm_location.py
@@ -30,3 +30,31 @@ def get_default_customer(self):
     @api.onchange("fsm_parent_id")
     def _onchange_fsm_parent_id_account(self):
         self.customer_id = self.fsm_parent_id.customer_id or False
+
+    @api.model
+    def _search(
+        self,
+        args,
+        offset=0,
+        limit=None,
+        order=None,
+        count=False,
+        access_rights_uid=None,
+    ):
+        args = args or []
+        context = dict(self._context) or {}
+        if context.get("customer_id"):
+            partner = self.env["res.partner"].browse(context.get("customer_id"))
+            args.extend(
+                [
+                    ("partner_id", "=", partner.id),
+                ]
+            )
+        return super(FSMLocation, self)._search(
+            args,
+            offset=offset,
+            limit=limit,
+            order=order,
+            count=count,
+            access_rights_uid=access_rights_uid,
+        )
diff --git a/fieldservice_account_analytic/models/fsm_order.py b/fieldservice_account_analytic/models/fsm_order.py
index 86227e69be..c056030973 100644
--- a/fieldservice_account_analytic/models/fsm_order.py
+++ b/fieldservice_account_analytic/models/fsm_order.py
@@ -26,37 +26,15 @@ def _compute_total_cost(self):
         for order in self:
             order.total_cost = 0.0
 
-    @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)
-                        ]
-                    }
-                }
-            else:
-                return {"domain": {"customer_id": [], "location_id": []}}
-        else:
-            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):
-        if self.customer_id:
-            self.location_id = self.customer_id.service_location_id
+        self.location_id = (
+            self.customer_id.service_location_id if self.customer_id else False
+        )
 
     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 not order.customer_id:
                 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 4d6dd0e399..5ddb6b8f8d 100644
--- a/fieldservice_account_analytic/models/res_company.py
+++ b/fieldservice_account_analytic/models/res_company.py
@@ -1,7 +1,7 @@
 # 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
+from odoo import fields, models
 
 
 class ResCompany(models.Model):
@@ -10,9 +10,3 @@ class ResCompany(models.Model):
     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_partner.py b/fieldservice_account_analytic/models/res_partner.py
new file mode 100644
index 0000000000..33238129d2
--- /dev/null
+++ b/fieldservice_account_analytic/models/res_partner.py
@@ -0,0 +1,39 @@
+# Copyright (C) 2022 - TODAY, Open Source Integrators
+# 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.model
+    def _search(
+        self,
+        args,
+        offset=0,
+        limit=None,
+        order=None,
+        count=False,
+        access_rights_uid=None,
+    ):
+        args = args or []
+        context = dict(self._context) or {}
+        if (
+            context.get("location_id")
+            and self.env.user.company_id.fsm_filter_location_by_contact
+        ):
+            location = self.env["fsm.location"].browse(context.get("location_id"))
+            args.extend(
+                [
+                    ("service_location_id", "=", location.id),
+                ]
+            )
+        return super(ResPartner, self)._search(
+            args,
+            offset=offset,
+            limit=limit,
+            order=order,
+            count=count,
+            access_rights_uid=access_rights_uid,
+        )
diff --git a/fieldservice_account_analytic/readme/CONTRIBUTORS.rst b/fieldservice_account_analytic/readme/CONTRIBUTORS.rst
index e9143c46f2..3ad2246d88 100644
--- a/fieldservice_account_analytic/readme/CONTRIBUTORS.rst
+++ b/fieldservice_account_analytic/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_account_analytic/static/description/index.html b/fieldservice_account_analytic/static/description/index.html
index 4956497980..b2dd05bcb6 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/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><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/field-service/tree/15.0/fieldservice_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-15-0/field-service-15-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/15.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
@@ -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_account_analytic%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_account_analytic%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -421,6 +421,7 @@ <h2><a class="toc-backref" href="#id6">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">
@@ -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">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/14.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/15.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>
diff --git a/fieldservice_account_analytic/tests/test_fsm_account_wizard.py b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
index f05ce7d688..54c156899e 100644
--- a/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
+++ b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
@@ -37,6 +37,19 @@ def setUp(self):
                 "customer_id": self.test_loc_partner.id,
             }
         )
+        self.location = self.env["fsm.location"].create(
+            {
+                "name": "Location 1",
+                "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_analytic_account = self.env["account.analytic.account"].create(
+            {"name": "test_analytic_account"}
+        )
         self.test_location2 = self.env["fsm.location"].create(
             {
                 "name": "Test Location 2",
@@ -46,6 +59,7 @@ def setUp(self):
                 "owner_id": self.test_loc_partner2.id,
                 "customer_id": self.test_loc_partner2.id,
                 "fsm_parent_id": self.test_location.id,
+                "analytic_account_id": self.test_analytic_account.id,
             }
         )
         self.default_account_revenue = self.env["account.account"].search(
@@ -61,8 +75,11 @@ def setUp(self):
         )
         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"}
+        self.product1 = self.env["product.product"].create(
+            {
+                "name": "Product A",
+                "detailed_type": "consu",
+            }
         )
 
     def test_convert_contact_to_fsm_loc(self):
@@ -81,12 +98,11 @@ def test_convert_contact_to_fsm_loc(self):
         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):
+    def test_fsm_orders_1(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,
@@ -96,33 +112,78 @@ def test_fsm_orders(self):
                 "request_early": fields.Datetime.today(),
             }
         )
-        order2 = self.WorkOrder.create(
+        order2 = self.env["fsm.order"].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(),
+                "date_start": fields.datetime.today(),
+                "date_end": fields.datetime.today() + timedelta(hours=2),
+                "request_early": fields.datetime.today(),
+            }
+        )
+        order4 = self.env["fsm.order"].create(
+            {
+                "location_id": self.location.id,
+                "date_start": fields.datetime.today(),
+                "date_end": fields.datetime.today() + timedelta(hours=2),
+                "request_early": fields.datetime.today(),
             }
         )
         order._compute_total_cost()
-        order._onchange_customer_id_location()
+        order4._compute_total_cost()
         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()
+        general_journal = self.env["account.journal"].search(
+            [
+                ("company_id", "=", self.env.user.company_id.id),
+                ("type", "=", "general"),
+            ],
+            limit=1,
+        )
+        general_move1 = self.env["account.move"].create(
+            {
+                "name": "general1",
+                "journal_id": general_journal.id,
+            }
+        )
+        self.move_line.create(
+            [
+                {
+                    "account_id": self.default_account_revenue.id,
+                    "analytic_account_id": self.test_analytic_account.id,
+                    "fsm_order_ids": [(6, 0, order2.ids)],
+                    "move_id": general_move1.id,
+                }
+            ]
+        )
         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,
+                    "fsm_order_ids": [(6, 0, order.ids)],
                 }
             )
+
+        self.analytic_line.create(
+            {
+                "fsm_order_id": order2.id,
+                "name": "Test01",
+                "product_id": self.product1.id,
+            }
+        )
+        self.analytic_line.onchange_product_id()
         with self.assertRaises(ValidationError):
             self.analytic_line.create(
                 {
-                    "analytic_account_id": self.test_analytic_account.id,
-                    "fsm_order_id": order2.id,
+                    "fsm_order_id": order.id,
+                    "name": "Test01",
                 }
             )
+        order._onchange_customer_id_location()
+        self.test_location2._onchange_fsm_parent_id_account()
+        self.env["res.partner"].with_context(location_id=self.test_location2.id).search(
+            []
+        )
+        self.env["fsm.location"].with_context(customer_id=self.test_partner.id).search(
+            []
+        )
diff --git a/fieldservice_account_analytic/views/fsm_order.xml b/fieldservice_account_analytic/views/fsm_order.xml
index 1688cbbdbf..b92d0e8c98 100644
--- a/fieldservice_account_analytic/views/fsm_order.xml
+++ b/fieldservice_account_analytic/views/fsm_order.xml
@@ -16,7 +16,10 @@
                 </page>
             </notebook>
             <field name="region_id" position="after">
-                <field name="customer_id" />
+                <field name="customer_id" context="{'location_id': location_id}" />
+            </field>
+            <field name="location_id" position="attributes">
+                <attribute name="context">{"customer_id": customer_id}</attribute>
             </field>
         </field>
     </record>

From 48a8a6df024261cafca6e6c8d822986978e7c93f Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Mon, 31 Oct 2022 16:28:18 +0000
Subject: [PATCH 26/37] Added translation using Weblate (Italian)

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

diff --git a/fieldservice_account_analytic/i18n/it.po b/fieldservice_account_analytic/i18n/it.po
new file mode 100644
index 0000000000..6be69b7ae4
--- /dev/null
+++ b/fieldservice_account_analytic/i18n/it.po
@@ -0,0 +1,126 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_account_analytic
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 15.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. module: fieldservice_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,name:fieldservice_account_analytic.model_res_partner
+#: 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_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,name:fieldservice_account_analytic.model_account_move_line
+msgid "Journal Item"
+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_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 ab571f4601da0118d7a6e3e59e3f364703aee999 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Mon, 31 Oct 2022 16:29:48 +0000
Subject: [PATCH 27/37] Translated using Weblate (Italian)

Currently translated at 100.0% (21 of 21 strings)

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

diff --git a/fieldservice_account_analytic/i18n/it.po b/fieldservice_account_analytic/i18n/it.po
index 6be69b7ae4..5b7183c29c 100644
--- a/fieldservice_account_analytic/i18n/it.po
+++ b/fieldservice_account_analytic/i18n/it.po
@@ -6,121 +6,123 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2022-10-31 18:44+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #. module: fieldservice_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 "Contabilità"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__analytic_account_id
 msgid "Analytic Account"
-msgstr ""
+msgstr "Contabilità analitica"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Riga analitica"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__contact
 msgid "Bill Contact"
-msgstr ""
+msgstr "Contatto fattura"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields.selection,name:fieldservice_account_analytic.selection__fsm_order__bill_to__location
 msgid "Bill Location"
-msgstr ""
+msgstr "Località fattura"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__bill_to
 msgid "Bill To"
-msgstr ""
+msgstr "Fatturare a"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id
 msgid "Billed Customer"
-msgstr ""
+msgstr "Cliente fatturato"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Aziende"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Impostazioni configurazione"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_res_partner
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__customer_id
 msgid "Contact"
-msgstr ""
+msgstr "Contatto"
 
 #. 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 "Ordine FSM"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_wizard
 msgid "FSM Record Conversion"
-msgstr ""
+msgstr "Conversione record FSM"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_location
 msgid "Field Service Location"
-msgstr ""
+msgstr "Località assistenza sul campo"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_fsm_order
 msgid "Field Service Order"
-msgstr ""
+msgstr "Ordine assistenza sul 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 ""
+msgstr "Filtra contatti con la località"
 
 #. 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 ""
+msgstr "Filtra la località in un ordine FSM dal contatto"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
 msgid "Journal Item"
-msgstr ""
+msgstr "Movimento contabile"
 
 #. 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 ""
+msgstr "Nessun conto analitico impostato nella località dell'ordine."
 
 #. 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 orario"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_order__total_cost
 msgid "Total Cost"
-msgstr ""
+msgstr "Costo totale"

From 60e91317a170bb8e5a35ca287ac9c3748d9e8eb3 Mon Sep 17 00:00:00 2001
From: Ignacio Buioli <ibuioli@gmail.com>
Date: Sat, 12 Nov 2022 04:29:25 +0000
Subject: [PATCH 28/37] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (21 of 21 strings)

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

diff --git a/fieldservice_account_analytic/i18n/es_AR.po b/fieldservice_account_analytic/i18n/es_AR.po
index 1c7d3d34cf..dbe86704dc 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: 2021-07-09 21:48+0000\n"
+"PO-Revision-Date: 2022-11-12 04:46+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: none\n"
 "Language: es_AR\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.2\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #. module: fieldservice_account_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
@@ -45,7 +45,7 @@ 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 ""
+msgstr "Facturar A"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id

From 45538edb3042307ea3d7e1233a318ff30746e3e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Douglas=20Cust=C3=B3dio?= <douglascstd@yahoo.com>
Date: Fri, 17 Mar 2023 20:13:39 +0000
Subject: [PATCH 29/37] Translated using Weblate (Portuguese (Brazil))

Currently translated at 95.2% (20 of 21 strings)

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

diff --git a/fieldservice_account_analytic/i18n/pt_BR.po b/fieldservice_account_analytic/i18n/pt_BR.po
index cfc97d6735..f7fa35a58e 100644
--- a/fieldservice_account_analytic/i18n/pt_BR.po
+++ b/fieldservice_account_analytic/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-12-08 22:39+0000\n"
-"Last-Translator: marcos-mendez <mendez.foto@gmail.com>\n"
+"PO-Revision-Date: 2023-03-17 22:22+0000\n"
+"Last-Translator: Douglas Custódio <douglascstd@yahoo.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"
+"X-Generator: Weblate 4.14.1\n"
 
 #. module: fieldservice_account_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
@@ -109,7 +109,7 @@ msgstr ""
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
 msgid "Journal Item"
-msgstr "Item de diário"
+msgstr "Item de Diário"
 
 #. module: fieldservice_account_analytic
 #: code:addons/fieldservice_account_analytic/models/account_move.py:0

From e2047d5f5f769d1401cd73718c086b7d7bc01c84 Mon Sep 17 00:00:00 2001
From: Juliette BLANC <juliette.blanc@camptocamp.com>
Date: Wed, 3 May 2023 10:50:09 +0200
Subject: [PATCH 30/37] [MIG] fieldservice_account_analytic: Migration to 16.0

---
 fieldservice_account_analytic/__manifest__.py |  2 +-
 .../migrations/15.0.1.0.0/post-migration.py   |  9 ---
 .../models/account_move.py                    |  8 +-
 .../models/fsm_order.py                       |  2 +-
 .../tests/test_fsm_account_wizard.py          | 77 ++++++++++---------
 5 files changed, 46 insertions(+), 52 deletions(-)
 delete mode 100644 fieldservice_account_analytic/migrations/15.0.1.0.0/post-migration.py

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index 2c8153cc5a..510745e267 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": "15.0.1.0.0",
+    "version": "16.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_analytic/migrations/15.0.1.0.0/post-migration.py b/fieldservice_account_analytic/migrations/15.0.1.0.0/post-migration.py
deleted file mode 100644
index 25f67de025..0000000000
--- a/fieldservice_account_analytic/migrations/15.0.1.0.0/post-migration.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).
-
-
-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/account_move.py b/fieldservice_account_analytic/models/account_move.py
index b3d637c7ab..f59f666f8f 100644
--- a/fieldservice_account_analytic/models/account_move.py
+++ b/fieldservice_account_analytic/models/account_move.py
@@ -11,13 +11,13 @@ class AccountMoveLine(models.Model):
     @api.model_create_multi
     def create(self, vals_list):
         for vals in vals_list:
-            if vals.get("fsm_order_ids") and vals.get("fsm_order_ids")[0][2]:
+            if vals.get("fsm_order_ids") and len(vals.get("fsm_order_ids")[0]) > 2:
                 fsm_orders = vals.get("fsm_order_ids")[0][2]
                 for order in self.env["fsm.order"].browse(fsm_orders).exists():
                     if order.location_id.analytic_account_id:
-                        vals[
-                            "analytic_account_id"
-                        ] = order.location_id.analytic_account_id.id
+                        vals["analytic_distribution"] = {
+                            order.location_id.analytic_account_id.id: 100
+                        }
                     else:
                         raise ValidationError(
                             _("No analytic account " "set on the order's Location.")
diff --git a/fieldservice_account_analytic/models/fsm_order.py b/fieldservice_account_analytic/models/fsm_order.py
index c056030973..d2efb63af6 100644
--- a/fieldservice_account_analytic/models/fsm_order.py
+++ b/fieldservice_account_analytic/models/fsm_order.py
@@ -17,7 +17,7 @@ class FSMOrder(models.Model):
         "res.partner",
         string="Contact",
         change_default=True,
-        index=True,
+        index="btree",
         tracking=True,
     )
 
diff --git a/fieldservice_account_analytic/tests/test_fsm_account_wizard.py b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
index 54c156899e..aa482991a2 100644
--- a/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
+++ b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
@@ -9,73 +9,76 @@
 
 
 class FSMAccountAnalyticCase(TransactionCase):
-    def setUp(self):
-        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"]
+    @classmethod
+    def setUpClass(cls):
+        super(FSMAccountAnalyticCase, cls).setUpClass()
+        cls.Wizard = cls.env["fsm.wizard"]
+        cls.WorkOrder = cls.env["fsm.order"]
+        cls.AccountInvoice = cls.env["account.move"]
+        cls.AccountInvoiceLine = cls.env["account.move.line"]
         # create a Res Partner
-        self.test_partner = self.env["res.partner"].create(
+        cls.test_partner = cls.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(
+        cls.test_loc_partner = cls.env["res.partner"].create(
             {"name": "Test Loc Partner", "phone": "ABC", "email": "tlp@email.com"}
         )
-        self.test_loc_partner2 = self.env["res.partner"].create(
+        cls.test_loc_partner2 = cls.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(
+        cls.test_location = cls.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,
+                "partner_id": cls.test_loc_partner.id,
+                "owner_id": cls.test_loc_partner.id,
+                "customer_id": cls.test_loc_partner.id,
             }
         )
-        self.location = self.env["fsm.location"].create(
+        cls.location = cls.env["fsm.location"].create(
             {
                 "name": "Location 1",
                 "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,
+                "partner_id": cls.test_loc_partner.id,
+                "owner_id": cls.test_loc_partner.id,
+                "customer_id": cls.test_loc_partner.id,
             }
         )
-        self.test_analytic_account = self.env["account.analytic.account"].create(
-            {"name": "test_analytic_account"}
+        cls.test_analytic_plan = cls.env["account.analytic.plan"].create(
+            {"name": "test_analytic_plan"}
         )
-        self.test_location2 = self.env["fsm.location"].create(
+        cls.test_analytic_account = cls.env["account.analytic.account"].create(
+            {
+                "name": "test_analytic_account",
+                "plan_id": cls.test_analytic_plan.id,
+            }
+        )
+        cls.test_location2 = cls.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,
-                "analytic_account_id": self.test_analytic_account.id,
+                "partner_id": cls.test_loc_partner2.id,
+                "owner_id": cls.test_loc_partner2.id,
+                "customer_id": cls.test_loc_partner2.id,
+                "fsm_parent_id": cls.test_location.id,
+                "analytic_account_id": cls.test_analytic_account.id,
             }
         )
-        self.default_account_revenue = self.env["account.account"].search(
+        cls.default_account_revenue = cls.env["account.account"].search(
             [
-                ("company_id", "=", self.env.user.company_id.id),
-                (
-                    "user_type_id",
-                    "=",
-                    self.env.ref("account.data_account_type_revenue").id,
-                ),
+                ("company_id", "=", cls.env.user.company_id.id),
+                ("account_type", "=", "income"),
             ],
             limit=1,
         )
-        self.move_line = self.env["account.move.line"]
-        self.analytic_line = self.env["account.analytic.line"]
-        self.product1 = self.env["product.product"].create(
+        cls.move_line = cls.env["account.move.line"]
+        cls.analytic_line = cls.env["account.analytic.line"]
+        cls.product1 = cls.env["product.product"].create(
             {
                 "name": "Product A",
                 "detailed_type": "consu",
@@ -149,7 +152,7 @@ def test_fsm_orders_1(self):
             [
                 {
                     "account_id": self.default_account_revenue.id,
-                    "analytic_account_id": self.test_analytic_account.id,
+                    "analytic_distribution": {self.test_analytic_account.id: 100},
                     "fsm_order_ids": [(6, 0, order2.ids)],
                     "move_id": general_move1.id,
                 }
@@ -159,7 +162,7 @@ def test_fsm_orders_1(self):
             self.move_line.create(
                 {
                     "account_id": self.default_account_revenue.id,
-                    "analytic_account_id": self.test_analytic_account.id,
+                    "analytic_account_id": {self.test_analytic_account.id: 100},
                     "fsm_order_ids": [(6, 0, order.ids)],
                 }
             )

From 6fdc95306ab3517896d0d38496f77fefc20070e6 Mon Sep 17 00:00:00 2001
From: oca-ci <oca-ci@odoo-community.org>
Date: Wed, 15 Nov 2023 15:32:26 +0000
Subject: [PATCH 31/37] [UPD] Update fieldservice_account_analytic.pot

---
 .../i18n/fieldservice_account_analytic.pot                     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
index 53dfcb6407..a2d7520a8c 100644
--- a/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
+++ b/fieldservice_account_analytic/i18n/fieldservice_account_analytic.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -108,6 +108,7 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: fieldservice_account_analytic
+#. odoo-python
 #: code:addons/fieldservice_account_analytic/models/account_move.py:0
 #: code:addons/fieldservice_account_analytic/models/analytic_account.py:0
 #, python-format

From f4e8a4cfbbaa4930d4a2472f9197c70617951b7a Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 15 Nov 2023 15:36:48 +0000
Subject: [PATCH 32/37] [BOT] post-merge updates

---
 fieldservice_account_analytic/README.rst      | 23 ++++----
 .../static/description/index.html             | 52 ++++++++++---------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/fieldservice_account_analytic/README.rst b/fieldservice_account_analytic/README.rst
index 108e7bc2ef..526cb15a12 100644
--- a/fieldservice_account_analytic/README.rst
+++ b/fieldservice_account_analytic/README.rst
@@ -2,10 +2,13 @@
 Field Service - Analytic Accounting
 ===================================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:c872de4b09a48a6f6cf3811cf08102104249a86cb7aa84f7a9871bfb58831449
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -14,16 +17,16 @@ 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/15.0/fieldservice_account_analytic
+    :target: https://github.com/OCA/field-service/tree/16.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-15-0/field-service-15-0-fieldservice_account_analytic
+    :target: https://translation.odoo-community.org/projects/field-service-16-0/field-service-16-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/15.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/field-service&target_branch=16.0
+    :alt: Try me on Runboat
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 This module adds the ability to track your analytic accounts on field
 service orders.
@@ -53,8 +56,8 @@ 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:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_account_analytic%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -108,6 +111,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/15.0/fieldservice_account_analytic>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/16.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 b2dd05bcb6..965d2ea92b 100644
--- a/fieldservice_account_analytic/static/description/index.html
+++ b/fieldservice_account_analytic/static/description/index.html
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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/" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
 <title>Field Service - Analytic Accounting</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z 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
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -366,8 +366,10 @@ <h1 class="title">Field Service - Analytic Accounting</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:c872de4b09a48a6f6cf3811cf08102104249a86cb7aa84f7a9871bfb58831449
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/field-service/tree/15.0/fieldservice_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-15-0/field-service-15-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/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/field-service/tree/16.0/fieldservice_account_analytic"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/field-service-16-0/field-service-16-0-fieldservice_account_analytic"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/field-service&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-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
@@ -375,24 +377,24 @@ <h1 class="title">Field Service - Analytic Accounting</h1>
 <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="#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>
+<li><a class="reference internal" href="#installation" id="toc-entry-1">Installation</a></li>
+<li><a class="reference internal" href="#configuration" id="toc-entry-2">Configuration</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-7">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="installation">
-<h1><a class="toc-backref" href="#id1">Installation</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-1">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>
+<h1><a class="toc-backref" href="#toc-entry-2">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>
@@ -400,23 +402,23 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-3">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:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+If you spotted it first, help us to smash 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:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id4">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-5">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>
+<h2><a class="toc-backref" href="#toc-entry-6">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>
@@ -425,22 +427,22 @@ <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="other-credits">
-<h2><a class="toc-backref" href="#id7">Other credits</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-7">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>
+<h2><a class="toc-backref" href="#toc-entry-8">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/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/15.0/fieldservice_account_analytic">OCA/field-service</a> project on GitHub.</p>
+<p><a class="reference external image-reference" href="https://github.com/osimallen"><img alt="osimallen" src="https://github.com/osimallen.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <a class="reference external image-reference" 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/16.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 074748b61a1bc7a7d0b3de5574fa2b8f1c2dc3db Mon Sep 17 00:00:00 2001
From: Ivorra78 <informatica@totmaterial.es>
Date: Wed, 15 Nov 2023 17:40:32 +0000
Subject: [PATCH 33/37] Translated using Weblate (Spanish)

Currently translated at 100.0% (21 of 21 strings)

Translation: field-service-16.0/field-service-16.0-fieldservice_account_analytic
Translate-URL: https://translation.odoo-community.org/projects/field-service-16-0/field-service-16-0-fieldservice_account_analytic/es/
---
 fieldservice_account_analytic/i18n/es.po | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/fieldservice_account_analytic/i18n/es.po b/fieldservice_account_analytic/i18n/es.po
index 84edf6730a..ae513fe94e 100644
--- a/fieldservice_account_analytic/i18n/es.po
+++ b/fieldservice_account_analytic/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-01-17 06:13+0000\n"
-"Last-Translator: Nelson Ramírez Sánchez <info@konos.cl>\n"
+"PO-Revision-Date: 2023-11-15 20:37+0000\n"
+"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
 "Language-Team: none\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: fieldservice_account_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
@@ -45,7 +45,7 @@ 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
@@ -55,12 +55,12 @@ msgstr "Facturado a Cliente"
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Configurar Ajustes"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_res_partner
@@ -91,24 +91,24 @@ 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 "Orden de  Servicio de Campo"
+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 ""
+msgstr "Filtrar contactos por Localizació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 ""
+msgstr "Filtrar la ubicación en un pedido FSM por el Contacto"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_move_line
 msgid "Journal Item"
-msgstr ""
+msgstr "Artículo Diario"
 
 #. module: fieldservice_account_analytic
 #: code:addons/fieldservice_account_analytic/models/account_move.py:0

From fbe24d6ae42df6775af7bd0c4c95247f4917ed55 Mon Sep 17 00:00:00 2001
From: Adriano Prado <adrianojprado@gmail.com>
Date: Tue, 5 Dec 2023 09:49:07 +0000
Subject: [PATCH 34/37] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (21 of 21 strings)

Translation: field-service-16.0/field-service-16.0-fieldservice_account_analytic
Translate-URL: https://translation.odoo-community.org/projects/field-service-16-0/field-service-16-0-fieldservice_account_analytic/pt_BR/
---
 fieldservice_account_analytic/i18n/pt_BR.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fieldservice_account_analytic/i18n/pt_BR.po b/fieldservice_account_analytic/i18n/pt_BR.po
index f7fa35a58e..1902f1113d 100644
--- a/fieldservice_account_analytic/i18n/pt_BR.po
+++ b/fieldservice_account_analytic/i18n/pt_BR.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-03-17 22:22+0000\n"
-"Last-Translator: Douglas Custódio <douglascstd@yahoo.com>\n"
+"PO-Revision-Date: 2023-12-05 12:35+0000\n"
+"Last-Translator: Adriano Prado <adrianojprado@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.14.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: fieldservice_account_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
@@ -45,7 +45,7 @@ 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 "Faturar para"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__customer_id

From 5c32369bad470cdd92f0659cf02ac74cd6418885 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Wed, 13 Dec 2023 11:10:34 +0000
Subject: [PATCH 35/37] Translated using Weblate (Italian)

Currently translated at 100.0% (21 of 21 strings)

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

diff --git a/fieldservice_account_analytic/i18n/it.po b/fieldservice_account_analytic/i18n/it.po
index 5b7183c29c..bda3854588 100644
--- a/fieldservice_account_analytic/i18n/it.po
+++ b/fieldservice_account_analytic/i18n/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-10-31 18:44+0000\n"
+"PO-Revision-Date: 2023-12-13 13:33+0000\n"
 "Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.14.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: fieldservice_account_analytic
 #: model_terms:ir.ui.view,arch_db:fieldservice_account_analytic.fsm_location_form_view_analytic
@@ -25,7 +25,7 @@ msgstr "Contabilità"
 #. module: fieldservice_account_analytic
 #: model:ir.model.fields,field_description:fieldservice_account_analytic.field_fsm_location__analytic_account_id
 msgid "Analytic Account"
-msgstr "Contabilità analitica"
+msgstr "Conto analitico"
 
 #. module: fieldservice_account_analytic
 #: model:ir.model,name:fieldservice_account_analytic.model_account_analytic_line

From 41aa83337f792a6caa8e7985bc672641c7a35f09 Mon Sep 17 00:00:00 2001
From: Antoni Marroig Campomar <amarroig@apsl.net>
Date: Wed, 17 Apr 2024 08:12:22 +0200
Subject: [PATCH 36/37] [IMP] fieldservice_account_analytic: pre-commit auto
 fixes

---
 fieldservice_account_analytic/README.rst      | 42 ++++++++++---------
 .../models/account_move.py                    |  2 +-
 .../models/analytic_account.py                |  2 +-
 .../models/fsm_location.py                    |  2 +-
 .../models/fsm_order.py                       |  2 +-
 .../models/res_partner.py                     |  2 +-
 fieldservice_account_analytic/pyproject.toml  |  3 ++
 .../readme/CONFIGURE.md                       |  4 ++
 .../readme/CONFIGURE.rst                      |  4 --
 .../readme/CONTRIBUTORS.md                    |  4 ++
 .../readme/CONTRIBUTORS.rst                   |  4 --
 .../readme/{CREDITS.rst => CREDITS.md}        |  2 +-
 .../readme/DESCRIPTION.md                     |  3 ++
 .../readme/DESCRIPTION.rst                    |  4 --
 .../readme/{INSTALL.rst => INSTALL.md}        |  0
 fieldservice_account_analytic/readme/USAGE.md |  1 +
 .../readme/USAGE.rst                          |  0
 .../static/description/index.html             | 39 +++++++++--------
 .../tests/test_fsm_account_wizard.py          |  2 +-
 19 files changed, 66 insertions(+), 56 deletions(-)
 create mode 100644 fieldservice_account_analytic/pyproject.toml
 create mode 100644 fieldservice_account_analytic/readme/CONFIGURE.md
 delete mode 100644 fieldservice_account_analytic/readme/CONFIGURE.rst
 create mode 100644 fieldservice_account_analytic/readme/CONTRIBUTORS.md
 delete mode 100644 fieldservice_account_analytic/readme/CONTRIBUTORS.rst
 rename fieldservice_account_analytic/readme/{CREDITS.rst => CREDITS.md} (50%)
 create mode 100644 fieldservice_account_analytic/readme/DESCRIPTION.md
 delete mode 100644 fieldservice_account_analytic/readme/DESCRIPTION.rst
 rename fieldservice_account_analytic/readme/{INSTALL.rst => INSTALL.md} (100%)
 create mode 100644 fieldservice_account_analytic/readme/USAGE.md
 delete mode 100644 fieldservice_account_analytic/readme/USAGE.rst

diff --git a/fieldservice_account_analytic/README.rst b/fieldservice_account_analytic/README.rst
index 526cb15a12..34bb0eabb0 100644
--- a/fieldservice_account_analytic/README.rst
+++ b/fieldservice_account_analytic/README.rst
@@ -17,21 +17,20 @@ 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/16.0/fieldservice_account_analytic
+    :target: https://github.com/OCA/field-service/tree/17.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-16-0/field-service-16-0-fieldservice_account_analytic
+    :target: https://translation.odoo-community.org/projects/field-service-17-0/field-service-17-0-fieldservice_account_analytic
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/field-service&target_branch=16.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/field-service&target_branch=17.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
 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.
+service orders. It also adds the option to track the billing partner for
+field service locations and orders.
 
 **Table of contents**
 
@@ -48,8 +47,13 @@ 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
+-  Go to Field Service > Master Data > Locations
+-  Create or select a location and set their analytic account
+
+Usage
+=====
+
+
 
 Bug Tracker
 ===========
@@ -57,7 +61,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 to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_account_analytic%0Aversion:%2016.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:%2017.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.
 
@@ -65,27 +69,27 @@ Credits
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Open Source Integrators
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-* Michael Allen <mallen@opensourceintegrators.com>
-* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
-* Brian McMaster <brian@mcmpest.com>
-* Freni Patel <fpatel@opensourceintegrators.com>
+-  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
-~~~~~~~~~~~~~
+-------------
 
 The development of this module has been financially supported by:
 
-* Open Source Integrators <https://opensourceintegrators.com>
+-  Open Source Integrators <https://opensourceintegrators.com>
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 
@@ -111,6 +115,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/16.0/fieldservice_account_analytic>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/17.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/models/account_move.py b/fieldservice_account_analytic/models/account_move.py
index f59f666f8f..3b69cb6bf9 100644
--- a/fieldservice_account_analytic/models/account_move.py
+++ b/fieldservice_account_analytic/models/account_move.py
@@ -22,4 +22,4 @@ def create(self, vals_list):
                         raise ValidationError(
                             _("No analytic account " "set on the order's Location.")
                         )
-        return super(AccountMoveLine, self).create(vals_list)
+        return super().create(vals_list)
diff --git a/fieldservice_account_analytic/models/analytic_account.py b/fieldservice_account_analytic/models/analytic_account.py
index a5b83cbb22..08f8cca3f5 100644
--- a/fieldservice_account_analytic/models/analytic_account.py
+++ b/fieldservice_account_analytic/models/analytic_account.py
@@ -21,7 +21,7 @@ def create(self, vals):
                 raise ValidationError(
                     _("No analytic account set " "on the order's Location.")
                 )
-        return super(AccountAnalyticLine, self).create(vals)
+        return super().create(vals)
 
     @api.onchange("product_id")
     def onchange_product_id(self):
diff --git a/fieldservice_account_analytic/models/fsm_location.py b/fieldservice_account_analytic/models/fsm_location.py
index dd74960eb8..fa4a46da71 100644
--- a/fieldservice_account_analytic/models/fsm_location.py
+++ b/fieldservice_account_analytic/models/fsm_location.py
@@ -50,7 +50,7 @@ def _search(
                     ("partner_id", "=", partner.id),
                 ]
             )
-        return super(FSMLocation, self)._search(
+        return super()._search(
             args,
             offset=offset,
             limit=limit,
diff --git a/fieldservice_account_analytic/models/fsm_order.py b/fieldservice_account_analytic/models/fsm_order.py
index d2efb63af6..dbcab41ef3 100644
--- a/fieldservice_account_analytic/models/fsm_order.py
+++ b/fieldservice_account_analytic/models/fsm_order.py
@@ -33,7 +33,7 @@ def _onchange_customer_id_location(self):
         )
 
     def write(self, vals):
-        res = super(FSMOrder, self).write(vals)
+        res = super().write(vals)
         for order in self:
             if "customer_id" not in vals and not order.customer_id:
                 order.customer_id = order.location_id.customer_id.id
diff --git a/fieldservice_account_analytic/models/res_partner.py b/fieldservice_account_analytic/models/res_partner.py
index 33238129d2..25e743675f 100644
--- a/fieldservice_account_analytic/models/res_partner.py
+++ b/fieldservice_account_analytic/models/res_partner.py
@@ -29,7 +29,7 @@ def _search(
                     ("service_location_id", "=", location.id),
                 ]
             )
-        return super(ResPartner, self)._search(
+        return super()._search(
             args,
             offset=offset,
             limit=limit,
diff --git a/fieldservice_account_analytic/pyproject.toml b/fieldservice_account_analytic/pyproject.toml
new file mode 100644
index 0000000000..4231d0cccb
--- /dev/null
+++ b/fieldservice_account_analytic/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/fieldservice_account_analytic/readme/CONFIGURE.md b/fieldservice_account_analytic/readme/CONFIGURE.md
new file mode 100644
index 0000000000..5cdbd33906
--- /dev/null
+++ b/fieldservice_account_analytic/readme/CONFIGURE.md
@@ -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/CONFIGURE.rst b/fieldservice_account_analytic/readme/CONFIGURE.rst
deleted file mode 100644
index ecc5d5f7a7..0000000000
--- a/fieldservice_account_analytic/readme/CONFIGURE.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-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.md b/fieldservice_account_analytic/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..66775f0510
--- /dev/null
+++ b/fieldservice_account_analytic/readme/CONTRIBUTORS.md
@@ -0,0 +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_account_analytic/readme/CONTRIBUTORS.rst b/fieldservice_account_analytic/readme/CONTRIBUTORS.rst
deleted file mode 100644
index 3ad2246d88..0000000000
--- a/fieldservice_account_analytic/readme/CONTRIBUTORS.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-* 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_account_analytic/readme/CREDITS.rst b/fieldservice_account_analytic/readme/CREDITS.md
similarity index 50%
rename from fieldservice_account_analytic/readme/CREDITS.rst
rename to fieldservice_account_analytic/readme/CREDITS.md
index 0eff0acf4e..7e4827b0a8 100644
--- a/fieldservice_account_analytic/readme/CREDITS.rst
+++ b/fieldservice_account_analytic/readme/CREDITS.md
@@ -1,3 +1,3 @@
 The development of this module has been financially supported by:
 
-* Open Source Integrators <https://opensourceintegrators.com>
+- Open Source Integrators \<<https://opensourceintegrators.com>\>
diff --git a/fieldservice_account_analytic/readme/DESCRIPTION.md b/fieldservice_account_analytic/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..004a1c52e9
--- /dev/null
+++ b/fieldservice_account_analytic/readme/DESCRIPTION.md
@@ -0,0 +1,3 @@
+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/readme/DESCRIPTION.rst b/fieldservice_account_analytic/readme/DESCRIPTION.rst
deleted file mode 100644
index 2941a900e3..0000000000
--- a/fieldservice_account_analytic/readme/DESCRIPTION.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-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/readme/INSTALL.rst b/fieldservice_account_analytic/readme/INSTALL.md
similarity index 100%
rename from fieldservice_account_analytic/readme/INSTALL.rst
rename to fieldservice_account_analytic/readme/INSTALL.md
diff --git a/fieldservice_account_analytic/readme/USAGE.md b/fieldservice_account_analytic/readme/USAGE.md
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/fieldservice_account_analytic/readme/USAGE.md
@@ -0,0 +1 @@
+
diff --git a/fieldservice_account_analytic/readme/USAGE.rst b/fieldservice_account_analytic/readme/USAGE.rst
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/fieldservice_account_analytic/static/description/index.html b/fieldservice_account_analytic/static/description/index.html
index 965d2ea92b..31fc65305a 100644
--- a/fieldservice_account_analytic/static/description/index.html
+++ b/fieldservice_account_analytic/static/description/index.html
@@ -369,22 +369,22 @@ <h1 class="title">Field Service - Analytic Accounting</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:c872de4b09a48a6f6cf3811cf08102104249a86cb7aa84f7a9871bfb58831449
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/field-service/tree/16.0/fieldservice_account_analytic"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/field-service-16-0/field-service-16-0-fieldservice_account_analytic"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/field-service&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/field-service/tree/17.0/fieldservice_account_analytic"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/field-service-17-0/field-service-17-0-fieldservice_account_analytic"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/field-service&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <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>
+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">
 <li><a class="reference internal" href="#installation" id="toc-entry-1">Installation</a></li>
 <li><a class="reference internal" href="#configuration" id="toc-entry-2">Configuration</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
-<li><a class="reference internal" href="#other-credits" id="toc-entry-7">Other credits</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-3">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-7">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-8">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-9">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -401,24 +401,27 @@ <h1><a class="toc-backref" href="#toc-entry-2">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="#toc-entry-3">Usage</a></h1>
+</div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-4">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 to smash 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:%2016.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:%2017.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="#toc-entry-4">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-5">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
 <ul class="simple">
 <li>Open Source Integrators</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-7">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>
@@ -427,14 +430,14 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="other-credits">
-<h2><a class="toc-backref" href="#toc-entry-7">Other credits</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-8">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="#toc-entry-8">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-9">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
@@ -442,7 +445,7 @@ <h2><a class="toc-backref" href="#toc-entry-8">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 image-reference" href="https://github.com/osimallen"><img alt="osimallen" src="https://github.com/osimallen.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <a class="reference external image-reference" 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/16.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/17.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>
diff --git a/fieldservice_account_analytic/tests/test_fsm_account_wizard.py b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
index aa482991a2..de746079aa 100644
--- a/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
+++ b/fieldservice_account_analytic/tests/test_fsm_account_wizard.py
@@ -11,7 +11,7 @@
 class FSMAccountAnalyticCase(TransactionCase):
     @classmethod
     def setUpClass(cls):
-        super(FSMAccountAnalyticCase, cls).setUpClass()
+        super().setUpClass()
         cls.Wizard = cls.env["fsm.wizard"]
         cls.WorkOrder = cls.env["fsm.order"]
         cls.AccountInvoice = cls.env["account.move"]

From b437d27bda92535031018a8bf7f5f491781fd326 Mon Sep 17 00:00:00 2001
From: Antoni Marroig Campomar <amarroig@apsl.net>
Date: Wed, 17 Apr 2024 09:01:32 +0200
Subject: [PATCH 37/37] [MIG] fieldservice_account_analytic: Migration to 17.0

---
 fieldservice_account_analytic/README.rst      |  3 +++
 fieldservice_account_analytic/__manifest__.py |  2 +-
 fieldservice_account_analytic/init_hook.py    |  6 ++---
 .../models/fsm_location.py                    |  2 --
 .../models/res_partner.py                     |  2 --
 .../readme/CONTRIBUTORS.md                    |  2 ++
 .../static/description/index.html             |  4 ++++
 .../views/res_config_settings.xml             | 24 +++++++------------
 8 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/fieldservice_account_analytic/README.rst b/fieldservice_account_analytic/README.rst
index 34bb0eabb0..b332a2b510 100644
--- a/fieldservice_account_analytic/README.rst
+++ b/fieldservice_account_analytic/README.rst
@@ -80,6 +80,9 @@ Contributors
 -  Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 -  Brian McMaster <brian@mcmpest.com>
 -  Freni Patel <fpatel@opensourceintegrators.com>
+-  `APSL <https://apsl.tech>`__:
+
+   -  Antoni Marroig <amarroig@apsl.net>
 
 Other credits
 -------------
diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
index 510745e267..c496157e31 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": "16.0.1.0.0",
+    "version": "17.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_analytic/init_hook.py b/fieldservice_account_analytic/init_hook.py
index 49ef6b0ab8..11dcaed476 100644
--- a/fieldservice_account_analytic/init_hook.py
+++ b/fieldservice_account_analytic/init_hook.py
@@ -2,9 +2,9 @@
 # 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(
+def pre_init_hook(env):
+    env.cr.execute("""ALTER TABLE "fsm_location" ADD "customer_id" INT;""")
+    env.cr.execute(
         """UPDATE "fsm_location" SET customer_id = owner_id
     WHERE customer_id IS NULL;"""
     )
diff --git a/fieldservice_account_analytic/models/fsm_location.py b/fieldservice_account_analytic/models/fsm_location.py
index fa4a46da71..6f558e37e1 100644
--- a/fieldservice_account_analytic/models/fsm_location.py
+++ b/fieldservice_account_analytic/models/fsm_location.py
@@ -38,7 +38,6 @@ def _search(
         offset=0,
         limit=None,
         order=None,
-        count=False,
         access_rights_uid=None,
     ):
         args = args or []
@@ -55,6 +54,5 @@ def _search(
             offset=offset,
             limit=limit,
             order=order,
-            count=count,
             access_rights_uid=access_rights_uid,
         )
diff --git a/fieldservice_account_analytic/models/res_partner.py b/fieldservice_account_analytic/models/res_partner.py
index 25e743675f..e6f038f110 100644
--- a/fieldservice_account_analytic/models/res_partner.py
+++ b/fieldservice_account_analytic/models/res_partner.py
@@ -14,7 +14,6 @@ def _search(
         offset=0,
         limit=None,
         order=None,
-        count=False,
         access_rights_uid=None,
     ):
         args = args or []
@@ -34,6 +33,5 @@ def _search(
             offset=offset,
             limit=limit,
             order=order,
-            count=count,
             access_rights_uid=access_rights_uid,
         )
diff --git a/fieldservice_account_analytic/readme/CONTRIBUTORS.md b/fieldservice_account_analytic/readme/CONTRIBUTORS.md
index 66775f0510..3a8fd31199 100644
--- a/fieldservice_account_analytic/readme/CONTRIBUTORS.md
+++ b/fieldservice_account_analytic/readme/CONTRIBUTORS.md
@@ -2,3 +2,5 @@
 - Serpent Consulting Services Pvt. Ltd. \<<support@serpentcs.com>\>
 - Brian McMaster \<<brian@mcmpest.com>\>
 - Freni Patel \<<fpatel@opensourceintegrators.com>\>
+- [APSL](https://apsl.tech):
+  - Antoni Marroig   \<<amarroig@apsl.net>\>
diff --git a/fieldservice_account_analytic/static/description/index.html b/fieldservice_account_analytic/static/description/index.html
index 31fc65305a..0ad4422cf0 100644
--- a/fieldservice_account_analytic/static/description/index.html
+++ b/fieldservice_account_analytic/static/description/index.html
@@ -427,6 +427,10 @@ <h2><a class="toc-backref" href="#toc-entry-7">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>Freni Patel &lt;<a class="reference external" href="mailto:fpatel&#64;opensourceintegrators.com">fpatel&#64;opensourceintegrators.com</a>&gt;</li>
+<li><a class="reference external" href="https://apsl.tech">APSL</a>:<ul>
+<li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
diff --git a/fieldservice_account_analytic/views/res_config_settings.xml b/fieldservice_account_analytic/views/res_config_settings.xml
index a8f77daefb..1f1e36e874 100644
--- a/fieldservice_account_analytic/views/res_config_settings.xml
+++ b/fieldservice_account_analytic/views/res_config_settings.xml
@@ -5,22 +5,14 @@
         <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>
+            <xpath expr="//block[@name='order_setting_container']" position="inside">
+                <setting
+                    string="Filter Contacts with Location"
+                    help="Filter the Location on an FSM Order by the Contact"
+                >
+                    <field name="fsm_filter_location_by_contact" />
+                </setting>
+            </xpath>
         </field>
     </record>
 </odoo>