diff --git a/electronic_mail.py b/electronic_mail.py index d7719e7..ecee958 100644 --- a/electronic_mail.py +++ b/electronic_mail.py @@ -209,6 +209,8 @@ class SearchingStart: def default_profile(): context = Transaction().context active_id = context.get('active_id') - filter_ = Pool().get('electronic.mail.filter')(active_id) - if filter_.profile: - return filter_.profile.id + active_model = context.get('active_model') + if active_model == 'electronic.mail.filter': + filter_ = Pool().get('electronic.mail.filter')(active_id) + if filter_.profile: + return filter_.profile.id diff --git a/locale/ca_ES.po b/locale/ca.po similarity index 100% rename from locale/ca_ES.po rename to locale/ca.po diff --git a/locale/es_ES.po b/locale/es.po similarity index 100% rename from locale/es_ES.po rename to locale/es.po diff --git a/tests/test_electronic_mail_filter.py b/tests/test_electronic_mail_filter.py index 527266d..bdb66c5 100644 --- a/tests/test_electronic_mail_filter.py +++ b/tests/test_electronic_mail_filter.py @@ -15,4 +15,4 @@ def suite(): suite = trytond.tests.test_tryton.suite() suite.addTests(unittest.TestLoader().loadTestsFromTestCase( ElectronicMailFilterTestCase)) - return suite \ No newline at end of file + return suite diff --git a/tryton.cfg b/tryton.cfg index 00effa3..804ecf0 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=4.1.0 +version=4.2.0 depends: ir res diff --git a/view/electronic_mail_filter_form.xml b/view/electronic_mail_filter_form.xml index d9fa4b5..4fbd68c 100644 --- a/view/electronic_mail_filter_form.xml +++ b/view/electronic_mail_filter_form.xml @@ -2,7 +2,7 @@ -
+