[FIX] all: fix pre-commit new checks

.github/workflows/pre-commit.yml

@@ -13,17 +13,10 @@ jobs:
   pre-commit:
     runs-on: ubuntu-22.04
     steps:
-<<<<<<< before updating
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-=======
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v2
         with:
           python-version: "3.11"
->>>>>>> after updating
       - name: Get python version
         run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
       - uses: actions/cache@v1

.github/workflows/stale.yml.rej

@@ -1,9 +0,0 @@
-diff a/.github/workflows/stale.yml b/.github/workflows/stale.yml	(rejected hunks)
-@@ -15,2 +15,3 @@ jobs:
-           # General settings.
-+          ascending: true
-           remove-stale-when-updated: true
-@@ -52,2 +53,3 @@ jobs:
-           repo-token: ${{ secrets.GITHUB_TOKEN }}
-+          ascending: true
-           only-labels: "needs more information"

support_branding/demo/ir_config_parameter_data.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data noupdate="0">
     <record id="demo_config_parameter_company_name" model="ir.config_parameter">
         <field name="key">support_company</field>
         <field name="value">Odoo Community Association</field>
@@ -21,5 +20,4 @@
         <field name="key">support_release</field>
         <field name="value">14.0</field>
     </record>
-    </data>
 </odoo>

web_create_write_confirm/views/assets.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
 
     <template id="assets_backend_extension" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
@@ -11,5 +10,4 @@
         </xpath>
     </template>
 
-    </data>
 </odoo>

web_create_write_confirm/views/popup_message.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
 
     <record id="view_popup_message_tree" model="ir.ui.view">
         <field name="name">view.popup.message.tree</field>
         <field name="model">popup.message</field>
         <field name="arch" type="xml">
-                <tree string="Popup Message">
+            <tree>
                 <field name="model_id" />
                 <field name="field_ids" widget="many2many_tags" />
                 <field name="popup_type" />
@@ -74,5 +73,4 @@
         sequence="10"
     />
 
-    </data>
 </odoo>

web_field_required_invisible_manager/views/views.xml

@@ -15,7 +15,7 @@
                         nolabel="1"
                         context="{'default_required_model_id': model}"
                     >
-                        <tree string="Fields">
+                        <tree>
                             <field name="required_model_id" invisible="1" />
                             <field name="invisible_model_id" invisible="1" />
                             <field name="model_name" invisible="1" />
@@ -45,7 +45,7 @@
                         nolabel="1"
                         context="{'default_invisible_model_id': model}"
                     >
-                        <tree string="Fields">
+                        <tree>
                             <field name="required_model_id" invisible="1" />
                             <field name="invisible_model_id" invisible="1" />
                             <field name="model_name" invisible="1" />
@@ -72,7 +72,7 @@
                         nolabel="1"
                         context="{'default_readonly_model_id': model}"
                     >
-                        <tree string="Fields">
+                        <tree>
                             <field name="required_model_id" invisible="1" />
                             <field name="invisible_model_id" invisible="1" />
                             <field name="readonly_model_id" invisible="1" />

web_m2x_options_manager/views/ir_model.xml

@@ -17,7 +17,7 @@
                         nolabel="1"
                         context="{'default_model_name': model}"
                     >
-                        <tree string="Fields Description" editable="bottom">
+                        <tree editable="bottom">
                             <field name="model_name" invisible="1" />
                             <field
                                 name="field_id"

web_no_bubble/views/web_no_bubble.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
     <template
         id="assets_backend"
         name="web_no_bubble_assets"
@@ -25,5 +24,4 @@
             />
         </xpath>
     </template>
-    </data>
 </odoo>

web_pwa_oca/views/res_config_settings_views.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
     <record id="res_config_settings_view_form" model="ir.ui.view">
         <field name="name">res.config.settings.view.form.pwa</field>
         <field name="model">res.config.settings</field>
@@ -12,10 +11,7 @@
                     <div class="col-12 col-lg-6 o_setting_box" id="domain_setting">
                         <div class="o_setting_right_pane">
                             <label for="pwa_name" string="PWA Title" />
-                                <span
+                            <span class="fa fa-lg fa-globe" title="Icon next to name" />
-                                    class="fa fa-lg fa-globe"
-                                    title="Icon next to name"
-                                />
                             <div class="text-muted">
                                 Name and icon of your PWA
                             </div>
@@ -68,5 +64,4 @@
             </div>
         </field>
     </record>
-    </data>
 </odoo>

web_switch_context_warning/view/view.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<openerp>
+<odoo>
-    <data>
     <template
         id="assets_backend"
         name="web_switch_context_warning assets"
@@ -13,5 +12,4 @@
             />
         </xpath>
     </template>
-    </data>
+</odoo>
-</openerp>