From b2d00200e715fec39adaa00e5e24b5169f5d2bce Mon Sep 17 00:00:00 2001
From: "Nicolas (vin)" <vin@odoo.com>
Date: Fri, 23 Sep 2022 06:19:38 +0000
Subject: [PATCH] [FIX] account, analytic: account.analytic.distribution.model
 views

Improve both tree and form views for the account.analytic.distribution.model

closes odoo/odoo#101001

X-original-commit: bb2820ad585ceed0f0562de3cd5f9ef8f1fac7d1
Signed-off-by: Ayob Habib (ayh) <ayh@odoo.com>
Signed-off-by: Nicolas Viseur <vin@odoo.com>
---
 .../account_analytic_distribution_model.py    |  2 +-
 ...ount_analytic_distribution_model_views.xml | 14 +++++-----
 .../analytic_distribution_model_views.xml     | 28 +++++++++++--------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/addons/account/models/account_analytic_distribution_model.py b/addons/account/models/account_analytic_distribution_model.py
index c398fa16120..84ed6e805f2 100644
--- a/addons/account/models/account_analytic_distribution_model.py
+++ b/addons/account/models/account_analytic_distribution_model.py
@@ -7,7 +7,7 @@ class AccountAnalyticDistributionModel(models.Model):
     _inherit = 'account.analytic.distribution.model'
 
     account_prefix = fields.Char(
-        string='Financial Accounts Prefix',
+        string='Accounts Prefix',
         help="Prefix that defines which accounts from the financial accounting this model should apply on.",
     )
     product_id = fields.Many2one(
diff --git a/addons/account/views/account_analytic_distribution_model_views.xml b/addons/account/views/account_analytic_distribution_model_views.xml
index c71faa853ec..45fbecfeb21 100644
--- a/addons/account/views/account_analytic_distribution_model_views.xml
+++ b/addons/account/views/account_analytic_distribution_model_views.xml
@@ -8,11 +8,11 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//field[@name='partner_id']" position="before">
-                            <field name="account_prefix"/>
+                            <field name="account_prefix" optional="show"/>
                     </xpath>
-                    <xpath expr="//field[@name='partner_category_id']" position="after">
-                            <field name="product_id"/>
-                            <field name="product_categ_id"/>
+                    <xpath expr="//field[@name='company_id']" position="before">
+                            <field name="product_id" optional="show"/>
+                            <field name="product_categ_id" optional="hide"/>
                     </xpath>
                 </data>
             </field>
@@ -24,10 +24,10 @@
             <field name="inherit_id" ref="analytic.account_analytic_distribution_model_form_view"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='partner_id']" position="before">
+                    <xpath expr="//field[@name='partner_category_id']" position="after">
                             <field name="account_prefix"/>
                     </xpath>
-                    <xpath expr="//field[@name='partner_category_id']" position="after">
+                    <xpath expr="//field[@name='company_id']" position="before">
                             <field name="product_id"/>
                             <field name="product_categ_id"/>
                     </xpath>
@@ -35,4 +35,4 @@
             </field>
         </record>
     </data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/addons/analytic/views/analytic_distribution_model_views.xml b/addons/analytic/views/analytic_distribution_model_views.xml
index 39b010873c8..bd96b272ed0 100644
--- a/addons/analytic/views/analytic_distribution_model_views.xml
+++ b/addons/analytic/views/analytic_distribution_model_views.xml
@@ -6,10 +6,10 @@
         <field name="arch" type="xml">
             <tree string="Analytic Distribution Model">
                 <field name="analytic_distribution_stored_char" invisible="1"/>
-                <field name="analytic_distribution" widget="analytic_distribution" nolabel="1"/>
-                <field name="partner_id"/>
-                <field name="partner_category_id"/>
-                <field name="company_id" groups="base.group_multi_company"/>
+                <field name="partner_id" optional="show"/>
+                <field name="partner_category_id" optional="hide"/>
+                <field name="company_id" groups="base.group_multi_company" optional="show"/>
+                <field name="analytic_distribution" widget="analytic_distribution" optional="show"/>
             </tree>
         </field>
     </record>
@@ -21,14 +21,18 @@
             <form string="Analytic Distribution Model">
                 <sheet>
                     <group>
-                        <group>
-                            <field name="partner_id"/>
-                            <field name="partner_category_id"/>
-                            <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="analytic_distribution_stored_char" invisible="1"/>
+                        <group string="Simultaneous conditions to meet" colspan="2">
+                            <group>
+                                <field name="partner_id"/>
+                                <field name="partner_category_id"/>
+                            </group>
+                            <group>
+                                <field name="company_id" groups="base.group_multi_company"/>
+                            </group>
                         </group>
-                        <group>
-                            <field name="analytic_distribution_stored_char" invisible="1"/>
-                            <field name="analytic_distribution" string="Analytic Distribution" widget="analytic_distribution"
+                        <group string="Analytic distribution to apply" colspan="2">
+                            <field name="analytic_distribution" widget="analytic_distribution"
                                    options="{'force_applicability': 'optional', 'disable_save': true}"/>
                         </group>
                     </group>
@@ -42,4 +46,4 @@
         <field name="res_model">account.analytic.distribution.model</field>
         <field name="view_mode">tree,form</field>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>