[NEW] View for Cobranca

OCA · Feb 18, 2020 · 332c33f · 332c33f
1 parent 88a5903
commit 332c33f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/l10n_br_account_payment_cobranca/views/account_payment_line.xml b/l10n_br_account_payment_cobranca/views/account_payment_line.xml
@@ -1,17 +1,40 @@
 <odoo>
     <data>
-        <record id="view_payment_order_form" model="ir.ui.view">
-            <field name="name">account.payment.order.form</field>
-            <field name="inherit_id"
-                   ref="account_payment_order.account_payment_line_form"/>
+        <record id="l10n_br_cobranca_payment_line_tree" model="ir.ui.view">
+            <field name="name">account.payment.line.tree</field>
+            <field name="model">account.payment.line</field>
+            <field name="arch" type="xml">
+                <tree string="Payment Lines">
+                    <field name="order_id" invisible="not context.get('account_payment_line_main_view')"/>
+                    <field name="partner_id"/>
+                    <field name="communication"/>
+                    <field name="nosso_numero"/>
+                    <field name="numero_documento"/>
+                    <field name="partner_bank_id"/>
+                    <field name="move_line_id" invisible="1"/>
+                    <field name="ml_maturity_date"/>
+                    <field name="date"/>
+                    <field name="amount_currency" string="Amount"/>
+                    <field name="currency_id" invisible="1"/>
+                    <field name="name"/>
+                    <field name="amount_company_currency" sum="Total in Company Currency" invisible="1"/>
+                    <field name="payment_type" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="l10n_br_cobranca_payment_line_form" model="ir.ui.view">
+            <field name="name">account.payment.line.form</field>
+            <field name="inherit_id" ref="l10n_br_account_payment_order.l10n_br_account_payment_line_form"/>
+            <field name="mode">primary</field>
             <field name="model">account.payment.line</field>
             <field name="arch" type="xml">
                 <!--<field name="line_ids" position="attributes">-->
                     <!--<attribute name="context">{'order_id': active_id or False,-->
                         <!--'default_mode': mode}-->
                     <!--</attribute>-->
                 <!--</field>-->
-                <group name="right" position="after">
+                <xpath expr="//group[@name='right']" position="after">
                     <group name="cnab" string="CNAB">
                         <field name="nosso_numero"/>
                         <field name="numero_documento"/>
@@ -21,7 +44,8 @@
                         <field name="codigo_finalidade_complementar"/>
                         <field name="aviso_ao_favorecido"/>
                     </group>
-                </group>
+                </xpath>
+
             </field>
         </record>
 

diff --git a/l10n_br_account_payment_cobranca/views/account_payment_order.xml b/l10n_br_account_payment_cobranca/views/account_payment_order.xml
@@ -4,8 +4,8 @@
     <record id="payment_cnab_payment_order_sequence" model="ir.ui.view">
         <field name="name">payment.order.form.sequence</field>
         <field name="model">account.payment.order</field>
-        <field name="inherit_id"
-               ref="account_payment_order.account_payment_order_form"/>
+        <field name="mode">primary</field>
+        <field name="inherit_id" ref="l10n_br_account_payment_order.l10n_br_account_payment_order_form"/>
         <field name="priority" eval="15"/>
         <field name="arch" type="xml">
             <div class="oe_title" position="before">
@@ -20,6 +20,7 @@
                     Verifique-os na aba "Problemas"
                 </div>
             </div>
+
             <field name="bank_line_count" position="after">
                 <field name="tipo_servico"/>
                 <field name="forma_lancamento"/>
@@ -30,6 +31,9 @@
                 <field name="codigo_instrucao_movimento"/>
                 <field name="tipo_movimento"/>
             </field>
+            <field name="payment_line_ids" position="attributes">
+                <attribute name="context">{'default_payment_type': payment_type, 'tree_view_ref': 'l10n_br_account_payment_cobranca.l10n_br_cobranca_payment_line_tree', 'form_view_ref': 'l10n_br_account_payment_cobranca.l10n_br_cobranca_payment_line_form'}</attribute>
+            </field>
             <page name="bank-payment-lines" position="after">
                 <page name="bank-error-lines" string="Problemas"
                       attrs="{'invisible': [('bank_line_error_ids','=',[])]}">