Merge 409df38 into b8f489f

l10n_br_account_banking_payment/README.rst → l10n_br_account_payment_order/README.rst

@@ -1,6 +1,6 @@
-============================================================
-Brazilian Banking - Debit and Payments Export Infrastructure
-============================================================
+=======================
+Brazilian Payment Order
+=======================
 
 .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
@@ -14,10 +14,10 @@ Brazilian Banking - Debit and Payments Export Infrastructure
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--brazil-lightgray.png?logo=github
-    :target: https://github.com/OCA/l10n-brazil/tree/10.0/l10n_br_account_banking_payment
+    :target: https://github.com/OCA/l10n-brazil/tree/10.0/l10n_br_account_payment_order
     :alt: OCA/l10n-brazil
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/l10n-brazil-10-0/l10n-brazil-10-0-l10n_br_account_banking_payment
+    :target: https://translation.odoo-community.org/projects/l10n-brazil-10-0/l10n-brazil-10-0-l10n_br_account_payment_order
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
     :target: https://runbot.odoo-community.org/runbot/124/10.0
@@ -80,13 +80,18 @@ Changelog
 
 * [MIG] Migração para a versão 10.
 
+10.0.2.0.0 (2018-05-17)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [REF] Modulo unido com o l10n_br_account_payment_mode e renomeado para l10n_br_account_payment_order.
+
 Bug Tracker
 ===========
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/l10n-brazil/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/l10n-brazil/issues/new?body=module:%20l10n_br_account_banking_payment%0Aversion:%2010.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/l10n-brazil/issues/new?body=module:%20l10n_br_account_payment_order%0Aversion:%2010.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -128,6 +133,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/l10n-brazil <https://github.com/OCA/l10n-brazil/tree/10.0/l10n_br_account_banking_payment>`_ project on GitHub.
+This module is part of the `OCA/l10n-brazil <https://github.com/OCA/l10n-brazil/tree/10.0/l10n_br_account_payment_order>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

l10n_br_account_banking_payment/__manifest__.py → l10n_br_account_payment_order/__manifest__.py

@@ -4,12 +4,12 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Brazilian Banking - Debit and Payments Export Infrastructure',
-    'version': '10.0.1.0.0',
+    'name': 'Brazilian Payment Order',
+    'version': '10.0.2.0.0',
     'license': 'AGPL-3',
     'author': "KMEE, "
               "Odoo Community Association (OCA)",
-    'website': 'https://github.com/odoo-brazil/odoo-brazil-banking',
+    'website': 'https://github.com/OCA/l10n-brazil',
     'category': 'Banking addons',
     'depends': [
         'l10n_br_account',
@@ -18,10 +18,12 @@
     ],
     'data': [
         'views/account_due_list.xml',
-        'views/account_payment.xml',
+        'views/account_payment_line.xml',
+        'views/account_payment_mode.xml',
     ],
     'demo': [
-        'demo/account_banking_payment_demo.xml'
+        'demo/account_payment_order_demo.xml',
+        'demo/account_payment_mode_demo.xml'
     ],
     'installable': True,
 }

l10n_br_account_payment_mode/demo/payment_demo.xml → l10n_br_account_payment_order/demo/account_payment_mode_demo.xml

@@ -114,15 +114,24 @@
             <field name="bank_name">Sicredi - Instituição Financeira Cooperativa</field>
         </record>
 
-        <record id="payment_mode_cheque" model="account.payment.mode">
-            <field name="name">Cheque</field>
-            <field name="fixed_journal_id" ref="l10n_br_account_product.aj_78df616ab31e95ee46c6a519a2ce9e12"/>
+        <!-- Account Journal -->
+        <record id="l10n_br_account_payment_order-account_journal" model="account.journal">
+            <field name="name">Diário de Banco(teste l10n_br_account_payment_order)</field>
+            <field name="code">TPO</field>
+            <field name="type">sale</field>
+            <field eval="1" name="revenue_expense"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
+        <!-- Account Payment Mode -->
+        <record id="payment_mode_boleto" model="account.payment.mode">
+            <field name="name">Boleto Bancario</field>
+            <field name="fixed_journal_id" ref="l10n_br_account_payment_order-account_journal"/>
             <field name="bank_account_link">variable</field>
-            <!--<field name="bank_id" ref="main_company_bank_bradesco"/>-->
+            <field name="bank_id" ref="main_company_bank_bradesco"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="payment_method_id"
-                   ref="account.account_payment_method_manual_out"/>
-            <field name="type_payment">99</field>
+                   ref="account.account_payment_method_manual_in"/>
         </record>
 
     </data>

l10n_br_account_banking_payment/demo/account_banking_payment_demo.xml → l10n_br_account_payment_order/demo/account_payment_order_demo.xml

@@ -11,7 +11,6 @@
         <field name="reconcile" eval="True"/>
     </record>
 
-
     <!-- Invoice -->
     <record model="account.invoice" id="demo_invoice_payment_order">
         <field name="name">Test Payment Order</field>

l10n_br_account_banking_payment/models/__init__.py → l10n_br_account_payment_order/models/__init__.py

@@ -3,5 +3,7 @@
 #  Luis Felipe Miléo - mileo@kmee.com.br
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import account_payment
+from . import account_payment_line
 from . import account_move_line
+from . import account_payment_mode
+from . import res_partner_bank

l10n_br_account_payment_mode/models/payment_mode.py → l10n_br_account_payment_order/models/account_payment_mode.py

@@ -19,21 +19,3 @@ class AccountPaymentMode(models.Model):
          'unique(internal_sequence_id)',
          u'Sequência já usada! Crie uma sequência unica para cada modo')
     ]
-
-
-class AccountPaymentMethod(models.Model):
-    _inherit = 'account.payment.method'
-
-    payment_type = fields.Selection(
-        selection_add=[
-            ('cobranca', u'Cobrança'),
-        ])
-
-
-class AccountPaymentOrder(models.Model):
-    _inherit = 'account.payment.order'
-
-    payment_type = fields.Selection(
-        selection_add=[
-            ('cobranca', u'Cobrança'),
-        ])

l10n_br_account_banking_payment/readme/HISTORY.rst → l10n_br_account_payment_order/readme/HISTORY.rst

@@ -18,3 +18,8 @@
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 * [MIG] Migração para a versão 10.
+
+10.0.2.0.0 (2018-05-17)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [REF] Modulo unido com o l10n_br_account_payment_mode e renomeado para l10n_br_account_payment_order.