Skip to content

Commit

Permalink
[FIX] Ajustando dependencias do módulo cnab
Browse files Browse the repository at this point in the history
  • Loading branch information
danimaribeiro committed Dec 6, 2018
1 parent 4c94d43 commit 3472c04
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 9 deletions.
3 changes: 3 additions & 0 deletions br_account_payment/models/payment_order.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
6 changes: 1 addition & 5 deletions br_cnab/models/payment_order.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion br_payment_cnab/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
'account_invoicing',
'br_account_payment',
'br_account_voucher',
'br_cnab'
],
'data': [
'data/data.xml',
Expand Down
2 changes: 1 addition & 1 deletion br_payment_cnab/bancos/santander.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion br_payment_cnab/serialize/cnab240.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion br_payment_cnab/tests/test_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
Expand Down

0 comments on commit 3472c04

Please sign in to comment.