diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-08-09 10:52:45 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-08-09 10:52:45 +0530 |
| commit | 374b834d9a689a1a9a19bc5fd1cc1e2ed7e04bca (patch) | |
| tree | 830fddd3d30195eb8e9e31c7b4ff420ce545d7db /addons/mail | |
| parent | 0e77a7cbda6ea1e7500c42b84f741c5ecbd48a4e (diff) | |
| parent | e970ecd62cb627a33832a561a082d211ab9923c7 (diff) | |
[MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20120809052245-638xhf0oyjtnhcak
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index 372b9a2566c..fea3d603f6a 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -59,7 +59,7 @@ The main features of the module are: """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'depends': ['base', 'base_tools'], + 'depends': ['base', 'base_tools', 'base_setup'], 'data': [ 'wizard/mail_compose_message_view.xml', 'res_config_view.xml', diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 47908ab3223..da6816d3441 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -16,7 +16,7 @@ openerp.mail = function(session) { session.web.FormView = session.web.FormView.extend({ do_action: function(action, on_close) { - if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids) { + if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids && this.fields.message_ids.view.get("actual_mode") != 'create') { var record_thread = this.fields.message_ids; var thread = record_thread.thread; thread.instantiate_composition_form('comment', true, false, 0, action.context); |