Skip to content
Browse files

[MERGE] forward port branch saas-14 up to 32c2af2

  • Loading branch information...
KangOl committed Apr 8, 2019
2 parents 214e819 + 32c2af2 commit cd28e53a31d255b17835f613c0de12a93417f9d9
@@ -62,7 +62,8 @@ def get_mail_values(self, res_ids):
if mail_values.get('email_to'):
recips = tools.email_split(mail_values['email_to'])
recips = tools.email_split(partners_email.get(res_id))
partner_id = (mail_values.get('recipient_ids') or [(False, '')])[0][1]
recips = tools.email_split(partners_email.get(partner_id))
mail_to = recips[0].lower() if recips else False
if (blacklist and mail_to in blacklist) or (seen_list and mail_to in seen_list):
# prevent sending to blocked addresses that were included by mistake
@@ -39,7 +39,7 @@ def _compute_website_url(self, website_path, xml_id):
def _get_website_url(self):
for action in self:
if action.state == 'code' and action.website_published:
action.website_url = self._compute_website_url(action.website_path, action.xml_id)
action.website_url = action._compute_website_url(action.website_path, action.xml_id)

def _get_eval_context(self, action):
@@ -16,6 +16,7 @@
from docutils.transforms import Transform, writer_aux
from docutils.writers.html4css1 import Writer
import lxml.html
import psycopg2

from cStringIO import StringIO
@@ -479,6 +480,14 @@ def upstream_dependencies(self, known_deps=None,

def _button_immediate_function(self, function):
# This is done because the installation/uninstallation/upgrade can modify a currently
# running cron job and prevent it from finishing, and since the ir_cron table is locked
# during execution, the lock won't be released until timeout.
self._cr.execute("SELECT * FROM ir_cron FOR UPDATE NOWAIT")
except psycopg2.OperationalError:
raise UserError(_("The server is busy right now, module operations are not possible at"
" this time, please try again later."))


0 comments on commit cd28e53

Please sign in to comment.
You can’t perform that action at this time.