diff --git a/odex25_takaful/odex_takaful/data/takaful_notification_mail_template.xml b/odex25_takaful/odex_takaful/data/takaful_notification_mail_template.xml
index 4ff2f0db6..6d593569d 100644
--- a/odex25_takaful/odex_takaful/data/takaful_notification_mail_template.xml
+++ b/odex25_takaful/odex_takaful/data/takaful_notification_mail_template.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <odoo noupdate="1">
-    <record id="email_template_sponsorship_confirmation1" model="mail.template">
+    <record id="email_template_sponsorship_confirmation10" model="mail.template">
         <field name="name">Sponsorship Confirmation Email</field>
         <field name="email_from">${ctx.get('email_from')} or ''}</field>
         <field name="email_to">${ctx.get('email_to')}</field>
         <field name="subject">Sponsorship Confirmation - ${object.sponsor_id.name}</field>
         <field name="partner_to">False</field>
-
+        <field name="report_template" ref="takaful_sponsorship_receipt_report"/>
+        <field name="report_name">${(object.name or '').replace('/','_')}</field>
         <field name="model_id" ref="odex_takaful.model_takaful_sponsorship"/>
         <field name="auto_delete" eval="True"></field>
         <field name="lang">ar_001</field>
@@ -17,7 +18,7 @@
                 <p><strong>Amount:</strong> ${object.total_sponsorship_amount} ${object.currency_id.name}</p>
                 <p>
                     <strong>Link:</strong>
-                    <a t-att-href="${object.record_url}/sponsorship/pdf/odex_takaful.report_sponsorship_receipt_document/${object.id}">
+                    <a href="${object.record_url}/sponsorship/pdf/odex_takaful.report_sponsorship_receipt_document/${object.id}">
                         Open Sponsorship Receipt
                     </a>
                 </p>
@@ -27,7 +28,7 @@
             ]]>
         </field>
     </record>
-    <record id="email_template_esterdad_confirmation3" model="mail.template">
+    <record id="email_template_esterdad_confirmation20" model="mail.template">
         <field name="name">Esterdad Confirmation Email</field>
         <field name="email_from">${ctx.get('email_from')} or ''}</field>
         <field name="email_to">${ctx.get('email_to')}</field>
@@ -37,6 +38,8 @@
         <field name="model_id" ref="odex_takaful.model_takaful_sponsorship"/>
         <field name="auto_delete" eval="True"></field>
         <field name="lang">ar_001</field>
