[IMP] tms_account: Analytic configuration

tms_account/__manifest__.py

@@ -5,16 +5,15 @@
     "name": "TMS - Accounting",
     "summary": "Track invoices linked to TMS orders",
     "version": "17.0.1.0.0",
-    "category": "Field Service",
+    "category": "Warehouse Management",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/stock-logistics-transport",
-    "depends": ["tms", "tms_sale", "tms_expense", "tms_purchase", "account_usability"],
+    "depends": ["tms_sale", "tms_expense", "tms_purchase", "account_usability"],
     "data": [
-        "security/res_groups.xml",
         "data/analytic_plan.xml",
+        "security/res_groups.xml",
         "views/res_config_settings.xml",
         "views/account_move.xml",
-        "views/account_analytic_plan.xml",
         "views/tms_order.xml",
         "views/tms_route.xml",
     ],

tms_account/data/analytic_plan.xml

@@ -2,11 +2,10 @@
 
     <record id="tms_route_analytic_plan" model="account.analytic.plan">
         <field name="name">Routes</field>
-        <field name="tms_flag">True</field>
     </record>
+
     <record id="tms_order_analytic_plan" model="account.analytic.plan">
         <field name="name">Trips</field>
-        <field name="tms_flag">True</field>
     </record>
 
 </odoo>

tms_account/models/__init__.py

@@ -1,12 +1,11 @@
-from . import account_analytic_plan
-from . import res_config_settings
-from . import tms_order
-from . import analytic_account
-from . import tms_route
-from . import account_move
-from . import account_move_line
-from . import purchase_order_line
-from . import hr_expense
-from . import sale_order_line
-from . import sale_order
-from . import account_analytic_line
+from . import (
+    tms_order,
+    tms_route,
+    account_move,
+    account_move_line,
+    purchase_order_line,
+    hr_expense,
+    sale_order_line,
+    sale_order,
+    account_analytic_line,
+)

tms_account/models/account_move_line.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2024 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import _, api, fields, models
 from odoo.tools import frozendict

tms_account/models/hr_expense.py

@@ -1,3 +1,5 @@
+# Copyright (C) 2024 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import api, models
 
 

tms_account/models/purchase_order_line.py

@@ -1,3 +1,5 @@
+# Copyright (C) 2024 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import api, models
 
 

tms_account/models/sale_order.py

@@ -1,6 +1,5 @@
-# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2024 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from odoo import api, models
 
 

tms_account/models/sale_order_line.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2024 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import models
 from odoo.fields import Command
@@ -15,23 +15,17 @@ def _default_analytic_distribution(self):
             trip_count = len(self.tms_order_ids)
             percentage_per_trip = 100 / trip_count
 
-            route_analytic_plan_group = self.env.ref(
-                "tms_account.group_tms_route_analytic_plan"
-            )
-            order_analytic_plan_group = self.env.ref(
-                "tms_account.group_tms_order_analytic_plan"
-            )
             analytic_account_ids = []
 
             trip_id = self.env["tms.order"].browse(trip.id)
 
-            if trip_id.route_id and route_analytic_plan_group:
-                analytic_account_id = trip_id.route_id.analytic_account_id.id
+            if trip_id:
+                analytic_account_id = trip_id.analytic_account_id.id
                 if analytic_account_id:
                     analytic_account_ids.append(str(analytic_account_id))
 
-            if order_analytic_plan_group:
-                analytic_account_id = trip_id.analytic_account_id.id
+            if trip_id.route_id:
+                analytic_account_id = trip_id.route_id.analytic_account_id.id
                 if analytic_account_id:
                     analytic_account_ids.append(str(analytic_account_id))
 
@@ -40,7 +34,6 @@ def _default_analytic_distribution(self):
                 total_distribution[distribution_key] = percentage_per_trip
 
         self.analytic_distribution = total_distribution
-
         return total_distribution
 
     def _prepare_invoice_line(self, **optional_values):

tms_account/models/tms_order.py

@@ -43,17 +43,13 @@ def _compute_total_revenue(self):
     @api.model
     def create(self, vals):
         order = super().create(vals)
-        if self.env.user.has_group(
-            "analytic.group_analytic_accounting"
-        ) and self.env.user.has_group("tms_account.group_tms_order_analytic_plan"):
-            analytic_account = self.env["account.analytic.account"].create(
-                {
-                    "name": vals.get("name"),
-                    "plan_id": self.env.ref("tms_account.tms_order_analytic_plan").id,
-                    "trip_id": order,
-                }
-            )
-            order.analytic_account_id = analytic_account
+        analytic_account = self.env["account.analytic.account"].create(
+            {
+                "name": vals.get("name"),
+                "plan_id": self.env.ref("tms_account.tms_order_analytic_plan").id,
+            }
+        )
+        order.analytic_account_id = analytic_account.id
         return order
 
     @api.model
