diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index b3f27b9f7fd..1617407b2af 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -22,6 +22,8 @@ You could use this simplified accounting in case you work with an (external) acc
         'data/data_account_type.xml',
         'data/account_data.xml',
         'data/digest_data.xml',
+        'views/account_report.xml',
+        'data/mail_template_data.xml',
         'views/account_payment_view.xml',
         'wizard/account_automatic_entry_wizard_views.xml',
         'wizard/account_unreconcile_view.xml',
@@ -45,9 +47,7 @@ You could use this simplified accounting in case you work with an (external) acc
         'views/account_chart_template_views.xml',
         'views/res_partner_bank_views.xml',
         'views/report_statement.xml',
-        'views/account_report.xml',
         'views/terms_template.xml',
-        'data/mail_template_data.xml',
         'wizard/account_validate_move_view.xml',
         'views/res_company_views.xml',
         'views/product_view.xml',
@@ -64,7 +64,6 @@ You could use this simplified accounting in case you work with an (external) acc
         'views/account_journal_dashboard_view.xml',
         'views/account_portal_templates.xml',
         'views/report_payment_receipt_templates.xml',
-        'data/payment_receipt_data.xml',
         'views/account_onboarding_templates.xml',
         'data/service_cron.xml',
         'views/account_incoterms_view.xml',
diff --git a/addons/account/data/mail_template_data.xml b/addons/account/data/mail_template_data.xml
index 1aa788e3019..62a79d8acd5 100644
--- a/addons/account/data/mail_template_data.xml
+++ b/addons/account/data/mail_template_data.xml
@@ -55,5 +55,34 @@
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
         </record>
+
+        <record id="mail_template_data_payment_receipt" model="mail.template">
+            <field name="name">Payment Receipt: Send by email</field>
+            <field name="model_id" ref="account.model_account_payment"/>
+            <field name="subject">${object.company_id.name} Payment Receipt (Ref ${object.name or 'n/a' })</field>
+            <field name="partner_to">${object.partner_id.id}</field>
+            <field name="body_html" type="xml">
+<div style="margin: 0px; padding: 0px;">
+    <p style="margin: 0px; padding: 0px; font-size: 13px;">
+        Dear ${object.partner_id.name}<br/><br/>
+        Thank you for your payment.
+        Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting
+        to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.
+        <br /><br />
+        Do not hesitate to contact us if you have any questions.
+        <br/><br/>
+        Best regards,
+        % if user.signature:
+            <br/>
+            ${user.signature | safe}
+        % endif
+    </p>
+</div>
+</field>
+            <field name="report_template" ref="account.action_report_payment_receipt"/>
+            <field name="report_name">${(object.name or '').replace('/','-')}</field>
+            <field name="lang">${object.partner_id.lang}</field>
+            <field name="auto_delete" eval="True"/>
+        </record>
     </data>
 </odoo>
diff --git a/addons/account/data/payment_receipt_data.xml b/addons/account/data/payment_receipt_data.xml
deleted file mode 100644
index 74b6eb657fb..00000000000
--- a/addons/account/data/payment_receipt_data.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-
-        <!--Email template -->
-        <record id="mail_template_data_payment_receipt" model="mail.template">
-            <field name="name">Payment Receipt: Send by email</field>
-            <field name="model_id" ref="account.model_account_payment"/>
-            <field name="subject">${object.company_id.name} Payment Receipt (Ref ${object.name or 'n/a' })</field>
-            <field name="partner_to">${object.partner_id.id}</field>
-            <field name="body_html" type="xml">
-<div style="margin: 0px; padding: 0px;">
-    <p style="margin: 0px; padding: 0px; font-size: 13px;">
-        Dear ${object.partner_id.name}<br/><br/>
-        Thank you for your payment.
-        Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting
-        to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.
-        <br /><br />
-        Do not hesitate to contact us if you have any questions.
-        <br/><br/>
-        Best regards,
-        % if user.signature:
-            <br/>
-            ${user.signature | safe}
-        % endif
-    </p>
-</div>
-</field>
-            <field name="report_template" ref="account.action_report_payment_receipt"/>
-            <field name="report_name">${(object.name or '').replace('/','-')}</field>
-            <field name="lang">${object.partner_id.lang}</field>
-            <field name="auto_delete" eval="True"/>
-        </record>
-
-        <record id="account_send_payment_receipt_by_email_action" model="ir.actions.act_window">
-            <field name="name">Send receipt by email</field>
-            <field name="res_model">mail.compose.message</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="context" eval="{
-                'mail_post_autofollow': True,
-                'default_composition_mode': 'comment',
-                'default_use_template': True,
-                'default_template_id': ref('account.mail_template_data_payment_receipt'),
-                'custom_layout': 'mail.mail_notification_light',
-            }"/>
-            <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'))]"/>
-        </record>
-
-        <record id="account_send_payment_receipt_by_email_action_multi" model="ir.actions.act_window">
-            <field name="name">Send receipts by email</field>
-            <field name="res_model">mail.compose.message</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="context" eval="{
-                'mail_post_autofollow': True,
-                'default_composition_mode': 'mass_mail',
-                'default_use_template': True,
-                'default_template_id': ref('account.mail_template_data_payment_receipt'),
-                'custom_layout': 'mail.mail_notification_light',
-            }"/>
-            <field name="binding_model_id" ref="model_account_payment"/>
-            <field name="binding_view_types">list</field>
-        </record>
-    </data>
-</odoo>
diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml
index 78251dc1d08..d47cae7d4cc 100644
--- a/addons/account/views/account_payment_view.xml
+++ b/addons/account/views/account_payment_view.xml
@@ -365,6 +365,39 @@
                 records.action_post()
             </field>
         </record>
+    </data>
+    <data noupdate="1">
+        <record id="account_send_payment_receipt_by_email_action" model="ir.actions.act_window">
+            <field name="name">Send receipt by email</field>
+            <field name="res_model">mail.compose.message</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context" eval="{
+                'mail_post_autofollow': True,
+                'default_composition_mode': 'comment',
+                'default_use_template': True,
+                'default_template_id': ref('account.mail_template_data_payment_receipt'),
+                'custom_layout': 'mail.mail_notification_light',
+            }"/>
+            <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'))]"/>
+        </record>
 
+        <record id="account_send_payment_receipt_by_email_action_multi" model="ir.actions.act_window">
+            <field name="name">Send receipts by email</field>
+            <field name="res_model">mail.compose.message</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context" eval="{
+                'mail_post_autofollow': True,
+                'default_composition_mode': 'mass_mail',
+                'default_use_template': True,
+                'default_template_id': ref('account.mail_template_data_payment_receipt'),
+                'custom_layout': 'mail.mail_notification_light',
+            }"/>
+            <field name="binding_model_id" ref="model_account_payment"/>
+            <field name="binding_view_types">list</field>
+        </record>
     </data>
 </odoo>