summaryrefslogtreecommitdiff
path: root/addons/email_template/wizard/__init__.py
diff options
context:
space:
mode:
authorBharat (OpenERP) <bde@tinyerp.com>2011-09-15 17:02:01 +0530
committerBharat (OpenERP) <bde@tinyerp.com>2011-09-15 17:02:01 +0530
commitd72be842e320dfff08b7ad4b443740060dfd5a4e (patch)
treefd8315220318e2abd672b4270a18a763c8564e9d /addons/email_template/wizard/__init__.py
parent1e767f0d14dfb0870767524bf16c9909bcaee995 (diff)
parentfbf6708d1041f84018bb9c13e997b705e6086648 (diff)
[MERGE] merged with main addons
bzr revid: bde@tinyerp.com-20110915113201-fgbs2d2qr45ljmsg
Diffstat (limited to 'addons/email_template/wizard/__init__.py')
-rw-r--r--addons/email_template/wizard/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py
index 1641152490e..b9ac29ec4c2 100644
--- a/addons/email_template/wizard/__init__.py
+++ b/addons/email_template/wizard/__init__.py
@@ -3,7 +3,7 @@
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2009 Sharoon Thomas
-# Copyright (C) 2010-2010 OpenERP SA (<http://www.openerp.com>)
+# Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
#
# 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,5 +19,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
#
##############################################################################
+import email_template_preview
+import mail_compose_message
-import email_template_send_wizard