diff --git a/addons/account/models/account_reconcile_model.py b/addons/account/models/account_reconcile_model.py index 5f5ef90618d..ad46f3bb738 100644 --- a/addons/account/models/account_reconcile_model.py +++ b/addons/account/models/account_reconcile_model.py @@ -22,6 +22,7 @@ class AccountReconcileModelPartnerMapping(models.Model): for record in self: if not (record.narration_regex or record.payment_ref_regex): raise ValidationError(_("Please set at least one of the match texts to create a partner mapping.")) + current_regex = None try: if record.payment_ref_regex: current_regex = record.payment_ref_regex diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py index a436fab2b66..dbe2b12bcc5 100644 --- a/addons/hw_escpos/controllers/main.py +++ b/addons/hw_escpos/controllers/main.py @@ -148,10 +148,9 @@ class EscposDriver(Thread): _logger.error('ESC/POS cannot initialize, please verify system dependencies.') return while True: + error = True + timestamp, task, data = self.queue.get(True) try: - error = True - timestamp, task, data = self.queue.get(True) - printer = self.get_escpos_printer() if printer == None: diff --git a/addons/mail/models/fetchmail.py b/addons/mail/models/fetchmail.py index 9212d168378..430f14f0565 100644 --- a/addons/mail/models/fetchmail.py +++ b/addons/mail/models/fetchmail.py @@ -152,6 +152,7 @@ odoo_mailgate: "|/path/to/odoo-mailgate.py --host=localhost -u %(uid)d -p PASSWO def button_confirm_login(self): for server in self: + connection = None try: connection = server.connect(allow_archived=True) server.write({'state': 'done'}) diff --git a/addons/point_of_sale/models/pos_session.py b/addons/point_of_sale/models/pos_session.py index c8240e69846..c46b2f62854 100644 --- a/addons/point_of_sale/models/pos_session.py +++ b/addons/point_of_sale/models/pos_session.py @@ -301,8 +301,8 @@ class PosSession(models.Model): else: raise e + balance = sum(self.move_id.line_ids.mapped('balance')) try: - balance = sum(self.move_id.line_ids.mapped('balance')) with self.move_id._check_balanced({'records': self.move_id.sudo()}): pass except UserError: diff --git a/odoo/addons/base/tests/test_qweb.py b/odoo/addons/base/tests/test_qweb.py index d90d161a978..e7cb9dc0645 100644 --- a/odoo/addons/base/tests/test_qweb.py +++ b/odoo/addons/base/tests/test_qweb.py @@ -662,6 +662,7 @@ class TestQWebNS(TransactionCase): """ }) + error_msg = None try: "" + 0 except TypeError as e: diff --git a/odoo/tests/common.py b/odoo/tests/common.py index eec7360ef33..4cd8507d557 100644 --- a/odoo/tests/common.py +++ b/odoo/tests/common.py @@ -1264,12 +1264,14 @@ class ChromeBrowser: delay = 0.1 tries = 0 failure_info = None + message = None while timeout > 0: try: os.kill(self.chrome_pid, 0) except ProcessLookupError: message = 'Chrome crashed at startup' break + res = None try: r = requests.get(url, timeout=3) if r.ok: