Merge branch '11.0' into 11.0-import-protocol-and-receipt

br_account/models/account_invoice_line.py

@@ -505,9 +505,7 @@ def _update_tax_from_ncm(self):
                 'tax_ipi_id': ncm.tax_ipi_id.id,
             })
 
-    def _set_taxes(self):
-        super(AccountInvoiceLine, self)._set_taxes()
-        self._update_tax_from_ncm()
+    def _set_taxes_from_fiscal_pos(self):
         fpos = self.invoice_id.fiscal_position_id
         if fpos:
             vals = fpos.map_tax_extra_values(
@@ -517,6 +515,10 @@ def _set_taxes(self):
                 if value and key in self._fields:
                     self.update({key: value})
 
+    def _set_taxes(self):
+        super(AccountInvoiceLine, self)._set_taxes()
+        self._update_tax_from_ncm()
+        self._set_taxes_from_fiscal_pos()
         other_taxes = self.invoice_line_tax_ids.filtered(
             lambda x: not x.domain)
         self.invoice_line_tax_ids = self.tax_icms_id | self.tax_icms_st_id | \

br_account_payment/models/payment_order.py

@@ -111,6 +111,9 @@ def _compute_amount_total(self):
     currency_id = fields.Many2one('res.currency', string='Moeda')
     amount_total = fields.Float(string="Total",
                                 compute='_compute_amount_total')
+    cnab_file = fields.Binary('CNAB File', readonly=True)
+    file_number = fields.Integer(u'Número sequencial do arquivo', readonly=1)
+    data_emissao_cnab = fields.Datetime('Data de Emissão do CNAB')
 
     def mark_order_line_processed(self, cnab_code, cnab_message,
                                   rejected=False, statement_id=None):

br_cnab/models/payment_order.py

@@ -5,17 +5,13 @@
 import base64
 from ..febraban.cnab import Cnab
 from datetime import datetime, date
-from odoo import api, fields, models
+from odoo import api, models
 from odoo.exceptions import UserError
 
 
 class PaymentOrder(models.Model):
     _inherit = 'payment.order'
 
-    cnab_file = fields.Binary('CNAB File', readonly=True)
-    file_number = fields.Integer(u'Número sequencial do arquivo', readonly=1)
-    data_emissao_cnab = fields.Datetime('Data de Emissão do CNAB')
-
     @api.multi
     def gerar_cnab(self):
         if len(self.line_ids) < 1:

br_nfse_bh/models/invoice_eletronic.py

@@ -309,7 +309,7 @@ def action_cancel_document(self, context=None, justificativa=None):
             certificado, cancelamento=canc, ambiente=self.ambiente)
 
         retorno = cancel['object']
-        if "Cancelamento" in dir(retorno):
+        if "RetCancelamento" in dir(retorno):
             self.state = 'cancel'
             self.codigo_retorno = '100'
             self.mensagem_retorno = u'Nota Fiscal de Serviço Cancelada'

br_payment_cnab/__manifest__.py

@@ -24,7 +24,6 @@
         'account_invoicing',
         'br_account_payment',
         'br_account_voucher',
-        'br_cnab'
     ],
     'data': [
         'data/data.xml',

br_payment_cnab/bancos/santander.py

@@ -30,7 +30,7 @@ def _get_cod_convenio_santander(self):
         return "{:4s}{:4s}{:12s}".format(
             str(bank_account.bank_id.bic).zfill(4),
             str(bank_account.bra_number).zfill(4),
-            str(bank_account.codigo_convenio).zfill(12))
+            str(bank_account.l10n_br_convenio_pagamento).zfill(12))
 
     def _get_header_arq(self):
         header = super()._get_header_arq()

br_payment_cnab/serialize/cnab240.py

@@ -196,7 +196,7 @@ def _get_header_lot(self, line, num_lot, lot):
             "cedente_inscricao_tipo": 2,
             "cedente_inscricao_numero": self._string_to_num(
                 self._order.company_id.cnpj_cpf),
-            "codigo_convenio": str(bank.codigo_convenio),
+            "codigo_convenio": str(bank.l10n_br_convenio_pagamento),
             "cedente_agencia": bank.bra_number,
             "cedente_agencia_dv": bank.bra_number_dig or '',
             "cedente_conta": bank.acc_number,

br_payment_cnab/tests/test_common.py

@@ -87,7 +87,7 @@ def setUp(self):
             'acc_number_dig': '0',  # 1 digito
             'bra_number': '1234',  # 4 digitos
             'bra_number_dig': '0',
-            'codigo_convenio': '123456-6',  # 7 digitos
+            'l10n_br_convenio_pagamento': '123456-6',  # 7 digitos
             'bank_id': sicoob.id,
             'partner_id': self.partner_fisica.id,
         })