+        <field name="report_template" ref="takaful_sponsorship_receipt_report"/>
+        <field name="report_name">${(object.name or '').replace('/','_')}</field>
         <field name="body_html"><![CDATA[
                 <p>Dear ${object.sponsor_id.name},</p>
                 <p>Your refund request has been confirmed.</p>
@@ -44,7 +47,7 @@
                 <p><strong>Reason:</strong> ${object.cancel_record_id.cancel_reason.name}</p>
                 <p>
                     <strong>Link:</strong>
-                    <a t-att-href="${object.record_url}/sponsorship/pdf/odex_takaful.report_sponsorship_receipt_document/${object.id}">
+                    <a href="${object.record_url}/sponsorship/pdf/odex_takaful.report_sponsorship_receipt_document/${object.id}">
                         Open Sponsorship Receipt
                     </a>
                 </p>
diff --git a/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py b/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py
index 79dc8dd49..1322c5c35 100644
--- a/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py
+++ b/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py
@@ -134,14 +134,12 @@ class TakafulSponsorship(models.Model):
 
     def action_quotation_send(self):
         self.ensure_one()
-        print('self.state >>>> ' , self.state)
         if self.state != 'canceled':
-            template = self.env.ref('odex_takaful.email_template_sponsorship_confirmation1')
+            template = self.env.ref('odex_takaful.email_template_sponsorship_confirmation10')
         else:
-            template = self.env.ref('odex_takaful.email_template_esterdad_confirmation3')
+            template = self.env.ref('odex_takaful.email_template_esterdad_confirmation20')
 
         lang = self.env.context.get('lang')
-        print('cancel_record_id >>>> ' , self.cancel_record_id.cancel_reason.name)
         if template.lang:
             lang = template._render_lang(self.ids)[self.id]
 
diff --git a/odex25_takaful/odex_takaful/reports/sponsorship_receipt_report.xml b/odex25_takaful/odex_takaful/reports/sponsorship_receipt_report.xml
index 23fa290c2..3d7bf02f7 100644
--- a/odex25_takaful/odex_takaful/reports/sponsorship_receipt_report.xml
+++ b/odex25_takaful/odex_takaful/reports/sponsorship_receipt_report.xml
@@ -11,18 +11,19 @@
                 <div class="page" style="position: relative;">
                     <!-- Watermark for canceled sponsorships -->
                     <t t-if="doc.state == 'canceled'">
-                        <div style="position: absolute;
-                        top: 0;
-                        right: 0;
-                        width: 100%;
-                        height: 100%;
+                    <div style="position: absolute;
+                        inset: 0;
+                        margin: 0;
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
                         color: red;
                         font-size: 5rem;
                         opacity: 0.1;
-                        transform: rotate(-45deg);
-                        transform-origin: top right;
-                        text-align: right;
-                        z-index: 0;">
+                        transform: rotate(35deg);
+                        transform-origin: center;
+                        z-index: 0;
+                        pointer-events: none;">
                         Canceled
                     </div>
                     </t>
diff --git a/odex25_takaful/odex_takaful/views/takaful_sponorship_view.xml b/odex25_takaful/odex_takaful/views/takaful_sponorship_view.xml
index 394cc8d54..b69d32336 100644
--- a/odex25_takaful/odex_takaful/views/takaful_sponorship_view.xml
+++ b/odex25_takaful/odex_takaful/views/takaful_sponorship_view.xml
@@ -58,7 +58,7 @@
                             attrs="{'invisible': ['|','|',('state','not in',['paid','partial_refund','under_replacement','replacement_done']),('record_type','!=','donation'), ('cancel_refund', '=', True)]}"/>
                     <button name="action_set_esterdad" type="object"
                             string="طلب الاسترداد" class="oe_highlight"
-                            attrs="{'invisible': ['|','|',('state','not in',['paid','partial_refund','under_replacement','replacement_done']),('record_type','!=','donation'), ('cancel_refund', '=', True)]}"/>
+                            attrs="{'invisible': ['|',('state','not in',['paid','partial_refund','under_replacement','replacement_done']), ('cancel_refund', '=', True)]}"/>
                     <button string="Approve Refund" name="approve_refund" type="object"
                             class="oe_highlight"
                             attrs="{'invisible': [ '|', ('record_type', '!=', 'donation'), ('state', '!=', 'approve_refund')]}"
diff --git a/odex25_takaful/odex_takaful/wizards/esterdad.py b/odex25_takaful/odex_takaful/wizards/esterdad.py
index 5fff0507a..ad6ad01e9 100644
--- a/odex25_takaful/odex_takaful/wizards/esterdad.py
+++ b/odex25_takaful/odex_takaful/wizards/esterdad.py
@@ -20,7 +20,7 @@ class EsterdadWizard(models.Model):
     )
     cancel_date = fields.Date()
     pay_date = fields.Datetime(related='sponsor_id.pay_date')
-    cancel_reason = fields.Many2one('sponsorship.reason.stop' , required = True)
+    cancel_reason = fields.Many2one('sponsorship.reason.stop')
     another_reason = fields.Boolean()
     reason = fields.Text()
     sponsor_id = fields.Many2one('takaful.sponsorship')
diff --git a/odex25_takaful/odex_takaful/wizards/esterdad.xml b/odex25_takaful/odex_takaful/wizards/esterdad.xml
index 8ea47e0c0..df5e8266c 100644
--- a/odex25_takaful/odex_takaful/wizards/esterdad.xml
+++ b/odex25_takaful/odex_takaful/wizards/esterdad.xml
@@ -27,9 +27,11 @@
                         <field name="currency_id" invisible="1"/>
                         <field name="cancel_date" readonly="1"/>
                         <field name="pay_date" readonly="1"/>
-                        <field name="cancel_reason"/>
+                        <field name="cancel_reason" attrs="{'invisible': [('another_reason', '=', True)],
+                       'required': [('another_reason', '=', False)]}"/>
                         <field name="another_reason"/>
-                        <field name="reason" attrs="{'invisible': [('another_reason', '=', False)]}"/>
+                        <field name="reason" attrs="{'invisible': [('another_reason', '=', False)],
+                       'required': [('another_reason', '=', True)]}"/>
                     </group>
                     <notebook>
                         <page string="بيانات المتبرع">
@@ -41,7 +43,7 @@
                         </page>
                         <page string="Payment Details" groups="odex_takaful.group_refund_approval">
                             <field name="payment_ids">
-                                <tree editable="1">
+                                <tree editable="1" >
                                     <field name="date" readonly="1"/>
 
                                     <field name="name" readonly="1"/>