From 00efda4d770fb43f8be78eba4d56d6a2279f6508 Mon Sep 17 00:00:00 2001
From: "Habib (ayh)" <ayh@odoo.com>
Date: Thu, 26 Oct 2023 19:24:42 +0200
Subject: [PATCH] [IMP] analytic,purchase,sale: misc analytic improvements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Order Plans by sequence in the widget and analytic item views
2. Add amount_field to analytic widget in sales and purchase views
3. UI improvements (split plan name and percentage)

Task-3572128

closes odoo/odoo#141030

Signed-off-by: William André (wan) <wan@odoo.com>
---
 addons/analytic/models/analytic_plan.py                         | 2 +-
 .../components/analytic_distribution/analytic_distribution.xml  | 2 +-
 addons/purchase/views/purchase_views.xml                        | 2 +-
 addons/sale/views/sale_order_views.xml                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/analytic/models/analytic_plan.py b/addons/analytic/models/analytic_plan.py
index 8535e031593..e4af7785810 100644
--- a/addons/analytic/models/analytic_plan.py
+++ b/addons/analytic/models/analytic_plan.py
@@ -213,7 +213,7 @@ class AccountAnalyticPlan(models.Model):
                 "applicability": plan._get_applicability(**kwargs) if plan in root_plans else 'optional',
                 "all_account_count": plan.all_account_count
             }
-            for plan in root_plans + forced_plans
+            for plan in (root_plans + forced_plans).sorted('sequence')
         ]
 
     def _get_applicability(self, **kwargs):
diff --git a/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.xml b/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.xml
index dbb43955285..cabaaa203cc 100644
--- a/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.xml
+++ b/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.xml
@@ -30,7 +30,7 @@
                     <thead>
                         <tr class="border-bottom">
                             <th t-foreach="allPlans" t-as="plan" t-key="plan.id">
-                                <span t-out="plan.name"/>(<span t-att-class="totals[plan.id].class" t-out="totals[plan.id].formattedValue"/>)
+                                <span t-out="plan.name"/> (<span t-att-class="totals[plan.id].class" t-out="totals[plan.id].formattedValue"/>)
                             </th>
                             <th t-out="'Percentage'" class="numeric_column_width"/>
                             <th t-if="valueColumnEnabled" class="numeric_column_width" t-out="props.record.fields[props.amount_field].string"/>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index dcbee5fa80d..28a4e9576c6 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -242,7 +242,7 @@
                                     <field name="analytic_distribution" widget="analytic_distribution"
                                            optional="hide"
                                            groups="analytic.group_analytic_accounting"
-                                           options="{'product_field': 'product_id', 'business_domain': 'purchase_order'}"/>
+                                           options="{'product_field': 'product_id', 'business_domain': 'purchase_order', 'amount_field': 'price_subtotal'}"/>
                                     <field name="product_qty"/>
                                     <field name="qty_received_manual" column_invisible="True"/>
                                     <field name="qty_received_method" column_invisible="True"/>
diff --git a/addons/sale/views/sale_order_views.xml b/addons/sale/views/sale_order_views.xml
index 9d5ca92a883..c146aca819b 100644
--- a/addons/sale/views/sale_order_views.xml
+++ b/addons/sale/views/sale_order_views.xml
@@ -513,7 +513,7 @@
                                 <field name="analytic_distribution" widget="analytic_distribution"
                                            optional="hide"
                                            groups="analytic.group_analytic_accounting"
-                                           options="{'product_field': 'product_id', 'business_domain': 'sale_order'}"/>
+                                           options="{'product_field': 'product_id', 'business_domain': 'sale_order', 'amount_field': 'price_subtotal'}"/>
                                 <field
                                     name="product_uom_qty"
                                     decoration-info="(not display_type and invoice_status == 'to invoice')" decoration-bf="(not display_type and invoice_status == 'to invoice')"