From 3ee9d6373571a3fe213ba792c492144c16e4081b Mon Sep 17 00:00:00 2001
From: Magno Costa <magno.costa@akretion.com.br>
Date: Fri, 28 May 2021 10:53:45 -0300
Subject: [PATCH] [FIX] Views, included priority in view to avoid inherit
 errors.

---
 l10n_br_account_payment_order/views/account_invoice.xml     | 1 +
 l10n_br_account_payment_order/views/account_journal.xml     | 6 ++++--
 l10n_br_account_payment_order/views/account_move_line.xml   | 2 +-
 l10n_br_account_payment_order/views/account_move_view.xml   | 1 +
 .../views/account_payment_line.xml                          | 1 +
 .../views/account_payment_mode.xml                          | 3 +--
 .../views/account_payment_views.xml                         | 1 +
 l10n_br_account_payment_order/views/bank_payment_line.xml   | 2 ++
 l10n_br_account_payment_order/views/res_company.xml         | 1 +
 9 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/l10n_br_account_payment_order/views/account_invoice.xml b/l10n_br_account_payment_order/views/account_invoice.xml
index 88ba35c48157..9ccaa07d9b09 100644
--- a/l10n_br_account_payment_order/views/account_invoice.xml
+++ b/l10n_br_account_payment_order/views/account_invoice.xml
@@ -5,6 +5,7 @@
     <record id="view_l10n_br_account_invoice_form_inherit" model="ir.ui.view">
         <field name="name">view.l10n_br_account.invoice.form.form.inherit</field>
         <field name="model">account.invoice</field>
+        <field name="priority">99</field>
         <field name="inherit_id" ref="account_payment_order.invoice_form"/>
         <field name="arch" type="xml">
             <notebook position="inside">
diff --git a/l10n_br_account_payment_order/views/account_journal.xml b/l10n_br_account_payment_order/views/account_journal.xml
index 1b4ae33ad2e1..94eb46d291d6 100644
--- a/l10n_br_account_payment_order/views/account_journal.xml
+++ b/l10n_br_account_payment_order/views/account_journal.xml
@@ -4,9 +4,10 @@
 
 <odoo>
 
-    <record model="ir.ui.view" id="account_journal_bank_form_view">
+    <record id="account_journal_bank_form_view" model="ir.ui.view">
         <field name="name">account.journal.bank.form (in l10n_br_account_payment_order)</field>
         <field name="model">account.journal</field>
+        <field name="priority">99</field>
         <field name="inherit_id" ref="account.view_account_bank_journal_form"/>
         <field name="arch" type="xml">
             <xpath expr="//form" position="inside">
@@ -15,9 +16,10 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="account_journal_form_view">
+    <record id="account_journal_form_view" model="ir.ui.view">
         <field name="name">account.journal.form (in l10n_br_account_payment_order)</field>
         <field name="model">account.journal</field>
+        <field name="priority">99</field>
         <field name="inherit_id" ref="account.view_account_journal_form"/>
         <field name="arch" type="xml">
             <xpath expr="//form" position="inside">
diff --git a/l10n_br_account_payment_order/views/account_move_line.xml b/l10n_br_account_payment_order/views/account_move_line.xml
index a845944ec6d1..f602c2a7264a 100644
--- a/l10n_br_account_payment_order/views/account_move_line.xml
+++ b/l10n_br_account_payment_order/views/account_move_line.xml
@@ -16,7 +16,7 @@
         <field name="name">cnab.account.move.line.form.inherit</field>
         <field name="model">account.move.line</field>
         <field name="inherit_id" ref="account.view_move_line_form"/>
-        <field name="priority" eval="16"/>
+        <field name="priority">99</field>
         <field name="arch" type="xml">
             <sheet position="before">
                 <header>
diff --git a/l10n_br_account_payment_order/views/account_move_view.xml b/l10n_br_account_payment_order/views/account_move_view.xml
index 5f0f291c4233..ecfd7a5b2f9a 100644
--- a/l10n_br_account_payment_order/views/account_move_view.xml
+++ b/l10n_br_account_payment_order/views/account_move_view.xml
@@ -4,6 +4,7 @@
     <record id="view_move_cnab_form" model="ir.ui.view">
         <field name="name">account.move.cnab.view</field>
         <field name="model">account.move</field>
