diff --git a/account/application/controllers/accounts/Vouchers.php b/account/application/controllers/accounts/Vouchers.php
index 030f4e7..5c6f181 100644
--- a/account/application/controllers/accounts/Vouchers.php
+++ b/account/application/controllers/accounts/Vouchers.php
@@ -206,6 +206,8 @@ class Vouchers extends CI_Controller
     {
         $data['pageTitle'] = $VoucherType->voucher_name;
         $data['VoucherType'] = $VoucherType;
+        $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+        $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
         $command = $this->uri->segment(4);
         switch ($command) {
             case 'create':
@@ -263,6 +265,7 @@ class Vouchers extends CI_Controller
 
 
                     echo json_encode(['status' => 'success']);
+                    loadview("accounts/vouchers/create", $data);
                     break;
                 }
 
diff --git a/account/application/controllers/inventory/Purchases.php b/account/application/controllers/inventory/Purchases.php
index c4125fc..41cf9f9 100644
--- a/account/application/controllers/inventory/Purchases.php
+++ b/account/application/controllers/inventory/Purchases.php
@@ -62,6 +62,8 @@ class Purchases extends CI_Controller
                 break;
             case 'add':
                 // 
+                $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+                $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
                 if (isset($_POST['submit'])) {
                     $TableData = array(
                         'transaction_type' => filter_var($_POST['transaction_type']),
diff --git a/account/application/controllers/inventory/Sales.php b/account/application/controllers/inventory/Sales.php
index 2dd5a72..8bea4c6 100644
--- a/account/application/controllers/inventory/Sales.php
+++ b/account/application/controllers/inventory/Sales.php
@@ -19,6 +19,8 @@ class Sales extends CI_Controller
         switch ($alias) {
             case 'create':
                 $data['items'] = $this->MStocks->getSellableItems();
+                $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+                $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
                 loadView("inventory/sales/create", $data);
                 break;
             case 'store':
diff --git a/account/application/views/accounts/vouchers/create.php b/account/application/views/accounts/vouchers/create.php
index 85f52c6..ad8ff49 100644
--- a/account/application/views/accounts/vouchers/create.php
+++ b/account/application/views/accounts/vouchers/create.php
@@ -95,7 +95,7 @@ button:hover {
                                     <div class="col-2">
                                         <fieldset>
                                             <legend>Transaction Date <span class="text-danger">*</span></legend>
-                                            <input type="text" class="form-control2 nepaliDatePicker" id="voucher_date" value="<?php echo NepaliDate(); ?>" name="voucher_date" required>
+                                            <input type="text" class="form-control2 " id="voucher_date" value="<?php echo NepaliDate(); ?>" name="voucher_date" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" required>
                                         </fieldset>
                                     </div>
                                     <div class="col-8">
@@ -499,4 +499,15 @@ button:hover {
     }
     $("#saveButton").prop("disabled", true);
 </script>
+<?php function footerFunctions()
+{ ?>
+  <script>
+   $("#voucher_date").nepaliDatePicker({
+    dateFormat: "%y-%m-%d",
+    closeOnDateSelect: true,
+    minDate: $('#voucher_date').data('start'),
+    maxDate: $('#voucher_date').data('end'),
 
+});
+  </script>
+<?php } ?>
\ No newline at end of file
diff --git a/account/application/views/inventory/purchases/create.php b/account/application/views/inventory/purchases/create.php
index e228700..ad9d079 100644
--- a/account/application/views/inventory/purchases/create.php
+++ b/account/application/views/inventory/purchases/create.php
@@ -72,6 +72,7 @@
         border: 0px;
     }
 </style>
+
 <div class="content-wrapper">
     <div class="content">
         <div class="container-fluid">
@@ -89,7 +90,7 @@
                                 <div class="row mb-2">
                                     <div class="col-2">
                                         <fieldset>
-                                            <legend>Transaction Date</legend><input type="text" class="form-control2 nepaliDatePicker" id="purchase_date" value="<?php echo NepaliDate(); ?>" name="purchase_date">
+                                            <legend>Transaction Date</legend><input type="text" class="form-control2" id="purchase_date" value="<?php echo NepaliDate(); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" name="purchase_date">
                                         </fieldset>
                                     </div>
                                     <div class="col-8">
@@ -428,4 +429,17 @@
             $("#grand_total").val(grandTotal.toFixed(2));
         }
     });
-</script>
\ No newline at end of file
+</script>
+
+<?php function footerFunctions()
+{ ?>
+  <script>
+   $("#purchase_date").nepaliDatePicker({
+    dateFormat: "%y-%m-%d",
+    closeOnDateSelect: true,
+    minDate: $('#purchase_date').data('start'),
+    maxDate: $('#purchase_date').data('end'),
+
+});
+  </script>
+<?php } ?>
\ No newline at end of file
diff --git a/account/application/views/inventory/purchases/view.php b/account/application/views/inventory/purchases/view.php
index 737b23b..3b11ed0 100644
--- a/account/application/views/inventory/purchases/view.php
+++ b/account/application/views/inventory/purchases/view.php
@@ -22,7 +22,7 @@
                             <div class="row bill-details">
                                 <div class="col">
                                     <p><strong>Bill Number:</strong> <?php echo $Purchase->purchase_id; ?></p>
-                                    <p><strong>Date:</strong> <?php echo myDate($Purchase->purchase_date); ?></p>
+                                    <p><strong>Date:</strong> <?php echo dbDate($Purchase->purchase_date); ?></p>
                                     <p><strong>Vendor:</strong> <?php echo $this->myaccounts->getAccountDetails($Purchase->accounts_id)->account_name; ?></p>
                                 </div>
                                
diff --git a/account/application/views/inventory/sales/create.php b/account/application/views/inventory/sales/create.php
index ac06d5c..1589a94 100644
--- a/account/application/views/inventory/sales/create.php
+++ b/account/application/views/inventory/sales/create.php
@@ -12,7 +12,7 @@
                                     <div class="col-2">
                                         <fieldset>
                                             <legend>Transaction Date <span class="text-danger">*</span></legend>
-                                            <input type="text" class="form-control2 nepaliDatePicker" id="salesDate" value="<?php echo NepaliDate(); ?>" name="salesDate" required>
+                                            <input type="text" class="form-control2" id="salesDate" value="<?php echo NepaliDate(); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" name="salesDate" required>
                                         </fieldset>
                                     </div>
                                     <div class="col-8">
@@ -260,4 +260,17 @@
         $('#tax').val(tax.toFixed(2));
         $('#grandtotal').val(grandTotal.toFixed(2));    
     }
-</script>
\ No newline at end of file
+</script>
+
+<?php function footerFunctions()
+{ ?>
+  <script>
+   $("#salesDate").nepaliDatePicker({
+    dateFormat: "%y-%m-%d",
+    closeOnDateSelect: true,
+    minDate: $('#salesDate').data('start'),
+    maxDate: $('#salesDate').data('end'),
+
+});
+  </script>
+<?php } ?>
\ No newline at end of file
diff --git a/account/application/views/inventory/sales/view.php b/account/application/views/inventory/sales/view.php
index 5859e98..9ba18c8 100644
--- a/account/application/views/inventory/sales/view.php
+++ b/account/application/views/inventory/sales/view.php
@@ -22,7 +22,7 @@
                             <div class="row bill-details">
                                 <div class="col">
                                     <p><strong>Bill Number:</strong> <?php echo $Sales->sales_id; ?></p>
-                                    <p><strong>Date:</strong> <?php echo myDate($Sales->sales_date); ?></p>
+                                    <p><strong>Date:</strong> <?php echo dbDate($Sales->sales_date); ?></p>
                                     <p><strong>Vendor:</strong> <?php echo $this->myaccounts->getAccountDetails($Sales->accounts_id)->account_name; ?></p>
                                 </div>