summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2013-10-03 16:04:58 +0200
committerThibault Delavallée <tde@openerp.com>2013-10-03 16:04:58 +0200
commitbdd86a831f026c0a99dd5f71e772488f2bea4eab (patch)
treeed1a9ced81536d01a026edfaaaf04857c50d0508
parentfed1b1e91c221d751b4f2b259463727f1e5b1dbb (diff)
[IMP] ir_actions in email_template: template_id domain not only on view, directly on field
bzr revid: tde@openerp.com-20131003140458-ztnd9taih2rcq8ty
-rw-r--r--addons/email_template/ir_actions.py3
-rw-r--r--addons/email_template/ir_actions_view.xml1
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/email_template/ir_actions.py b/addons/email_template/ir_actions.py
index 64c50651f11..ae2395e3b81 100644
--- a/addons/email_template/ir_actions.py
+++ b/addons/email_template/ir_actions.py
@@ -54,7 +54,8 @@ class actions_server(osv.Model):
readonly=True, string='Body'
),
'template_id': fields.many2one(
- 'email.template', 'Email Template', ondelete='set null'
+ 'email.template', 'Email Template', ondelete='set null',
+ domain="[('model_id', '=', model_id)]",
),
}
diff --git a/addons/email_template/ir_actions_view.xml b/addons/email_template/ir_actions_view.xml
index fae9c364312..8f5875257aa 100644
--- a/addons/email_template/ir_actions_view.xml
+++ b/addons/email_template/ir_actions_view.xml
@@ -16,7 +16,6 @@
<group attrs="{'invisible': [('model_id', '=', False)]}">
<field name="template_id"
on_change='on_change_template_id(template_id)'
- domain="[('model_id', '=', model_id)]"
attrs="{'required': [('state', '=', 'email')]}"/>
<p colspan="2" attrs="{'invisible': [('template_id', '!=', False)]}">
Choose a template to display its values.