@@ -100,41 +96,19 @@ def _default_analytic_distribution(self):
         # Initialize distribution dictionary
         distribution = {}
 
-        # Fetch the analytic accounts based on group names
-        route_analytic_plan_group = self.env.ref(
-            "tms_account.group_tms_route_analytic_plan"
-        )
-        order_analytic_plan_group = self.env.ref(
-            "tms_account.group_tms_order_analytic_plan"
-        )
-
         analytic_account_ids = []
 
         # Iterate over tms_order_ids to determine analytic accounts
         for tms_order in self.sale_id.tms_order_ids:
-            if tms_order.route_id and route_analytic_plan_group:
-                analytic_account_id = tms_order.route_id.analytic_account_id.id
-                analytic_accounts = self.env["account.analytic.account"].search(
-                    [("id", "=", analytic_account_id)]
-                )
-                account_id = str(analytic_accounts.id)
-                if account_id:
-                    analytic_account_ids.append(account_id)
-
-            if order_analytic_plan_group:
-                analytic_account_id = tms_order.analytic_account_id.id
-                analytic_accounts = self.env["account.analytic.account"].search(
-                    [("id", "=", analytic_account_id)]
-                )
-                account_id = str(analytic_accounts.id)
-                if account_id:
-                    analytic_account_ids.append(account_id)
+            if tms_order.route_id and tms_order.route_id.analytic_account_id:
+                analytic_account_ids.append(tms_order.route_id.analytic_account_id.id)
+            if tms_order.analytic_account_id:
+                analytic_account_ids.append(tms_order.analytic_account_id.id)
 
         # Ensure distribution is provided with unique analytic accounts
         analytic_account_ids = list(set(analytic_account_ids))
         if analytic_account_ids:
             distribution[", ".join(analytic_account_ids)] = 100
-
         return distribution
 
     def _handle_bills(self):

tms_account/models/tms_route.py

@@ -6,7 +6,6 @@
 class TMSRoute(models.Model):
     _inherit = "tms.route"
 
-    analytic_plan_id = fields.Many2one("account.analytic.plan")
     analytic_account_id = fields.Many2one(
         "account.analytic.account",
         domain=[("plan_id", "=", "%(tms_account.tms_route_analytic_plan)d")],
@@ -34,16 +33,13 @@ def _compute_total_revenue(self):
     @api.model
     def create(self, vals_list):
         route = super().create(vals_list)
-        if self.env.user.has_group("tms_account.group_tms_route_analytic_plan"):
-            # If analytic account not provided
-            if vals_list.get("analytic_account_id") in [False, None]:
-                # Create analytic account
-                analytic_plan = self.env.ref("tms_account.tms_route_analytic_plan")
-                account_vals_list = {"name": route.name, "plan_id": analytic_plan.id}
-                AccountAnalyticAccount = self.env["account.analytic.account"]
-                account = AccountAnalyticAccount.create(account_vals_list)
-
-                # Set the analytic_account_id
-                route.analytic_account_id = account.id
-
+        # If analytic account not provided
+        if vals_list.get("analytic_account_id") in [False, None]:
+            # Create analytic account
+            plan = self.env.ref("tms_account.tms_route_analytic_plan")
+            analytic = self.env["account.analytic.account"].create(
+                {"name": route.name, "plan_id": plan.id}
+            )
+        # Set the analytic_account_id
+        route.analytic_account_id = analytic.id
         return route

tms_account/views/res_config_settings.xml

@@ -5,20 +5,12 @@
         <field name="priority" eval="40" />
         <field name="inherit_id" ref="tms.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//setting[@name='tms_sale_setting']" position="after">
-                <field name="tms_analytic_plan_domain" invisible="1" />
+            <xpath expr="//setting[@id='tms_account']" position="after">
                 <setting
                     help="Manage analytic account for trips or routes."
                     invisible="not module_tms_account"
                 >
                     <field name="group_analytic_accounting" />
-                    <span />
-                    <field
-                        name="tms_analytic_plan"
-                        invisible="not group_analytic_accounting"
-                        domain="tms_analytic_plan_domain"
-                        widget="many2many_checkboxes"
-                    />
                 </setting>
             </xpath>
         </field>

tms_account/views/tms_order.xml

@@ -45,6 +45,16 @@
                     invisible="not sale_id and not purchase_ids"
                 />
             </xpath>
+            <xpath expr="//notebook" position="inside">
+                <page string="Accounting">
+                    <group id="account_main">
+                        <group id="account_left">
+                            <field name="analytic_account_id" />
+                        </group>
+                        <group id="account_right" />
+                    </group>
+                </page>
+            </xpath>
         </field>
     </record>