Upgrade to 5.7

issue9096
This commit is contained in:
Raimon Esteve 2020-11-28 13:42:46 +01:00
parent 1f53ac5374
commit ff509b2cdf
2 changed files with 1 additions and 16 deletions

View File

@ -24,16 +24,3 @@ class Trigger(metaclass=PoolMeta):
model = Transaction().context.get('model', None)
if model:
return model
@staticmethod
def default_action_model():
Model = Pool().get('ir.model')
email_trigger = Transaction().context.get('email_template', False)
if not email_trigger:
return
models = Model.search(
[('model', '=', 'electronic.mail.template')], limit=1)
if models:
return models[0].id

View File

@ -3,9 +3,7 @@
The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
<data>
<xpath
expr="/form/notebook/page[@string='General']/field[@name='email']"
position="after">
<newline/>
expr="/form/notebook/page[@id='general']" position="inside">
<label name="email_filename"/>
<field name="email_filename"/>
</xpath>