From 3750bdc113e67c20f9819997c0e3e49ba43b433c Mon Sep 17 00:00:00 2001
From: raimonesteve <raimonesteve@gmail.com>
Date: Sat, 21 Mar 2020 17:30:08 +0100
Subject: [PATCH] Upgrade last changes to 5.x

---
 action.py   |  3 +--
 message.xml | 16 ++++++++++++++++
 template.py | 31 ++++++++-----------------------
 tryton.cfg  |  1 +
 4 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 message.xml

diff --git a/action.py b/action.py
index b2d0686..687ec58 100644
--- a/action.py
+++ b/action.py
@@ -16,8 +16,7 @@ class ActionReport(metaclass=PoolMeta):
 
     @classmethod
     def __register__(cls, module_name):
-        TableHandler = backend.get('TableHandler')
-        table = TableHandler(cls, module_name)
+        table = backend.TableHandler(cls, module_name)
 
         # Migration from 3.8: rename file_name into email_filename
         if (table.column_exist('file_name')
diff --git a/message.xml b/message.xml
new file mode 100644
index 0000000..aef89cb
--- /dev/null
+++ b/message.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+    <data grouped="1">
+        <record model="ir.message" id="msg_recipients_error">
+            <field name="text">Not valid recipients emails. Check emails in To, Cc or Bcc.</field>
+        </record>
+        <record model="ir.message" id="msg_smtp_server_default">
+            <field name="text">There are not default SMTP server.</field>
+        </record>
+        <record model="ir.message" id="msg_template_deleted">
+            <field name="text">This template has been deactivated or deleted.</field>
+        </record>
+    </data>
+</tryton>
diff --git a/template.py b/template.py
index 09e4efa..747d4f7 100644
--- a/template.py
+++ b/template.py
@@ -9,6 +9,8 @@ from trytond.wizard import Wizard, StateTransition, StateView, Button
 from trytond.transaction import Transaction
 from trytond.tools import grouped_slice
 from trytond.config import config
+from trytond.i18n import gettext
+from trytond.exceptions import UserError
 from trytond.sendmail import SMTPDataManager, sendmail_transactional, sendmail
 from genshi.template import TextTemplate
 from jinja2 import Template as Jinja2Template
@@ -76,17 +78,6 @@ class Template(ModelSQL, ModelView):
         domain=[('state', '=', 'done')])
     # TODO Add styles
 
-    @classmethod
-    def __setup__(cls):
-        super(Template, cls).__setup__()
-        cls._error_messages.update({
-                'smtp_error': ('Wrong connection to SMTP server. Email have '
-                    'not sent.\n\nServer mail info:\n\n%s'),
-                'recipients_error': ('Not valid recipients emails. Check '
-                    'emails in To, Cc or Bcc'),
-                'smtp_server_default': 'There are not default SMTP server',
-                })
-
     @staticmethod
     def default_engine():
         return 'genshi'
@@ -300,7 +291,7 @@ class Template(ModelSQL, ModelView):
                 if k in ['from_', 'sender', 'to', 'cc', 'bcc']:
                     value = value.replace(' ', '').replace(',', ';')
                     if value and not cls.validate_emails(value):
-                        cls.raise_user_error('recipients_error')
+                        raise UserError(gettext('electronic_mail.msg_recipients_error'))
                 val[k] = value
 
             if not render_html:
@@ -346,7 +337,7 @@ class Template(ModelSQL, ModelView):
                     ('default', '=', True),
                     ], limit=1)
             if not servers:
-                cls.raise_user_error('smtp_server_default')
+                raise UserError(gettext('electronic_mail.msg_smtp_server_default'))
             server, = servers
 
         for value in values:
@@ -470,14 +461,6 @@ class SendTemplate(Wizard):
             ])
     send = StateTransition()
 
-    @classmethod
-    def __setup__(cls):
-        super(SendTemplate, cls).__setup__()
-        cls._error_messages.update({
-                'template_deleted': (
-                    'This template has been deactivated or deleted.'),
-                })
-
     def default_start(self, fields):
         default = self.render_fields(self.__name__)
         return default
@@ -491,8 +474,10 @@ class SendTemplate(Wizard):
         action_id = context.get('action_id', None)
 
         wizard = Wizard(action_id)
-        template = (wizard.template[0] if wizard.template
-            else self.raise_user_error('template_deleted'))
+        if wizard.template:
+            template = wizard.template[0]
+        else:
+            raise UserError(gettext('electronic_mail.msg_template_deleted'))
         total = len(active_ids)
 
         # TODO IMP to load first record and not browse all active ids
diff --git a/tryton.cfg b/tryton.cfg
index 076424a..f62f8a3 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -10,3 +10,4 @@ xml:
     template.xml
     action.xml
     user.xml
+    message.xml