From 091d35257810c687a1dee9a223ba19791884e1c9 Mon Sep 17 00:00:00 2001
From: Alessandro Uffreduzzi <alessandro.uffreduzzi@pytech.it>
Date: Mon, 30 Oct 2023 17:31:10 +0100
Subject: [PATCH] [FIX] all: fix pre-commit new checks

---
 .../views/sale_blanket_order_views.xml        |  3 -
 sale_delivery_state/demo/sale_demo.xml        |  1 +
 .../wizard/sale_exception_confirm_view.xml    |  2 +-
 .../views/sale_portal_templates.xml           |  1 +
 sale_product_set/views/product_set.xml        | 78 ++++++++++++++++++-
 sale_product_set/views/product_set_line.xml   | 32 +++++++-
 6 files changed, 107 insertions(+), 10 deletions(-)

diff --git a/sale_blanket_order/views/sale_blanket_order_views.xml b/sale_blanket_order/views/sale_blanket_order_views.xml
index 810e6151cf88..bcf55194fe5e 100644
--- a/sale_blanket_order/views/sale_blanket_order_views.xml
+++ b/sale_blanket_order/views/sale_blanket_order_views.xml
@@ -358,9 +358,6 @@
             </p>
         </field>
     </record>
-
-    <!-- MENU'S -->
-
     <menuitem
         id="menu_blanket_order_config"
         parent="sale.sale_order_menu"
diff --git a/sale_delivery_state/demo/sale_demo.xml b/sale_delivery_state/demo/sale_demo.xml
index 54d99d214e90..46f2eddadc50 100644
--- a/sale_delivery_state/demo/sale_demo.xml
+++ b/sale_delivery_state/demo/sale_demo.xml
@@ -6,6 +6,7 @@
         <field name="partner_invoice_id" ref="base.res_partner_2" />
         <field name="partner_shipping_id" ref="base.res_partner_2" />
         <field name="user_id" ref="base.user_demo" />
+        <field name="pricelist_id" ref="product.list0" />
         <field name="team_id" ref="sales_team.team_sales_department" />
         <field
             name="date_order"
diff --git a/sale_exception/wizard/sale_exception_confirm_view.xml b/sale_exception/wizard/sale_exception_confirm_view.xml
index cd480c0c4918..c7e641d7d068 100644
--- a/sale_exception/wizard/sale_exception_confirm_view.xml
+++ b/sale_exception/wizard/sale_exception_confirm_view.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <form string="Blocked in draft due to exceptions">
                 <group>
-                    <field name="exception_ids" nolabel="1" colspan="2">
+                    <field name="exception_ids" nolabel="1" colspan="4">
                         <tree>
                             <field name="name" />
                             <field name="description" />
diff --git a/sale_fixed_discount/views/sale_portal_templates.xml b/sale_fixed_discount/views/sale_portal_templates.xml
index 406e99b74fed..0df48d966103 100644
--- a/sale_fixed_discount/views/sale_portal_templates.xml
+++ b/sale_fixed_discount/views/sale_portal_templates.xml
@@ -3,6 +3,7 @@
     <template
         id="sale_order_portal_content"
         inherit_id="sale.sale_order_portal_content"
+        priority="999"
     >
         <xpath
             expr="//section[@id='details']//t[@t-set='display_discount']"
diff --git a/sale_product_set/views/product_set.xml b/sale_product_set/views/product_set.xml
index 4d011abb7ef5..38a2ec1729b4 100644
--- a/sale_product_set/views/product_set.xml
+++ b/sale_product_set/views/product_set.xml
@@ -1,14 +1,86 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
+    <record id="view_product_set_tree" model="ir.ui.view">
+        <field name="name">product.set.tree</field>
+        <field name="model">product.set</field>
+        <field name="type">tree</field>
+        <field name="priority" eval="8" />
+        <field name="arch" type="xml">
+            <tree>
+                <field name="ref" />
+                <field name="name" />
+                <field name="partner_id" />
+                <field name="company_id" groups="base.group_multi_company" />
+            </tree>
+        </field>
+    </record>
     <record id="view_product_set_form" model="ir.ui.view">
         <field name="name">product.set.form</field>
         <field name="model">product.set</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="product_set.view_product_set_form" />
         <field name="arch" type="xml">
-            <field name="quantity" position="after">
-                <field name="discount" groups="product.group_discount_per_so_line" />
-            </field>
+            <form string="Product set">
+                <sheet>
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('active', '=', True)]}"
+                    />
+                    <div class="oe_button_box" name="button_box" />
+                    <group name="main">
+                        <group name="name">
+                            <field name="active" invisible="1" />
+                            <field name="name" select="1" />
+                            <field name="ref" />
+                        </group>
+                        <group name="partner">
+                            <field name="partner_id" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                        <label for="set_line_ids" />
+                        <field name="set_line_ids" nolabel="1">
+                            <tree editable="top">
+                                <field name="sequence" widget="handle" />
+                                <field name="product_id" />
+                                <field name="quantity" />
+                                <field
+                                    name="discount"
+                                    groups="product.group_discount_per_so_line"
+                                />
+                            </tree>
+                        </field>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="view_product_set_search" model="ir.ui.view">
+        <field name="name">product.set.search</field>
+        <field name="model">product.set</field>
+        <field name="type">search</field>
+        <field name="priority" eval="8" />
+        <field name="arch" type="xml">
+            <search string="Product set">
+                <field name="name" select="True" />
+                <filter
+                    name="active"
+                    string="Archived"
+                    domain="[('active', '=', False)]"
+                />
+                <field name="ref" select="True" />
+                <field name="partner_id" />
+                <filter
+                    name="group_by_partner_id"
+                    string="Partner"
+                    domain="[]"
+                    context="{'group_by':'partner_id'}"
+                />
+            </search>
         </field>
     </record>
     <menuitem
diff --git a/sale_product_set/views/product_set_line.xml b/sale_product_set/views/product_set_line.xml
index 1900a9445ae0..63c89b8f137a 100644
--- a/sale_product_set/views/product_set_line.xml
+++ b/sale_product_set/views/product_set_line.xml
@@ -6,9 +6,35 @@
         <field name="type">tree</field>
         <field name="inherit_id" ref="product_set.view_product_set_line_tree" />
         <field name="arch" type="xml">
-            <field name="quantity" position="after">
-                 <field name="discount" groups="product.group_discount_per_so_line" />
-            </field>
+            <tree editable="top">
+                <field name="product_set_id" />
+                <field name="product_id" />
+                <field name="quantity" />
+                <field name="discount" groups="product.group_discount_per_so_line" />
+            </tree>
+        </field>
+    </record>
+    <record id="view_product_set_line_search" model="ir.ui.view">
+        <field name="name">product.set.line.search</field>
+        <field name="model">product.set.line</field>
+        <field name="type">search</field>
+        <field name="priority" eval="8" />
+        <field name="arch" type="xml">
+            <search string="Product set line">
+                <field name="product_set_id" />
+                <field name="product_id" />
+                <filter
+                    name="group_by_product_set_id"
+                    domain="[]"
+                    context="{'group_by':'product_set_id'}"
+                />
+                <filter
+                    name="group_by_product_id"
+                    string="Product"
+                    domain="[]"
+                    context="{'group_by':'product_id'}"
+                />
+            </search>
         </field>
     </record>
      <menuitem