From 1513a9ae77e9cba0909cfb97da4f5548b7012da1 Mon Sep 17 00:00:00 2001 From: "YSA (Openerp)" Date: Tue, 1 Feb 2011 17:13:08 +0530 Subject: [IMP] clean email_template module, merge email_template and mail_gateway module, developed email_gateway module. task ID-2007. bzr revid: ysa@tinyerp.com-20110201114308-nwb7qzj8ko99eerw --- addons/email_template/__init__.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'addons/email_template/__init__.py') diff --git a/addons/email_template/__init__.py b/addons/email_template/__init__.py index dd87232679d..d44217b82b3 100644 --- a/addons/email_template/__init__.py +++ b/addons/email_template/__init__.py @@ -20,8 +20,6 @@ # ############################################################################## -import email_template_account import email_template -import email_template_mailbox import wizard -- cgit v1.2.3 From 5e912c68d6099fa30ff7d285bd49f4b2ca008ef5 Mon Sep 17 00:00:00 2001 From: "YSA (Openerp)" Date: Thu, 3 Feb 2011 15:44:28 +0530 Subject: [IMP] remove template_languange in email_template module. bzr revid: ysa@tinyerp.com-20110203101428-pwxk02no9tbxfzkz --- addons/email_template/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'addons/email_template/__init__.py') diff --git a/addons/email_template/__init__.py b/addons/email_template/__init__.py index d44217b82b3..dec5a285362 100644 --- a/addons/email_template/__init__.py +++ b/addons/email_template/__init__.py @@ -23,3 +23,10 @@ import email_template import wizard +try: + from mako.template import Template as MakoTemplate +except ImportError: + logging.getLogger('init').warning("module email_template: Mako templates not installed") + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + -- cgit v1.2.3 From 20b34865ea97b88fbaf867ab90fbb9f48ef124ef Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Tue, 8 Feb 2011 17:48:55 +0530 Subject: Fix problem in email.template.preview wizard. bzr revid: ysa@tinyerp.com-20110208121855-zxqrmgyk0rkhlms9 --- addons/email_template/__init__.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'addons/email_template/__init__.py') diff --git a/addons/email_template/__init__.py b/addons/email_template/__init__.py index dec5a285362..15a99722203 100644 --- a/addons/email_template/__init__.py +++ b/addons/email_template/__init__.py @@ -23,10 +23,5 @@ import email_template import wizard -try: - from mako.template import Template as MakoTemplate -except ImportError: - logging.getLogger('init').warning("module email_template: Mako templates not installed") - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3 From 72220cb09b96b907e29cfb31fda39bf67bd1eb02 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Tue, 15 Feb 2011 01:19:36 +0530 Subject: [REVIEW+IMP] email_template: inherit related improvement bzr revid: hmo@tinyerp.com-20110214194936-92himmpn80ytmjim --- addons/email_template/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'addons/email_template/__init__.py') diff --git a/addons/email_template/__init__.py b/addons/email_template/__init__.py index 15a99722203..51cec6064b8 100644 --- a/addons/email_template/__init__.py +++ b/addons/email_template/__init__.py @@ -3,7 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2009 Sharoon Thomas -# Copyright (C) 2010-2010 OpenERP SA () +# Copyright (C) 2010-Today OpenERP SA () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,9 +19,8 @@ # along with this program. If not, see # ############################################################################## - +import mako_template import email_template import wizard # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - -- cgit v1.2.3 From 0b0aa95cfeecbcc99adbd1d3d7b0d87ae1e00edc Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 25 Aug 2011 14:27:25 +0200 Subject: [IMP] email_template: another pass of cleanup (wip) bzr revid: odo@openerp.com-20110825122725-mc1zx2f3ck9xr6g9 --- addons/email_template/__init__.py | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/email_template/__init__.py') diff --git a/addons/email_template/__init__.py b/addons/email_template/__init__.py index 51cec6064b8..97931ea8bd5 100644 --- a/addons/email_template/__init__.py +++ b/addons/email_template/__init__.py @@ -19,7 +19,6 @@ # along with this program. If not, see # ############################################################################## -import mako_template import email_template import wizard -- cgit v1.2.3