+        <field name="priority">99</field>
         <field name="inherit_id" ref="account.view_move_form"/>
         <field name="arch" type="xml">
             <xpath expr="/form/sheet/notebook" position="inside">
diff --git a/l10n_br_account_payment_order/views/account_payment_line.xml b/l10n_br_account_payment_order/views/account_payment_line.xml
index 0e70cb7f3569..fa7d1c4553f8 100644
--- a/l10n_br_account_payment_order/views/account_payment_line.xml
+++ b/l10n_br_account_payment_order/views/account_payment_line.xml
@@ -9,6 +9,7 @@
     <record id="l10n_br_account_payment_order_payment_line_form" model="ir.ui.view">
         <field name="name">l10n_br_account_payment_order.payment.line.form</field>
         <field name="model">account.payment.line</field>
+        <field name="priority">99</field>
         <field name="inherit_id" ref="account_payment_order.account_payment_line_form"/>
         <field name="arch" type="xml">
             <!-- TODO Campos não podem ser alterados aqui, o account.move.line ficaria
diff --git a/l10n_br_account_payment_order/views/account_payment_mode.xml b/l10n_br_account_payment_order/views/account_payment_mode.xml
index a5a8a09d8ab5..2f6ff48836c7 100644
--- a/l10n_br_account_payment_order/views/account_payment_mode.xml
+++ b/l10n_br_account_payment_order/views/account_payment_mode.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <odoo>
 
     <record id="l10n_br_account_payment_mode_form" model="ir.ui.view">
         <field name="name">payment.mode.l10n_br_payment.form</field>
         <field name="model">account.payment.mode</field>
+        <field name="priority">99</field>
         <field name="inherit_id" ref="account_payment_order.account_payment_mode_form"/>
-        <field name="priority" eval="14"/>
         <field name="arch" type="xml">
             <field name="payment_order_ok" position="after">
                 <separator/>
diff --git a/l10n_br_account_payment_order/views/account_payment_views.xml b/l10n_br_account_payment_order/views/account_payment_views.xml
index 2c1d921633e6..c70a76443e8a 100644
--- a/l10n_br_account_payment_order/views/account_payment_views.xml
+++ b/l10n_br_account_payment_order/views/account_payment_views.xml
@@ -4,6 +4,7 @@
     <record id="l10n_br-view_account_payment_invoice_form" model="ir.ui.view">
         <field name="name">l10n_br_account_payment_order.view.account.payment.invoice.form</field>
         <field name="model">account.payment</field>
+        <field name="priority">99</field>
         <field name="inherit_id" ref="payment.view_account_payment_invoice_form_inherit_payment"/>
         <field name="arch" type="xml">
 
diff --git a/l10n_br_account_payment_order/views/bank_payment_line.xml b/l10n_br_account_payment_order/views/bank_payment_line.xml
index 54bf1af2ca93..eb11cfeed08b 100644
--- a/l10n_br_account_payment_order/views/bank_payment_line.xml
+++ b/l10n_br_account_payment_order/views/bank_payment_line.xml
@@ -1,8 +1,10 @@
+<?xml version="1.0"?>
 <odoo>
 
     <record id="bank_payment_line_form" model="ir.ui.view">
         <field name="name">bank.payment.line.form</field>
         <field name="model">bank.payment.line</field>
+        <field name="priority">99</field>
         <field name="inherit_id"
                ref="account_payment_order.bank_payment_line_form"/>
         <field name="arch" type="xml">
diff --git a/l10n_br_account_payment_order/views/res_company.xml b/l10n_br_account_payment_order/views/res_company.xml
index 0362eff8e874..5f1e666bb0da 100644
--- a/l10n_br_account_payment_order/views/res_company.xml
+++ b/l10n_br_account_payment_order/views/res_company.xml
@@ -4,6 +4,7 @@
     <record id="res_company_form" model="ir.ui.view">
         <field name="name">l10n_br_account_payment_order.res.company.form</field>
         <field name="model">res.company</field>
+        <field name="priority">99</field>
         <field name="inherit_id" ref="base.view_company_form"/>
         <field name="arch" type="xml">
             <notebook position="inside">