diff --git a/account_credit_hold/models/res_partner.py b/account_credit_hold/models/res_partner.py index 3cc765d..38390f9 100644 --- a/account_credit_hold/models/res_partner.py +++ b/account_credit_hold/models/res_partner.py @@ -44,8 +44,8 @@ class Partner(models.Model): rec.hold_bg = False rec.message_post(body=_('Credit hold lifted.')) - def _execute_followup_partner(self): - res = super()._execute_followup_partner() + def _execute_followup_partner(self, options=None): + res = super()._execute_followup_partner(options) if self.followup_status == 'in_need_of_action': if self.followup_line_id.account_hold: self.action_credit_hold() diff --git a/bemade_mailcow_integration/models/mailcow_mailbox.py b/bemade_mailcow_integration/models/mailcow_mailbox.py index f6699e6..f5d4d30 100644 --- a/bemade_mailcow_integration/models/mailcow_mailbox.py +++ b/bemade_mailcow_integration/models/mailcow_mailbox.py @@ -53,7 +53,7 @@ class MailcowMailbox(models.Model): Overridden create method to add a new mailbox entry on the Mailcow server for each user created in Odoo. """ - res_list = [] + res = self.env['mail.mailcow.mailbox'] for vals in vals_list: password = secrets.token_hex(16) @@ -81,10 +81,8 @@ class MailcowMailbox(models.Model): self.api_request(endpoint, method='POST', data=data) _logger.info(f"Mailbox {vals['local_part']}@{vals['domain']} has been created on Mailcow server") - res = super().create(vals) - res_list.append(res) - - return res_list + res |= super().create(vals) + return res def write(self, vals): """ @@ -141,8 +139,8 @@ class MailcowMailbox(models.Model): self.api_request(endpoint, method='POST', data=data) _logger.info(f'Mailbox for user {user.login} has been created on Mailcow server') - pw_bundle = seld.env['password.bundle'].search([('name', '=', user.name)]) - self.env['password.key'].create_mailbox_for_user(res) + pw_bundle = self.env['password.bundle'].search([('name', '=', user.name)]) + self.env['password.key'].create_mailbox_for_user(user) return self.create({ 'address': user.login,