diff --git a/l10n_br_account_payment_cobranca/__manifest__.py b/l10n_br_account_payment_cobranca/__manifest__.py
index 2a95eaabb4ad..560012a85575 100644
--- a/l10n_br_account_payment_cobranca/__manifest__.py
+++ b/l10n_br_account_payment_cobranca/__manifest__.py
@@ -40,7 +40,7 @@
         "security/ir.model.access.csv",
     ],
     "demo": [
-        # 'demo/l10n_br_payment_mode.xml',
+        'demo/l10n_br_payment_mode.xml',
     ],
     "test": [
         # 'tests/invoice_create.yml'
diff --git a/l10n_br_account_payment_cobranca/data/boleto_data.xml b/l10n_br_account_payment_cobranca/data/boleto_data.xml
index bca3e6d31ebd..12f79aba2510 100644
--- a/l10n_br_account_payment_cobranca/data/boleto_data.xml
+++ b/l10n_br_account_payment_cobranca/data/boleto_data.xml
@@ -11,6 +11,7 @@
 
     <record id="base.main_company" model="res.company">
         <field name="own_number_sequence" ref="sequence_boleto_own_number"/>
+        <field name="own_number_type">1</field>
     </record>
 
 </odoo>
diff --git a/l10n_br_account_payment_cobranca/demo/l10n_br_payment_mode.xml b/l10n_br_account_payment_cobranca/demo/l10n_br_payment_mode.xml
index 6da79653ea0c..36ba7d8f5c32 100644
--- a/l10n_br_account_payment_cobranca/demo/l10n_br_payment_mode.xml
+++ b/l10n_br_account_payment_cobranca/demo/l10n_br_payment_mode.xml
@@ -2,11 +2,11 @@
 <odoo noupdate="1">
 
     <!-- payment.mode cobrança Bradesco240 -->
-    <record id="payment_mode_cobranca_bradesco240" model="payment.mode">
+    <record id="payment_mode_cobranca_bradesco240" model="account.payment.mode">
         <field name="name">Cobrança Bradesco240</field>
-        <field name="journal" ref="account.bank_journal"/>
+        <field name="journal" ref="l10n_br_account_payment_order.l10n_br_account_payment_order-account_journal"/>
         <field name="bank_id"
-               ref="l10n_br_account_payment_mode.main_company_bank_bradesco"/>
+               ref="l10n_br_account_payment_order.main_company_bank_bradesco"/>
         <field name="company_id" ref="base.main_company"/>
         <field name="type"
                ref="l10n_br_account_payment_cobranca.payment_mode_type_cnab240"/>
@@ -16,7 +16,11 @@
         <field name="instrucoes">Pagavel em qualquer banco ate o
             vencimento
         </field>
-        <field name="boleto_type">3</field>
+<!--        <field name="boleto_type">3</field>-->
+        <field name="bank_account_link">variable</field>
+        <field name="payment_order_ok">True</field>
+        <field name="payment_method_id" ref="l10n_br_account_payment_cobranca.payment_mode_type_cnab240"/>
+        <field name="operation_type">3</field>
         <field name="boleto_convenio">06</field>
         <field name="boleto_carteira">03</field>
         <field name="boleto_modalidade">DM</field>
@@ -25,11 +29,11 @@
     </record>
 
     <!-- payment.mode cobrança Itau240 -->
-    <record id="payment_mode_cobranca_itau240" model="payment.mode">
+    <record id="payment_mode_cobranca_itau240" model="account.payment.mode">
         <field name="name">Cobrança Itau240</field>
-        <field name="journal" ref="account.bank_journal"/>
+        <field name="journal" ref="l10n_br_account_payment_order.l10n_br_account_payment_order-account_journal"/>
         <field name="bank_id"
-               ref="l10n_br_account_payment_mode.main_company_bank_itau"/>
+               ref="l10n_br_account_payment_order.main_company_bank_itau"/>
         <field name="company_id" ref="base.main_company"/>
         <field name="type"
                ref="l10n_br_account_payment_cobranca.payment_mode_type_cnab240"/>
@@ -39,7 +43,11 @@
         <field name="instrucoes">Pagavel em qualquer banco ate o
             vencimento
         </field>
-        <field name="boleto_type">6</field>
+<!--        <field name="boleto_type">6</field>-->
+        <field name="bank_account_link">variable</field>
+        <field name="payment_order_ok">True</field>
+        <field name="payment_method_id" ref="l10n_br_account_payment_cobranca.payment_mode_type_cnab240"/>
+        <field name="operation_type">3</field>
         <field name="boleto_convenio">06</field>
         <field name="boleto_carteira">03</field>
         <field name="boleto_modalidade">DM</field>
@@ -48,11 +56,11 @@
     </record>
 
     <!-- payment.mode cobrança Cef240 -->
-    <record id="payment_mode_cobranca_cef240" model="payment.mode">
+    <record id="payment_mode_cobranca_cef240" model="account.payment.mode">
         <field name="name">Cobrança Cef240</field>
-        <field name="journal" ref="account.bank_journal"/>
+        <field name="journal" ref="l10n_br_account_payment_order.l10n_br_account_payment_order-account_journal"/>
         <field name="bank_id"
-               ref="l10n_br_account_payment_mode.main_company_bank_cef"/>
+               ref="l10n_br_account_payment_order.main_company_bank_cef"/>
         <field name="company_id" ref="base.main_company"/>
         <field name="type"
                ref="l10n_br_account_payment_cobranca.payment_mode_type_cnab240"/>
@@ -62,7 +70,11 @@
         <field name="instrucoes">Pagavel em qualquer banco ate o
             vencimento
         </field>
-        <field name="boleto_type">11</field>
+<!--        <field name="boleto_type">11</field>-->
+        <field name="bank_account_link">variable</field>
+        <field name="payment_order_ok">True</field>
+        <field name="payment_method_id" ref="l10n_br_account_payment_cobranca.payment_mode_type_cnab240"/>
+        <field name="operation_type">3</field>
         <field name="boleto_convenio">06</field>
         <field name="boleto_carteira">03</field>
         <field name="boleto_modalidade">DM</field>
@@ -70,4 +82,9 @@
         <field name="aceite">S</field>
     </record>
 
+    <!-- account invoice -->
+    <record model="account.invoice" id="l10n_br_account_payment_order.demo_invoice_payment_order">
+        <field name="payment_mode_id" ref="l10n_br_account_payment_cobranca.payment_mode_cobranca_bradesco240"/>
+    </record>
+
 </odoo>