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/wizard/__init__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/email_template/wizard/__init__.py') diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py index 1641152490e..969a883ef69 100644 --- a/addons/email_template/wizard/__init__.py +++ b/addons/email_template/wizard/__init__.py @@ -21,3 +21,4 @@ ############################################################################## import email_template_send_wizard +import email_template_preview -- 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/wizard/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/email_template/wizard/__init__.py') diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py index 969a883ef69..006106a0263 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 () +# 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,6 +19,6 @@ # along with this program. If not, see # ############################################################################## - -import email_template_send_wizard import email_template_preview +import email_template_send_wizard + -- cgit v1.2.3 From 30bde91c88d539c5b41276df683fed89070165dc Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Wed, 23 Feb 2011 14:57:08 +0530 Subject: [ADD] email_template :- inherit email.compose.message wizard and add template_id field. on template_id field get template and change the value of wizard. bzr revid: ysa@tinyerp.com-20110223092708-aibiuj5ojw41y6ky --- addons/email_template/wizard/__init__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/email_template/wizard/__init__.py') diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py index 006106a0263..1bac2d4aaad 100644 --- a/addons/email_template/wizard/__init__.py +++ b/addons/email_template/wizard/__init__.py @@ -21,4 +21,5 @@ ############################################################################## import email_template_preview import email_template_send_wizard +import email_compose_message -- cgit v1.2.3 From 99bac0b9be878df5ccdb9c1118f4cb2245b35be7 Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Thu, 14 Apr 2011 18:49:38 +0530 Subject: [REM] email_template: remove email_template_send wizard and IMP bzr revid: rha@tinyerp.com-20110414131938-5y133uyx5j7hl5v0 --- addons/email_template/wizard/__init__.py | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/email_template/wizard/__init__.py') diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py index 1bac2d4aaad..b0ad4313b4f 100644 --- a/addons/email_template/wizard/__init__.py +++ b/addons/email_template/wizard/__init__.py @@ -20,6 +20,5 @@ # ############################################################################## import email_template_preview -import email_template_send_wizard import email_compose_message -- cgit v1.2.3 From d5d209965898e3f91581b81f95caeed0e89dce2a Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 9 Sep 2011 15:10:45 +0200 Subject: [IMP] mail*: rename mail.compose.wizard extension, for consistency bzr revid: odo@openerp.com-20110909131045-mzuspzazkv34ns3q --- addons/email_template/wizard/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/email_template/wizard/__init__.py') diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py index b0ad4313b4f..b9ac29ec4c2 100644 --- a/addons/email_template/wizard/__init__.py +++ b/addons/email_template/wizard/__init__.py @@ -20,5 +20,5 @@ # ############################################################################## import email_template_preview -import email_compose_message +import mail_compose_message -- cgit v1.2.3