diff options
| author | Raphael Collet <rco@openerp.com> | 2012-06-28 15:12:10 +0200 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-06-28 15:12:10 +0200 |
| commit | 1debe0efcd00a294fa436a8a13416ccb1de0e919 (patch) | |
| tree | a9a7209823affdaedb129f6f1cd1c0173fa11a6e /addons/mail/wizard | |
| parent | 083deae5a4845cb9578b318ec08bd2d62b79a755 (diff) | |
| parent | a6e3d4bf0029d879e008414090d54499ffe358f4 (diff) | |
[MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
Diffstat (limited to 'addons/mail/wizard')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index dd07cbce9b2..cb2ed1eec19 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -34,7 +34,7 @@ from ..mail_message import to_email EXPRESSION_PATTERN = re.compile('(\$\{.+?\})') class mail_compose_message(osv.osv_memory): - """Generic E-mail composition wizard. This wizard is meant to be inherited + """Generic Email composition wizard. This wizard is meant to be inherited at model and view level to provide specific wizard features. The behavior of the wizard can be modified through the use of context @@ -58,7 +58,7 @@ class mail_compose_message(osv.osv_memory): """ _name = 'mail.compose.message' _inherit = 'mail.message.common' - _description = 'E-mail composition wizard' + _description = 'Email composition wizard' def default_get(self, cr, uid, fields, context=None): """Overridden to provide specific defaults depending on the context |