odoo-brazil · mileo · Sep 13, 2019 · Sep 14, 2019 · Sep 14, 2019 · Sep 14, 2019
diff --git a/.isort.cfg b/.isort.cfg
@@ -1,2 +1,2 @@
 [settings]
-known_third_party = OpenSSL,dateutil,erpbrasil,lxml,odoo,openupgradelib,requests,setuptools
+known_third_party = OpenSSL,dateutil,erpbrasil,lxml,odoo,openerp,openupgradelib,pytz,requests,setuptools,workalendar
diff --git a/README.md b/README.md
@@ -76,23 +76,27 @@ Available addons
 ----------------
 addon | version | summary
 --- | --- | ---
-[l10n_br_account](l10n_br_account/) | 12.0.2.0.0 | Brazilian Localization Account
+[l10n_br_account](l10n_br_account/) | 12.0.2.1.1 | Brazilian Localization Account
 [l10n_br_account_payment_order](l10n_br_account_payment_order/) | 12.0.1.0.0 | Brazilian Payment Order
 [l10n_br_base](l10n_br_base/) | 12.0.1.0.1 | Customization of base module for implementations in Brazil.
-[l10n_br_coa](l10n_br_coa/) | 12.0.2.0.0 | Base Brasilian Localization of Chart of Account
-[l10n_br_coa_generic](l10n_br_coa_generic/) | 12.0.2.0.0 | Plano de Contas para empresas do Regime normal (Micro e pequenas empresas)
-[l10n_br_coa_simple](l10n_br_coa_simple/) | 12.0.2.0.0 | Brazilian Simple Chart of Account
+[l10n_br_coa](l10n_br_coa/) | 12.0.2.1.0 | Base Brasilian Localization for the Chart of Accounts
+[l10n_br_coa_generic](l10n_br_coa_generic/) | 12.0.2.1.0 | Plano de Contas para empresas do Regime normal (Micro e pequenas empresas)
+[l10n_br_coa_simple](l10n_br_coa_simple/) | 12.0.2.1.0 | Brazilian Simple Chart of Account
 [l10n_br_crm](l10n_br_crm/) | 12.0.1.0.0 | Brazilian Localization CRM
 [l10n_br_currency_rate_update](l10n_br_currency_rate_update/) | 12.0.1.0.0 | Update exchange rates using OCA modules for Brazil
-[l10n_br_fiscal](l10n_br_fiscal/) | 12.0.3.5.1 | Brazilian fiscal core module.
+[l10n_br_fiscal](l10n_br_fiscal/) | 12.0.4.0.0 | Brazilian fiscal core module.
 [l10n_br_hr](l10n_br_hr/) | 12.0.1.0.0 | Brazilian Localization HR
 [l10n_br_hr_contract](l10n_br_hr_contract/) | 12.0.1.0.0 | Brazilian Localization HR Contract
-[l10n_br_nfse](l10n_br_nfse/) | 12.0.1.3.0 | NFS-e
+[l10n_br_mis_report](l10n_br_mis_report/) | 12.0.1.1.0 | Templates de relatórios contábeis brasileiros: Balanço Patrimonial e DRE
+[l10n_br_nfse](l10n_br_nfse/) | 12.0.1.4.0 | NFS-e
 [l10n_br_portal](l10n_br_portal/) | 12.0.1.0.0 | Campos Brasileiros no Portal
 [l10n_br_resource](l10n_br_resource/) | 12.0.1.0.0 | This module extend core resource to create important brazilian informations. Define a Brazilian calendar and some tools to compute dates used in financial and payroll modules
 [l10n_br_sale](l10n_br_sale/) | 12.0.1.0.0 | Brazilian Localization Sale
 [l10n_br_stock](l10n_br_stock/) | 12.0.1.0.0 | Brazilian Localization Warehouse
+[l10n_br_stock_account](l10n_br_stock_account/) | 12.0.1.0.0 | Brazilian Localization WMS Accounting
+[l10n_br_website_sale](l10n_br_website_sale/) | 12.0.1.0.1 | Website sale localização brasileira.
 [l10n_br_zip](l10n_br_zip/) | 12.0.2.0.0 | Brazilian Localisation ZIP Codes
