[IMP] marketing campaign

[odoo/odoo.git] / addons / email_template / email_template_account.py

diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
old mode 100755 (executable)
new mode 100644 (file)
index 2503d19..0bcf3c3
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -30,7 +30,7 @@ class email_template_account(osv.osv):
                             'text/html'
                             ]
     _columns = {
-        'name': fields.char('Email Account Desc',
+        'name': fields.char('Description',
                         size=64, required=True,
                         readonly=True, select=True,
                         states={'draft':[('readonly', False)]}),
@@ -56,22 +56,16 @@ class email_template_account(osv.osv):
                         size=120, invisible=True,
                         required=False, readonly=True,
                         states={'draft':[('readonly', False)]}),
-        'smtptls':fields.boolean('Use TLS',
+        'smtptls':fields.boolean('TLS',
                         states={'draft':[('readonly', False)]}, readonly=True),
                                 
-        'smtpssl':fields.boolean('Use SSL/TLS (only in python 2.6)',
+        'smtpssl':fields.boolean('SSL/TLS (only in python 2.6)',
                         states={'draft':[('readonly', False)]}, readonly=True),
         'send_pref':fields.selection([
                                       ('html', 'HTML otherwise Text'),
                                       ('text', 'Text otherwise HTML'),
                                       ('both', 'Both HTML & Text')
                                       ], 'Mail Format', required=True),
-        'allowed_groups':fields.many2many(
-                        'res.groups',
-                        'account_group_rel', 'templ_id', 'group_id',
-                        string="Allowed User Groups",
-                        help="Only users from these groups will be" \
-                        "allowed to send mails from this ID"),
         'company':fields.selection([
                         ('yes', 'Yes'),
                         ('no', 'No')
@@ -89,7 +83,7 @@ class email_template_account(osv.osv):
                                   ('suspended', 'Suspended'),
                                   ('approved', 'Approved')
                                   ],
-                        'Account Status', required=True, readonly=True),
+                        'Status', required=True, readonly=True),
     }
 
     _defaults = {
@@ -102,7 +96,6 @@ class email_template_account(osv.osv):
                                                         ['name'],
                                                         context
                                                         )['name'],
-         'smtpssl':lambda * a:True,
          'state':lambda * a:'draft',
          'user':lambda self, cursor, user, context:user,
          'send_pref':lambda * a: 'html',