From bcc42d4a8ab34903079930d06dd7d1bfd2e04c7d Mon Sep 17 00:00:00 2001
From: nikj-odoo <nikj@odoo.com>
Date: Tue, 17 Oct 2023 18:05:51 +0530
Subject: [PATCH] [IMP] sale,sale_management: improve quotation template form
 view

With this commit, we have improved the UI for the Prepayment amount field
in both the quotation template form view and the Sale order form view.
The changes have made it easier for users to input and review information.

task-3546106

closes odoo/odoo#139461

Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 addons/sale/views/sale_order_views.xml        | 19 ++++++++++-------
 .../views/sale_order_template_views.xml       | 21 ++++++++++++-------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/addons/sale/views/sale_order_views.xml b/addons/sale/views/sale_order_views.xml
index c146aca819b..ee90d3dc7cf 100644
--- a/addons/sale/views/sale_order_views.xml
+++ b/addons/sale/views/sale_order_views.xml
@@ -694,14 +694,17 @@
                                 <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
                                 <field name="require_signature"
                                        readonly="state in ['cancel', 'sale']"/>
-                                <field name="require_payment"
-                                       readonly="state in ['cancel', 'sale']"/>
-                                <field name="prepayment_percent"
-                                       readonly="state in ['cancel', 'sale']"
-                                       invisible="not require_payment"
-                                       widget="percentage"
-                                       string="Prepayment amount"
-                                       style="width: 3rem"/>
+                                <label for="require_payment"/>
+                                <div id="require_payment">
+                                    <field name="require_payment"
+                                        readonly="state in ['cancel', 'sale']"/>
+                                    <span class="mx-3" invisible="not require_payment">of</span>
+                                    <field name="prepayment_percent"
+                                        readonly="state in ['cancel', 'sale']"
+                                        invisible="not require_payment"
+                                        widget="percentage"
+                                        style="width: 3rem"/>
+                                </div>
                                 <field name="reference" readonly="1" invisible="not reference"/>
                                 <field name="client_order_ref"/>
                                 <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/>
diff --git a/addons/sale_management/views/sale_order_template_views.xml b/addons/sale_management/views/sale_order_template_views.xml
index 3a82df72d90..82ba3910c40 100644
--- a/addons/sale_management/views/sale_order_template_views.xml
+++ b/addons/sale_management/views/sale_order_template_views.xml
@@ -31,22 +31,27 @@
                     <group>
                         <group name="sale_info">
                             <field name="active" invisible="1"/>
-                            <label for="number_of_days" string="Quotation expires after"/>
+                            <label for="number_of_days" string="Quotation Validity"/>
                             <div id="number_of_days">
                                 <field name="number_of_days" style="width: 3rem;"/>
                                 <div class="d-inline-block">days</div>
                             </div>
-                            <field name="require_signature"/>
-                            <field name="require_payment"/>
-                            <field name="prepayment_percent"
-                                   invisible="not require_payment"
-                                   widget="percentage"
-                                   string="Prepayment amount"
-                                   style="width: 3rem"/>
                             <field name="mail_template_id" context="{'default_model': 'sale.order'}"/>
                             <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
                             <field name="journal_id"/>
                         </group>
+                        <group name="so_confirmation">
+                            <field name="require_signature"/>
+                            <label for="require_payment"/>
+                            <div id="require_payment" class="o_row">
+                                <field name="require_payment" class="oe_inline"/>
+                                <span invisible="not require_payment">of</span>
+                                <field name="prepayment_percent"
+                                       invisible="not require_payment"
+                                       widget="percentage"
+                                       class="oe_inline"/>
+                            </div>
+                        </group>
                     </group>
                     <notebook name="main_book">
                         <page string="Lines" name="order_lines">