+[payment_cielo](payment_cielo/) | 12.0.3.2.0 | Payment Acquirer: Cielo Implementation
 
 
 Unported addons

diff --git a/l10n_br_account/__manifest__.py b/l10n_br_account/__manifest__.py
@@ -7,7 +7,7 @@
     "license": "AGPL-3",
     "author": "Akretion, Odoo Community Association (OCA)",
     "website": "http://github.com/OCA/l10n-brazil",
-    "version": "12.0.2.0.0",
+    "version": "12.0.2.1.1",
     "depends": ["account_cancel", "l10n_br_coa", "l10n_br_fiscal"],
     "data": [
         # security

diff --git a/l10n_br_account/data/account_tax_group.xml b/l10n_br_account/data/account_tax_group.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
 
     <!-- Account Tax Group -->
     <record id="l10n_br_coa.tax_group_icms" model="account.tax.group">

diff --git a/l10n_br_account/i18n/pt_BR.po b/l10n_br_account/i18n/pt_BR.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-07 09:02+0000\n"
-"PO-Revision-Date: 2020-06-13 17:19+0000\n"
-"Last-Translator: Maurício Liell <mauricio@liell.com.br>\n"
+"PO-Revision-Date: 2020-11-05 07:08+0000\n"
+"Last-Translator: Eder Brito <britoederr@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr "Conta"
 #. module: l10n_br_account
 #: model:ir.model,name:l10n_br_account.model_l10n_br_account_document_line_mixin
 msgid "Account Document Line Mixin"
-msgstr ""
+msgstr "Mixin de Linha de Documento da Conta"
 
 #. module: l10n_br_account
 #: model:ir.model.fields,field_description:l10n_br_account.field_l10n_br_fiscal_operation__journal_id
@@ -69,7 +69,7 @@ msgstr "Anotação de crédito"
 #. module: l10n_br_account
 #: model:ir.model.fields,field_description:l10n_br_account.field_l10n_br_account_document_line_mixin__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Nome de Exibição"
 
 #. module: l10n_br_account
 #: code:addons/l10n_br_account/wizards/account_invoice_refund.py:68
@@ -143,7 +143,7 @@ msgstr "Forçar Operação Fiscal"
 #. module: l10n_br_account
 #: model:ir.model.fields,field_description:l10n_br_account.field_l10n_br_account_document_line_mixin__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: l10n_br_account
 #: model:ir.model,name:l10n_br_account.model_account_invoice
@@ -163,22 +163,22 @@ msgstr "Item de Diário"
 #. module: l10n_br_account
 #: model:ir.model.fields,field_description:l10n_br_account.field_l10n_br_account_document_line_mixin____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Última Modificação em"
 
 #. module: l10n_br_account
 #: model_terms:ir.ui.view,arch_db:l10n_br_account.invoice_search
 msgid "Legal Name"
-msgstr ""
+msgstr "Razão Social"
 
 #. module: l10n_br_account
 #: model_terms:ir.ui.view,arch_db:l10n_br_account.invoice_line_form
 msgid "Outros Custos"
-msgstr ""
+msgstr "Outros Custos"
 
 #. module: l10n_br_account
 #: model_terms:ir.ui.view,arch_db:l10n_br_account.invoice_search
 msgid "State Tax Number"
-msgstr ""
+msgstr "Número de Imposto Estadual"
 
 #. module: l10n_br_account
 #: model:ir.model,name:l10n_br_account.model_account_tax
@@ -194,7 +194,7 @@ msgstr "Grupo de Imposto"
 #. module: l10n_br_account
 #: model_terms:ir.ui.view,arch_db:l10n_br_account.invoice_line_form
 msgid "Taxes"
-msgstr ""
+msgstr "Impostos"
 
 #. module: l10n_br_account
 #: model:ir.model,name:l10n_br_account.model_account_tax_template
@@ -211,6 +211,8 @@ msgstr "Usado nos documentos fiscais"
 #, python-format
 msgid "You cannot delete a fiscal document which is not draft state."
 msgstr ""
+"Você não pode excluir um documento fiscal que não esteja no estado de "
+"rascunho."
 
 #~ msgid "Tax Account"
 #~ msgstr "Conta de imposto"

diff --git a/l10n_br_account/models/account_invoice_line.py b/l10n_br_account/models/account_invoice_line.py
@@ -143,6 +143,9 @@ def create(self, values):
     def write(self, values):
         dummy_doc_line = self.env.ref(
             'l10n_br_fiscal.fiscal_document_line_dummy')
+        if values.get('invoice_id'):
+            values['document_id'] = self.env[
+                "account.invoice"].browse(values['invoice_id']).fiscal_document_id.id
         result = super().write(values)
         for line in self:
             if line.fiscal_document_line_id != dummy_doc_line:

diff --git a/l10n_br_account/tests/test_customer_invoice_dummy.py b/l10n_br_account/tests/test_customer_invoice_dummy.py
@@ -228,3 +228,11 @@ def test_invoice_other_currency(self):
         assert self.invoice_3.move_id, "Move Receivable not created for open invoice"
         self.assertEquals(
             self.invoice_3.state, "open", "Invoice should be in state Open")
+
+    def test_invoice_line_ids_write(self):
+        self.invoice_3.invoice_line_ids.write({'invoice_id': self.invoice_3.id})
+        for line in self.invoice_3.invoice_line_ids:
+            self.assertEquals(
+                line.document_id.id,
+                self.invoice_3.fiscal_document_id.id,
+                "line.document_id should be equal account.fiscal_document_id")
diff --git a/l10n_br_account/wizards/account_invoice_refund.py b/l10n_br_account/wizards/account_invoice_refund.py
@@ -35,59 +35,59 @@ def compute_refund(self, mode="refund"):
 
                 if (
                     not self.force_fiscal_operation_id
-                    and not invoice.operation_id
+                    and not invoice.fiscal_operation_id
                 ):
                     raise UserError(_("Document without Operation !"))
 
                 if (
                     not self.force_fiscal_operation_id
-                    and not invoice.operation_id.return_operation_id
+                    and not invoice.fiscal_operation_id.return_operation_id
                 ):
                     raise UserError(
                         _(
                             "Fiscal Operation: There is not Return Operation "
                             "for %s !"
                         )
-                        % invoice.operation_id.name
+                        % invoice.fiscal_operation_id.name
                     )
 
-                invoice.operation_id = (
+                invoice.fiscal_operation_id = (
                     self.force_fiscal_operation_id.id
-                    or invoice.operation_id.return_operation_id.id
+                    or invoice.fiscal_operation_id.return_operation_id.id
                 )
 
                 invoice_values = {
-                    "operation_id": invoice.operation_id.id,
+                    "fiscal_operation_id": invoice.fiscal_operation_id.id,
                 }
 
                 for line in invoice.invoice_line_ids:
                     if (
                         not self.force_fiscal_operation_id
-                        and not line.operation_id
+                        and not line.fiscal_operation_id
                     ):
                         raise UserError(_("Document line without Operation !"))
 
                     if (
                         not self.force_fiscal_operation_id
-                        and not line.operation_id.refund_operation_id
+                        and not line.fiscal_operation_id.refund_operation_id
                     ):
                         raise UserError(
                             _(
                                 "Fiscal Operation: There is not Return "
                                 "Operation for %s !"
                             )
-                            % line.operation_id.name
+                            % line.fiscal_operation_id.name
                         )
 
-                    line.operation_id = (
+                    line.fiscal_operation_id = (
                         self.force_fiscal_operation_id.id
-                        or line.operation_id.return_operation_id
+                        or line.fiscal_operation_id.return_operation_id
                     )
 
                     line._onchange_operation_id()
 
                     line_values = {
-                        "operation_id": line.operation_id.id,
+                        "fiscal_operation_id": line.fiscal_operation_id.id,
                         "fiscal_operation_line_id": line.fiscal_operation_line_id.id,
                     }
                     line.write(line_values)
@@ -104,10 +104,10 @@ def fields_view_get(self, view_id=None, view_type="form", toolbar=False,
         fiscal_operation_type = REFUND_TO_OPERATION[invoice_type]
         fiscal_type = FISCAL_TYPE_REFUND[fiscal_operation_type]
         eview = etree.fromstring(result["arch"])
-        operation_id = eview.xpath(
+        fiscal_operation_id = eview.xpath(
             "//field[@name='force_fiscal_operation_id']")
 
-        for field in operation_id:
+        for field in fiscal_operation_id:
             field.set(
                 "domain",
                 "[('fiscal_operation_type', '=', '%s'), ('fiscal_type', 'in', %s)]"

diff --git a/l10n_br_account_payment_order/README.rst b/l10n_br_account_payment_order/README.rst
@@ -117,14 +117,6 @@ Contributors
 * Magno Costa <[email protected]>
 
 
-Other credits
-~~~~~~~~~~~~~
-
-The development of this module has been financially supported by:
-
-* KMEE INFORMATICA LTDA - www.kmee.com.br
-* AKRETION LTDA - www.akretion.com
-
 Maintainers
 ~~~~~~~~~~~
 

diff --git a/l10n_br_account_payment_order/__init__.py b/l10n_br_account_payment_order/__init__.py
@@ -3,4 +3,5 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
+from . import wizards
 from . import tests
diff --git a/l10n_br_account_payment_order/__manifest__.py b/l10n_br_account_payment_order/__manifest__.py
@@ -4,9 +4,10 @@
 
 {
     'name': 'Brazilian Payment Order',
-    'version': '12.0.1.0.0',
+    'version': '12.0.3.0.0',
     'license': 'AGPL-3',
     'author': "KMEE, "
+              "Akretion, "
               "Odoo Community Association (OCA)",
     'website': 'https://github.com/OCA/l10n-brazil',
     'category': 'Banking addons',
@@ -17,16 +18,61 @@
         'account_cancel',
     ],
     'data': [
-        'views/account_due_list.xml',
+        # Security
+        'security/cnab_cobranca_security.xml',
+        'security/ir.model.access.csv',
+
+        # Data
+        'data/cnab_data.xml',
+        'data/l10n_br_payment_export_type.xml',
+        'data/boleto_data.xml',
+        'data/account_analytic_tag_data.xml',
+        'data/l10n_br_cnab_return_move_code_data.xml',
+        'data/l10n_br_cnab_mov_instruction_code_data.xml',
+        'data/l10n_br_cnab_option_data.xml',
+
+        # Reports
+        'reports/report_print_button_view.xml',
+
+        # Wizards
+        'wizards/account_payment_line_create_view.xml',
+        'wizards/account_move_line_change.xml',
+
+        # Views
+        'views/account_journal.xml',
         'views/account_payment_order.xml',
-        'views/account_payment_order_menu_views.xml',
         'views/account_payment_line.xml',
         'views/account_payment_mode.xml',
+        'views/res_company.xml',
+        'views/bank_payment_line.xml',
+        # TODO - Separação dos dados de importação para um objeto especifico
+        #  cnab.return.log armazenando o LOG do Arquivo de Retorno CNAB
+        #  de forma separada e permitindo a integração com a alteração feita no
+        #  modulo do BRCobranca onde se esta utilizando o modulo
+        #  account_base_move_import para fazer essa tarefa de wizard de importação,
+        #  o objeto l10n_br_cnab esta comentado para permitir, caso seja necessário,
+        #  a implementação de outra forma de importação pois tem os metodos que eram
+        #  usados pela KMEE e o historico git do arquivo
+        # 'views/l10n_br_cnab_retorno_view.xml',
+        # 'views/l10n_br_cnab_evento_views.xml',
+        # 'views/l10n_br_payment_cnab.xml',
+        # 'views/l10n_br_cobranca_cnab.xml',
+        # 'views/l10n_br_cobranca_cnab_lines.xml',
+        'views/l10n_br_cnab_return_log_view.xml',
+        'views/account_invoice.xml',
+        'views/account_move_line.xml',
+        'views/l10n_br_cnab_return_move_code_view.xml',
+        'views/account_payment_views.xml',
+        'views/l10n_br_cnab_mov_instruction_code_view.xml',
+        'views/account_move_view.xml'
     ],
     'demo': [
         'demo/res_partner_bank.xml',
+        'demo/account_account.xml',
         'demo/account_journal.xml',
         'demo/account_payment_mode.xml',
+        'demo/account_invoice.xml',
+        'demo/res_users.xml',
         'demo/account_payment_order.xml',
     ],
     'installable': True,