Merge 959265f into 978d819

br_account_payment/wizard/payment_cnab_import.py

@@ -2,10 +2,12 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import base64
-
+import logging
 from odoo import fields, models
 from odoo.exceptions import UserError
 
+_logger = logging.getLogger(__name__)
+
 
 class l10nBrPaymentCnabImport(models.TransientModel):
     _name = 'l10n_br.payment.cnab.import'
@@ -38,8 +40,15 @@ def do_import(self, cnab_file):
         pass
 
     def action_import_cnab(self):
-        cnab = base64.decodestring(self.cnab_file)
-        acc_number, bra_number = self._get_account(cnab)
-
-        self.validate_journal(acc_number, bra_number)
-        return self.do_import(cnab)
+        try:
+            cnab = base64.decodestring(self.cnab_file)
+            acc_number, bra_number = self._get_account(cnab)
+
+            self.validate_journal(acc_number, bra_number)
+            return self.do_import(cnab)
+        except UserError:
+            raise
+        except Exception as e:
+            _logger.error(str(e), exc_info=True)
+            msg = 'O arquivo importado não parece ser o correto:\n%s' % str(e)
+            raise UserError(msg)

br_account_voucher/models/account_voucher.py

@@ -90,3 +90,12 @@ def voucher_move_line_create(self, line_total, move_id, company_currency,
             line.analytic_tag_ids = [(6, False, line2.analytic_tag_ids.ids)]
 
         return line_total
+
+    @api.multi
+    def first_move_line_get(self, move_id, company_currency, current_currency):
+        vals = super(AccountVoucher, self).first_move_line_get(
+            move_id, company_currency, current_currency)
+        # Correção do valor quando retenção - tax_amount é negativo
+        if self.tax_amount < 0.0:
+            vals['credit'] += self.tax_amount
+        return vals

br_payment_cnab/models/payment_information.py

@@ -181,4 +181,4 @@ def _compute_tax_identification(self):
         for item in self:
             if item.payment_type not in ('05', '06', '07', '09'):
                 continue
-            return TAX_IDENTIFICATION.get(item.payment_type)
+            item.tax_identification = TAX_IDENTIFICATION.get(item.payment_type)