From f8d351aa43cf51ba0f71e43169e2d5da419f225e Mon Sep 17 00:00:00 2001
From: "Valentin Vallaeys (vava)" <vava@odoo.com>
Date: Wed, 23 Aug 2023 08:47:03 +0000
Subject: [PATCH] [FIX] *: fix domain definition (not) in operator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* account, account_peppol, purchase_requisition, stock_delivery, base

There are some conditions in xml that uses `in` or `not in` for a check
with a string. These are replaced by `==` or `!=` operators,
respectively.

closes odoo/odoo#132798

Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 addons/account/views/account_move_views.xml                   | 2 +-
 addons/account_peppol/views/res_config_settings_views.xml     | 2 +-
 .../purchase_requisition/views/purchase_requisition_views.xml | 2 +-
 addons/stock_delivery/views/delivery_view.xml                 | 4 ++--
 odoo/addons/base/wizard/base_partner_merge_views.xml          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index da699d5bb3e..cf7be8c2eed 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -437,7 +437,7 @@
                            decoration-danger="payment_state == 'not_paid'"
                            decoration-warning="payment_state in ('partial', 'in_payment')"
                            decoration-success="payment_state in ('paid', 'reversed')"
-                           invisible="payment_state in 'invoicing_legacy' or state != 'posted' or move_type == 'entry'"
+                           invisible="payment_state == 'invoicing_legacy' or state != 'posted' or move_type == 'entry'"
                            optional="show"/>
                     <field name="state" widget="badge" decoration-success="state == 'posted'" decoration-info="state == 'draft'" optional="show"/>
                     <field name="move_type" column_invisible="context.get('default_move_type', True)"/>
diff --git a/addons/account_peppol/views/res_config_settings_views.xml b/addons/account_peppol/views/res_config_settings_views.xml
index afe437ef600..42b63011110 100644
--- a/addons/account_peppol/views/res_config_settings_views.xml
+++ b/addons/account_peppol/views/res_config_settings_views.xml
@@ -64,7 +64,7 @@
                                            required="is_account_peppol_participant"/>
                                 </div>
                                 <div class="content-group pt-3"
-                                     invisible="account_peppol_proxy_state not in 'not_registered' or not is_account_peppol_participant">
+                                     invisible="account_peppol_proxy_state != 'not_registered' or not is_account_peppol_participant">
                                     <span>
                                         I want to migrate my Peppol connection to Odoo (optional):
                                     </span>
diff --git a/addons/purchase_requisition/views/purchase_requisition_views.xml b/addons/purchase_requisition/views/purchase_requisition_views.xml
index 155054ebfc0..5747b20a3b1 100644
--- a/addons/purchase_requisition/views/purchase_requisition_views.xml
+++ b/addons/purchase_requisition/views/purchase_requisition_views.xml
@@ -145,7 +145,7 @@
                         <field name="ordering_date" readonly="state not in ('draft', 'in_progress', 'open', 'ongoing')"/>
                         <field name="schedule_date" readonly="state not in ('draft', 'in_progress', 'open', 'ongoing')"/>
                         <field name="origin" placeholder="e.g. PO0025" readonly="state != 'draft'"/>
-                        <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" readonly="state not in 'draft'"/>
+                        <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" readonly="state != 'draft'"/>
                     </group>
                 </group>
                 <notebook>
diff --git a/addons/stock_delivery/views/delivery_view.xml b/addons/stock_delivery/views/delivery_view.xml
index dc7b28c9e26..e81a8c4dd87 100644
--- a/addons/stock_delivery/views/delivery_view.xml
+++ b/addons/stock_delivery/views/delivery_view.xml
@@ -25,7 +25,7 @@
                         <label for="carrier_tracking_ref"/>
                         <div name="tracking">
                             <field name="carrier_tracking_ref" class="oe_inline" readonly="state in ('done', 'cancel')"/>
-                            <button type='object' class="oi oi-arrow-right oe_link" confirm="Cancelling a delivery may not be undoable. Are you sure you want to continue?" name="cancel_shipment" string="Cancel" invisible="not carrier_tracking_ref or delivery_type in ['fixed', 'base_on_rule'] or not delivery_type or state not in 'done'"/>
+                            <button type='object' class="oi oi-arrow-right oe_link" confirm="Cancelling a delivery may not be undoable. Are you sure you want to continue?" name="cancel_shipment" string="Cancel" invisible="not carrier_tracking_ref or delivery_type in ['fixed', 'base_on_rule'] or not delivery_type or state != 'done'"/>
                         </div>
                         <label for="weight" string="Weight"/>
                         <div>
@@ -44,7 +44,7 @@
                          invisible="not carrier_tracking_ref or not carrier_id or delivery_type == 'grid'" />
                 </div>
                 <xpath expr="/form/header/button[last()]" position="after">
-                    <button name="send_to_shipper" string="Send to Shipper" type="object" invisible="carrier_tracking_ref or delivery_type in ['fixed', 'base_on_rule'] or not delivery_type or state not in 'done' or picking_type_code == 'incoming'" data-hotkey="shift+v"/>
+                    <button name="send_to_shipper" string="Send to Shipper" type="object" invisible="carrier_tracking_ref or delivery_type in ['fixed', 'base_on_rule'] or not delivery_type or state != 'done' or picking_type_code == 'incoming'" data-hotkey="shift+v"/>
                 </xpath>
                 <xpath expr="/form/header/button[last()]" position="after">
                     <button name="print_return_label" string="Print Return Label" type="object" invisible="not is_return_picking or state == 'done' or picking_type_code != 'incoming'" data-hotkey="shift+o"/>
diff --git a/odoo/addons/base/wizard/base_partner_merge_views.xml b/odoo/addons/base/wizard/base_partner_merge_views.xml
index 078e751dc68..7134282f222 100644
--- a/odoo/addons/base/wizard/base_partner_merge_views.xml
+++ b/odoo/addons/base/wizard/base_partner_merge_views.xml
@@ -43,7 +43,7 @@
                         </group>
                         <separator string="Options" invisible="state not in ('option',)"/>
                         <group invisible="state not in ('option', 'finished')">
-                            <field name='maximum_group' readonly="state in 'finished'"/>
+                            <field name='maximum_group' readonly="state == 'finished'"/>
                         </group>
                         <separator string="Merge the following contacts"
                             invisible="state in ('option', 'finished')"/>