Update fieldservice_account_analytic/models/fsm_order.py

fieldservice_account_analytic/README.rst

@@ -53,7 +53,16 @@ To configure this module, you need to:
 Usage
 =====
 
-
+-  Go to Field Service > Master Data > Locations
+-  Create or select a location
+-  Go to the Accounting tab
+-  Select a new or existing analytic account
+-  Go to Field Service> Operations > All Orders
+-  Create or select an order
+-  Select a location
+-  Go to the Accounting tab
+-  Add subcontractor costs
+-  Complete and invoice the order
 
 Bug Tracker
 ===========

fieldservice_account_analytic/models/fsm_order.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 
 
 class FSMOrder(models.Model):
@@ -57,18 +57,3 @@ def create(self, vals_list):
                 )
                 record.analytic_account_id = analytic_account
         return record
-
-    def action_view_analytic_account(self):
-        self.ensure_one()
-        analytic_account = self.env["account.analytic.account"].search(
-            [("fsm_order_id", "=", self.id)], limit=1
-        )
-
-        if analytic_account:
-            return {
-                "type": "ir.actions.act_window",
-                "res_model": "account.analytic.account",
-                "view_mode": "form",
-                "res_id": analytic_account.id,
-                "name": _("Analytic Account for Order %s") % self.name,
-            }

fieldservice_account_analytic/static/description/index.html

@@ -403,6 +403,18 @@ <h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1>
+<ul class="simple">
+<li>Go to Field Service &gt; Master Data &gt; Locations</li>
+<li>Create or select a location</li>
+<li>Go to the Accounting tab</li>
+<li>Select a new or existing analytic account</li>
+<li>Go to Field Service&gt; Operations &gt; All Orders</li>
+<li>Create or select an order</li>
+<li>Select a location</li>
+<li>Go to the Accounting tab</li>
+<li>Add subcontractor costs</li>
+<li>Complete and invoice the order</li>
+</ul>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>

fieldservice_account_analytic/tests/test_fsm_account_wizard.py

@@ -26,17 +26,6 @@ def setUpClass(cls):
         cls.test_loc_partner2 = cls.env["res.partner"].create(
             {"name": "Test Loc Partner 2", "phone": "123", "email": "[email protected]"}
         )
-        # create expected FSM Location to compare to converted FSM Location
-        cls.test_location = cls.env["fsm.location"].create(
-            {
-                "name": "Test Location",
-                "phone": "123",
-                "email": "[email protected]",
-                "partner_id": cls.test_loc_partner.id,
-                "owner_id": cls.test_loc_partner.id,
-                "customer_id": cls.test_loc_partner.id,
-            }
-        )
         cls.location = cls.env["fsm.location"].create(
             {
                 "name": "Location 1",
@@ -56,6 +45,18 @@ def setUpClass(cls):
                 "plan_id": cls.test_analytic_plan.id,
             }
         )
+        # create expected FSM Location to compare to converted FSM Location
+        cls.test_location = cls.env["fsm.location"].create(
+            {
+                "name": "Test Location",
+                "phone": "123",
+                "email": "[email protected]",
+                "partner_id": cls.test_loc_partner.id,
+                "owner_id": cls.test_loc_partner.id,
+                "customer_id": cls.test_loc_partner.id,
+                "analytic_account_id": cls.test_analytic_account.id,
+            }
+        )
         cls.test_location2 = cls.env["fsm.location"].create(
             {
                 "name": "Test Location 2",
@@ -122,6 +123,7 @@ def test_fsm_orders_1(self):
                 "request_early": fields.datetime.today(),
             }
         )
+
         order4 = self.env["fsm.order"].create(
             {
                 "location_id": self.location.id,

fieldservice_account_analytic/views/fsm_order.xml

@@ -8,7 +8,11 @@
                 <page name="accounting" string="Accounting">
                     <group id="account-main">
                         <group id="account-left">
-                            <field name="bill_to" widget="radio" options="{'horizontal': true}"/>
+                            <field
+                                name="bill_to"
+                                widget="radio"
+                                options="{'horizontal': true}"
+                            />
                         </group>
                         <group id="account-right">
                             <field name="analytic_account_id" />