From 1709cba800bc4a9bf3b50a025eb6d4e375e3f070 Mon Sep 17 00:00:00 2001
From: niyasraphy <niyasraphyk@gmail.com>
Date: Thu, 3 Nov 2022 18:14:59 +0000
Subject: [PATCH] [FIX] sale,purchase,stock,account: partner form warning
 alignment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes odoo/odoo#105511

X-original-commit: 6aa86c92c7ee7d46c54250960c2b34753e13b8be
Signed-off-by: William André (wan) <wan@odoo.com>
---
 addons/account/i18n/account.pot             |  5 +++++
 addons/account/views/partner_view.xml       | 12 ++++++------
 addons/purchase/i18n/purchase.pot           |  5 +++++
 addons/purchase/views/res_partner_views.xml | 12 ++++++------
 addons/sale/views/res_partner_views.xml     | 10 +++++-----
 addons/stock/i18n/stock.pot                 |  5 +++++
 addons/stock/views/res_partner_views.xml    | 12 +++++++-----
 7 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 6e64697c1ab..314d9b06797 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -14194,6 +14194,11 @@ msgstr ""
 msgid "Type Name"
 msgstr ""
 
+#. module: account
+#: model_terms:ir.ui.view,arch_db:account.partner_view_buttons
+msgid "Type a message..."
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement_line__qr_code_method
 #: model:ir.model.fields,help:account.field_account_move__qr_code_method
diff --git a/addons/account/views/partner_view.xml b/addons/account/views/partner_view.xml
index 54f9d464591..9c884b9caa2 100644
--- a/addons/account/views/partner_view.xml
+++ b/addons/account/views/partner_view.xml
@@ -158,14 +158,14 @@
                 </div>
 
                 <page name="internal_notes" position="inside">
-                    <t groups="account.group_account_invoice,account.group_account_readonly">
-                        <group colspan="2" col="2" groups="account.group_warning_account">
-                            <separator string="Warning on the Invoice" colspan="4"/>
-                            <field name="invoice_warn" nolabel="1" />
-                            <field name="invoice_warn_msg" colspan="3" nolabel="1"
+                    <group groups="account.group_account_invoice,account.group_account_readonly">
+                        <group groups="account.group_warning_account" col="2">
+                            <separator string="Warning on the Invoice" colspan="2"/>
+                            <field name="invoice_warn" nolabel="1" colspan="2" required="1"/>
+                            <field name="invoice_warn_msg" placeholder="Type a message..." colspan="2" nolabel="1"
                                 attrs="{'required':[('invoice_warn','!=', False), ('invoice_warn','!=','no-message')], 'invisible':[('invoice_warn','in',(False,'no-message'))]}"/>
                         </group>
-                    </t>
+                    </group>
                 </page>
             </field>
         </record>
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index db6cdcc4952..da4a1f92362 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -2766,6 +2766,11 @@ msgstr ""
 msgid "True if the reminder email is confirmed by the vendor."
 msgstr ""
 
+#. module: purchase
+#: model_terms:ir.ui.view,arch_db:purchase.res_partner_view_purchase_buttons
+msgid "Type a message..."
+msgstr ""
+
 #. module: purchase
 #: model:ir.model.fields,help:purchase.field_purchase_order__activity_exception_decoration
 msgid "Type of the exception activity on record."
diff --git a/addons/purchase/views/res_partner_views.xml b/addons/purchase/views/res_partner_views.xml
index b45e4c4db5c..2af15b0ab8b 100644
--- a/addons/purchase/views/res_partner_views.xml
+++ b/addons/purchase/views/res_partner_views.xml
@@ -96,14 +96,14 @@
                     </button>
                 </div>
                 <page name="internal_notes" position="inside">
