From cc5b18f43e191ac4c0b65d56e957607629b02a68 Mon Sep 17 00:00:00 2001
From: Pieter Paulussen <pieterpaulussen@code-source.be>
Date: Wed, 30 Apr 2025 16:16:48 +0200
Subject: [PATCH] [FIX] product_status: re-align template and variant form view

---
 product_status/views/product_views.xml | 110 ++++++++++++++-----------
 1 file changed, 62 insertions(+), 48 deletions(-)

diff --git a/product_status/views/product_views.xml b/product_status/views/product_views.xml
index 32702e65a7a..b782ca4e700 100644
--- a/product_status/views/product_views.xml
+++ b/product_status/views/product_views.xml
@@ -4,27 +4,34 @@
         <field name="model">product.template</field>
         <field name="inherit_id" ref="product.product_template_only_form_view" />
         <field name="arch" type="xml">
-            <group name="sale" position="inside">
-                <group name="product_status_wrapper">
+            <notebook position="inside">
+                <page name="product_status" string="Product Status">
                     <group name="product_status" string="Product Status">
-                        <field name="new_until" />
-                        <field name="discontinued_until" />
-                        <field name="end_of_life_date" />
-                        <field name="state" />
+                        <group>
+                            <field name="new_until" />
+                            <field name="discontinued_until" />
+                            <field name="end_of_life_date" />
+                            <field name="state" />
+                        </group>
+                        <group>
+                            <div class="alert alert-info" role="alert" colspan="2">
+                                By order of importance, the status is computed by:<br />
+                                <ul>
+                                <li>End-of-life</li>
+                                <li>Discontinued until</li>
+                                <li>New until</li>
+                            </ul>
+                                <strong
+                            >End-of-life</strong> has priority over the other dates.<br
+                            />
+                                <strong
+                            >Discontinued-until</strong> has priority over <strong
+                            >New until</strong>.
+                            </div>
+                        </group>
                     </group>
-                    <div class="alert alert-info" role="alert" colspan="2">
-            By order of importance, the status is computed by:<br />
-            <ul>
-                        <li>End-of-life</li>
-                        <li>Discontinued until</li>
-                        <li>New until</li>
-                    </ul>
-            <strong>End-of-life</strong> has priority over the other dates.<br />
-            <strong>Discontinued-until</strong> has priority over <strong
-                    >New until</strong>.
-          </div>
-                </group>
-            </group>
+                </page>
+            </notebook>
         </field>
     </record>
 
@@ -32,37 +39,44 @@
         <field name="model">product.product</field>
         <field name="inherit_id" ref="product.product_normal_form_view" />
         <field name="arch" type="xml">
-            <group name="sale" position="inside">
-                <group name="product_status_wrapper">
+            <notebook position="inside">
+                <page name="product_status" string="Product Status">
                     <group name="product_status" string="Product Status">
-                        <field name="has_status_date" invisible="1" />
-                        <field name="new_until" />
-                        <field name="discontinued_until" />
-                        <field name="end_of_life_date" />
-                        <field name="tmpl_new_until" invisible="has_status_date" />
-                        <field
-                            name="tmpl_discontinued_until"
-                            invisible="has_status_date"
-                        />
-                        <field
-                            name="tmpl_end_of_life_date"
-                            invisible="has_status_date"
-                        />
-                        <field name="state" />
+                        <group>
+                            <field name="has_status_date" invisible="1" />
+                            <field name="new_until" />
+                            <field name="discontinued_until" />
+                            <field name="end_of_life_date" />
+                            <field name="tmpl_new_until" invisible="has_status_date" />
+                            <field
+                                name="tmpl_discontinued_until"
+                                invisible="has_status_date"
+                            />
+                            <field
+                                name="tmpl_end_of_life_date"
+                                invisible="has_status_date"
+                            />
+                            <field name="state" />
+                        </group>
+                        <group>
+                            <div class="alert alert-info" role="alert" colspan="2">
+                                By order of importance, the status is computed by:<br />
+                                <ul>
+                                <li>End-of-life</li>
+                                <li>Discontinued until</li>
+                                <li>New until</li>
+                            </ul>
+                                <strong
+                            >End-of-life</strong> has priority over the other dates.<br
+                            />
+                                <strong
+                            >Discontinued-until</strong> has priority over <strong
+                            >New until</strong>.
+                            </div>
+                        </group>
                     </group>
-                    <div class="alert alert-info" role="alert" colspan="2">
-            By order of importance, the status is computed by:<br />
-            <ul>
-                        <li>End-of-life</li>
-                        <li>Discontinued until</li>
-                        <li>New until</li>
-                    </ul>
-            <strong>End-of-life</strong> has priority over the other dates.<br />
-            <strong>Discontinued-until</strong> has priority over <strong
-                    >New until</strong>.
-          </div>
-                </group>
-            </group>
+                </page>
+            </notebook>
         </field>
     </record>