parent
5c0b0a91f1
commit
2973da8c30
|
@ -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
|
||||
|
|
|
@ -15,4 +15,4 @@ def suite():
|
|||
suite = trytond.tests.test_tryton.suite()
|
||||
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
|
||||
ElectronicMailFilterTestCase))
|
||||
return suite
|
||||
return suite
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[tryton]
|
||||
version=4.1.0
|
||||
version=4.2.0
|
||||
depends:
|
||||
ir
|
||||
res
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<!-- This file is part of electronic_mail_filter module for Tryton.
|
||||
The COPYRIGHT file at the top level of this repository contains the full
|
||||
copyright notices and license terms. -->
|
||||
<form string="Electronic Mail Filter">
|
||||
<form>
|
||||
<label name="name"/>
|
||||
<field name="name"/>
|
||||
<label name="model"/>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<!-- This file is part of electronic_mail_filter module for Tryton.
|
||||
The COPYRIGHT file at the top level of this repository contains the full
|
||||
copyright notices and license terms. -->
|
||||
<tree string="Electronic Mail Filters">
|
||||
<tree>
|
||||
<field name="name"/>
|
||||
<field name="template"/>
|
||||
<field name="cron"/>
|
||||
|
|
Loading…
Reference in New Issue