diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index e182f042..bdb87587 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -14,7 +14,9 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
 #: model:mail.template,report_name:rma.mail_template_rma_notification
+#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
 msgid "${(object.name or '')}"
 msgstr ""
 
@@ -23,6 +25,16 @@ msgstr ""
 msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
 msgstr ""
 
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
+msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' }) products received"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_draft_notification
+msgid "${object.company_id.name} Your RMA has been succesfully created (Ref ${object.name or 'n/a' })"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma_team.py:46
 #, python-format
@@ -46,6 +58,43 @@ msgid "<div style=\"margin: 0px; padding: 0px;\">\n"
 "        "
 msgstr ""
 
+#. module: rma
+#: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
+msgid "<div style=\"margin: 0px; padding: 0px;\">\n"
+"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"    Dear ${object.partner_id.name}\n"
+"    % if object.partner_id.parent_id:\n"
+"        (${object.partner_id.parent_id.name})\n"
+"    % endif\n"
+"    <br/><br/>\n"
+"    The products for your RMA <strong>${object.name}</strong>\n"
+"    from ${object.company_id.name} have been received in our warehouse.\n"
+"    <br/><br/>\n"
+"    Do not hesitate to contact us if you have any question.\n"
+"</p>\n"
+"</div>\n"
+"        "
+msgstr ""
+
+#. module: rma
+#: model:mail.template,body_html:rma.mail_template_rma_draft_notification
+msgid "<div style=\"margin: 0px; padding: 0px;\">\n"
+"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"    Dear ${object.partner_id.name}\n"
+"    % if object.partner_id.parent_id:\n"
+"        (${object.partner_id.parent_id.name})\n"
+"    % endif\n"
+"    <br/><br/>\n"
+"    You've succesfully placed your RMA <strong>${object.name}</strong>\n"
+"    on ${object.company_id.name}. Our team will check it and will validate\n"
+"    it as soon as possible.\n"
+"    <br/><br/>\n"
+"    Do not hesitate to contact us if you have any question.\n"
+"</p>\n"
+"</div>\n"
+"        "
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\"Download\"/>"
@@ -428,7 +477,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1195
+#: code:addons/rma/models/rma.py:1225
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
 msgid "Customer"
@@ -523,7 +572,7 @@ msgid "Draft RMA"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1154
+#: code:addons/rma/models/rma.py:1184
 #, python-format
 msgid "E-mail subject: %s\n"
 "\n"
@@ -552,12 +601,36 @@ msgstr ""
 msgid "Email Template confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email sent to the customer once the RMA is confirmed."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email sent to the customer when they place an RMA from the portal"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:63
 #, python-format
@@ -631,7 +704,7 @@ msgid "If the active field is set to false, it will allow you to hide the RMA Te
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1158
+#: code:addons/rma/models/rma.py:1188
 #, python-format
 msgid "Incoming e-mail"
 msgstr ""
@@ -752,7 +825,7 @@ msgstr ""
 #. module: rma
 #: code:addons/rma/models/rma.py:31
 #: code:addons/rma/models/rma.py:507
-#: code:addons/rma/models/rma.py:1157
+#: code:addons/rma/models/rma.py:1187
 #, python-format
 msgid "New"
 msgstr ""
@@ -773,13 +846,13 @@ msgid "Next Activity Type"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:808
+#: code:addons/rma/models/rma.py:838
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:791
+#: code:addons/rma/models/rma.py:821
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr ""
@@ -943,7 +1016,7 @@ msgid "Quantity to extract"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:841
+#: code:addons/rma/models/rma.py:871
 #, python-format
 msgid "Quantity to extract cannot be greater than remaining delivery quantity (%s %s)"
 msgstr ""
@@ -973,7 +1046,7 @@ msgid "RMA #"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/res_company.py:37
+#: code:addons/rma/models/res_company.py:73
 #, python-format
 msgid "RMA Code"
 msgstr ""
@@ -1015,15 +1088,11 @@ msgid "RMA Location"
 msgstr ""
 
 #. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
 msgid "RMA Notification"
 msgstr ""
 
-#. module: rma
-#: model:mail.message.subtype,name:rma.mt_rma_notification
-msgid "RMA Notificatoin"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1041,6 +1110,11 @@ msgstr ""
 msgid "RMA Out Type"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Receipt Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:87
 #, python-format
@@ -1096,6 +1170,11 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1171,7 +1250,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:724
+#: code:addons/rma/models/rma.py:754
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1227,13 +1306,13 @@ msgid "Replaced"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1064
+#: code:addons/rma/models/rma.py:1094
 #, python-format
 msgid "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a>) has been created."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1075
+#: code:addons/rma/models/rma.py:1105
 #, python-format
 msgid "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" data-oe-id=\"%d\">%s</a><br/>Quantity %f %s<br/>This replacement did not create a new move, but one of the previously created moves was updated with this data."
 msgstr ""
@@ -1249,7 +1328,7 @@ msgid "Requested operation"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:772
+#: code:addons/rma/models/rma.py:802
 #, python-format
 msgid "Required field(s):%s"
 msgstr ""
@@ -1278,7 +1357,7 @@ msgid "Return to customer"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1025
+#: code:addons/rma/models/rma.py:1055
 #, python-format
 msgid "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a> has been created."
 msgstr ""
@@ -1314,11 +1393,33 @@ msgstr ""
 msgid "Send RMA Confirmation"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA info to customer"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1388,7 +1489,7 @@ msgid "Split RMA"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:926
+#: code:addons/rma/models/rma.py:956
 #, python-format
 msgid "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been created."
 msgstr ""
@@ -1487,7 +1588,7 @@ msgid "The quantity done for the product '%s' must be equal to its initial deman
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:829
+#: code:addons/rma/models/rma.py:859
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr ""
@@ -1499,19 +1600,19 @@ msgid "There is at least one invoice lines whose quantity is less than the quant
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:818
+#: code:addons/rma/models/rma.py:848
 #, python-format
 msgid "This RMA cannot be split."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:805
+#: code:addons/rma/models/rma.py:835
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:788
+#: code:addons/rma/models/rma.py:818
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr ""
@@ -1634,11 +1735,33 @@ msgstr ""
 msgid "Website communication history"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When customers themselves place an RMA from the portal, send an automatic notification acknowleging it."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA products are received, send an automatic information email."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "When the RMA receipt is confirmed, send a confirmation email to the customer."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
@@ -1646,7 +1769,7 @@ msgid "When the delivery is confirmed, send a confirmation email to the customer
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:529
+#: code:addons/rma/models/rma.py:535
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""