Skip to content

Commit

Permalink
[FIX] Views, included priority in view to avoid inherit errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
mbcosta committed May 28, 2021
1 parent 854a329 commit 3ee9d63
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 5 deletions.
1 change: 1 addition & 0 deletions l10n_br_account_payment_order/views/account_invoice.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
6 changes: 4 additions & 2 deletions l10n_br_account_payment_order/views/account_journal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion l10n_br_account_payment_order/views/account_move_line.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions l10n_br_account_payment_order/views/account_move_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions l10n_br_account_payment_order/views/account_payment_mode.xml
Original file line number Diff line number Diff line change
@@ -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/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down
2 changes: 2 additions & 0 deletions l10n_br_account_payment_order/views/bank_payment_line.xml
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
1 change: 1 addition & 0 deletions l10n_br_account_payment_order/views/res_company.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down

0 comments on commit 3ee9d63

Please sign in to comment.