diff options
| author | Ankit Sathvara <asa@odoo.com> | 2020-09-29 08:32:40 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2020-09-29 08:45:52 +0000 |
| commit | 71a39c6650e18b71a212bf21150fece683ae01c7 (patch) | |
| tree | 677cfd54390209cf1d86f2fca91f08b6347e671f /addons | |
| parent | bf24c18c44fc45e934524cdeab3d5d8ba50b4def (diff) | |
[FIX] account, mail: properly evaluate and clean xml context
Before this commit, there were some traceback while performing
several actions due to context that was not properly evaluated.
This commit fixes those traceback by evaluating the context and
thus enabling user to perform those actions without traceback.
We also clean some badly-configured email actions in accounting.
Task Id : 2302572
PR #56501
Co-authored-by: D J <dja@odoo.com>
Co-authored-by: Thibault Delavallée <tde@odoo.com>
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/account/data/payment_receipt_data.xml | 14 | ||||
| -rw-r--r-- | addons/mail/views/res_partner_views.xml | 12 |
2 files changed, 10 insertions, 16 deletions
diff --git a/addons/account/data/payment_receipt_data.xml b/addons/account/data/payment_receipt_data.xml index 50b5f6e3689..74b6eb657fb 100644 --- a/addons/account/data/payment_receipt_data.xml +++ b/addons/account/data/payment_receipt_data.xml @@ -37,16 +37,13 @@ <field name="res_model">mail.compose.message</field> <field name="view_mode">form</field> <field name="target">new</field> - <field name="context">{ - 'default_model': 'account.payment', + <field name="context" eval="{ 'mail_post_autofollow': True, 'default_composition_mode': 'comment', 'default_use_template': True, - 'default_res_id': active_id, 'default_template_id': ref('account.mail_template_data_payment_receipt'), - 'force_email': True, 'custom_layout': 'mail.mail_notification_light', - }</field> + }"/> <field name="binding_model_id" ref="model_account_payment"/> <field name="binding_view_types">form</field> <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/> @@ -57,16 +54,13 @@ <field name="res_model">mail.compose.message</field> <field name="view_mode">form</field> <field name="target">new</field> - <field name="context">{ - 'default_model': 'account.payment', + <field name="context" eval="{ 'mail_post_autofollow': True, 'default_composition_mode': 'mass_mail', 'default_use_template': True, - 'default_res_id': active_id, 'default_template_id': ref('account.mail_template_data_payment_receipt'), - 'force_email': True, 'custom_layout': 'mail.mail_notification_light', - }</field> + }"/> <field name="binding_model_id" ref="model_account_payment"/> <field name="binding_view_types">list</field> </record> diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml index 1c7c38718a7..278d3fae535 100644 --- a/addons/mail/views/res_partner_views.xml +++ b/addons/mail/views/res_partner_views.xml @@ -117,12 +117,12 @@ <field name="res_model">mail.compose.message</field> <field name="view_mode">form</field> <field name="target">new</field> - <field name="context">{ - 'default_composition_mode': 'mass_mail', - 'default_partner_to': '${object.id or \'\'}', - 'default_use_template': True, - 'default_template_id': ref('email_template_partner'), - }</field> + <field name="context" eval="{ + 'default_composition_mode': 'mass_mail', + 'default_partner_to': '${object.id or \'\'}', + 'default_use_template': True, + 'default_template_id': ref('email_template_partner'), + }"/> <field name="binding_model_id" ref="base.model_res_partner"/> <field name="binding_view_types">list</field> </record> |