diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php
index e81ce7f9..a0f8ccb5 100755
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -157,22 +157,13 @@ class Sales extends BaseController
 		if ($this->request->getMethod(true) === 'POST' && $this->request->getPost('btn_submit')) {
 		
 
-			$from_date = $this->request->getPost('from_date');
-			$to_date = $this->request->getPost('to_date');
-			$hsn_number = $this->request->getPost('hsn_number');
-			$product_id = $this->request->getPost('product');
-            $client_id = $this->request->getPost('client');
-			
-		
+			$data['from_date'] = $this->request->getPost('from_date');
+			$data['to_date'] = $this->request->getPost('to_date');
+			$data['hsn_number'] = $this->request->getPost('hsn_number');
+			$data['product_id'] = $this->request->getPost('product');
+            $data['client_id'] = $this->request->getPost('client');
 
-            $headline .= ((isset($from_date) && isset($to_date)) && (!empty($from_date) && !empty($to_date))) ? $from_date . ' to ' . $to_date. ', ' : '';
-			$headline .= (isset($hsn_number) && !empty($hsn_number)) ? $hsn_number . ', ' : '';
-            $headline .= (isset($product_id) && !empty($product_id)) ? $this->ipinvoice_model->getProductName($product_id) . ', ' : '';
-            $headline .= (isset($client_id) && !empty($client_id)) ? $this->ipinvoice_model->getClientName($client_id) . ', ' : '';
-			
-			
-
-			$report = $this->ipinvoice_model->sales_report($from_date, $to_date, $hsn_number, $product_id, $client_id);
+			$report = $this->ipinvoice_model->sales_report($data['from_date'], $data['to_date'], $data['hsn_number'], $data['product_id'], $data['client_id']);
 		} 
 		$data['hsn'] = $this->ipinvoice_model->getHsn();
 		$data['product'] = $this->ipinvoice_model->getProducts();
diff --git a/app/Models/Ipinvoice_model.php b/app/Models/Ipinvoice_model.php
index dc662e6f..8d087f7e 100755
--- a/app/Models/Ipinvoice_model.php
+++ b/app/Models/Ipinvoice_model.php
@@ -130,7 +130,7 @@ class Ipinvoice_model extends Model
         }
     
         // Order by invoice number in descending order
-        $builder->orderBy('ip_invoices.invoice_number', 'DESC');
+        $builder->orderBy('ip_invoices.invoice_date_created', 'DESC');
     
         $query = $builder->get();
         return $query->getResult();
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index 00b6e289..88dd00ae 100755
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -1544,7 +1544,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
                             <div class="form-row" style="padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
 
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label>Total Frieght Amount <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1552,7 +1552,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     echo form_input($data);
                                     ?>
                                 </div>
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label>Total Landing Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1561,7 +1561,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label>Total Assessable Value <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1570,7 +1570,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1579,7 +1579,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1588,7 +1588,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1597,7 +1597,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1607,7 +1607,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                 </div>
 
 
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label>Total IGST <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1618,7 +1618,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
 
 
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1650,7 +1650,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                               </div>
                                         </div>  -->
 
-                                <div class="form-group col-md-4">
+                                <div class="form-group col-md-3">
                                     <label id="lbl_international">Total Order Value <?php echo "($INR)" ?> </label>
                                     <input type="hidden" name="preinterTotalorderValue"
                                         value="<?php echo $totalCapitalOrder ?>">
diff --git a/app/Views/report_sales.php b/app/Views/report_sales.php
index 17d5d175..04d7a270 100644
--- a/app/Views/report_sales.php
+++ b/app/Views/report_sales.php
@@ -84,7 +84,7 @@
 													<?php echo 'From Date'; ?>
 												</label>
 												<div class="input-group">
-													<input name="from_date" id="max-date" class="form-control datepicker" autocomplete="off">
+													<input name="from_date" id="max-date" class="form-control datepicker" autocomplete="off" value="<?php if(isset($from_date)){ echo $from_date; } ?>">
 
 												</div>
 											</div>
@@ -93,7 +93,7 @@
 													<?php echo 'To Date'; ?>
 												</label>
 												<div class="input-group">
-													<input name="to_date" id="min-date" class="form-control datepicker" autocomplete="off">
+													<input name="to_date" id="min-date" class="form-control datepicker" autocomplete="off"  value="<?php if(isset($to_date)){ echo $to_date; } ?>">
 												</div>
 
 											</div>
@@ -105,7 +105,7 @@
 													<option value="">Select HSN</option>
 													<?php
 													foreach ($hsn as $val): { ?>
-															<option value="<?php echo $val->hsn_or_sac; ?>"><?php echo $val->hsn_or_sac;  ?></option>
+															<option <?php if(isset($hsn_number) && ($hsn_number == $val->hsn_or_sac)){ echo 'selected'; } ?> value="<?php echo $val->hsn_or_sac; ?>"><?php echo $val->hsn_or_sac;  ?></option>
 													<?php }
 													endforeach; ?>
 												</select>
@@ -119,7 +119,7 @@
 													<option value="">Select Product</option>
 													<?php
 													foreach ($product as $val): { ?>
-															<option value="<?php echo $val->product_id; ?>"><?php echo $val->product_name;  ?></option>
+															<option  <?php if(isset($product_id) && ($product_id == $val->product_id)){ echo 'selected'; } ?>  value="<?php echo $val->product_id; ?>"><?php echo $val->product_name;  ?></option>
 													<?php }
 													endforeach; ?>
 												</select>
@@ -133,15 +133,18 @@
 													<option value="">Select Client</option>
 													<?php
 													foreach ($client as $val): { ?>
-															<option value="<?php echo $val->client_id; ?>"><?php echo $val->client_name;  ?></option>
+															<option <?php if(isset($client_id) && ($client_id == $val->client_id)){ echo 'selected'; } ?>   value="<?php echo $val->client_id; ?>"><?php echo $val->client_name;  ?></option>
 													<?php }
 													endforeach; ?>
 												</select>
 											</div>
-											<div class="col-md-6"></div>
-											<div class="col-md-6 text-right"><br>
-												<input type="submit" class="btn btn-success" name="btn_submit"
-													value="View Report">
+											<div class="col-md-8"></div>
+											
+											<div class="col-md-4 text-right">
+											<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('sales_report') ?>';">
+
+
+												<input type="submit" class="btn btn-success m-2" name="btn_submit" value="View Report">
 											</div>
 
 										</div>
@@ -267,9 +270,7 @@
 				[10, 20, 30, 50, "All"]
 			], // Rows per page options
 			responsive: true, // Responsive table
-			order: [
-				[0, 'desc']
-			], // Default ordering (column index 0, descending)
+			 ordering : false,
 			language: {
 				paginate: {
 					next: '<i class="fas fa-angle-right"></i>', // Next button icon