Merge 8545970 into 308ab71

OCA · Dec 18, 2019 · 2e95fd8 · 2e95fd8
2 parents 308ab71 + 8545970
commit 2e95fd8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/l10n_br_account_payment_order/__manifest__.py b/l10n_br_account_payment_order/__manifest__.py
@@ -17,6 +17,7 @@
         'account_due_list',
     ],
     'data': [
+        'views/account_payment_order_menu_views.xml',
         'views/account_due_list.xml',
         'views/account_payment_line.xml',
         'views/account_payment_mode.xml',

diff --git a/l10n_br_account_payment_order/views/account_payment_mode.xml b/l10n_br_account_payment_order/views/account_payment_mode.xml
@@ -9,22 +9,15 @@
         <field name="priority" eval="14"/>
         <field name="arch" type="xml">
             <xpath expr="//form/group[@name='note']" position="before">
-                <group string="Configurações" name='l10n-br-config' col="4">
-                    <notebook colspan="4">
-                        <page string="Cobrança" attrs="{'invisible': [('payment_type', '=', 'outbound')]}">
-                            <group>
+                <group string="Configurações Brasileiras" name='l10n-br-config' col="4">
+                    <notebook colspan="4" name="l10n_br_account_payment_order">
+                        <page string="Geral">
+                            <group name="l10n_br_account_payment_order-geral">
                                 <field name="internal_sequence_id"/>
                                 <field name="instrucoes"/>
                                 <field name="invoice_print"/>
                             </group>
                         </page>
-                        <page string="Pagamento" attrs="{'invisible': [('payment_type', '=', 'inbound')]}">
-                            <group>
-                                <field name="internal_sequence_id" required='True'/>
-                                <field name="instrucoes"/>
-                                <field name="invoice_print"/>
-                            </group>
-                        </page>
                     </notebook>
                 </group>
             </xpath>

diff --git a/l10n_br_account_payment_order/views/account_payment_order_menu_views.xml b/l10n_br_account_payment_order/views/account_payment_order_menu_views.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo><!-- This Menu Item Must have a parent -->
+    <menuitem id="menu_retorno_categ" name="Retorno"
+              parent="account_payment_order.payment_root" sequence="3"/>
+    <menuitem id="menu_remessa_categ" name="Remessa"
+              parent="account_payment_order.payment_root" sequence="1"/>
+
+
+    <menuitem id="account_payment_order.account_payment_order_outbound_menu"
+              parent="menu_remessa_categ" sequence="10"/>
+
+    <menuitem id="account_payment_order.account_payment_order_inbound_menu"
+              parent="menu_remessa_categ" sequence="20"/>
+
+    <menuitem id="account_payment_order.bank_payment_line_menu"
+              parent="menu_remessa_categ" sequence="50"/>
+</odoo>