-                    <t groups="purchase.group_purchase_user">
-                        <group colspan="2" col="2" groups="purchase.group_warning_purchase">
-                            <separator string="Warning on the Purchase Order" colspan="4"/>
-                            <field name="purchase_warn" nolabel="1" />
-                            <field name="purchase_warn_msg" colspan="3" nolabel="1"
+                    <group groups="purchase.group_purchase_user">
+                        <group groups="purchase.group_warning_purchase" col="2">
+                            <separator string="Warning on the Purchase Order" colspan="2"/>
+                            <field name="purchase_warn" nolabel="1" colspan="2" required="1"/>
+                            <field name="purchase_warn_msg" colspan="2" placeholder="Type a message..." nolabel="1"
                                 attrs="{'required':[('purchase_warn','!=', False), ('purchase_warn','!=','no-message')], 'invisible':[('purchase_warn','in',(False,'no-message'))]}"/>
                         </group>
-                    </t>
+                    </group>
                 </page>
             </field>
         </record>
diff --git a/addons/sale/views/res_partner_views.xml b/addons/sale/views/res_partner_views.xml
index d744f8dad37..76190e3771e 100644
--- a/addons/sale/views/res_partner_views.xml
+++ b/addons/sale/views/res_partner_views.xml
@@ -51,12 +51,12 @@
                     <field string="Sales" name="sale_order_count" widget="statinfo"/>
                 </button>
             </div>
-            <xpath expr="//page[@name='internal_notes']//field[@name='comment']" position="before">
+            <xpath expr="//page[@name='internal_notes']//field[@name='comment']" position="after">
                 <group groups="sale.group_warning_sale,sales_team.group_sale_salesman">
-                    <group>
-                        <separator string="Warning on the Sales Order" />
-                        <field name="sale_warn" string="Warning" />
-                        <field name="sale_warn_msg" string="Message" placeholder="Type a message..."
+                    <group col="2">
+                        <separator string="Warning on the Sales Order" colspan="2"/>
+                        <field name="sale_warn" nolabel="1" colspan="2" required="1"/>
+                        <field name="sale_warn_msg" nolabel="1" string="Message" placeholder="Type a message..." colspan="2"
                                 attrs="{'required':[('sale_warn','!=', False), ('sale_warn','!=','no-message')], 'invisible':[('sale_warn','in',(False,'no-message'))]}"/>
                     </group>
                 </group>
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 629fc7599e9..c3077bff649 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -8295,6 +8295,11 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: stock
+#: model_terms:ir.ui.view,arch_db:stock.view_partner_stock_warnings_form
+msgid "Type a message..."
+msgstr ""
+
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move__picking_code
 #: model:ir.model.fields,field_description:stock.field_stock_move_line__picking_code
diff --git a/addons/stock/views/res_partner_views.xml b/addons/stock/views/res_partner_views.xml
index 05766a1a81f..cb87e67b3e2 100644
--- a/addons/stock/views/res_partner_views.xml
+++ b/addons/stock/views/res_partner_views.xml
@@ -27,11 +27,13 @@
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
             <page name="internal_notes" position="inside">
-                <group colspan="2" col="2" groups="stock.group_warning_stock">
-                    <separator string="Warning on the Picking" colspan="4"/>
-                    <field name="picking_warn" nolabel="1" />
-                    <field name="picking_warn_msg" colspan="3" nolabel="1" 
-                        attrs="{'required':[('picking_warn','!=', False), ('picking_warn','!=','no-message')], 'invisible':[('picking_warn','in',(False,'no-message'))]}"/>
+                <group groups="stock.group_warning_stock">
+                    <group col="2">
+                        <separator string="Warning on the Picking" colspan="2"/>
+                        <field name="picking_warn" nolabel="1" colspan="2" required="1"/>
+                        <field name="picking_warn_msg" placeholder="Type a message..." colspan="2" nolabel="1"
+                            attrs="{'required':[('picking_warn','!=', False), ('picking_warn','!=','no-message')], 'invisible':[('picking_warn','in',(False,'no-message'))]}"/>
+                    </group>
                 </group>
             </page>
         </field>