Merge PR #3287 into 14.0

Signed-off-by rvalyi
OCA · Aug 16, 2024 · 4e5d4d9 · 4e5d4d9
2 parents 6db0660 + b63debd
commit 4e5d4d9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 deletions.
diff --git a/l10n_br_account_payment_brcobranca/constants/br_cobranca.py b/l10n_br_account_payment_brcobranca/constants/br_cobranca.py
@@ -11,6 +11,8 @@
 from odoo.exceptions import UserError
 from odoo.tools import config
 
+TIMEOUT = 300  # seconds
+
 DICT_BRCOBRANCA_CNAB_TYPE = {
     "240": "cnab240",
     "400": "cnab400",

diff --git a/l10n_br_account_payment_brcobranca/models/account_move.py b/l10n_br_account_payment_brcobranca/models/account_move.py
@@ -12,7 +12,7 @@
 from odoo import _, models
 from odoo.exceptions import UserError
 
-from ..constants.br_cobranca import get_brcobranca_api_url
+from ..constants.br_cobranca import TIMEOUT, get_brcobranca_api_url
 
 logger = logging.getLogger(__name__)
 
@@ -71,7 +71,12 @@ def _get_brcobranca_boleto(self, boletos):
             brcobranca_service_url,
             self.name,
         )
-        res = requests.post(brcobranca_service_url, data={"type": "pdf"}, files=files)
+        res = requests.post(
+            brcobranca_service_url,
+            data={"type": "pdf"},
+            files=files,
+            timeout=TIMEOUT,
+        )
 
         if str(res.status_code)[0] == "2":
             pdf_string = res.content

diff --git a/l10n_br_account_payment_brcobranca/models/account_payment_line.py b/l10n_br_account_payment_brcobranca/models/account_payment_line.py
@@ -122,18 +122,16 @@ def _prepare_bank_line_santander(self, payment_mode_id, linhas_pagamentos):
     def prepare_bank_payment_line(self, bank_name_brcobranca):
         payment_mode_id = self.order_id.payment_mode_id
         linhas_pagamentos = self._prepare_boleto_line_vals()
-        try:
+
+        # Casos onde o Banco além dos principais campos possui campos
+        # específicos, dos casos por enquanto mapeados, se estiver vendo
+        # um caso que está faltando por favor considere fazer um
+        # PR para ajudar
+        if hasattr(self, f"_prepare_bank_line_{bank_name_brcobranca.name}"):
             bank_method = getattr(
                 self, f"_prepare_bank_line_{bank_name_brcobranca.name}"
             )
-            if bank_method:
-                bank_method(payment_mode_id, linhas_pagamentos)
-        except Exception:
-            _logger.warning(
-                f"Error executing method _prepare_bank_line_{bank_name_brcobranca.name}."
-                "Check the bank name and provided parameters.",
-                exc_info=True,
-            )
+            bank_method(payment_mode_id, linhas_pagamentos)
 
         # Cada Banco pode possuir seus Codigos de Instrução
         if (

diff --git a/l10n_br_account_payment_brcobranca/models/account_payment_order.py b/l10n_br_account_payment_brcobranca/models/account_payment_order.py
@@ -16,6 +16,7 @@
 
 from ..constants.br_cobranca import (
     DICT_BRCOBRANCA_CNAB_TYPE,
+    TIMEOUT,
     get_brcobranca_api_url,
     get_brcobranca_bank,
 )
@@ -146,16 +147,13 @@ def generate_payment_file(self):
             "sequencial_remessa": self.file_number,
         }
 
-        try:
+        # Casos onde o Banco além dos principais campos possui campos
+        # específicos, dos casos por enquanto mapeados, se estiver vendo
+        # um caso que está faltando por favor considere fazer um
+        # PR para ajudar
+        if hasattr(self, f"_prepare_remessa_{bank_brcobranca.name}"):
             bank_method = getattr(self, f"_prepare_remessa_{bank_brcobranca.name}")
-            if bank_method:
-                bank_method(remessa_values, cnab_type)
-        except Exception:
-            _logger.warning(
-                f"Error executing method _prepare_remessa_{bank_brcobranca.name}."
-                "Check the bank name and provided parameters.",
-                exc_info=True,
-            )
+            bank_method(remessa_values, cnab_type)
 
         remessa = self._get_brcobranca_remessa(
             bank_brcobranca, remessa_values, cnab_type
@@ -185,6 +183,7 @@ def _get_brcobranca_remessa(self, bank_brcobranca, remessa_values, cnab_type):
                 "bank": bank_brcobranca.name,
             },
             files=files,
+            timeout=TIMEOUT,
         )
 
         if cnab_type == "240" and "R01" in res.text[242:254]:

diff --git a/l10n_br_account_payment_brcobranca/parser/cnab_file_parser.py b/l10n_br_account_payment_brcobranca/parser/cnab_file_parser.py
@@ -13,7 +13,7 @@
 
 from odoo.addons.account_move_base_import.parser.file_parser import FileParser
 
-from ..constants.br_cobranca import get_brcobranca_api_url
+from ..constants.br_cobranca import TIMEOUT, get_brcobranca_api_url
 
 logger = logging.getLogger(__name__)
 
@@ -91,6 +91,7 @@ def _get_brcobranca_retorno(self, files):
                 "bank": bank_name_brcobranca,
             },
             files=files,
+            timeout=TIMEOUT,
         )
 
         if res.status_code != 201: