diff --git a/sale_order_line_menu/README.rst b/sale_order_line_menu/README.rst
index c92099847b6e..c7d2c0377017 100644
--- a/sale_order_line_menu/README.rst
+++ b/sale_order_line_menu/README.rst
@@ -17,13 +17,13 @@ Sale Order Line Menu
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github
-    :target: https://github.com/OCA/sale-workflow/tree/17.0/sale_order_line_menu
+    :target: https://github.com/OCA/sale-workflow/tree/18.0/sale_order_line_menu
     :alt: OCA/sale-workflow
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/sale-workflow-17-0/sale-workflow-17-0-sale_order_line_menu
+    :target: https://translation.odoo-community.org/projects/sale-workflow-18-0/sale-workflow-18-0-sale_order_line_menu
     :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/sale-workflow&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/sale-workflow&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -46,7 +46,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/sale-workflow/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/sale-workflow/issues/new?body=module:%20sale_order_line_menu%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_order_line_menu%0Aversion:%2018.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.
 
@@ -86,6 +86,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/sale-workflow <https://github.com/OCA/sale-workflow/tree/17.0/sale_order_line_menu>`_ project on GitHub.
+This module is part of the `OCA/sale-workflow <https://github.com/OCA/sale-workflow/tree/18.0/sale_order_line_menu>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/sale_order_line_menu/__manifest__.py b/sale_order_line_menu/__manifest__.py
index 6bdc42366065..2d281ba78cd4 100644
--- a/sale_order_line_menu/__manifest__.py
+++ b/sale_order_line_menu/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Sale Order Line Menu",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "summary": "Adds a Sale Order Lines Menu",
     "website": "https://github.com/OCA/sale-workflow",
diff --git a/sale_order_line_menu/models/sale_order_line.py b/sale_order_line_menu/models/sale_order_line.py
index e7190e8a37a1..483c59264fb9 100644
--- a/sale_order_line_menu/models/sale_order_line.py
+++ b/sale_order_line_menu/models/sale_order_line.py
@@ -12,9 +12,3 @@ class SaleOrderLine(models.Model):
         store=True,
         index=True,
     )
-    analytic_account_id = fields.Many2one(
-        related="order_id.analytic_account_id",
-        readonly=True,
-        store=True,
-        index=True,
-    )
diff --git a/sale_order_line_menu/static/description/index.html b/sale_order_line_menu/static/description/index.html
index 4e60743905a1..6d4bf1fd75b9 100644
--- a/sale_order_line_menu/static/description/index.html
+++ b/sale_order_line_menu/static/description/index.html
@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* 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 }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -368,7 +369,7 @@ <h1 class="title">Sale Order Line Menu</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:ef4a6d178f0b7fad01cf6f4ec898fe6cd926e1cad89ac26a51ab39b9a3e2689f
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/sale-workflow/tree/17.0/sale_order_line_menu"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-workflow-17-0/sale-workflow-17-0-sale_order_line_menu"><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/sale-workflow&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><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/sale-workflow/tree/18.0/sale_order_line_menu"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-workflow-18-0/sale-workflow-18-0-sale_order_line_menu"><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/sale-workflow&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Adds a menu item and some views to navigate through Sale Order lines.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -392,7 +393,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/sale-workflow/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/sale-workflow/issues/new?body=module:%20sale_order_line_menu%0Aversion:%2017.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/sale-workflow/issues/new?body=module:%20sale_order_line_menu%0Aversion:%2018.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">
@@ -423,11 +424,13 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-6">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>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/17.0/sale_order_line_menu">OCA/sale-workflow</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/18.0/sale_order_line_menu">OCA/sale-workflow</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/sale_order_line_menu/views/sale_order_line_views.xml b/sale_order_line_menu/views/sale_order_line_views.xml
index 10e7f212fd7b..d91cb2dea97f 100644
--- a/sale_order_line_menu/views/sale_order_line_views.xml
+++ b/sale_order_line_menu/views/sale_order_line_views.xml
@@ -2,8 +2,21 @@
 <!-- Copyright 2023 Moduon Team
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-    <record id="sale_order_line_tree" model="ir.ui.view">
-        <field name="name">sale.order.line.tree</field>
+    <record id="sale_order_line_view_form_no_create" model="ir.ui.view">
+        <field name="name">sale.order.line.view.form.no.create</field>
+        <field name="model">sale.order.line</field>
+        <field name="inherit_id" ref="sale.sale_order_line_view_form_readonly" />
+        <field name="mode">primary</field>
+        <field name="priority">999</field>
+        <field name="arch" type="xml">
+            <form position="attributes">
+                <attribute name="create">false</attribute>
+            </form>
+        </field>
+    </record>
+
+    <record id="sale_order_line_list" model="ir.ui.view">
+        <field name="name">sale.order.line.list</field>
         <field name="model">sale.order.line</field>
         <field name="inherit_id" ref="sale.view_order_line_tree" />
         <field name="mode">primary</field>
@@ -14,7 +27,13 @@
                 <field name="invoice_status" optional="hide" />
             </xpath>
             <xpath expr="//field[@name='name']" position="after">
-                <field name="analytic_account_id" optional="hide" />
+                <field
+                    name="analytic_distribution"
+                    widget="analytic_distribution"
+                    groups="analytic.group_analytic_accounting"
+                    options="{'product_field': 'product_id', 'business_domain': 'sale_order'}"
+                    optional="hide"
+                />
             </xpath>
             <xpath expr="//field[@name='order_partner_id']" position="after">
                 <field name="product_id" />
@@ -34,7 +53,7 @@
                 />
                 <field name="price_total" optional="hide" sum="Price Total" />
             </xpath>
-            <xpath expr="//tree" position="inside">
+            <xpath expr="//list" position="inside">
                 <field name="date_order" widget="date" optional="show" />
             </xpath>
             <xpath expr="//field[@name='salesman_id']" position="attributes">
@@ -55,7 +74,7 @@
             <xpath expr="//field[@name='name']" position="attributes">
                 <attribute name="optional">show</attribute>
             </xpath>
-            <xpath expr="//tree" position="inside">
+            <xpath expr="//list" position="inside">
                 <field
                     name="invoice_lines"
                     widget="many2many_tags"
@@ -67,7 +86,7 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="view_sale_order_line_pivot">
+    <record id="view_sale_order_line_pivot" model="ir.ui.view">
         <field name="name">sale.order.line.pivot</field>
         <field name="model">sale.order.line</field>
         <field name="arch" type="xml">
@@ -144,11 +163,6 @@
                     string="Invoice Status"
                     context="{'group_by' : 'invoice_status'}"
                 />
-                <filter
-                    name="groupby_account_analytic"
-                    string="Analytic Account"
-                    context="{'group_by' : 'analytic_account_id'}"
-                />
                 <filter
                     name="groupby_date_order"
                     string="Order Date"
@@ -162,21 +176,43 @@
         <field name="name">Order Lines</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.order.line</field>
-        <field name="view_mode">tree,form,pivot</field>
+        <field name="view_mode">list,form,pivot</field>
         <field
             name="search_view_id"
             ref="sale_order_line_menu.sale_order_line_search"
         />
-        <field name="view_id" ref="sale_order_line_menu.sale_order_line_tree" />
         <field
             name="domain"
         >[('display_type', 'not in', ['line_section', 'line_note'])]</field>
     </record>
 
+    <record
+        id="ir_action_order_line_list_window_view"
+        model="ir.actions.act_window.view"
+    >
+        <field eval="1" name="sequence" />
+        <field name="view_mode">list</field>
+        <field name="view_id" ref="sale_order_line_menu.sale_order_line_list" />
+        <field name="act_window_id" ref="sale_order_line_menu.action_orders_lines" />
+    </record>
+
+    <record
+        id="ir_action_order_line_form_window_view"
+        model="ir.actions.act_window.view"
+    >
+        <field eval="2" name="sequence" />
+        <field name="view_mode">form</field>
+        <field
+            name="view_id"
+            ref="sale_order_line_menu.sale_order_line_view_form_no_create"
+        />
+        <field name="act_window_id" ref="sale_order_line_menu.action_orders_lines" />
+    </record>
+
     <menuitem
         id="sale_order_line_menu"
         name="Order Lines"
-        action="action_orders_lines"
+        action="sale_order_line_menu.action_orders_lines"
         parent="sale.sale_order_menu"
         groups="sales_team.group_sale_salesman"
         sequence="21"