diff --git a/app/Models/ClientPolicyModel.php b/app/Models/ClientPolicyModel.php
index 8f84def5..204324c5 100755
--- a/app/Models/ClientPolicyModel.php
+++ b/app/Models/ClientPolicyModel.php
@@ -118,7 +118,16 @@ class ClientPolicyModel extends Model
 
 
         return $this->db->table('client_policy')
-            ->select('client_policy.*')
+            ->select('
+
+                    client_policy.*,
+                    CASE
+                        WHEN client_policy.policy_entry_from = 3
+                            AND client_policy.cd_ac_pk IS NULL
+                        THEN leads.cd_amount
+                        ELSE NULL
+                    END AS lead_cd_amount
+            ', false)
             ->select('insurers.name as insurer_name, insurers.short_name as insurer_short')
             ->select('tpa.name as tpa_name, tpa.short_name as tpa_short')
             ->select('policy_type.policy_type as policy_type_name')
@@ -132,6 +141,7 @@ class ClientPolicyModel extends Model
             ->join('tpa_branch', 'client_policy.tpa_branch_id = tpa_branch.id', 'left')
             ->join('policy_type', 'policy_type.id = client_policy.policy_type_id')
             ->join('client_branch', 'client_branch.id = client_policy.client_branch_id')
+            ->join('leads', 'client_policy.is_from_lead = leads.id', 'left')
             ->where('client_policy.client_id', $client_id)
             // ->where('client_policy.policy_status', 1)
             ->where('client_policy.is_active', 1)
diff --git a/app/Views/cd_master_add_modal.php b/app/Views/cd_master_add_modal.php
index 84de0dd8..d07b87d4 100644
--- a/app/Views/cd_master_add_modal.php
+++ b/app/Views/cd_master_add_modal.php
@@ -289,7 +289,6 @@
 
         $('#opening_date').val('');
         $('#cd_ac_no_for_cd_master').val('');
-        $('#opening_bal').val('');        
         // $('#CDMasterForm').attr('action', '<?php echo base_url('master/cash_deposite/create');?>'); 
         $('#title').html('Add Opening Amount');
         $('#cd_master_btn_Submit').html('Submit');
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index 0277d199..c9b5a2b7 100755
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -645,7 +645,11 @@ function featchClient(){
             $('.loader-mask').delay(350).fadeOut('slow');
 
             if(res.status == true){
-                let client_url = '<?= base_url('client/list/') ?>' + res.client_id + '?client_policy_id=' + res.client_policy_id+'#police-tab';
+                let client_url = '<?= base_url('client/list/') ?>'
+                    + res.client_id
+                    + '?cd_amt=' + (res.cd_amount ?? 0)
+                    + '&client_policy_id=' + res.client_policy_id
+                    + '#police-tab';
                 toastr.success(res.message, 'SUCCESS')
                 window.location.href = client_url
             }else{
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index e520a493..398a0faf 100755
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -527,7 +527,7 @@ input:checked + .slider_blue::before {
                                         <div class="btn-group dropdown">
                                             <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                             <div class="dropdown-menu dropdown-menu-right">
-                                                <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                                <a href="#" data-id="${item.id}" id="${item.policy_id}" data-cdamt="${item.lead_cd_amount}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                                 <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
                                                 <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
 
@@ -794,7 +794,7 @@ input:checked + .slider_blue::before {
                                                     <div class="btn-group dropdown">
                                                         <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                                         <div class="dropdown-menu dropdown-menu-right">
-                                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" data-cdamt="${item.lead_cd_amount}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
                                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
 
@@ -851,6 +851,12 @@ input:checked + .slider_blue::before {
                 }, 1000);
             },
             complete :function(){
+                $('#opening_bal').val("")
+                const hash = window.location.hash;
+                if (hash === '#police-tab') {
+                    let client_url = '<?= base_url('client/list/') ?>' + res.client_id ;
+                    window.location.href = client_url
+                }
                 console.log('AJAX request completed');
             }
         });
@@ -935,6 +941,14 @@ input:checked + .slider_blue::before {
 
         var policy_form_action = '';
         var policy_id = $(this).attr('data-id');
+        var opening_bal = $(this).attr('data-cdamt') ?? "";
+        console.log('opening_bal', opening_bal)
+        console.log('opening_bal',  $('#opening_bal'))
+
+        if(opening_bal != "null"){
+            $('#opening_bal').val(opening_bal);
+        }
+
 
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
@@ -2031,6 +2045,7 @@ input:checked + .slider_blue::before {
             // Get the `client_policy_id` from the URL
             const urlParams = new URLSearchParams(window.location.search);
             const clientPolicyId = urlParams.get('client_policy_id');
+            const cd_amt = urlParams.get('cd_amt');
 
             if (clientPolicyId) {
                 // Call your function with the `client_policy_id`
@@ -2038,6 +2053,10 @@ input:checked + .slider_blue::before {
                     getClientPolicyDataForEdit(clientPolicyId);
                 }, 3000);
             }
+
+            if(cd_amt){
+                $('#opening_bal').val(cd_amt);
+            }
         }
     });
 
@@ -2498,7 +2517,7 @@ $(document).ready(function () {
                                     <div class="btn-group dropdown">
                                         <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                         <div class="dropdown-menu dropdown-menu-right">
-                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" data-cdamt="${item.lead_cd_amount}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
 
@@ -2534,7 +2553,7 @@ $(document).ready(function () {
                                     <div class="btn-group dropdown">
                                         <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                         <div class="dropdown-menu dropdown-menu-right">
-                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" data-cdamt="${item.lead_cd_amount}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
                                             <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;