diff --git a/account/application/controllers/Welcome.php b/account/application/controllers/Welcome.php
index 9824f58..6e2f7e6 100644
--- a/account/application/controllers/Welcome.php
+++ b/account/application/controllers/Welcome.php
@@ -241,5 +241,8 @@ class Welcome extends CI_Controller
     if ($query->num_rows() == 0) {
       $this->db->query("ALTER TABLE tbl_accounts ADD COLUMN account_bank VARCHAR(50)");
     }
+
+    $this->db->query("ALTER TABLE tbl_translations MODIFY COLUMN nepali VARCHAR(255) COLLATE utf8_unicode_ci");
+
   }
 }
diff --git a/account/application/controllers/accounts/Ledger.php b/account/application/controllers/accounts/Ledger.php
index c4f77f5..45c7a2e 100644
--- a/account/application/controllers/accounts/Ledger.php
+++ b/account/application/controllers/accounts/Ledger.php
@@ -40,6 +40,8 @@ class Ledger extends CI_Controller
                 break;
             case 'partyledger':
                 $data['pageTitle'] = "View Party Ledger";
+                $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+                $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
                 // $_GET['show_ledger'];
                 if (isset($_GET['show_ledger'])) {
                     $fromDate_Nepali = $_GET['from_date'];
@@ -75,15 +77,19 @@ class Ledger extends CI_Controller
                 loadView("accounts/daybook", $data);
                 break;
             case 'bank_book':
+                $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+                $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
                 $data['pageTitle'] = "Bank Book";               
                 loadView("accounts/ledger_bankbook", $data);
                 break;
             case 'cash_book':
+                $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+                $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
                 $data['pageTitle'] = "Cash Book";               
                 loadView("accounts/ledger_cashbook", $data);
                 break;
             case 'receiveables':
-                $data['pageTitle'] = "Accounts Receiveables";               
+                $data['pageTitle'] = "Accounts Receivables";               
                 loadView("accounts/ledger_receiveables", $data);
                 break;
             case 'payables':
diff --git a/account/application/controllers/accounts/Reports.php b/account/application/controllers/accounts/Reports.php
index f6003ca..41df1a9 100644
--- a/account/application/controllers/accounts/Reports.php
+++ b/account/application/controllers/accounts/Reports.php
@@ -116,7 +116,7 @@ class Reports extends CI_Controller
                 break;
             case 'balance_by_ledger':
                 $accategory_id = 0;
-                $data['pageTitle'] = "Account Balances By Group";
+                $data['pageTitle'] = "Account Balances By Ledgers";
                 if (isset($_GET['group'])) {
                     $accategory_id = ($_GET['group']) ? $_GET['group'] : 0;
                 }
diff --git a/account/application/controllers/accounts/Vouchers.php b/account/application/controllers/accounts/Vouchers.php
index 35b4980..d4dbd66 100644
--- a/account/application/controllers/accounts/Vouchers.php
+++ b/account/application/controllers/accounts/Vouchers.php
@@ -26,6 +26,8 @@ class Vouchers extends CI_Controller
                 break;
             case 'listvouchers':
                 $data['pageTitle'] = "Vouchers";
+                $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+                $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
                 $fromDate_bs = isset($_GET['from_date']) ? $_GET['from_date'] : firstDayOfNepaliMonth();
                 $todate_bs = isset($_GET['to_date']) ? $_GET['to_date'] : NepaliDate(Today());
                 $fromDate_ad = NepaliToEnglishDate($fromDate_bs);
diff --git a/account/application/controllers/inventory/Stocks.php b/account/application/controllers/inventory/Stocks.php
index 0df951c..2bbf4fc 100644
--- a/account/application/controllers/inventory/Stocks.php
+++ b/account/application/controllers/inventory/Stocks.php
@@ -57,6 +57,8 @@ class Stocks extends CI_Controller
                 loadView("inventory/stocks/add", $data);
                 break;
             case 'summary':
+                $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+                $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
                 $data['StockRecords'] = $this->MStocks->getStockSummary();
                 // pre($data['StockRecords']);
                 loadView("inventory/stocks/summary", $data);
diff --git a/account/application/helpers/bibhelper_helper.php b/account/application/helpers/bibhelper_helper.php
index f7d9e56..56d32db 100644
--- a/account/application/helpers/bibhelper_helper.php
+++ b/account/application/helpers/bibhelper_helper.php
@@ -44,8 +44,8 @@ function createNepaliDateInput($name, $display, $id, $default = "", $class = "")
     <?php if ($display != "") : ?>
         <label for="datepicker<?php echo $id; ?>"><?php echo function_exists("myLang") ? myLang($display) : $display; ?></label>
     <?php endif; ?>
-    <div class="input-group" id="ass_date" data-target-input="nearest">
-        <input id="<?php echo $id; ?>" name="<?php echo $name; ?>" type="text" class="form-control nepaliDatePicker <?php echo $class; ?>" autocomplete="off" value="<?php echo ($default == "") ? NepaliDate() : $default; ?>">
+    <div class="input-group ass_date" id="ass_date" data-target-input="nearest">
+        <input id="<?php echo $id; ?>" name="<?php echo $name; ?>" type="text" class="form-control  <?php echo $class; ?>" autocomplete="off" value="<?php echo ($default == "") ? NepaliDate() : $default; ?>">
     </div>
 <?php
 }
@@ -95,14 +95,14 @@ function getFieldfromValue($tableName, $fieldName, $lookupField, $referenceValue
         return "N/A";
     }
 }
-function fillComboWithValue($fieldName, $displayName, $fieldID, $tableName, $displayField, $valueField, $default = "", $CSSclass = "", $multiple = false, $condition = "")
+function fillComboWithValue($fieldName, $displayName, $fieldID, $tableName, $displayField, $valueField, $default = "", $CSSclass = "", $multiple = false, $condition = "", $required=false)
 {
     $ci = &get_instance();
 ?>
     <?php if ($displayName != "") : ?>
         <label for="<?php echo $fieldID; ?>"><?php echo function_exists("myLang") ? myLang($displayName) : $displayName; ?></label>
     <?php endif; ?>
-    <select name="<?php echo $fieldName; ?><?php echo ($multiple) ? "[]" : ""; ?>" <?php if ($CSSclass != "none") : ?>class="form-control select2 <?php echo $CSSclass; ?>" <?php else : ?> class="form-control" <?php endif; ?> id="<?php echo $fieldID; ?>" <?php echo ($multiple) ? "multiple" : ""; ?>>
+    <select name="<?php echo $fieldName; ?><?php echo ($multiple) ? "[]" : ""; ?>" <?php if ($CSSclass != "none") : ?>class="form-control select2 <?php echo $CSSclass; ?>" <?php else : ?> class="form-control" <?php endif; ?> id="<?php echo $fieldID; ?>" <?php echo ($multiple) ? "multiple" : ""; ?><?php echo ($required) ? "required" : ""; ?>>
         <option value="">Select <?php echo function_exists("myLang") ? myLang($displayName) : $displayName; ?></option>
         <?php
         $q = "select * from $tableName";
diff --git a/account/application/libraries/Myaccounts.php b/account/application/libraries/Myaccounts.php
index 7dca589..06dfebb 100644
--- a/account/application/libraries/Myaccounts.php
+++ b/account/application/libraries/Myaccounts.php
@@ -69,7 +69,8 @@ class myaccounts
         $i = 0;
         $crTotal = 0;
         $drTotal = 0;
-        $fields = array();
+        $fields = array();  
+        // print_r($VoucherDetails);die;
         foreach ($VoucherDetails as $VoucherDetail) :
             $i++;
             $fields['account_name_' . $i] = $VoucherDetail->account_name;
@@ -90,6 +91,9 @@ class myaccounts
             $fields['amount_in_words'] = trim($CI->numbertoword->nepali_word($crTotal));
         else
             $fields['amount_in_words'] = trim($CI->numbertoword->english_word($crTotal));
+        
+        // $fields['narration_' . $i] = $VoucherDetail->narration;
+
         $file = APPPATH . "/../pdf/e_voucher1.pdf";
         $pdf = new FPDM($file);
         //pre($pdf->getContent($file,"PDF"));
@@ -205,12 +209,12 @@ class myaccounts
             $balance = getBalance($Account->account_id);
             $BalanceTotal += $balance;
             // pre($Account);
-            $html .= "<tr><td><a href='#' onClick='showLedger(" . $Account->account_id . ")'>" . $Account->account_name . "</a></td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='text-right col-1'></td><td class='text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
+            $html .= "<tr><td><a href='#' onClick='showLedger(" . $Account->account_id . ")'>" . $Account->account_name . "</a></td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='text-right col-1'>". myCurrency($balance) ."</td><td class='text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
         endforeach;
         $html .= "</tbody><tfoot>";
-        if ($full == "") {
-            $html .= "<tr><th colspan=2 class='text-right '>Total</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th><th></th><th></th></tr>";
-        }
+        // if ($full == "") {
+            $html .= "<tr><th colspan=2 class='text-right '>Total</th><th class='text-right'>" . (($BalanceTotal > 0) ? myCurrency(abs($BalanceTotal )) : "") . "</th><th class='text-right'>" . (($BalanceTotal < 0) ? myCurrency(abs($BalanceTotal )) : "") . "</th><th>" . myCurrency($BalanceTotal) . "</th><th></th></tr>";
+        // }
         $html .= "</tfoot></table>\n";
         $html .= " <div class=\"modal fade\" id=\"ledgerdetails_box\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"ledgerdetails_box\" aria-hidden=\"true\">
         <div class=\"modal-dialog modal-xl\" role=\"document\">
@@ -660,7 +664,7 @@ class myaccounts
         $data['oldBalance'] = $oldBalance;
         return $data;
     }
-    function showLedger($account_id, $fromDate = "", $toDate = "")
+    function showLedger($account_id, $fromDate = "", $toDate = "", $fiscalStart = "", $fiscalEnd = "" )
     {
         $oldBalance = $this->getOldBalance($account_id, FYStart());
         $fromDate = ($fromDate == "") ? NepaliToEnglishDate(FYStart()) : $fromDate;
@@ -695,6 +699,7 @@ class myaccounts
                             <th class="col-1 text-right"><?php myLang("Debit"); ?></th>
                             <th class="col-1 text-right"><?php myLang("Credit"); ?></th>
                             <th class="col-1"><?php myLang("Balance"); ?></th>
+                            <input type="hidden" id="refdate" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>">
                         </tr>
                     </thead>
                     <tbody>
@@ -772,6 +777,22 @@ class myaccounts
             </div> -->
             </div>
         </div>
+        <?php
+        function footerfunctions()
+        {
+        ?>
+            <script>
+                $(".ass_date").nepaliDatePicker({
+                dateFormat: "%y-%m-%d",
+                closeOnDateSelect: true,
+                minDate: $('#refdate').data('start'),
+                maxDate: $('#refdate').data('end'),
+
+            });
+            </script>
+        <?php
+        }
+        ?>
     <?php
     }
     function ledgerPDF_FPDM($account_id, $fromDate, $toDate)
@@ -922,7 +943,7 @@ class myaccounts
         // $pdf->Output("F", $OutputFileLocation . $OutputFile);
         // return $OutputFile;
     }
-    function listVouchers($fromDate = "", $toDate = "", $account_id = "", $vouchertype_id = "", $showAccounts = false, $showVoucherTypes = false)
+    function listVouchers($fromDate = "", $toDate = "", $account_id = "", $vouchertype_id = "", $showAccounts = false, $showVoucherTypes = false, $fiscalStart = "", $fiscalEnd = "")
     {
         // echo $toDate;
         $ci = &get_instance();
@@ -997,9 +1018,12 @@ class myaccounts
                         <!-- <td><?php echo $TableRow->voucher_state; ?></td> -->
                         <td class="col-1 text-center">
                             <a onClick="javascript:showDetails(<?php echo $TableRow->voucher_id; ?>);" class="btn btn-success btn-xs" title="View Details"><i class="fa fa-eye"></i></a>
-                            <a onClick="javascript:showDetails(<?php echo $TableRow->voucher_id; ?>);" class="btn btn-info btn-xs" title="View Details"><i class="fas fa-edit"></i></a>
+                            <!-- <a onClick="javascript:showDetails(<?php //echo $TableRow->voucher_id; ?>);" class="btn btn-info btn-xs" title="View Details"><i class="fas fa-edit"></i></a> -->
                             <a onClick="javascript:showPDF(<?php echo $TableRow->voucher_id; ?>);" class="btn btn-primary btn-xs" title="View PDF"><i class="fa fa-file-pdf"></i></a>
-                            <a onClick="javascript:deleteVoucher(<?php echo $TableRow->voucher_id; ?>);" class="btn btn-danger btn-xs" title="Delete Voucher"><i class="fa fa-trash"></i></a>
+                            <?php //print_r($ci->session->userdata());die; ?>
+                            <?php if ($ci->session->userdata('LoggedUser') != 'admin'): ?>
+                                <a onClick="javascript:deleteVoucher(<?php echo $TableRow->voucher_id; ?>);" class="btn btn-danger btn-xs" title="Delete Voucher"><i class="fa fa-trash"></i></a>
+                            <?php endif; ?>
                         </td>
                     </tr>
                 <?php endforeach; ?>
@@ -1034,6 +1058,7 @@ class myaccounts
                         <button type="button" onClick='reversalEntry()' id="reversalBtn" class="btn btn-secondary" data-dismiss="modal" data-id="">Revarsal Entry</button>
                         <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                     </div>
+                    <input type="hidden" id="refdate" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>">
                 </div>
             </div>
         </div>
@@ -1112,6 +1137,15 @@ class myaccounts
                     }
                 }
             </script>
+            <script>
+                $(".ass_date").nepaliDatePicker({
+                dateFormat: "%y-%m-%d",
+                closeOnDateSelect: true,
+                minDate: $('#refdate').data('start'),
+                maxDate: $('#refdate').data('end'),
+
+            });
+            </script>
         <?php
         }
         ?>
@@ -1204,7 +1238,7 @@ class myaccounts
                             <td><?php echo myCurrency($drTotal); ?></td>
                         </tr>
                         <tr>
-                            <td colspan="<?php echo $TotalCols; ?>" class="text-left" height=100>Narration: <?php echo $TableRow->narration; ?></td>
+                            <td colspan="<?php echo $TotalCols; ?>" class="text-left" height=100><i>Narration: <?php echo $TableRow->narration; ?></i></td>
                         </tr>
                         <tr>
                             <td colspan="<?php echo $TotalCols; ?>" class="text-center" height=200>
@@ -1344,7 +1378,7 @@ class myaccounts
         <?php if ($displayName != "") : ?>
             <label for="<?php echo $fieldID; ?>"><?php echo function_exists("myLang") ? myLang($displayName) : $displayName; ?></label>
         <?php endif; ?>
-        <select name="<?php echo $fieldName; ?>" class="form-control select2 <?php echo $CSSclass; ?>" id="<?php echo $fieldID; ?>">
+        <select name="<?php echo $fieldName; ?>" class="form-control select2 <?php echo $CSSclass; ?>" id="<?php echo $fieldID; ?> " required>
             <option value="">Select </option>
             <!-- <option value="">Select <?php //echo function_exists("myLang") ? myLang($displayName) : $displayName; 
                                             ?></option> -->
diff --git a/account/application/views/accounts/accountheads/edit.php b/account/application/views/accounts/accountheads/edit.php
index 3af678c..ecc0d59 100644
--- a/account/application/views/accounts/accountheads/edit.php
+++ b/account/application/views/accounts/accountheads/edit.php
@@ -34,7 +34,7 @@
                                     <div class="col-7">
                                         <div class="form-group">
 
-                                            <?php fillComboWithValue("accategory_id", "Under", "accategory_id", "tbl_accategories", "accategory_name", "accategory_id", $TableData->accategory_id, "", false, "status=1"); ?>
+                                            <?php fillComboWithValue("accategory_id", "Under", "accategory_id", "tbl_accategories", "accategory_name", "accategory_id", $TableData->accategory_id, "", false, "status=1", $required=true); ?>
 
                                         </div>
                                     </div>
@@ -80,76 +80,152 @@
                                 $category_name = getFieldfromValue("tbl_accategories", "accategory_name", "accategory_id", $TableData->accategory_id);
                                 ?>
                                 <div id="creditorFields" style="display: none;">
-                                <!-- <?php //if ($category_name == "Sundry Creditors" || $category_name == "Sundry Debtors") : ?> -->
+                                    <!-- <?php //if ($category_name == "Sundry Creditors" || $category_name == "Sundry Debtors") : 
+                                            ?> -->
+                                    <hr>
+                                    <div class="row" style="padding-bottom: 4px;"><b>Mailing Details:</b></div>
                                     <div class="row">
-                                            <!--COL START-->
-                                            <div class="col">
-                                                <div class="form-group">
-                                                    <label for="account_partyname">Party Name</label><input type="text" class="form-control" id="account_partyname" value="<?php echo $TableData->account_partyname; ?>" name="account_partyname">
-                                                </div>
-                                            </div>
-                                            <!--COL END-->
-
-                                            <!--COL START-->
-                                            <div class="col">
-                                                <div class="form-group">
-                                                    <label for="account_partyaddress">Party Address</label><input type="text" class="form-control" id="account_partyaddress" value="<?php echo $TableData->account_partyaddress; ?>" name="account_partyaddress">
-                                                </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="form-group">
-                                                    <label for="account_partypan">PAN</label><input type="text" class="form-control" id="account_partypan" value="<?php echo $TableData->account_partypan; ?>" name="account_partypan">
-                                                </div>
-                                            </div>
-                                            <!--COL END-->
-                                            <!--COL START-->
-                                            <div class="col">
-                                                <div class="form-group">
-                                                    <label for="account_partyemail">Party Email</label><input type="email" class="form-control" id="account_partyemail" value="<?php echo $TableData->account_partyemail; ?>" name="account_partyemail">
-                                                </div>
-                                                
-                                            </div>
-                                            <!--COL END-->
-                                            </div>
-                                            <div class="row">
-                                            <!--COL START-->
-                                            <div class="col">
-                                                <div class="form-group">
-                                                    <label for="account_partycontact">Party Contact</label><input type="text" class="form-control" id="account_partycontact" value="<?php echo $TableData->account_partycontact; ?>" name="account_partycontact">
-                                                </div>
-
-                                            </div>
-                                            <!--COL END-->
-                                            <!--COL START-->
-                                            <div class="col">
-
-
-                                                <div class="form-group">
-                                                    <label for="account_partycontactperson">Contact Person</label><input type="text" class="form-control" id="account_partycontactperson" value="<?php echo $TableData->account_partycontactperson; ?>" name="account_partycontactperson">
-                                                </div>
-
-                                            </div>
-                                            <!--COL END-->
-
-                                            <!--COL START-->
-                                            <div class="col">
-
-
-                                                <div class="form-group">
-                                                    <label for="account_partycontactpersoncontact">Contact Person Phone</label><input type="text" class="form-control" id="account_partycontactpersoncontact" value="<?php echo $TableData->account_partycontactpersoncontact; ?>" name="account_partycontactpersoncontact">
-                                                </div>
-
-                                            </div>
-                                            <!--COL END-->
-                                            </div>
-                                   
-
-                                <!-- <?php //endif; ?> -->
-                             </div>
-                                <div class="row" id="bankFields" >
-                                <!-- <?php //if ($category_name == "Bank Account") : ?> -->
-                                    
                                         <!--COL START-->
+                                        <div class="col">
+                                            <div class="form-group">
+                                                <label for="account_partyname">Party Name</label><input type="text" class="form-control" id="account_partyname" value="<?php echo $TableData->account_partyname; ?>" name="account_partyname">
+                                            </div>
+                                        </div>
+                                        <!--COL END-->
+
+                                        <!--COL START-->
+                                        <div class="col">
+                                            <div class="form-group">
+                                                <label for="account_partyaddress">Party Address</label><input type="text" class="form-control" id="account_partyaddress" value="<?php echo $TableData->account_partyaddress; ?>" name="account_partyaddress">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <hr>
+                                    <div class="row" style="padding-bottom: 4px;"><b>Contact Details:</b></div>
+                                    <div class="row">
+
+                                        <!--COL END-->
+                                        <!--COL START-->
+                                        <div class="col">
+                                            <div class="form-group">
+                                                <label for="account_partyemail">Party Email</label><input type="email" class="form-control" id="account_partyemail" value="<?php echo $TableData->account_partyemail; ?>" name="account_partyemail">
+                                            </div>
+
+                                        </div>
+                                        <!--COL END-->
+                                        <!--COL START-->
+                                        <div class="col">
+                                            <div class="form-group">
+                                                <label for="account_partycontact">Party Contact</label><input type="text" class="form-control" id="account_partycontact" value="<?php echo $TableData->account_partycontact; ?>" name="account_partycontact">
+                                            </div>
+
+                                        </div>
+                                        <!--COL END-->
+                                        <!--COL START-->
+                                        <div class="col">
+
+
+                                            <div class="form-group">
+                                                <label for="account_partycontactperson">Contact Person</label><input type="text" class="form-control" id="account_partycontactperson" value="<?php echo $TableData->account_partycontactperson; ?>" name="account_partycontactperson">
+                                            </div>
+
+                                        </div>
+                                        <!--COL END-->
+
+                                        <!--COL START-->
+                                        <div class="col">
+
+
+                                            <div class="form-group">
+                                                <label for="account_partycontactpersoncontact">Contact Person Phone</label><input type="text" class="form-control" id="account_partycontactpersoncontact" value="<?php echo $TableData->account_partycontactpersoncontact; ?>" name="account_partycontactpersoncontact">
+                                            </div>
+
+                                        </div>
+                                        <!--COL END-->
+                                    </div>
+                                    <hr>
+                                    <div class="row" style="padding-bottom: 4px;"><b>Tax Information:</b></div>
+                                    <div class="row">
+                                        <div class="col-md-6 col-lg-2">
+                                            <div class="form-group">
+                                                <label for="account_partypan">PAN</label><input type="text" class="form-control" id="account_partypan" value="<?php echo $TableData->account_partypan; ?>" name="account_partypan">
+                                            </div>
+                                        </div>
+
+
+                                        <!-- <?php //endif; 
+                                                ?> -->
+                                    </div>
+                                </div>
+
+                                <div id="bankFields">
+                                    <!-- <?php //if ($category_name == "Bank Account") : 
+                                            ?> -->
+                                    <hr>
+                                    <div class="row" style="padding-bottom: 4px;"><b>Mailing Details:</b></div>
+                                    <div class="row">
+                                        <!--COL START-->
+                                        <div class="col">
+                                            <div class="form-group">
+                                                <label for="account_partyname">Party Name</label><input type="text" class="form-control" id="account_partyname" value="<?php echo $TableData->account_partyname; ?>" name="account_partyname">
+                                            </div>
+                                        </div>
+                                        <!--COL END-->
+
+                                        <!--COL START-->
+                                        <div class="col">
+                                            <div class="form-group">
+                                                <label for="account_partyaddress">Party Address</label><input type="text" class="form-control" id="account_partyaddress" value="<?php echo $TableData->account_partyaddress; ?>" name="account_partyaddress">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--COL START-->
+                                    <hr>
+                                    <div class="row" style="padding-bottom: 4px;"><b>Contact Details:</b></div>
+                                    <div class="row">
+
+                                        <!--COL END-->
+                                        <!--COL START-->
+                                        <div class="col">
+                                            <div class="form-group">
+                                                <label for="account_partyemail">Party Email</label><input type="email" class="form-control" id="account_partyemail" value="<?php echo $TableData->account_partyemail; ?>" name="account_partyemail">
+                                            </div>
+
+                                        </div>
+                                        <!--COL END-->
+                                        <!--COL START-->
+                                        <div class="col">
+                                            <div class="form-group">
+                                                <label for="account_partycontact">Party Contact</label><input type="text" class="form-control" id="account_partycontact" value="<?php echo $TableData->account_partycontact; ?>" name="account_partycontact">
+                                            </div>
+
+                                        </div>
+                                        <!--COL END-->
+                                        <!--COL START-->
+                                        <div class="col">
+
+
+                                            <div class="form-group">
+                                                <label for="account_partycontactperson">Contact Person</label><input type="text" class="form-control" id="account_partycontactperson" value="<?php echo $TableData->account_partycontactperson; ?>" name="account_partycontactperson">
+                                            </div>
+
+                                        </div>
+                                        <!--COL END-->
+
+                                        <!--COL START-->
+                                        <div class="col">
+
+
+                                            <div class="form-group">
+                                                <label for="account_partycontactpersoncontact">Contact Person Phone</label><input type="text" class="form-control" id="account_partycontactpersoncontact" value="<?php echo $TableData->account_partycontactpersoncontact; ?>" name="account_partycontactpersoncontact">
+                                            </div>
+
+                                        </div>
+                                        <!--COL END-->
+                                    </div>
+                                    <hr>
+                                    <div class="row" style="padding-bottom: 4px;"><b>Account Details:</b></div>
+                                    <div class="row">
                                         <div class="col">
 
 
@@ -179,12 +255,14 @@
                                             </div>
 
                                         </div>
-                                        <!--COL END-->
-                                        <!-- <?php //endif; ?> -->
                                     </div>
-                                
+                                    <!--COL END-->
+                                    <!-- <?php //endif; 
+                                            ?> -->
+                                </div>
 
 
+                                <hr>
                                 <div class="row">
                                     <!--COL START-->
                                     <div class="col">
@@ -224,28 +302,28 @@
 </script>
 
 <script>
-$(document).ready(function() {
-    function updateFields() {
-        var category = $('#accategory_id').val(); // Assuming the category select field has this ID
+    $(document).ready(function() {
+        function updateFields() {
+            var category = $('#accategory_id').val(); // Assuming the category select field has this ID
 
-        if (category == 2) {
-            $('#bankFields').show();
-            $('#creditorFields').hide();
-        } else if (category == 4 || category == 30) {
-            $('#bankFields').hide();
-            $('#creditorFields').show();
-        } else {
-            $('#bankFields').hide();
-            $('#creditorFields').hide();
+            if (category == 2) {
+                $('#bankFields').show();
+                $('#creditorFields').hide();
+            } else if (category == 4 || category == 30) {
+                $('#bankFields').hide();
+                $('#creditorFields').show();
+            } else {
+                $('#bankFields').hide();
+                $('#creditorFields').hide();
+            }
         }
-    }
 
-    // On page load
-    updateFields();
-
-    // On category change
-    $('#accategory_id').change(function() {
+        // On page load
         updateFields();
+
+        // On category change
+        $('#accategory_id').change(function() {
+            updateFields();
+        });
     });
-});
 </script>
\ No newline at end of file
diff --git a/account/application/views/accounts/balances/bycategory.php b/account/application/views/accounts/balances/bycategory.php
index 94771f3..d72619f 100644
--- a/account/application/views/accounts/balances/bycategory.php
+++ b/account/application/views/accounts/balances/bycategory.php
@@ -26,9 +26,17 @@ function displayCategoryTree($tree)
 {
     echo '<table class="table table-bordered">';
     foreach ($tree as $category) {
+        // print_r($category);die;
         echo '<tr>';
         echo '<td class="col-1">' . $category['accategory_id'] . '</td>';
-        echo '<td class="col-6"><a href="' . site_url("accounts/reports/balance_by_group") . "?category=" . $category['accategory_id'] . '">' . $category['accategory_name'] . '</a></td>';
+        echo '<td class="col-6">' 
+            . ($category['parent_category_id'] == 0 
+                ? "<b><a href='" . site_url("accounts/reports/balance_by_group") . "?category=" . $category['accategory_id'] . "'>" 
+                : "<a href='" . site_url("accounts/reports/balance_by_ledger") . "?group=" . $category['accategory_id'] . "'>")
+            . $category['accategory_name'] 
+            . "</a>" 
+            . ($category['parent_category_id'] == 0 ? "</b>" : "")
+            . '</td>';
         echo '<td class="col-2">' . myCurrency($category['dr']) . '</td>';
         echo '<td class="col-2">' . myCurrency($category['cr']) . '</td>';
         echo '</tr>';
diff --git a/account/application/views/accounts/balances/bygroup.php b/account/application/views/accounts/balances/bygroup.php
index 7f57528..a71ea30 100644
--- a/account/application/views/accounts/balances/bygroup.php
+++ b/account/application/views/accounts/balances/bygroup.php
@@ -1,6 +1,8 @@
 <?php
 $drWidth = 250;
 $crWidth = 250;
+$balanceWidth = 250;
+
 $AccountCategories = $this->myaccounts->getChildAccountCategories();
 ?>
 <style>
@@ -34,10 +36,13 @@ $AccountCategories = $this->myaccounts->getChildAccountCategories();
                                     <?php
                                     $drTotal = 0;
                                     $crTotal = 0;
+                                    $balanceTotal = 0;
                                     foreach ($AccountCategories as $AccountCategory) :
                                         $drTotal += $AccountCategory->dr;
                                         $crTotal += $AccountCategory->cr;
+                                        $balanceTotal += $AccountCategory->Balance
                                     ?>
+                                    <!-- <?php //print_r($AccountCategory);die; ?> -->
                                         <tr>
                                             <td>
                                                 <a href="<?php echo site_url("accounts/reports/balance_by_ledger") . "?group=" . $AccountCategory->accategory_id; ?>">
@@ -45,9 +50,9 @@ $AccountCategories = $this->myaccounts->getChildAccountCategories();
                                                 </a>
                                             </td>
                                             <td width="<?php echo $drWidth; ?>"><?php echo myCurrency($AccountCategory->dr); ?></td>
-                                            <td width="<?php echo $crWidth; ?>"><?php echo myCurrency($AccountCategory->cr); ?></td>
-                                            <td class="text-right">Balance</td>
-                                            <td class="text-center"><a href="#" class="btn btn-info btn-xs"><i class="fas fa-edit"></i> </a></td>
+                                            <td width="<?php echo $crWidth; ?>"><?php echo myCurrency(abs($AccountCategory->cr)); ?></td>
+                                            <td class="text-right"><?php echo myCurrency($AccountCategory->Balance); ?></td>
+                                            <td class="text-center"><a href="<?php echo site_url("accounts/reports/balance_by_ledger") . "?group=" . $AccountCategory->accategory_id; ?>" class="btn btn-info btn-xs"><i class="fas fa-eye"></i> </a></td>
                                         </tr>
                                     <?php endforeach; ?>
                                 </tbody>
@@ -55,8 +60,8 @@ $AccountCategories = $this->myaccounts->getChildAccountCategories();
                                     <tr>
                                         <th>Total</th>
                                         <td width="<?php echo $drWidth; ?>"><?php echo myCurrency($drTotal); ?></td>
-                                        <td width="<?php echo $crWidth; ?>"><?php echo myCurrency($crTotal); ?></td>
-                                        <td ></td>
+                                        <td width="<?php echo $crWidth; ?>"><?php echo myCurrency(abs($crTotal)); ?></td>
+                                        <td class="text-right"><?php echo myCurrency($balanceTotal); ?></td>
                                         <td ></td>
                                     </tr>
                                 </thead>
diff --git a/account/application/views/accounts/balances/byledger.php b/account/application/views/accounts/balances/byledger.php
index e69de29..f5ee6cc 100644
--- a/account/application/views/accounts/balances/byledger.php
+++ b/account/application/views/accounts/balances/byledger.php
@@ -0,0 +1,133 @@
+<?php
+$drWidth = 250;
+$crWidth = 250;
+$Accounts = $this->acc->getAccountsByCategory($accategory_id);
+$array = json_decode(json_encode($Accounts), true);
+// print_r($array);die;
+$tree = buildCategoryTree($array, false);
+function buildCategoryTree($categories, $parent_id = 0, $showZero = true)
+{
+    $tree = array();
+    foreach ($categories as $category) {
+            // print_r($category);die;
+            // print_r(myCurrency(getBalance($category['account_id'])));die;
+            $category['dr'] = getDrTotal('account_id');
+            $category['cr'] = getCrTotal('account_id');
+            if ($showZero && ($category['dr'] !== 0 || $category['cr'] !== 0)) {
+                $tree[] = $category;
+            } elseif (!$showZero && ($category['dr'] !== 0 && $category['cr'] !== 0)) {
+                $tree[] = $category;
+            }
+        }
+    
+    return $tree;
+}
+function displayCategoryTree($tree)
+{
+    echo '<table class="table table-bordered">';
+    echo '<thead>';
+    echo    '<tr>';
+    echo        '<th>Sn</th>';
+    echo        '<th>Account</th>';
+    echo        '<th class="text-right">Balance</th>';
+    echo    '</tr>';
+    echo '</thead>';
+    echo '<tbody>';
+    $BalanceTotal = 0;
+    foreach ($tree as $category) {
+        echo '<tr>';
+        echo '<td class="col-1">' . $category['account_id'] . '</td>';
+        echo '<td class="col-9"><a href="#" onClick="showLedger(' . $category['account_id'] . ')">' . $category['account_name'] . '</a></td>';
+        echo '<td class="col-2">' . myCurrency(getBalance($category['account_id'])) . '</td>';
+        $BalanceTotal += getBalance($category['account_id']);
+        echo '</tr>';
+        if (isset($category['children']) && !empty($category['children'])) {
+            echo '<tr>';
+            echo '<td colspan="4 ">';
+            displayCategoryTree($category['children']);
+            echo '</td>';
+            echo '</tr>';
+        }
+    }
+    echo '</tbody>';
+    echo '<tfoot>';
+    echo "<tr><th colspan=2 class='text-right'>Total</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th></tr>";
+    echo '</table>';
+}
+$html = "";
+$html .= " <div class=\"modal fade\" id=\"ledgerdetails_box\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"ledgerdetails_box\" aria-hidden=\"true\">
+<div class=\"modal-dialog modal-xl\" role=\"document\">
+    <div class=\"modal-content\">
+        <div class=\"modal-header\">
+            <h5 class=\"modal-title\" id=\"exampleModalLabel\">Ledger Details</h5>
+            <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\">
+                <span aria-hidden=\"true\">&times;</span>
+            </button>
+        </div>
+        <div class=\"modal-body\" id=\"details_container\">
+            Ledger Details Goes Here
+        </div>
+        <!--<div class=\"modal-footer\">
+        <button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">Close</button>
+        <button type=\"button\" class=\"btn btn-success\" data-dismiss=\"modal\">Print</button>
+        </div>-->
+    </div>
+</div>
+</div>";
+$html .= '<script>function showLedger(id) {$.ajax({url: \'';
+$html .= site_url("accounts/reports/ajax/getledgersummary/");
+$html .= '\' + id,success: function(data) {$(\'#ledgerdetails_box #details_container\').html(data);$(\'#ledgerdetails_box\').modal(\'show\');}});}</script>';
+echo $html;
+?>
+<style>
+    .expandable {
+        text-decoration: underline;
+    }
+  
+</style>
+<div class="content-wrapper">
+    <div class="content">
+        <div class="container-fluid">
+            <?php //pre($tree); 
+            ?>
+            <div class="row">
+                <div class="col">
+                    <div class="card card-primary card-outline">
+                        <div class="card-header">
+                            <h5 class="m-0"><?php echo $pageTitle; ?> </h5>
+                        </div>
+                        <div class="card-body">
+                            <input type="checkbox" name="showZero" value="true" id="showZero">
+                            <label for="showZero">
+                                Show Zero Balances
+                            </label>
+                            <?php displayCategoryTree($tree);  ?>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <script>
+            function toggleSubTable(row) {
+                var subTable = row.nextElementSibling;
+                subTable.style.display = subTable.style.display === 'none' ? 'table-row' : 'none';
+            }
+            function showLedger(id) {
+            // $("#accountsContainer").html("");
+            // alert(id);
+            $.ajax({
+                url: "<?php echo site_url("accounts/reports/ajax/getledgersummary/"); ?>" + id, //accounts/getledgersummary/
+                success: function(data) {
+                    $("#ledgerdetails_box #details_container").html(data);
+                    $("#ledgerdetails_box").modal("show");
+                    $('.dataTable').DataTable().clear().destroy();
+                    $(".dataTable").dataTable();
+                }
+            });
+        }
+        </script>
+        
+    </div>
+    <!-- /.content -->
diff --git a/account/application/views/accounts/balancesheet_new.php b/account/application/views/accounts/balancesheet_new.php
index e6afeda..f3005c4 100644
--- a/account/application/views/accounts/balancesheet_new.php
+++ b/account/application/views/accounts/balancesheet_new.php
@@ -103,40 +103,40 @@ $BIBAccounts = new BIBAccounts();
                                         <div class="col">
                                             <div class="form-group">
                                                 <label for="fromDate"><?php myLang("Starting Period"); ?></label>
-                                                <input type="text" class="form-control " name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
+                                                <input type="text" class="form-control " name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
                                             </div>
                                             <div class="form-group">
                                                 <label for="toDate"><?php myLang("Ending Period"); ?></label>
-                                                <input type="text" class="form-control " name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
+                                                <input type="text" class="form-control " name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
                                             </div>
                                         </div>
                                         <div class="dropdown-divider"></div>
-                                        <div class="form-check">
+                                        <!-- <div class="form-check">
                                             <input class="form-check-input" type="checkbox">
                                             <label class="form-check-label">Select
                                                 All</label>
-                                        </div>
+                                        </div> -->
                                         <div class="form-check">
-                                            <input type="hidden" name="showOB" value="not">
+                                            <!-- <input type="hidden" name="showOB" value="not"> -->
                                             <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
                                             <!-- <input class="form-check-input" type="checkbox"> -->
-                                            <label class="form-check-label">Opening</label>
+                                            <label class="form-check-label" for="showOB">Opening</label>
                                         </div>
                                         <div class="form-check">
                                             <!-- <input class="form-check-input" type="checkbox"> -->
                                             <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
-                                            <label class="form-check-label">Closing</label>
+                                            <label class="form-check-label" for="showClosing">Closing</label>
                                         </div>
                                         <div class="form-check">
                                             <!-- <input class="form-check-input" type="checkbox" checked> -->
                                             <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
-                                            <label class="form-check-label">Period</label>
+                                            <label class="form-check-label" for="showPeriod">Period</label>
                                         </div>
                                     </div>
                                     <div class="dropdown-divider"></div>
-                                    <div class="form-group p-2 pb-0">
-                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
-                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    <div class="form-group p-2 pb-0 text-right">
+                                        <button type="button" class="btn btn-info btn-sm " style="width:60px;height:30px;" onclick="resetForm()">Reset</button>
+                                        <button type="submit" class="btn btn-primary mr-2 btn-sm" style="width:60px;height:30px;">Search </button>
                                     </div>
                                 </div>
                             </div>
@@ -144,6 +144,8 @@ $BIBAccounts = new BIBAccounts();
                                 <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
                                     Export
                                 </button>
+                                <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle
+                        Collapse</button> -->
                                 <!-- <div class="dropdown-menu" role="menu">
                 <a href="#" class="dropdown-item">Export</a>
                 <a href="#" class="dropdown-item">Pdf</a>
@@ -151,8 +153,8 @@ $BIBAccounts = new BIBAccounts();
                 <a href="#" class="dropdown-item">View calendar</a>
               </div> -->
                             </div>
-                            
-                            <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
+
+                            <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
                         </form>
                         <script>
                             function resetForm() {
@@ -226,8 +228,7 @@ $BIBAccounts = new BIBAccounts();
             <div class="row">
                 <div class="col">
                     <!-- <button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle Collapse</button> -->
-                    <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle
-                        Collapse</button>
+
                     <div class="card card-primary card-outline">
                         <div class="card-body p-0">
                             <?php
@@ -270,7 +271,7 @@ $BIBAccounts = new BIBAccounts();
                                                     </tr>
                                                     <tr>
                                                         <td colspan="7" class="group-details p-0">
-                                                            <div id="group_<?php echo $group->acgroup_id; ?>" class="collapse">
+                                                            <div id="group_<?php echo $group->acgroup_id; ?>" class="">
                                                                 <?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
                                                                 <?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
                                                             </div>
@@ -295,12 +296,12 @@ $BIBAccounts = new BIBAccounts();
                                                 ?>
                                                 <?php foreach ($AccountGroups as $group) : ?>
                                                     <tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
-                                                        <td class="group-name"><?php echo $group->acgroup_name; ?></td>
+                                                        <td class="group-name"><b><?php echo $group->acgroup_name; ?></b></td>
                                                         <td class="group-total"><?php echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td>
                                                     </tr>
                                                     <tr>
                                                         <td colspan="7" class="group-details p-0">
-                                                            <div id="group_<?php echo $group->acgroup_id; ?>" class="collapse">
+                                                            <div id="group_<?php echo $group->acgroup_id; ?>" class="">
                                                                 <?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
                                                                 <?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
                                                             </div>
@@ -327,12 +328,12 @@ $BIBAccounts = new BIBAccounts();
                                                 ?>
                                                 <?php foreach ($AccountGroups as $group) : ?>
                                                     <tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
-                                                        <td class="group-name"><?php echo $group->acgroup_name; ?></td>
-                                                        <td class="group-total"><?php echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0); ?></td>
+                                                        <td class="group-name"><b><?php echo $group->acgroup_name; ?></b></td>
+                                                        <td class="group-total text-right pr-2"><?php echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0); ?></td>
                                                     </tr>
                                                     <tr>
                                                         <td colspan="7" class="group-details p-0">
-                                                            <div id="group_<?php echo $group->acgroup_id; ?>" class="collapse">
+                                                            <div id="group_<?php echo $group->acgroup_id; ?>" class="">
                                                                 <?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
                                                                 <?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
                                                             </div>
@@ -406,6 +407,14 @@ $BIBAccounts = new BIBAccounts();
 function footerfunctions()
 {
 ?>
+    <script>
+        $(document).ready(function() {
+            // Prevent the dropdown from closing when clicking inside
+            $('.dropdown-menu').on('click', function(event) {
+                event.stopPropagation();
+            });
+        });
+    </script>
     <script>
         $(document).ready(function() {
             document.getElementById("toggleShowAll").click();
@@ -461,15 +470,15 @@ function footerfunctions()
             minDate: $('#fromDate').data('start'),
             maxDate: $('#fromDate').data('end'),
         });
-        </script>
-        <script>
+    </script>
+    <script>
         $("#toDate").nepaliDatePicker({
             dateFormat: "%y-%m-%d",
             closeOnDateSelect: true,
             minDate: $('#toDate').data('start'),
             maxDate: $('#toDate').data('end'),
         });
-        </script>
+    </script>
 
 <?php
 }
diff --git a/account/application/views/accounts/cash_flow.php b/account/application/views/accounts/cash_flow.php
index 121e3ce..571a9a2 100644
--- a/account/application/views/accounts/cash_flow.php
+++ b/account/application/views/accounts/cash_flow.php
@@ -16,51 +16,64 @@ $PL = $IncomesTotal - $ExpensesTotal;
         padding: 0px;
         margin: 0px;
     }
+
     .group-name {
         width: 40%;
     }
+
     .group-total {
         width: 10%;
     }
+
     .table-gray {
         background-color: #eee;
     }
+
     .table td,
     .table th {
         padding: 0px;
         margin: 0px;
     }
+
     .bg-darker {
         background-color: #ddd;
     }
+
     td .table {
         border: 0px !important;
         margin-bottom: 0rem;
     }
+
     table td:first-child {
         padding-left: 5px;
     }
+
     .table-bordered.vertical-borders td,
     .table-bordered.vertical-borders th {
         border-left: 1px solid #dee2e6;
         border-right: 1px solid #dee2e6;
     }
+
     .table-bordered.vertical-borders thead th {
         padding: 0.25rem;
         border-top: none;
         border-bottom: 2px solid #dee2e6;
     }
+
     .table-bordered.vertical-borders tfoot th {
         padding: 0.25rem;
         border-top: 2px solid #dee2e6;
         border-bottom: none;
     }
+
     .currency {
         font-weight: normal !important;
     }
+
     .underline {
         text-decoration: underline;
     }
+
     .form-control {
         display: block;
         width: 100%;
@@ -84,7 +97,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
             <div class="card card-primary card-outline">
                 <div class="card-header ">
                     <h3 class="card-title mt-1">Cash Flow<?php //echo $pageTitle; 
-                                                    ?> </h3>
+                                                            ?> </h3>
                     <div class="card-tools">
                         <form method="post" action="" id="FilterForm">
                             <!-- button with a dropdown -->
@@ -97,40 +110,40 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                         <div class="col">
                                             <div class="form-group">
                                                 <label for="fromDate"><?php myLang("Starting Period"); ?></label>
-                                                <input type="text" class="form-control" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
+                                                <input type="text" class="form-control " name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
                                             </div>
                                             <div class="form-group">
                                                 <label for="toDate"><?php myLang("Ending Period"); ?></label>
-                                                <input type="text" class="form-control" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
+                                                <input type="text" class="form-control " name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
                                             </div>
                                         </div>
                                         <div class="dropdown-divider"></div>
-                                        <div class="form-check">
+                                        <!-- <div class="form-check">
                                             <input class="form-check-input" type="checkbox">
                                             <label class="form-check-label">Select
                                                 All</label>
-                                        </div>
+                                        </div> -->
                                         <div class="form-check">
-                                            <input type="hidden" name="showOB" value="not">
+                                            <!-- <input type="hidden" name="showOB" value="not"> -->
                                             <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
                                             <!-- <input class="form-check-input" type="checkbox"> -->
-                                            <label class="form-check-label">Opening</label>
+                                            <label class="form-check-label" for="showOB">Opening</label>
                                         </div>
                                         <div class="form-check">
                                             <!-- <input class="form-check-input" type="checkbox"> -->
                                             <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
-                                            <label class="form-check-label">Closing</label>
+                                            <label class="form-check-label" for="showClosing">Closing</label>
                                         </div>
                                         <div class="form-check">
                                             <!-- <input class="form-check-input" type="checkbox" checked> -->
                                             <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
-                                            <label class="form-check-label">Period</label>
+                                            <label class="form-check-label" for="showPeriod">Period</label>
                                         </div>
                                     </div>
                                     <div class="dropdown-divider"></div>
-                                    <div class="form-group p-2 pb-0">
-                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
-                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    <div class="form-group p-2 pb-0 text-right">
+                                        <button type="button" class="btn btn-info btn-sm " style="width:60px;height:30px;" onclick="resetForm()">Reset</button>
+                                        <button type="submit" class="btn btn-primary mr-2 btn-sm" style="width:60px;height:30px;">Search </button>
                                     </div>
                                 </div>
                             </div>
@@ -145,6 +158,8 @@ $PL = $IncomesTotal - $ExpensesTotal;
                 <a href="#" class="dropdown-item">View calendar</a>
               </div> -->
                             </div>
+                            <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
+
                             <!-- <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> -->
                             <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
                         </form>
@@ -214,7 +229,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
                     </script>
                 </div> -->
             </div>
-                            <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
+            <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
             <div class="card card-primary card-outline">
                 <!-- <div class="card-header">
                     <h4 class="card-title">Cash Flow</h4>
@@ -237,6 +252,8 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                 <td colspan=3 class="p-0">
                                     <table class="table g-0">
                                         <?php $total1 = 0;
+                                        $counter = 0;
+                                        $index = 0;
                                         foreach ($IncomesExpenses['Incomes'] as $Incomes) { ?>
                                             <?php if ($Incomes['account'] == "GROUP TOTAL") : ?>
                                                 <!-- <tr>
@@ -245,19 +262,21 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                                     <td class="text-right" width="15%"><u><?php echo myCurrency($Incomes['amount']); ?></u></td>
                                                 </tr> -->
                                             <?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?>
-                                                <tr>
+                                                <tr class="parent-row" class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $index; ?>">
                                                     <td class="pr-2" width="70%"><b><?php echo $Incomes['category']; ?></b></td>
-                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
                                                     <td width="15%"></td>
+                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
                                                 </tr>
                                             <?php else : ?>
                                                 <?php $total1 += $Incomes['amount']; ?>
-                                                <tr>
+                                                <tr class="collapse" data-target="#group_<?php echo $index; ?>">
                                                     <td class="pr-2" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?></td>
-                                                    <td width="15%"></td>
                                                     <td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
+                                                    <td width="15%"></td>
                                                 </tr>
                                             <?php endif; ?>
+                                            <?php $counter = $index ?>
+
                                         <?php }; ?>
                                     </table>
                                 </td>
@@ -272,17 +291,18 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                                     <td class="text-right" width="15%"><u><?php echo myCurrency($Expenses['amount']); ?></u></td>
                                                 </tr> -->
                                             <?php elseif ($Expenses['account'] == "CATEGORY TOTAL") : ?>
-                                                <tr>
+                                                <tr data-toggle="collapse" data-target="#group_<?php echo $counter; ?>">
                                                     <td class="" width="70%"><b><?php echo $Expenses['category']; ?></b></td>
-                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
                                                     <td width="15%"></td>
+                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
+
                                                 </tr>
                                             <?php else : ?>
                                                 <?php $total += $Expenses['amount']; ?>
-                                                <tr>
+                                                <tr class="collapse" data-target="#group_<?php echo $counter; ?>">
                                                     <td class="" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Expenses['account']; ?></td>
-                                                    <td width="15%"></td>
                                                     <td class="text-right" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
+                                                    <td width="15%"></td>
                                                 </tr>
                                             <?php endif; ?>
                                         <?php }; ?>
@@ -335,22 +355,79 @@ $PL = $IncomesTotal - $ExpensesTotal;
             </div>
         </div><!-- /.container-fluid -->
     </section>
-<?php function footerFunctions()
-{ ?>
-  <script>
-        $("#fromDate").nepaliDatePicker({
-            dateFormat: "%y-%m-%d",
-            closeOnDateSelect: true,
-            minDate: $('#fromDate').data('start'),
-            maxDate: $('#fromDate').data('end'),
-        });
+    <?php function footerFunctions()
+    { ?>
+        <script>
+            $(document).ready(function() {
+                // Prevent the dropdown from closing when clicking inside
+                $('.dropdown-menu').on('click', function(event) {
+                    event.stopPropagation();
+                });
+            });
         </script>
         <script>
-        $("#toDate").nepaliDatePicker({
-            dateFormat: "%y-%m-%d",
-            closeOnDateSelect: true,
-            minDate: $('#toDate').data('start'),
-            maxDate: $('#toDate').data('end'),
-        });
+            // var exportButton = document.getElementById("exportButton");
+            // exportButton.addEventListener("click", function() {
+            //     exportTableToCSV("table.csv");
+            // });
+            document.addEventListener("DOMContentLoaded", function() {
+                // Trigger click event on page load
+                document.getElementById("toggleShowAll").click();
+            });
+            document.getElementById("toggleShowAll").addEventListener("click", function(e) {
+                e.preventDefault();
+                var nestedRows = document.getElementsByClassName("collapse");
+                for (var i = 0; i < nestedRows.length; i++) {
+                    if (nestedRows[i].classList.contains("show")) {
+                        nestedRows[i].classList.remove("show");
+                    } else {
+                        nestedRows[i].classList.add("show");
+                    }
+                }
+            });
+
+            function exportTableToCSV(filename) {
+                var csv = [];
+                var rows = document.querySelectorAll("table tr:not(.hide)");
+                for (var i = 0; i < rows.length; i++) {
+                    var row = [];
+                    var cols = rows[i].querySelectorAll("td:not(.hide), th:not(.hide)");
+                    // Check if the parent row is collapsed or hidden
+                    var parentRow = rows[i].closest(".collapse");
+                    var isParentCollapsed = parentRow && (!parentRow.classList.contains("show"));
+                    if (isParentCollapsed) {
+                        continue; // Skip child table rows if parent is collapsed
+                    }
+                    for (var j = 0; j < cols.length; j++) {
+                        var cellValue = cols[j].innerText.replace(/,/g, ""); // Remove commas from the cell value
+                        row.push(cellValue);
+                    }
+                    csv.push(row.join(","));
+                }
+                // Create a CSV file
+                var csvContent = "data:text/csv;charset=utf-8," + csv.join("\n");
+                var encodedUri = encodeURI(csvContent);
+                var link = document.createElement("a");
+                link.setAttribute("href", encodedUri);
+                link.setAttribute("download", filename);
+                document.body.appendChild(link);
+                link.click();
+            }
         </script>
-<?php } ?>
\ No newline at end of file
+        <script>
+            $("#fromDate").nepaliDatePicker({
+                dateFormat: "%y-%m-%d",
+                closeOnDateSelect: true,
+                minDate: $('#fromDate').data('start'),
+                maxDate: $('#fromDate').data('end'),
+            });
+        </script>
+        <script>
+            $("#toDate").nepaliDatePicker({
+                dateFormat: "%y-%m-%d",
+                closeOnDateSelect: true,
+                minDate: $('#toDate').data('start'),
+                maxDate: $('#toDate').data('end'),
+            });
+        </script>
+    <?php } ?>
\ No newline at end of file
diff --git a/account/application/views/accounts/ledger/partywise.php b/account/application/views/accounts/ledger/partywise.php
index f35d302..671fb55 100644
--- a/account/application/views/accounts/ledger/partywise.php
+++ b/account/application/views/accounts/ledger/partywise.php
@@ -40,7 +40,7 @@
                             <?php if (isset($account_id) && $account_id != "") {
                                 $fromDate = NepaliToEnglishDate(isset($_GET['from_date']) ? $_GET['from_date'] : firstDayOfNepaliMonth());
                                 $toDate = isset($_GET['to_date']) ? $_GET['to_date'] : Today();
-                                $this->myaccounts->showLedger($account_id, $fromDate, $toDate);
+                                $this->myaccounts->showLedger($account_id, $fromDate, $toDate, $fiscalStart, $fiscalEnd);
                             } ?>
                             <div class="modal fade" id="ledgerdetails_box" tabindex="-1" role="dialog" aria-labelledby="ledgerdetails_box" aria-hidden="true">
                                 <div class="modal-dialog modal-xl" role="document">
diff --git a/account/application/views/accounts/ledger_bankbook.php b/account/application/views/accounts/ledger_bankbook.php
index f7574cf..39fd4d5 100644
--- a/account/application/views/accounts/ledger_bankbook.php
+++ b/account/application/views/accounts/ledger_bankbook.php
@@ -3,82 +3,82 @@
         <div class="container-fluid">
             <div class="row">
                 <div class="col">
-                <div class="card card-primary card-outline">
+                    <div class="card card-primary card-outline">
                         <div class="card-header  disabled color-palette">
                             <h3 class="card-title mt-1"><?php echo $pageTitle; ?> </h3>
                             <div class="card-tools">
-                        <form method="post" action="" id="FilterForm">
-                            <!-- button with a dropdown -->
-                            <div class="btn-group">
-                                <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
-                                    Filters
-                                </button>
-                                <div class="dropdown-menu" role="menu">
-                                    <div class="form-group p-2 pb-0">
-                                        <div class="col">
-                                            <div class="form-group">
-                                                <label for="fromDate"><?php myLang("Starting Period"); ?></label>
-                                                <input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
-                                            </div>
-                                            <div class="form-group">
-                                                <label for="toDate"><?php myLang("Ending Period"); ?></label>
-                                                <input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
-                                            </div>
-                                        </div>
-                                        <div class="dropdown-divider"></div>
-                                        <div class="form-check">
+                                <form method="post" action="" id="FilterForm">
+                                    <!-- button with a dropdown -->
+                                    <div class="btn-group">
+                                        <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
+                                            Filters
+                                        </button>
+                                        <div class="dropdown-menu" role="menu">
+                                            <div class="form-group p-2 pb-0">
+                                                <div class="col">
+                                                    <div class="form-group">
+                                                        <label for="fromDate"><?php myLang("Starting Period"); ?></label>
+                                                        <input type="text" class="form-control " name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="toDate"><?php myLang("Ending Period"); ?></label>
+                                                        <input type="text" class="form-control " name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
+                                                    </div>
+                                                </div>
+                                                <div class="dropdown-divider"></div>
+                                                <!-- <div class="form-check">
                                             <input class="form-check-input" type="checkbox">
                                             <label class="form-check-label">Select
                                                 All</label>
-                                        </div>
-                                        <div class="form-check">
-                                            <input type="hidden" name="showOB" value="not">
-                                            <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
-                                            <!-- <input class="form-check-input" type="checkbox"> -->
-                                            <label class="form-check-label">Opening</label>
-                                        </div>
-                                        <div class="form-check">
-                                            <!-- <input class="form-check-input" type="checkbox"> -->
-                                            <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
-                                            <label class="form-check-label">Closing</label>
-                                        </div>
-                                        <div class="form-check">
-                                            <!-- <input class="form-check-input" type="checkbox" checked> -->
-                                            <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
-                                            <label class="form-check-label">Period</label>
+                                        </div> -->
+                                                <div class="form-check">
+                                                    <!-- <input type="hidden" name="showOB" value="not"> -->
+                                                    <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
+                                                    <!-- <input class="form-check-input" type="checkbox"> -->
+                                                    <label class="form-check-label" for="showOB">Opening</label>
+                                                </div>
+                                                <div class="form-check">
+                                                    <!-- <input class="form-check-input" type="checkbox"> -->
+                                                    <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
+                                                    <label class="form-check-label" for="showClosing">Closing</label>
+                                                </div>
+                                                <div class="form-check">
+                                                    <!-- <input class="form-check-input" type="checkbox" checked> -->
+                                                    <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
+                                                    <label class="form-check-label" for="showPeriod">Period</label>
+                                                </div>
+                                            </div>
+                                            <div class="dropdown-divider"></div>
+                                            <div class="form-group p-2 pb-0 text-right">
+                                                <button type="button" class="btn btn-info btn-sm " style="width:60px;height:30px;" onclick="resetForm()">Reset</button>
+                                                <button type="submit" class="btn btn-primary mr-2 btn-sm" style="width:60px;height:30px;">Search </button>
+                                            </div>
                                         </div>
                                     </div>
-                                    <div class="dropdown-divider"></div>
-                                    <div class="form-group p-2 pb-0">
-                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
-                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="btn-group">
-                                <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
-                                    Export
-                                </button>
-                                <!-- <div class="dropdown-menu" role="menu">
+                                    <div class="btn-group">
+                                        <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
+                                            Export
+                                        </button>
+                                        <!-- <div class="dropdown-menu" role="menu">
                                             <a href="#" class="dropdown-item">Export</a>
                                             <a href="#" class="dropdown-item">Pdf</a>
                                             <div class="dropdown-divider"></div>
                                             <a href="#" class="dropdown-item">View calendar</a>
                                           </div> -->
+                                    </div>
+
+                                    <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
+                                </form>
+                                <script>
+                                    function resetForm() {
+                                        document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
+                                        document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
+                                        document.getElementById("showOB").checked = <?php echo  "false"; ?>;
+                                        document.getElementById("showClosing").checked = <?php echo  "false"; ?>;
+                                        document.getElementById("FilterForm").submit();
+                                    }
+                                </script>
                             </div>
-                           
-                            <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
-                        </form>
-                        <script>
-                            function resetForm() {
-                                document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
-                                document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
-                                document.getElementById("showOB").checked = <?php echo  "false"; ?>;
-                                document.getElementById("showClosing").checked = <?php echo  "false"; ?>;
-                                document.getElementById("FilterForm").submit();
-                            }
-                        </script>
-                    </div>
                         </div>
                         <div class="card-body">
                             <div class="row">
@@ -89,11 +89,11 @@
                                         <?php
                                         $accategory_id = 3;
                                         $CI = &get_instance();
-                                       
+
                                         $CI->db->where("status", 1)->where("accategory_id = 2");
                                         $CI->db->order_by("account_name ASC");
                                         $Accounts = $CI->db->get("tbl_accounts")->result();
-                                       
+
                                         foreach ($Accounts as $Account) {
                                             $Account->Group = $CI->db->query("select * from tbl_acgroups where acgroup_id=(select acgroup_id from tbl_accategories where accategory_id = $Account->accategory_id)")->row();
                                             $Account->Category = $CI->db->query("select * from tbl_accategories where accategory_id = $Account->accategory_id")->row();
@@ -108,7 +108,7 @@
                                         $html = "";
                                         $html .= "<table class='table table-bordered table-striped longdataTable'>";
                                         $html .= "<thead>";
-                                        $html .= "<tr><th class='text-center col-1'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center col-1 '>Action</th></tr>";
+                                        $html .= "<tr><th class='text-center col-1'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center'>Balance</th><th class='text-center col-1 '>Action</th></tr>";
                                         $html .= "</thead><tbody>";
                                         $sn = 0;
                                         $BalanceTotal = 0;
@@ -116,10 +116,10 @@
                                             $balance = getBalance($Account->account_id);
                                             $BalanceTotal += $balance;
                                             // pre($Account);
-                                            $html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td><a href='#' onClick='showLedger(" . $Account->account_id . ")'>" . $Account->account_name . "</a></td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
+                                            $html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td><a href='#' onClick='showLedger(" . $Account->account_id . ")'>" . $Account->account_name . "</a></td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='col-1'>" . (myCurrency($balance)) . "</td><td class='text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
                                         endforeach;
                                         $html .= "</tbody><tfoot>";
-                                        $html .= "<tr><th colspan=3 class='text-right'>Total</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th><th></th><th></th></tr>";
+                                        $html .= "<tr><th colspan=3 class='text-right'>Total</th><th class='text-right'>" . (($BalanceTotal > 0) ? myCurrency(abs($BalanceTotal)) : "") . "</th><th class='text-right'>" . (($BalanceTotal < 0) ? myCurrency(abs($BalanceTotal)) : "") . "</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th></tr>";
                                         $html .= "</tfoot></table>\n";
                                         $html .= " <div class=\"modal fade\" id=\"ledgerdetails_box\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"ledgerdetails_box\" aria-hidden=\"true\">
         <div class=\"modal-dialog modal-xl\" role=\"document\">
@@ -158,6 +158,79 @@
 <?php function footerFunctions()
 {
 ?>
+    <script>
+        $(document).ready(function() {
+            // Prevent the dropdown from closing when clicking inside
+            $('.dropdown-menu').on('click', function(event) {
+                event.stopPropagation();
+            });
+        });
+    </script>
+    <script>
+        // var exportButton = document.getElementById("exportButton");
+        // exportButton.addEventListener("click", function() {
+        //     exportTableToCSV("table.csv");
+        // });
+        document.addEventListener("DOMContentLoaded", function() {
+            // Trigger click event on page load
+            document.getElementById("toggleShowAll").click();
+        });
+        document.getElementById("toggleShowAll").addEventListener("click", function(e) {
+            e.preventDefault();
+            var nestedRows = document.getElementsByClassName("collapse");
+            for (var i = 0; i < nestedRows.length; i++) {
+                if (nestedRows[i].classList.contains("show")) {
+                    nestedRows[i].classList.remove("show");
+                } else {
+                    nestedRows[i].classList.add("show");
+                }
+            }
+        });
+
+        function exportTableToCSV(filename) {
+            var csv = [];
+            var rows = document.querySelectorAll("table tr:not(.hide)");
+            for (var i = 0; i < rows.length; i++) {
+                var row = [];
+                var cols = rows[i].querySelectorAll("td:not(.hide), th:not(.hide)");
+                // Check if the parent row is collapsed or hidden
+                var parentRow = rows[i].closest(".collapse");
+                var isParentCollapsed = parentRow && (!parentRow.classList.contains("show"));
+                if (isParentCollapsed) {
+                    continue; // Skip child table rows if parent is collapsed
+                }
+                for (var j = 0; j < cols.length; j++) {
+                    var cellValue = cols[j].innerText.replace(/,/g, ""); // Remove commas from the cell value
+                    row.push(cellValue);
+                }
+                csv.push(row.join(","));
+            }
+            // Create a CSV file
+            var csvContent = "data:text/csv;charset=utf-8," + csv.join("\n");
+            var encodedUri = encodeURI(csvContent);
+            var link = document.createElement("a");
+            link.setAttribute("href", encodedUri);
+            link.setAttribute("download", filename);
+            document.body.appendChild(link);
+            link.click();
+        }
+    </script>
+    <script>
+        $("#fromDate").nepaliDatePicker({
+            dateFormat: "%y-%m-%d",
+            closeOnDateSelect: true,
+            minDate: $('#fromDate').data('start'),
+            maxDate: $('#fromDate').data('end'),
+        });
+    </script>
+    <script>
+        $("#toDate").nepaliDatePicker({
+            dateFormat: "%y-%m-%d",
+            closeOnDateSelect: true,
+            minDate: $('#toDate').data('start'),
+            maxDate: $('#toDate').data('end'),
+        });
+    </script>
 <?php
 }
 ?>
\ No newline at end of file
diff --git a/account/application/views/accounts/ledger_cashbook.php b/account/application/views/accounts/ledger_cashbook.php
index 08ab3ce..bfd6648 100644
--- a/account/application/views/accounts/ledger_cashbook.php
+++ b/account/application/views/accounts/ledger_cashbook.php
@@ -18,40 +18,40 @@
                                                 <div class="col">
                                                     <div class="form-group">
                                                         <label for="fromDate"><?php myLang("Starting Period"); ?></label>
-                                                        <input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
+                                                        <input type="text" class="form-control " name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
                                                     </div>
                                                     <div class="form-group">
                                                         <label for="toDate"><?php myLang("Ending Period"); ?></label>
-                                                        <input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
+                                                        <input type="text" class="form-control " name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
                                                     </div>
                                                 </div>
                                                 <div class="dropdown-divider"></div>
+                                                <!-- <div class="form-check">
+                                            <input class="form-check-input" type="checkbox">
+                                            <label class="form-check-label">Select
+                                                All</label>
+                                        </div> -->
                                                 <div class="form-check">
-                                                    <input class="form-check-input" type="checkbox">
-                                                    <label class="form-check-label">Select
-                                                        All</label>
-                                                </div>
-                                                <div class="form-check">
-                                                    <input type="hidden" name="showOB" value="not">
+                                                    <!-- <input type="hidden" name="showOB" value="not"> -->
                                                     <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
                                                     <!-- <input class="form-check-input" type="checkbox"> -->
-                                                    <label class="form-check-label">Opening</label>
+                                                    <label class="form-check-label" for="showOB">Opening</label>
                                                 </div>
                                                 <div class="form-check">
                                                     <!-- <input class="form-check-input" type="checkbox"> -->
                                                     <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
-                                                    <label class="form-check-label">Closing</label>
+                                                    <label class="form-check-label" for="showClosing">Closing</label>
                                                 </div>
                                                 <div class="form-check">
                                                     <!-- <input class="form-check-input" type="checkbox" checked> -->
                                                     <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
-                                                    <label class="form-check-label">Period</label>
+                                                    <label class="form-check-label" for="showPeriod">Period</label>
                                                 </div>
                                             </div>
                                             <div class="dropdown-divider"></div>
-                                            <div class="form-group p-2 pb-0">
-                                                <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
-                                                <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                            <div class="form-group p-2 pb-0 text-right">
+                                                <button type="button" class="btn btn-info btn-sm " style="width:60px;height:30px;" onclick="resetForm()">Reset</button>
+                                                <button type="submit" class="btn btn-primary mr-2 btn-sm" style="width:60px;height:30px;">Search </button>
                                             </div>
                                         </div>
                                     </div>
@@ -109,7 +109,7 @@
                                         $html = "";
                                         $html .= "<table class='table table-bordered table-striped longdataTable'>";
                                         $html .= "<thead>";
-                                        $html .= "<tr><th class='text-center' width='25'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center col-1'>Action</th></tr>";
+                                        $html .= "<tr><th class='text-center' width='25'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center'>Balance</th><th class='text-center col-1'>Action</th></tr>";
                                         $html .= "</thead><tbody>";
                                         $sn = 0;
                                         $BalanceTotal = 0;
@@ -117,10 +117,10 @@
                                             $balance = getBalance($Account->account_id);
                                             $BalanceTotal += $balance;
                                             // pre($Account);
-                                            $html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td><a href='#' onClick='showLedger(" . $Account->account_id . ")'>" . $Account->account_name . "</a></td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class=' text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
+                                            $html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td><a href='#' onClick='showLedger(" . $Account->account_id . ")'>" . $Account->account_name . "</a></td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='col-1'>" . (myCurrency($balance)) . "</td><td class=' text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
                                         endforeach;
                                         $html .= "</tbody><tfoot>";
-                                        $html .= "<tr><th colspan=3 class='text-right'>Total</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th><th></th><th></th></tr>";
+                                        $html .= "<tr><th colspan=3 class='text-right'>Total</th><th class='text-right'>" . (($BalanceTotal > 0) ? myCurrency(abs($BalanceTotal)) : "") . "</th><th class='text-right'>" . (($BalanceTotal < 0) ? myCurrency(abs($BalanceTotal)) : "") . "</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th><th></th></tr>";
                                         $html .= "</tfoot></table>\n";
                                         $html .= " <div class=\"modal fade\" id=\"ledgerdetails_box\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"ledgerdetails_box\" aria-hidden=\"true\">
                                         <div class=\"modal-dialog modal-xl\" role=\"document\">
@@ -159,6 +159,79 @@
 <?php function footerFunctions()
 {
 ?>
+    <script>
+        $(document).ready(function() {
+            // Prevent the dropdown from closing when clicking inside
+            $('.dropdown-menu').on('click', function(event) {
+                event.stopPropagation();
+            });
+        });
+    </script>
+            <script>
+            // var exportButton = document.getElementById("exportButton");
+            // exportButton.addEventListener("click", function() {
+            //     exportTableToCSV("table.csv");
+            // });
+            document.addEventListener("DOMContentLoaded", function() {
+                // Trigger click event on page load
+                document.getElementById("toggleShowAll").click();
+            });
+            document.getElementById("toggleShowAll").addEventListener("click", function(e) {
+                e.preventDefault();
+                var nestedRows = document.getElementsByClassName("collapse");
+                for (var i = 0; i < nestedRows.length; i++) {
+                    if (nestedRows[i].classList.contains("show")) {
+                        nestedRows[i].classList.remove("show");
+                    } else {
+                        nestedRows[i].classList.add("show");
+                    }
+                }
+            });
+
+            function exportTableToCSV(filename) {
+                var csv = [];
+                var rows = document.querySelectorAll("table tr:not(.hide)");
+                for (var i = 0; i < rows.length; i++) {
+                    var row = [];
+                    var cols = rows[i].querySelectorAll("td:not(.hide), th:not(.hide)");
+                    // Check if the parent row is collapsed or hidden
+                    var parentRow = rows[i].closest(".collapse");
+                    var isParentCollapsed = parentRow && (!parentRow.classList.contains("show"));
+                    if (isParentCollapsed) {
+                        continue; // Skip child table rows if parent is collapsed
+                    }
+                    for (var j = 0; j < cols.length; j++) {
+                        var cellValue = cols[j].innerText.replace(/,/g, ""); // Remove commas from the cell value
+                        row.push(cellValue);
+                    }
+                    csv.push(row.join(","));
+                }
+                // Create a CSV file
+                var csvContent = "data:text/csv;charset=utf-8," + csv.join("\n");
+                var encodedUri = encodeURI(csvContent);
+                var link = document.createElement("a");
+                link.setAttribute("href", encodedUri);
+                link.setAttribute("download", filename);
+                document.body.appendChild(link);
+                link.click();
+            }
+        </script>
+        <script>
+            $("#fromDate").nepaliDatePicker({
+                dateFormat: "%y-%m-%d",
+                closeOnDateSelect: true,
+                minDate: $('#fromDate').data('start'),
+                maxDate: $('#fromDate').data('end'),
+            });
+        </script>
+        <script>
+            $("#toDate").nepaliDatePicker({
+                dateFormat: "%y-%m-%d",
+                closeOnDateSelect: true,
+                minDate: $('#toDate').data('start'),
+                maxDate: $('#toDate').data('end'),
+            });
+        </script>
 <?php
 }
 ?>
\ No newline at end of file
diff --git a/account/application/views/accounts/pl_new.php b/account/application/views/accounts/pl_new.php
index 83390cc..34d78e2 100644
--- a/account/application/views/accounts/pl_new.php
+++ b/account/application/views/accounts/pl_new.php
@@ -95,7 +95,7 @@ $BIBAccounts = new BIBAccounts();
             <div class="card card-primary card-outline ">
                 <div class="card-header">
                     <h2 class="card-title mt-1"><?php echo $pageTitle; ?> <?php //myLang("Report"); 
-                                                                        ?></h2>
+                                                                            ?></h2>
                     <div class="card-tools">
                         <form method="post" action="" id="FilterForm">
                             <!-- button with a dropdown -->
@@ -108,40 +108,40 @@ $BIBAccounts = new BIBAccounts();
                                         <div class="col">
                                             <div class="form-group">
                                                 <label for="fromDate"><?php myLang("Starting Period"); ?></label>
-                                                <input type="text" class="form-control " name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
+                                                <input type="text" class="form-control " name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
                                             </div>
                                             <div class="form-group">
                                                 <label for="toDate"><?php myLang("Ending Period"); ?></label>
-                                                <input type="text" class="form-control " name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
+                                                <input type="text" class="form-control " name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
                                             </div>
                                         </div>
                                         <div class="dropdown-divider"></div>
-                                        <div class="form-check">
+                                        <!-- <div class="form-check">
                                             <input class="form-check-input" type="checkbox">
                                             <label class="form-check-label">Select
                                                 All</label>
-                                        </div>
+                                        </div> -->
                                         <div class="form-check">
-                                            <input type="hidden" name="showOB" value="not">
+                                            <!-- <input type="hidden" name="showOB" value="not"> -->
                                             <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
                                             <!-- <input class="form-check-input" type="checkbox"> -->
-                                            <label class="form-check-label">Opening</label>
+                                            <label class="form-check-label" for="showOB">Opening</label>
                                         </div>
                                         <div class="form-check">
                                             <!-- <input class="form-check-input" type="checkbox"> -->
                                             <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
-                                            <label class="form-check-label">Closing</label>
+                                            <label class="form-check-label" for="showClosing">Closing</label>
                                         </div>
                                         <div class="form-check">
                                             <!-- <input class="form-check-input" type="checkbox" checked> -->
                                             <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
-                                            <label class="form-check-label">Period</label>
+                                            <label class="form-check-label" for="showPeriod">Period</label>
                                         </div>
                                     </div>
                                     <div class="dropdown-divider"></div>
-                                    <div class="form-group p-2 pb-0">
-                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
-                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    <div class="form-group p-2 pb-0 text-right">
+                                        <button type="button" class="btn btn-info btn-sm " style="width:60px;height:30px;" onclick="resetForm()">Reset</button>
+                                        <button type="submit" class="btn btn-primary mr-2 btn-sm" style="width:60px;height:30px;">Search </button>
                                     </div>
                                 </div>
                             </div>
@@ -156,8 +156,8 @@ $BIBAccounts = new BIBAccounts();
                                             <a href="#" class="dropdown-item">View calendar</a>
                                           </div> -->
                             </div>
-                           
-                            <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
+
+                            <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
                         </form>
                         <script>
                             function resetForm() {
@@ -177,7 +177,7 @@ $BIBAccounts = new BIBAccounts();
         <div class="container-fluid">
             <div class="row">
                 <div class="col">
-                    <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
+                    <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
                     <div class="card card-primary card-outline ">
                         <div class="card-body p-0">
                             <?php
@@ -222,7 +222,7 @@ $BIBAccounts = new BIBAccounts();
                                                     </tr>
                                                     <tr>
                                                         <td colspan="7" class="group-details p-0" width="85%">
-                                                            <div id="group_<?php echo $group->acgroup_id; ?>" class="collapse">
+                                                            <div id="group_<?php echo $group->acgroup_id; ?>" class="">
                                                                 <?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
                                                                 <?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
                                                             </div>
@@ -261,7 +261,7 @@ $BIBAccounts = new BIBAccounts();
                                                     </tr>
                                                     <tr>
                                                         <td colspan="7" class="group-details p-0">
-                                                            <div id="group_<?php echo $group->acgroup_id; ?>" class="collapse">
+                                                            <div id="group_<?php echo $group->acgroup_id; ?>" class="">
                                                                 <i> <?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
                                                                     <?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
                                                                 </i>
@@ -351,6 +351,14 @@ $BIBAccounts = new BIBAccounts();
 function footerfunctions()
 {
 ?>
+    <script>
+        $(document).ready(function() {
+            // Prevent the dropdown from closing when clicking inside
+            $('.dropdown-menu').on('click', function(event) {
+                event.stopPropagation();
+            });
+        });
+    </script>
     <script>
         document.addEventListener("DOMContentLoaded", function() {
             // Trigger click event on page load
diff --git a/account/application/views/accounts/receipt_and_payment.php b/account/application/views/accounts/receipt_and_payment.php
index abb10fb..bdaefd9 100644
--- a/account/application/views/accounts/receipt_and_payment.php
+++ b/account/application/views/accounts/receipt_and_payment.php
@@ -91,8 +91,10 @@ $PL = $IncomesTotal - $ExpensesTotal;
         box-shadow: inset 0 0 0 transparent;
         transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
     }
-    .table.table-head-fixed thead tr:nth-child(1) th{
-        padding-left: 6px;;
+
+    .table.table-head-fixed thead tr:nth-child(1) th {
+        padding-left: 6px;
+        ;
     }
 </style>
 
@@ -108,7 +110,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
 
                 <div class="card-header">
                     <h3 class="card-title mt-1">Receipts And Payments <?php //echo $pageTitle; 
-                                                                    ?> </h3>
+                                                                        ?> </h3>
 
                     <div class="card-tools">
                         <form method="post" action="" id="FilterForm">
@@ -119,54 +121,49 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                     Filters
                                 </button>
                                 <div class="dropdown-menu" role="menu">
-
-
                                     <div class="form-group p-2 pb-0">
                                         <div class="col">
                                             <div class="form-group">
                                                 <label for="fromDate"><?php myLang("Starting Period"); ?></label>
-                                                <input type="text" class="form-control" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>"  id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
+                                                <input type="text" class="form-control " name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
                                             </div>
-
-
                                             <div class="form-group">
                                                 <label for="toDate"><?php myLang("Ending Period"); ?></label>
-                                                <input type="text" class="form-control" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
+                                                <input type="text" class="form-control " name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
                                             </div>
                                         </div>
                                         <div class="dropdown-divider"></div>
-                                        <div class="form-check">
-
+                                        <!-- <div class="form-check">
                                             <input class="form-check-input" type="checkbox">
                                             <label class="form-check-label">Select
                                                 All</label>
-                                        </div>
+                                        </div> -->
                                         <div class="form-check">
-                                            <input type="hidden" name="showOB" value="not">
+                                            <!-- <input type="hidden" name="showOB" value="not"> -->
                                             <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
                                             <!-- <input class="form-check-input" type="checkbox"> -->
-                                            <label class="form-check-label">Opening</label>
+                                            <label class="form-check-label" for="showOB">Opening</label>
                                         </div>
                                         <div class="form-check">
                                             <!-- <input class="form-check-input" type="checkbox"> -->
                                             <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
-                                            <label class="form-check-label">Closing</label>
+                                            <label class="form-check-label" for="showClosing">Closing</label>
                                         </div>
                                         <div class="form-check">
                                             <!-- <input class="form-check-input" type="checkbox" checked> -->
                                             <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
-                                            <label class="form-check-label">Period</label>
+                                            <label class="form-check-label" for="showPeriod">Period</label>
                                         </div>
                                     </div>
                                     <div class="dropdown-divider"></div>
-                                    <div class="form-group p-2 pb-0">
-                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
-                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    <div class="form-group p-2 pb-0 text-right">
+                                        <button type="button" class="btn btn-info btn-sm " style="width:60px;height:30px;" onclick="resetForm()">Reset</button>
+                                        <button type="submit" class="btn btn-primary mr-2 btn-sm" style="width:60px;height:30px;">Search </button>
                                     </div>
                                 </div>
                             </div>
                             <div class="btn-group">
-                                <button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
+                                <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
                                     Export
                                 </button>
 
@@ -180,7 +177,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
                             </div>
                             <!-- <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> -->
 
-                            <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
+                            <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
 
                         </form>
                         <script>
@@ -260,7 +257,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
 
                 <div class="card card-primary card-outline">
                     <?php $IncomesExpenses = $BIBAccounts->prepareIncomeExpenses() ?>
-                    <table class="table table-head-fixed table-bordered  g-0">
+                    <table class="table table-head-fixed table-bordered  g-0" id="TrialBalanceTable">
                         <thead>
                             <tr>
                                 <th class="" width="35%"><?php myLang("Receipts"); ?></th>
@@ -276,8 +273,9 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                 <td colspan=3 class="p-0">
                                     <table class="table g-0">
                                         <?php $total1 = 0;
+                                        $counter = 0;
+                                        $index = 0;
                                         foreach ($IncomesExpenses['Incomes'] as $Incomes) { ?>
-
                                             <?php if ($Incomes['account'] == "GROUP TOTAL") : ?>
                                                 <!--tr>
                                                     <td class="" width="70%"><b><?php echo $Incomes['group']; ?></b></td>
@@ -286,20 +284,26 @@ $PL = $IncomesTotal - $ExpensesTotal;
 
                                                 </tr-->
                                             <?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?>
-                                                <tr>
+                                                <?php $index++; ?>
+                                                <tr class="parent-row" class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $index; ?>">
                                                     <td class="" width="70%"><b><?php echo $Incomes['category']; ?></b></td>
-                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
-                                                    <td width="15%"></td>
-                                                </tr>
-                                            <?php else : ?>
-                                                <?php $total1 += $Incomes['amount']; ?>
-                                                <tr>
-                                                    <td class="pr-2" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?></td>
                                                     <td width="15%"></td>
                                                     <td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
 
+                                                </tr>
+                                            <?php else : ?>
+                                                <?php $total1 += $Incomes['amount']; ?>
+                                                <tr class="collapse" data-target="#group_<?php echo $index; ?>">
+                                                    <td class="pr-2" width="70%">
+                                                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?>
+                                                    </td>
+                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
+
+                                                    <td width="15%"></td>
+
                                                 </tr>
                                             <?php endif; ?>
+                                            <?php $counter = $index ?>
 
                                         <?php }; ?>
 
@@ -318,19 +322,23 @@ $PL = $IncomesTotal - $ExpensesTotal;
 
                                                 </tr-->
                                             <?php elseif ($Expenses['account'] == "CATEGORY TOTAL") : ?>
-                                                <tr>
+                                                <?php $counter++; ?>
+                                                <tr data-toggle="collapse" data-target="#group_<?php echo $counter; ?>">
                                                     <td class="pr-2" width="70%"><b><?php echo $Expenses['category']; ?></b></td>
-                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
                                                     <td width="15%"></td>
+                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
 
                                                 </tr>
 
                                             <?php else : ?>
                                                 <?php $total += $Expenses['amount']; ?>
-                                                <tr>
-                                                    <td class="" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Expenses['account']; ?></td>
-                                                    <td width="15%"></td>
+                                                <tr class="collapse" data-target="#group_<?php echo $counter; ?>">
+                                                    <td class="" width="70%">
+                                                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                                            <?php echo $Expenses['account']; ?>
+                                                    </td>
                                                     <td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
+                                                    <td width="15%"></td>
 
 
                                                 </tr>
@@ -387,22 +395,79 @@ $PL = $IncomesTotal - $ExpensesTotal;
         </div><!-- /.container-fluid -->
     </section>
 
-<?php function footerFunctions()
-{ ?>
-  <script>
-        $("#fromDate").nepaliDatePicker({
-            dateFormat: "%y-%m-%d",
-            closeOnDateSelect: true,
-            minDate: $('#fromDate').data('start'),
-            maxDate: $('#fromDate').data('end'),
-        });
-    </script>
-    <script>
-        $("#toDate").nepaliDatePicker({
-            dateFormat: "%y-%m-%d",
-            closeOnDateSelect: true,
-            minDate: $('#toDate').data('start'),
-            maxDate: $('#toDate').data('end'),
-        });
-    </script>
-<?php } ?>
\ No newline at end of file
+    <?php function footerFunctions()
+    { ?>
+        <script>
+            $(document).ready(function() {
+                // Prevent the dropdown from closing when clicking inside
+                $('.dropdown-menu').on('click', function(event) {
+                    event.stopPropagation();
+                });
+            });
+        </script>
+        <script>
+            // var exportButton = document.getElementById("exportButton");
+            // exportButton.addEventListener("click", function() {
+            //     exportTableToCSV("table.csv");
+            // });
+            document.addEventListener("DOMContentLoaded", function() {
+                // Trigger click event on page load
+                document.getElementById("toggleShowAll").click();
+            });
+            document.getElementById("toggleShowAll").addEventListener("click", function(e) {
+                e.preventDefault();
+                var nestedRows = document.getElementsByClassName("collapse");
+                for (var i = 0; i < nestedRows.length; i++) {
+                    if (nestedRows[i].classList.contains("show")) {
+                        nestedRows[i].classList.remove("show");
+                    } else {
+                        nestedRows[i].classList.add("show");
+                    }
+                }
+            });
+
+            function exportTableToCSV(filename) {
+                var csv = [];
+                var rows = document.querySelectorAll("table tr:not(.hide)");
+                for (var i = 0; i < rows.length; i++) {
+                    var row = [];
+                    var cols = rows[i].querySelectorAll("td:not(.hide), th:not(.hide)");
+                    // Check if the parent row is collapsed or hidden
+                    var parentRow = rows[i].closest(".collapse");
+                    var isParentCollapsed = parentRow && (!parentRow.classList.contains("show"));
+                    if (isParentCollapsed) {
+                        continue; // Skip child table rows if parent is collapsed
+                    }
+                    for (var j = 0; j < cols.length; j++) {
+                        var cellValue = cols[j].innerText.replace(/,/g, ""); // Remove commas from the cell value
+                        row.push(cellValue);
+                    }
+                    csv.push(row.join(","));
+                }
+                // Create a CSV file
+                var csvContent = "data:text/csv;charset=utf-8," + csv.join("\n");
+                var encodedUri = encodeURI(csvContent);
+                var link = document.createElement("a");
+                link.setAttribute("href", encodedUri);
+                link.setAttribute("download", filename);
+                document.body.appendChild(link);
+                link.click();
+            }
+        </script>
+        <script>
+            $("#fromDate").nepaliDatePicker({
+                dateFormat: "%y-%m-%d",
+                closeOnDateSelect: true,
+                minDate: $('#fromDate').data('start'),
+                maxDate: $('#fromDate').data('end'),
+            });
+        </script>
+        <script>
+            $("#toDate").nepaliDatePicker({
+                dateFormat: "%y-%m-%d",
+                closeOnDateSelect: true,
+                minDate: $('#toDate').data('start'),
+                maxDate: $('#toDate').data('end'),
+            });
+        </script>
+    <?php } ?>
\ No newline at end of file
diff --git a/account/application/views/accounts/setup/singleentryvoucher/list.php b/account/application/views/accounts/setup/singleentryvoucher/list.php
index d7c6248..245bf4c 100644
--- a/account/application/views/accounts/setup/singleentryvoucher/list.php
+++ b/account/application/views/accounts/setup/singleentryvoucher/list.php
@@ -34,7 +34,7 @@
             <div class="card-body">
 
               <?php $TableData = $this->db->query("select * from tbl_vouchertypes")->result(); ?>
-              <table class="table table-bordered table-striped dataTable">
+              <table class="table table-bordered table-striped longdataTable">
                 <thead>
                   <tr>
                     <th class="text-center">Sn</th>
diff --git a/account/application/views/accounts/trialbalance_new.php b/account/application/views/accounts/trialbalance_new.php
index 508a434..a4b2fce 100644
--- a/account/application/views/accounts/trialbalance_new.php
+++ b/account/application/views/accounts/trialbalance_new.php
@@ -94,7 +94,8 @@ $BIBAccounts = new BIBAccounts();
         <div class="container-fluid">
             <div class="card card-primary card-outline">
                 <div class="card-header">
-                    <h2 class="card-title mt-1"><?php echo $pageTitle; ?> <?php //myLang("Report"); ?></h2>
+                    <h2 class="card-title mt-1"><?php echo $pageTitle; ?> <?php //myLang("Report"); 
+                                                                            ?></h2>
 
                     <div class="card-tools">
                         <form method="post" action="" id="FilterForm">
@@ -105,49 +106,44 @@ $BIBAccounts = new BIBAccounts();
                                     Filters
                                 </button>
                                 <div class="dropdown-menu" role="menu">
-
-
                                     <div class="form-group p-2 pb-0">
                                         <div class="col">
                                             <div class="form-group">
                                                 <label for="fromDate"><?php myLang("Starting Period"); ?></label>
-                                                <input type="text" class="form-control " name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
+                                                <input type="text" class="form-control " name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
                                             </div>
-
-
                                             <div class="form-group">
                                                 <label for="toDate"><?php myLang("Ending Period"); ?></label>
-                                                <input type="text" class="form-control " name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart;?>" data-end="<?php echo $fiscalEnd;?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
+                                                <input type="text" class="form-control " name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
                                             </div>
                                         </div>
                                         <div class="dropdown-divider"></div>
-                                        <div class="form-check">
-
+                                        <!-- <div class="form-check">
                                             <input class="form-check-input" type="checkbox">
                                             <label class="form-check-label">Select
                                                 All</label>
-                                        </div>
+                                        </div> -->
                                         <div class="form-check">
-                                            <input type="hidden" name="showOB" value="not">
+                                            <!-- <input type="hidden" name="showOB" value="not"> -->
                                             <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
                                             <!-- <input class="form-check-input" type="checkbox"> -->
-                                            <label class="form-check-label">Opening</label>
+                                            <label class="form-check-label" for="showOB">Opening</label>
                                         </div>
                                         <div class="form-check">
                                             <!-- <input class="form-check-input" type="checkbox"> -->
                                             <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
-                                            <label class="form-check-label">Closing</label>
+                                            <label class="form-check-label" for="showClosing">Closing</label>
                                         </div>
                                         <div class="form-check">
                                             <!-- <input class="form-check-input" type="checkbox" checked> -->
                                             <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
-                                            <label class="form-check-label">Period</label>
+                                            <label class="form-check-label" for="showPeriod">Period</label>
                                         </div>
                                     </div>
                                     <div class="dropdown-divider"></div>
-                                    <div class="form-group p-2 pb-0">
-                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
-                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    <div class="form-group p-2 pb-0 text-right">
+                                        <button type="button" class="btn btn-info btn-sm " style="width:60px;height:30px;" onclick="resetForm()">Reset</button>
+                                        <button type="submit" class="btn btn-primary mr-2 btn-sm" style="width:60px;height:30px;">Search </button>
                                     </div>
                                 </div>
                             </div>
@@ -312,6 +308,14 @@ $BIBAccounts = new BIBAccounts();
 function footerfunctions()
 {
 ?>
+    <script>
+        $(document).ready(function() {
+            // Prevent the dropdown from closing when clicking inside
+            $('.dropdown-menu').on('click', function(event) {
+                event.stopPropagation();
+            });
+        });
+    </script>
     <script>
         // var exportButton = document.getElementById("exportButton");
         // exportButton.addEventListener("click", function() {
@@ -360,23 +364,23 @@ function footerfunctions()
             document.body.appendChild(link);
             link.click();
         }
-        </script>
-        <script>
+    </script>
+    <script>
         $("#fromDate").nepaliDatePicker({
             dateFormat: "%y-%m-%d",
             closeOnDateSelect: true,
             minDate: $('#fromDate').data('start'),
             maxDate: $('#fromDate').data('end'),
         });
-        </script>
-        <script>
+    </script>
+    <script>
         $("#toDate").nepaliDatePicker({
             dateFormat: "%y-%m-%d",
             closeOnDateSelect: true,
             minDate: $('#toDate').data('start'),
             maxDate: $('#toDate').data('end'),
         });
-        </script>
+    </script>
 <?php
 }
 ?>
\ No newline at end of file
diff --git a/account/application/views/accounts/vouchers/create.php b/account/application/views/accounts/vouchers/create.php
index b78bafb..bb175df 100644
--- a/account/application/views/accounts/vouchers/create.php
+++ b/account/application/views/accounts/vouchers/create.php
@@ -99,7 +99,7 @@ button:hover {
                                         </fieldset>
                                     </div>
                                     <div class="col-8">
-                                        <h1 class="text-center"><?php echo $pageTitle; ?> Voucher</h1>
+                                        <h1 class="text-center"><?php echo $pageTitle; ?></h1>
                                         <!-- <fieldset>
                                             <legend><span id="selectedAccountName"></span> Balance</legend><span id="selectedAccountBalance" style="padding: 6px 0px;    display: inline-block;    text-align: right;    width: 100%;">Choose A/C First</span>
                                         </fieldset> -->
diff --git a/account/application/views/accounts/vouchers/listvouchers.php b/account/application/views/accounts/vouchers/listvouchers.php
index 1282cbc..1158332 100644
--- a/account/application/views/accounts/vouchers/listvouchers.php
+++ b/account/application/views/accounts/vouchers/listvouchers.php
@@ -34,7 +34,7 @@
                             // echo $toDate;
                             $account_id = isset($_GET['account_id']) ? $_GET['account_id'] : '';
                             $vouchertype_id = isset($_GET['vouchertypes']) ? $_GET['vouchertypes'] : '';
-                            $this->myaccounts->listVouchers($fromDate, $toDate, $account_id, $vouchertype_id, true);
+                            $this->myaccounts->listVouchers($fromDate, $toDate, $account_id, $vouchertype_id, true, false, $fiscalStart, $fiscalEnd);
                             ?>
                         </div>
                     </div>
@@ -42,4 +42,5 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
diff --git a/account/application/views/fiscalyear/list.php b/account/application/views/fiscalyear/list.php
index c816b45..a34e13c 100644
--- a/account/application/views/fiscalyear/list.php
+++ b/account/application/views/fiscalyear/list.php
@@ -100,7 +100,7 @@
                     <th>From</th>
                     <th>To</th>
                     <!-- <th>Created By</th> -->
-                    <th class="col-1 text-center">Action</th>
+                    <th class="col-2 text-center">Action</th>
                   </tr>
                 </thead>
                 <tbody>
diff --git a/account/application/views/includes/sidebar.php b/account/application/views/includes/sidebar.php
index b8a64ad..27096c6 100644
--- a/account/application/views/includes/sidebar.php
+++ b/account/application/views/includes/sidebar.php
@@ -116,7 +116,7 @@ $subparam2 = $this->uri->segment(4);
             <?php if ($LoggedUser == "admin") : ?>
               <?php foreach ($VoucherTypes as $VoucherType) : if ($VoucherType->voucher_alias != "sales" && $VoucherType->voucher_alias != "purchase") : ?>
                   <li class="nav-item"><a href="<?php echo site_url("accounts/vouchers/" . $VoucherType->voucher_alias . "/create"); ?>" class="nav-link <?php echo ($subparam == $VoucherType->voucher_alias && $subparam2 == "create") ? "active" : ""; ?>">
-                      <p><?php echo $VoucherType->voucher_name; ?> Voucher</p>
+                      <p><?php echo $VoucherType->voucher_name; ?></p>
                     </a></li>
               <?php endif;
               endforeach; ?>
@@ -160,7 +160,7 @@ $subparam2 = $this->uri->segment(4);
               showMenu("Profit and Loss Statement", "accounts/reports/pl");
               showMenu("Balance Sheet", "accounts/reports/balance_sheet");
               // showMenu("Balance Sheet (Vertical)", "accounts/reports/balance_sheet_vertical");
-              showMenu("Receipt And Payment", "accounts/reports/receipt_and_payment");
+              showMenu("Receipt and Payment", "accounts/reports/receipt_and_payment");
               // showMenu("Income And Expenses", "accounts/reports/incomes_and_expenses");
               showMenu("Cash Flow", "accounts/reports/cash_flow");
               showMenu("Ratio Analysis", "accounts/reports/ratio_analysis");
diff --git a/account/application/views/inventory/items/list.php b/account/application/views/inventory/items/list.php
index 2ec2a89..d851089 100644
--- a/account/application/views/inventory/items/list.php
+++ b/account/application/views/inventory/items/list.php
@@ -38,7 +38,7 @@
                                     <!--COL START-->
                                     <div class="col-6">
                                         <div class="form-group">
-                                            <?php fillComboWithValue("units_id", "Units <span class='text-danger'>*</span>", "units_id", "tbl_units", "title", "unit_id", isset($item) ? $item->units_id : '',); ?>
+                                            <?php fillComboWithValue("units_id", "Units <span class='text-danger'>*</span>", "units_id", "tbl_units", "title", "unit_id", isset($item) ? $item->units_id : '', "", false, "", true); ?>
                                         </div>
                                     </div>
                                     <!--COL END-->
@@ -47,7 +47,7 @@
                                     <!--COL START-->
                                     <div class="col">
                                         <div class="form-group">
-                                            <?php fillComboWithValue("itemcategories_id", "Group <span class='text-danger'>*</span>", "itemcategories_id", "tbl_itemcategories", "title", "itemcategory_id", isset($item) ? $item->itemcategories_id : ''); ?>
+                                            <?php fillComboWithValue("itemcategories_id", "Group <span class='text-danger'>*</span>", "itemcategories_id", "tbl_itemcategories", "title", "itemcategory_id", isset($item) ? $item->itemcategories_id : '', "", false, "", true); ?>
                                         </div>
                                     </div>
                                     <!--COL END-->
diff --git a/account/application/views/inventory/purchases/create.php b/account/application/views/inventory/purchases/create.php
index 1559bed..bbdebe5 100644
--- a/account/application/views/inventory/purchases/create.php
+++ b/account/application/views/inventory/purchases/create.php
@@ -441,10 +441,8 @@
             });
 
             if(type=='amount'){
-                alert("amount");
                 discountamount = parseFloat($("input[name='discount']").val());
                 discountpercent = (discountamount * 100) / subtotal; 
-                alert(discountamount);
                 $("#discountpercentage").val(discountpercent.toFixed(2));
             }else{
                 discountpercent = parseFloat($("input[name='discountpercentage']").val());
diff --git a/account/application/views/inventory/purchases/view.php b/account/application/views/inventory/purchases/view.php
index 5d96f42..c5def29 100644
--- a/account/application/views/inventory/purchases/view.php
+++ b/account/application/views/inventory/purchases/view.php
@@ -7,11 +7,11 @@
 
                     <div class="card card-primary card-outline">
                         <div class="card-header">
-
+                            <!-- <button class="btn btn-primary btn-xs float-right" style="margin-left: 2px;" onclick="printDiv('printableArea')"><i class="fas fa-print"></i></button> -->
                             <h5 class="m-0"><?php echo $pageTitle; ?> <?php showCreateButton($this->uri->segment(1) . "/" . $this->uri->segment(2) . "/add","Create New ".$pageTitle); ?></h5>
 
                         </div>
-
+                        <div id="printableArea">
                         <div class="card-body">
 
                             <div class="row bill-header">
@@ -88,11 +88,24 @@
                                 </div>
                             </div>
 
-
+                        </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<script>
+function printDiv(divName) {
+    var printContents = document.getElementById(divName).innerHTML;
+    var originalContents = document.body.innerHTML;
+
+    document.body.innerHTML = printContents;
+
+    window.print();
+
+    document.body.innerHTML = originalContents;
+}
+</script>
diff --git a/account/application/views/inventory/sales/create.php b/account/application/views/inventory/sales/create.php
index 1589a94..9fa378f 100644
--- a/account/application/views/inventory/sales/create.php
+++ b/account/application/views/inventory/sales/create.php
@@ -240,10 +240,8 @@
         var discountamount = 0;
         var discountpercent = 0;
         if(type=='amount'){
-            alert("amount");
             discountamount = parseFloat($("input[name='discount']").val());
             discountpercent = (discountamount * 100) / subtotal; 
-            alert(discountamount);
             $("#discountpercentage").val(discountpercent.toFixed(2));
         }else{
             discountpercent = parseFloat($("input[name='discountpercentage']").val());
diff --git a/account/application/views/inventory/sales/view.php b/account/application/views/inventory/sales/view.php
index f4f66e3..fe03b21 100644
--- a/account/application/views/inventory/sales/view.php
+++ b/account/application/views/inventory/sales/view.php
@@ -7,11 +7,11 @@
 
                     <div class="card card-primary card-outline">
                         <div class="card-header">
-
+                            <!-- <button class="btn btn-primary btn-xs float-right" style="margin-left: 2px;" onclick="printDiv('printableArea')"><i class="fas fa-print"></i></button> -->
                             <h5 class="m-0"><?php echo $pageTitle; ?> <a href="<?php echo site_url($this->uri->segment(1) . "/" . $this->uri->segment(2) . "/create"); ?>" class="btn btn-sm btn-primary float-right">Create New <?php echo $pageTitle; ?></a></h5>
 
                         </div>
-
+                        <div id="printableArea">
                         <div class="card-body">
 
                             <div class="row bill-header">
@@ -86,7 +86,7 @@
                                 </div>
                             </div>
 
-
+                        </div>
                         </div>  
                     </div>
                 </div>
diff --git a/account/application/views/inventory/stocks/summary.php b/account/application/views/inventory/stocks/summary.php
index f26f7b9..6d9437a 100644
--- a/account/application/views/inventory/stocks/summary.php
+++ b/account/application/views/inventory/stocks/summary.php
@@ -94,69 +94,85 @@
                                                                                                                 ?></a> -->
                             </h5>
                             <div class="card-tools">
-                                <!-- button with a dropdown -->
-                                <div class="btn-group">
-                                    <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
-                                        Filters
-                                    </button>
-                                    <div class="dropdown-menu" role="menu">
-                                        <div class="form-group p-2 pb-0">
-                                            <div class="col">
-                                                <div class="form-group">
-                                                    <label for="fromDate"><?php myLang("Starting Period"); ?></label>
-                                                    <input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
+                                <form method="post" action="" id="FilterForm">
+                                    <!-- button with a dropdown -->
+                                    <div class="btn-group">
+                                        <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
+                                            Filters
+                                        </button>
+                                        <div class="dropdown-menu" role="menu">
+                                            <div class="form-group p-2 pb-0">
+                                                <div class="col">
+                                                    <div class="form-group">
+                                                        <label for="fromDate"><?php myLang("Starting Period"); ?></label>
+                                                        <input type="text" class="form-control " name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="toDate"><?php myLang("Ending Period"); ?></label>
+                                                        <input type="text" class="form-control " name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" data-start="<?php echo $fiscalStart; ?>" data-end="<?php echo $fiscalEnd; ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
+                                                    </div>
                                                 </div>
-                                                <div class="form-group">
-                                                    <label for="toDate"><?php myLang("Ending Period"); ?></label>
-                                                    <input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
+                                                <div class="dropdown-divider"></div>
+                                                <!-- <div class="form-check">
+                                            <input class="form-check-input" type="checkbox">
+                                            <label class="form-check-label">Select
+                                                All</label>
+                                        </div> -->
+                                                <div class="form-check">
+                                                    <!-- <input type="hidden" name="showOB" value="not"> -->
+                                                    <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
+                                                    <!-- <input class="form-check-input" type="checkbox"> -->
+                                                    <label class="form-check-label" for="showOB">Opening</label>
+                                                </div>
+                                                <div class="form-check">
+                                                    <!-- <input class="form-check-input" type="checkbox"> -->
+                                                    <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
+                                                    <label class="form-check-label" for="showClosing">Closing</label>
+                                                </div>
+                                                <div class="form-check">
+                                                    <!-- <input class="form-check-input" type="checkbox" checked> -->
+                                                    <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
+                                                    <label class="form-check-label" for="showPeriod">Period</label>
                                                 </div>
                                             </div>
                                             <div class="dropdown-divider"></div>
-                                            <div class="form-check">
-                                                <input class="form-check-input" type="checkbox">
-                                                <label class="form-check-label">Select
-                                                    All</label>
+                                            <div class="form-group p-2 pb-0 text-right">
+                                                <button type="button" class="btn btn-info btn-sm " style="width:60px;height:30px;" onclick="resetForm()">Reset</button>
+                                                <button type="submit" class="btn btn-primary mr-2 btn-sm" style="width:60px;height:30px;">Search </button>
                                             </div>
-                                            <div class="form-check">
-                                                <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
-                                                <!-- <input class="form-check-input" type="checkbox"> -->
-                                                <label class="form-check-label">Opening</label>
-                                            </div>
-                                            <div class="form-check">
-                                                <!-- <input class="form-check-input" type="checkbox"> -->
-                                                <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
-                                                <label class="form-check-label">Closing</label>
-                                            </div>
-                                            <div class="form-check">
-                                                <!-- <input class="form-check-input" type="checkbox" checked> -->
-                                                <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
-                                                <label class="form-check-label">Period</label>
-                                            </div>
-                                        </div>
-                                        <div class="dropdown-divider"></div>
-                                        <div class="form-group p-2 pb-0">
-                                        <button type="submit" class="btn btn-primary btn-sm mr-2 text-center">Search Now</button>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="btn-group">
-                                    <button type="button" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
-                                        Export
-                                    </button>
-                                    <!-- <div class="dropdown-menu" role="menu">
+                                    <div class="btn-group">
+                                        <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
+                                            Export
+                                        </button>
+                                        <!-- <div class="dropdown-menu" role="menu">
                                             <a href="#" class="dropdown-item">Export</a>
                                             <a href="#" class="dropdown-item">Pdf</a>
                                             <div class="dropdown-divider"></div>
                                             <a href="#" class="dropdown-item">View calendar</a>
                                           </div> -->
-                                </div>
+                                    </div>
+
+                                    <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
+                                </form>
+                                <script>
+                                    function resetForm() {
+                                        document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
+                                        document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
+                                        document.getElementById("showOB").checked = <?php echo  "false"; ?>;
+                                        document.getElementById("showClosing").checked = <?php echo  "false"; ?>;
+                                        document.getElementById("FilterForm").submit();
+                                    }
+                                </script>
                             </div>
                         </div>
                         <div class="card-body">
+
                             <table class="table table-bordered table-striped dataTable">
                                 <thead>
                                     <tr>
-                                    <th rowspan="2" width="40" style="vertical-align: middle;"><?php myLang('S.No.'); ?></th>
+                                        <th rowspan="2" width="40" style="vertical-align: middle;"><?php myLang('S.No.'); ?></th>
                                         <th rowspan="2" style="vertical-align: middle;"> <?php myLang('Item'); ?></th>
                                         <th rowspan="2" width="80" style="vertical-align: middle;"><?php myLang('Units'); ?></th>
                                         <th colspan="3" class="text-center"><?php myLang('Opening'); ?></th>
@@ -180,12 +196,14 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <?php $Total = 0;$PTotal=0;$STotal=0;$CTotal=0;
-                                    foreach ($StockRecords as $TableRow) :  ?>
+                                    <?php $Total = 0;
+                                    $PTotal = 0;
+                                    $STotal = 0;
+                                    $CTotal = 0;
+                                    foreach ($StockRecords as $index => $TableRow) :  ?>
                                         <tr>
-
-                                            <td></td>
-                                            <td><?php echo ($TableRow->Item)?$TableRow->Item->title:"N/A"; ?></td>
+                                            <td><?php echo $index + 1; ?></td>
+                                            <td><?php echo ($TableRow->Item) ? $TableRow->Item->title : "N/A"; ?></td>
                                             <td><?php echo getFieldfromValue("tbl_units", "title", "unit_id", $TableRow->Item->units_id); ?></td>
                                             <td class="text-right"><?php echo $TableRow->Summary->Opening->qty; ?></td>
                                             <td class="text-right"><?php echo $TableRow->Summary->Opening->rate; ?></td>
@@ -226,4 +244,85 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<?php function footerFunctions()
+{
+?>
+    <script>
+        $(document).ready(function() {
+            // Prevent the dropdown from closing when clicking inside
+            $('.dropdown-menu').on('click', function(event) {
+                event.stopPropagation();
+            });
+        });
+    </script>
+    <script>
+        // var exportButton = document.getElementById("exportButton");
+        // exportButton.addEventListener("click", function() {
+        //     exportTableToCSV("table.csv");
+        // });
+        document.addEventListener("DOMContentLoaded", function() {
+            // Trigger click event on page load
+            document.getElementById("toggleShowAll").click();
+        });
+        document.getElementById("toggleShowAll").addEventListener("click", function(e) {
+            e.preventDefault();
+            var nestedRows = document.getElementsByClassName("collapse");
+            for (var i = 0; i < nestedRows.length; i++) {
+                if (nestedRows[i].classList.contains("show")) {
+                    nestedRows[i].classList.remove("show");
+                } else {
+                    nestedRows[i].classList.add("show");
+                }
+            }
+        });
+
+        function exportTableToCSV(filename) {
+            var csv = [];
+            var rows = document.querySelectorAll("table tr:not(.hide)");
+            for (var i = 0; i < rows.length; i++) {
+                var row = [];
+                var cols = rows[i].querySelectorAll("td:not(.hide), th:not(.hide)");
+                // Check if the parent row is collapsed or hidden
+                var parentRow = rows[i].closest(".collapse");
+                var isParentCollapsed = parentRow && (!parentRow.classList.contains("show"));
+                if (isParentCollapsed) {
+                    continue; // Skip child table rows if parent is collapsed
+                }
+                for (var j = 0; j < cols.length; j++) {
+                    var cellValue = cols[j].innerText.replace(/,/g, ""); // Remove commas from the cell value
+                    row.push(cellValue);
+                }
+                csv.push(row.join(","));
+            }
+            // Create a CSV file
+            var csvContent = "data:text/csv;charset=utf-8," + csv.join("\n");
+            var encodedUri = encodeURI(csvContent);
+            var link = document.createElement("a");
+            link.setAttribute("href", encodedUri);
+            link.setAttribute("download", filename);
+            document.body.appendChild(link);
+            link.click();
+        }
+    </script>
+    <script>
+        $("#fromDate").nepaliDatePicker({
+            dateFormat: "%y-%m-%d",
+            closeOnDateSelect: true,
+            minDate: $('#fromDate').data('start'),
+            maxDate: $('#fromDate').data('end'),
+        });
+    </script>
+    <script>
+        $("#toDate").nepaliDatePicker({
+                dateFormat: "%y-%m-%d",
+                closeOnDateSelect: true,
+                minDate: $('#toDate').data('start'),
+                maxDate: $('#toDate').data('end'),
+            }
+        );
+    </script>
+<?php
+}
+?>
\ No newline at end of file
diff --git a/account/application/views/translations/list.php b/account/application/views/translations/list.php
index bcbda1d..23f1c18 100644
--- a/account/application/views/translations/list.php
+++ b/account/application/views/translations/list.php
@@ -27,8 +27,8 @@
                                             <td class="text-center"><?php echo $TableRow->translation_id; ?></td>
                                             <td><?php echo $TableRow->english; ?></td>
                                             <td><?php echo $TableRow->nepali; ?></td>
-                                            <td class="text-center"><a href="<?php echo site_url($this->uri->segment(1) . "/" . $this->uri->segment(2) . "/edit/$id"); ?>" class="btn btn-info btn-xs"><i class="fas fa-edit"></i> Edit</a>
-                                                <a onClick="javascript:doDelete(<?php echo $id; ?>);" class="btn btn-danger btn-xs"><i class="fas fa-trash"></i> Delete</a>
+                                            <td class="text-center"><a href="<?php echo site_url($this->uri->segment(1) . "/" . $this->uri->segment(2) . "/edit/$id"); ?>" class="btn btn-info btn-xs"><i class="fas fa-edit"></i></a>
+                                                <a onClick="javascript:doDelete(<?php echo $id; ?>);" class="btn btn-danger btn-xs"><i class="fas fa-trash"></i></a>
                                             </td>
                                         </tr>
                                     <?php endforeach; ?>
diff --git a/account/pdf/ledgers/ledger_1.wpdf b/account/pdf/ledgers/ledger_1.wpdf
index 12f26a6..65ae26b 100644
Binary files a/account/pdf/ledgers/ledger_1.wpdf and b/account/pdf/ledgers/ledger_1.wpdf differ
diff --git a/account/pdf/ledgers/ledger_21.wpdf b/account/pdf/ledgers/ledger_21.wpdf
index 5a607b4..1e5128b 100644
Binary files a/account/pdf/ledgers/ledger_21.wpdf and b/account/pdf/ledgers/ledger_21.wpdf differ
diff --git a/account/pdf/ledgers/ledger_29.wpdf b/account/pdf/ledgers/ledger_29.wpdf
index edfb13e..68176c4 100644
Binary files a/account/pdf/ledgers/ledger_29.wpdf and b/account/pdf/ledgers/ledger_29.wpdf differ
diff --git a/account/pdf/ledgers/ledger_30.wpdf b/account/pdf/ledgers/ledger_30.wpdf
new file mode 100644
index 0000000..da22029
Binary files /dev/null and b/account/pdf/ledgers/ledger_30.wpdf differ
diff --git a/account/pdf/ledgers/ledger_31.wpdf b/account/pdf/ledgers/ledger_31.wpdf
new file mode 100644
index 0000000..c2b2780
Binary files /dev/null and b/account/pdf/ledgers/ledger_31.wpdf differ
diff --git a/account/pdf/ledgers/ledger_33.wpdf b/account/pdf/ledgers/ledger_33.wpdf
new file mode 100644
index 0000000..8a7f161
Binary files /dev/null and b/account/pdf/ledgers/ledger_33.wpdf differ
diff --git a/account/pdf/ledgers/ledger_4.wpdf b/account/pdf/ledgers/ledger_4.wpdf
index 0dc4479..68cb6e0 100644
Binary files a/account/pdf/ledgers/ledger_4.wpdf and b/account/pdf/ledgers/ledger_4.wpdf differ
diff --git a/account/pdf/vouchers/Voucher_2.pdf b/account/pdf/vouchers/Voucher_2.pdf
index 8c4e7cb..171fa12 100644
Binary files a/account/pdf/vouchers/Voucher_2.pdf and b/account/pdf/vouchers/Voucher_2.pdf differ
diff --git a/account/pdf/vouchers/Voucher_4.pdf b/account/pdf/vouchers/Voucher_4.pdf
new file mode 100644
index 0000000..82c39fe
Binary files /dev/null and b/account/pdf/vouchers/Voucher_4.pdf differ
diff --git a/account/pdf/vouchers/Voucher_5.pdf b/account/pdf/vouchers/Voucher_5.pdf
index 7922ddb..6bd3614 100644
Binary files a/account/pdf/vouchers/Voucher_5.pdf and b/account/pdf/vouchers/Voucher_5.pdf differ
diff --git a/account/plugins/nepalidatepicker/nepaliDatePicker.min.js b/account/plugins/nepalidatepicker/nepaliDatePicker.min.js
index 0cb030a..1af50a7 100644
--- a/account/plugins/nepalidatepicker/nepaliDatePicker.min.js
+++ b/account/plugins/nepalidatepicker/nepaliDatePicker.min.js
@@ -1 +1,1169 @@
-var calendarFunctions={};!function($){var calendarData={bsMonths:["बैशाख","जेठ","असार","साउन","भदौ","असोज","कार्तिक","मंसिर","पौष","माघ","फागुन","चैत"],bsDays:["आइत","सोम","मंगल","बुध","बिही","शुक्र","शनि"],nepaliNumbers:["0","1","2","3","4","5","6","7","8","9"],bsMonthUpperDays:[[30,31],[31,32],[31,32],[31,32],[31,32],[30,31],[29,30],[29,30],[29,30],[29,30],[29,30],[30,31]],extractedBsMonthData:[[0,1,1,22,1,3,1,1,1,3,1,22,1,3,1,3,1,22,1,3,1,19,1,3,1,1,3,1,2,2,1,3,1],[1,2,2,2,2,2,2,1,3,1,3,1,2,2,2,3,2,2,2,1,3,1,3,1,2,2,2,2,2,2,2,2,2,2,2,1,3,1,2,2,2,2,2,2,2,2,2,2,2,1,3,1,2,2,2,2,2,1,1,1,2,2,2,2,2,1,3,1,1,2],[0,1,2,1,3,1,3,1,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,1,3,1,3,1,2,2,2,2,2,2,2,2,2,1,3,1,3,1,2,2,2,2,2,2,2,2,2,1,3,1,3,1,1,1,1,2,2,2,2,2,1,3,1,1,2],[1,2,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,2,2,2,1,3,1,3,1,3,1,3,1,3,1,2,2,2,1,3,1,3,1,3,1,3,1,3,1,3,2,2,1,3,1,2,2,2,1,2],[59,1,26,1,28,1,2,1,12],[0,1,2,2,2,2,2,2,2,2,2,2,2,1,3,1,3,1,3,1,2,2,2,2,2,2,2,2,2,2,2,1,3,1,2,2,2,2,2,2,2,2,2,2,2,1,3,1,2,2,2,2,2,2,2,2,2,2,5,1,1,2,2,1,3,1,2,1,2],[0,12,1,3,1,3,1,5,1,11,1,3,1,3,1,18,1,3,1,3,1,18,1,3,1,3,1,27,1,2],[1,2,2,2,2,1,2,2,2,2,2,2,2,3,1,3,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,15,2,4],[0,1,2,2,2,2,1,3,1,3,1,3,1,2,2,2,3,2,2,2,1,3,1,3,1,3,1,2,2,2,2,2,2,2,1,3,1,3,1,3,1,2,2,2,2,2,2,2,2,2,1,3,1,3,1,2,2,2,15,2,4],[1,1,3,1,3,1,14,1,3,1,1,1,3,1,14,1,3,1,3,1,3,1,18,1,3,1,3,1,3,1,14,1,3,15,1,2,1,1],[0,1,1,3,1,3,1,10,1,3,1,3,1,1,1,3,1,3,1,10,1,3,1,3,1,3,1,3,1,14,1,3,1,3,1,3,1,3,1,10,1,20,1,1,1],[1,2,2,1,3,1,3,1,3,1,2,2,2,2,2,3,2,2,2,2,2,1,3,1,3,1,3,1,2,2,2,2,2,2,2,1,3,1,3,1,3,1,3,1,2,2,2,2,2,2,2,1,3,1,3,1,20,3]],minBsYear:1970,maxBsYear:2100,minAdDateEqBsDate:{ad:{year:1913,month:3,date:13},bs:{year:1970,month:1,date:1}}},validationFunctions={validateRequiredParameters:function(requiredParameters){$.each(requiredParameters,function(key,value){if("undefined"==typeof value||null===value)throw new ReferenceError("Missing required parameters: "+Object.keys(requiredParameters).join(", "))})},validateBsYear:function(bsYear){if("number"!=typeof bsYear||null===bsYear)throw new TypeError("Invalid parameter bsYear value");if(bsYear<calendarData.minBsYear||bsYear>calendarData.maxBsYear)throw new RangeError("Parameter bsYear value should be in range of "+calendarData.minBsYear+" to "+calendarData.maxBsYear)},validateAdYear:function(adYear){if("number"!=typeof adYear||null===adYear)throw new TypeError("Invalid parameter adYear value");if(adYear<calendarData.minBsYear-57||adYear>calendarData.maxBsYear-57)throw new RangeError("Parameter adYear value should be in range of "+(calendarData.minBsYear-57)+" to "+(calendarData.maxBsYear-57))},validateBsMonth:function(bsMonth){if("number"!=typeof bsMonth||null===bsMonth)throw new TypeError("Invalid parameter bsMonth value");if(bsMonth<1||bsMonth>12)throw new RangeError("Parameter bsMonth value should be in range of 1 to 12")},validateAdMonth:function(adMonth){if("number"!=typeof adMonth||null===adMonth)throw new TypeError("Invalid parameter adMonth value");if(adMonth<1||adMonth>12)throw new RangeError("Parameter adMonth value should be in range of 1 to 12")},validateBsDate:function(bsDate){if("number"!=typeof bsDate||null===bsDate)throw new TypeError("Invalid parameter bsDate value");if(bsDate<1||bsDate>32)throw new RangeError("Parameter bsDate value should be in range of 1 to 32")},validateAdDate:function(adDate){if("number"!=typeof adDate||null===adDate)throw new TypeError("Invalid parameter adDate value");if(adDate<1||adDate>31)throw new RangeError("Parameter adDate value should be in range of 1 to 31")},validatePositiveNumber:function(numberParameters){$.each(numberParameters,function(key,value){if("number"!=typeof value||null===value||value<0)throw new ReferenceError("Invalid parameters: "+Object.keys(numberParameters).join(", "));if("yearDiff"===key&&value>calendarData.maxBsYear-calendarData.minBsYear+1)throw new RangeError("Parameter yearDiff value should be in range of 0 to "+(calendarData.maxBsYear-calendarData.minBsYear+1))})}};$.extend(calendarFunctions,{getNepaliNumber:function(number){if("undefined"==typeof number)throw new Error("Parameter number is required");if("number"!=typeof number||number<0)throw new Error("Number should be positive integer");var prefixNum=Math.floor(number/10),suffixNum=number%10;return 0!==prefixNum?calendarFunctions.getNepaliNumber(prefixNum)+calendarData.nepaliNumbers[suffixNum]:calendarData.nepaliNumbers[suffixNum]},getNumberByNepaliNumber:function(nepaliNumber){if("undefined"==typeof nepaliNumber)throw new Error("Parameter nepaliNumber is required");if("string"!=typeof nepaliNumber)throw new Error("Parameter nepaliNumber should be in string");for(var number=0,i=0;i<nepaliNumber.length;i++){var numIndex=calendarData.nepaliNumbers.indexOf(nepaliNumber.charAt(i));if(numIndex===-1)throw new Error("Invalid nepali number");number=10*number+numIndex}return number},getBsMonthInfoByBsDate:function(bsYear,bsMonth,bsDate,dateFormatPattern){if(validationFunctions.validateRequiredParameters({bsYear:bsYear,bsMonth:bsMonth,bsDate:bsDate}),validationFunctions.validateBsYear(bsYear),validationFunctions.validateBsMonth(bsMonth),validationFunctions.validateBsDate(bsDate),null===dateFormatPattern)dateFormatPattern="%D, %M %d, %y";else if("string"!=typeof dateFormatPattern)throw new TypeError("Invalid parameter dateFormatPattern value");var daysNumFromMinBsYear=calendarFunctions.getTotalDaysNumFromMinBsYear(bsYear,bsMonth,bsDate),adDate=new Date(calendarData.minAdDateEqBsDate.ad.year,calendarData.minAdDateEqBsDate.ad.month,calendarData.minAdDateEqBsDate.ad.date-1);adDate.setDate(adDate.getDate()+daysNumFromMinBsYear);var bsMonthFirstAdDate=calendarFunctions.getAdDateByBsDate(bsYear,bsMonth,1),bsMonthDays=calendarFunctions.getBsMonthDays(bsYear,bsMonth);bsDate=bsDate>bsMonthDays?bsMonthDays:bsDate;var eqAdDate=calendarFunctions.getAdDateByBsDate(bsYear,bsMonth,bsDate),weekDay=eqAdDate.getDay()+1,formattedDate=calendarFunctions.bsDateFormat(dateFormatPattern,bsYear,bsMonth,bsDate);return{bsYear:bsYear,bsMonth:bsMonth,bsDate:bsDate,weekDay:weekDay,formattedDate:formattedDate,adDate:eqAdDate,bsMonthFirstAdDate:bsMonthFirstAdDate,bsMonthDays:bsMonthDays}},getAdDateByBsDate:function(bsYear,bsMonth,bsDate){validationFunctions.validateRequiredParameters({bsYear:bsYear,bsMonth:bsMonth,bsDate:bsDate}),validationFunctions.validateBsYear(bsYear),validationFunctions.validateBsMonth(bsMonth),validationFunctions.validateBsDate(bsDate);var daysNumFromMinBsYear=calendarFunctions.getTotalDaysNumFromMinBsYear(bsYear,bsMonth,bsDate),adDate=new Date(calendarData.minAdDateEqBsDate.ad.year,calendarData.minAdDateEqBsDate.ad.month,calendarData.minAdDateEqBsDate.ad.date-1);return adDate.setDate(adDate.getDate()+daysNumFromMinBsYear),adDate},getTotalDaysNumFromMinBsYear:function(bsYear,bsMonth,bsDate){if(validationFunctions.validateRequiredParameters({bsYear:bsYear,bsMonth:bsMonth,bsDate:bsDate}),validationFunctions.validateBsYear(bsYear),validationFunctions.validateBsMonth(bsMonth),validationFunctions.validateBsDate(bsDate),bsYear<calendarData.minBsYear||bsYear>calendarData.maxBsYear)return null;for(var daysNumFromMinBsYear=0,diffYears=bsYear-calendarData.minBsYear,month=1;month<=12;month++)daysNumFromMinBsYear+=month<bsMonth?calendarFunctions.getMonthDaysNumFormMinBsYear(month,diffYears+1):calendarFunctions.getMonthDaysNumFormMinBsYear(month,diffYears);return daysNumFromMinBsYear+=bsYear>2085&&bsYear<2088?bsDate-2:2085===bsYear&&bsMonth>5?bsDate-2:bsYear>2088?bsDate-4:2088===bsYear&&bsMonth>5?bsDate-4:bsDate},getMonthDaysNumFormMinBsYear:function(bsMonth,yearDiff){validationFunctions.validateRequiredParameters({bsMonth:bsMonth,yearDiff:yearDiff}),validationFunctions.validateBsMonth(bsMonth),validationFunctions.validatePositiveNumber({yearDiff:yearDiff});var yearCount=0,monthDaysFromMinBsYear=0;if(0===yearDiff)return 0;for(var bsMonthData=calendarData.extractedBsMonthData[bsMonth-1],i=0;i<bsMonthData.length;i++)if(0!==bsMonthData[i]){var bsMonthUpperDaysIndex=i%2;if(!(yearDiff>yearCount+bsMonthData[i])){monthDaysFromMinBsYear+=calendarData.bsMonthUpperDays[bsMonth-1][bsMonthUpperDaysIndex]*(yearDiff-yearCount),yearCount=yearDiff-yearCount;break}yearCount+=bsMonthData[i],monthDaysFromMinBsYear+=calendarData.bsMonthUpperDays[bsMonth-1][bsMonthUpperDaysIndex]*bsMonthData[i]}return monthDaysFromMinBsYear},getBsMonthDays:function(bsYear,bsMonth){validationFunctions.validateRequiredParameters({bsYear:bsYear,bsMonth:bsMonth}),validationFunctions.validateBsYear(bsYear),validationFunctions.validateBsMonth(bsMonth);for(var yearCount=0,totalYears=bsYear+1-calendarData.minBsYear,bsMonthData=calendarData.extractedBsMonthData[bsMonth-1],i=0;i<bsMonthData.length;i++)if(0!==bsMonthData[i]){var bsMonthUpperDaysIndex=i%2;if(yearCount+=bsMonthData[i],totalYears<=yearCount)return 2085===bsYear&&5===bsMonth||2088===bsYear&&5===bsMonth?calendarData.bsMonthUpperDays[bsMonth-1][bsMonthUpperDaysIndex]-2:calendarData.bsMonthUpperDays[bsMonth-1][bsMonthUpperDaysIndex]}return null},getBsDateByAdDate:function(adYear,adMonth,adDate){validationFunctions.validateRequiredParameters({adYear:adYear,adMonth:adMonth,adDate:adDate}),validationFunctions.validateAdYear(adYear),validationFunctions.validateAdMonth(adMonth),validationFunctions.validateAdDate(adDate);var bsYear=adYear+57,bsMonth=(adMonth+9)%12;bsMonth=0===bsMonth?12:bsMonth;var bsDate=1;if(adMonth<4)bsYear-=1;else if(4===adMonth){var bsYearFirstAdDate=calendarFunctions.getAdDateByBsDate(bsYear,1,1);adDate<bsYearFirstAdDate.getDate()&&(bsYear-=1)}var bsMonthFirstAdDate=calendarFunctions.getAdDateByBsDate(bsYear,bsMonth,1);if(adDate>=1&&adDate<bsMonthFirstAdDate.getDate()){bsMonth=1!==bsMonth?bsMonth-1:12;var bsMonthDays=calendarFunctions.getBsMonthDays(bsYear,bsMonth);bsDate=bsMonthDays-(bsMonthFirstAdDate.getDate()-adDate)+1}else bsDate=adDate-bsMonthFirstAdDate.getDate()+1;return{bsYear:bsYear,bsMonth:bsMonth,bsDate:bsDate}},getBsYearByAdDate:function(adYear,adMonth,adDate){validationFunctions.validateRequiredParameters({adYear:adYear,adMonth:adMonth,adDate:adDate}),validationFunctions.validateAdYear(adYear),validationFunctions.validateAdMonth(adMonth),validationFunctions.validateAdDate(adDate);var bsDate=calendarFunctions.getBsDateByAdDate(adYear,adMonth,adDate);return bsDate.bsYear},getBsMonthByAdDate:function(adYear,adMonth,adDate){validationFunctions.validateRequiredParameters({adYear:adYear,adMonth:adMonth,adDate:adDate}),validationFunctions.validateAdYear(adYear),validationFunctions.validateAdMonth(adMonth),validationFunctions.validateAdDate(adDate);var bsDate=calendarFunctions.getBsDateByAdDate(adYear,adMonth,adDate);return bsDate.bsMonth},bsDateFormat:function(dateFormatPattern,bsYear,bsMonth,bsDate){validationFunctions.validateRequiredParameters({dateFormatPattern:dateFormatPattern,bsYear:bsYear,bsMonth:bsMonth,bsDate:bsDate}),validationFunctions.validateBsYear(bsYear),validationFunctions.validateBsMonth(bsMonth),validationFunctions.validateBsDate(bsDate);var eqAdDate=calendarFunctions.getAdDateByBsDate(bsYear,bsMonth,bsDate),weekDay=eqAdDate.getDay()+1,formattedDate=dateFormatPattern;return formattedDate=formattedDate.replace(/%d/g,calendarFunctions.getNepaliNumber(bsDate)),formattedDate=formattedDate.replace(/%y/g,calendarFunctions.getNepaliNumber(bsYear)),formattedDate=formattedDate.replace(/%m/g,calendarFunctions.getNepaliNumber(bsMonth)),formattedDate=formattedDate.replace(/%M/g,calendarData.bsMonths[bsMonth-1]),formattedDate=formattedDate.replace(/%D/g,calendarData.bsDays[weekDay-1])},parseFormattedBsDate:function(dateFormat,dateFormattedText){validationFunctions.validateRequiredParameters({dateFormat:dateFormat,dateFormattedText:dateFormattedText});for(var diffTextNum=0,extractedFormattedBsDate={bsYear:null,bsMonth:null,bsDate:null,bsDay:null},i=0;i<dateFormat.length;i++)if("%"===dateFormat.charAt(i)){var valueOf=dateFormat.substring(i,i+2),endChar=dateFormat.charAt(i+2),tempText=dateFormattedText.substring(i+diffTextNum),endIndex=""!==endChar?tempText.indexOf(endChar):tempText.length,value=tempText.substring(0,endIndex);"%y"===valueOf?(extractedFormattedBsDate.bsYear=calendarFunctions.getNumberByNepaliNumber(value),diffTextNum+=value.length-2):"%d"===valueOf?(extractedFormattedBsDate.bsDate=calendarFunctions.getNumberByNepaliNumber(value),diffTextNum+=value.length-2):"%D"===valueOf?(extractedFormattedBsDate.bsDay=calendarData.bsDays.indexOf(value)+1,diffTextNum+=value.length-2):"%m"===valueOf?(extractedFormattedBsDate.bsMonth=calendarFunctions.getNumberByNepaliNumber(value),diffTextNum+=value.length-2):"%M"===valueOf&&(extractedFormattedBsDate.bsMonth=calendarData.bsMonths.indexOf(value)+1,diffTextNum+=value.length-2)}if(!extractedFormattedBsDate.bsDay){var eqAdDate=calendarFunctions.getAdDateByBsDate(extractedFormattedBsDate.bsYear,extractedFormattedBsDate.bsMonth,extractedFormattedBsDate.bsDate);extractedFormattedBsDate.bsDay=eqAdDate.getDay()+1}return extractedFormattedBsDate}}),$.fn.nepaliDatePicker=function(options){var datePickerPlugin={options:$.extend({dateFormat:"%D, %M %d, %y",closeOnDateSelect:!0,defaultDate:"",minDate:null,maxDate:null,yearStart:calendarData.minBsYear,yearEnd:calendarData.maxBsYear},options),init:function($element){$element.prop("readonly_removed",!0);var $nepaliDatePicker=$('<div class="nepali-date-picker">');$("body").append($nepaliDatePicker),""!==$element.val()?datePickerPlugin.renderFormattedSpecificDateCalendar($nepaliDatePicker,datePickerPlugin.options.dateFormat,$element.val()):datePickerPlugin.renderCurrentMonthCalendar($nepaliDatePicker),datePickerPlugin.addEventHandler($element,$nepaliDatePicker),datePickerPlugin.addCommonEventHandler($nepaliDatePicker)},addCommonEventHandler:function(){var $datePickerWrapper=$(".nepali-date-picker");$(document).click(function(event){var $targetElement=$(event.target);$targetElement.is($(".nepali-date-picker"))||($datePickerWrapper.hide(),$datePickerWrapper.find(".drop-down-content").hide())})},addEventHandler:function($element,$nepaliDatePicker){$element.click(function(){if($(".nepali-date-picker").is(":visible"))return void $(".nepali-date-picker").hide();var inputFieldPosition=$(this).offset();return $nepaliDatePicker.css({top:inputFieldPosition.top+$(this).outerHeight(!0),left:inputFieldPosition.left}),$element.val()&&datePickerPlugin.renderFormattedSpecificDateCalendar($nepaliDatePicker,datePickerPlugin.options.dateFormat,$element.val()),$nepaliDatePicker.show(),datePickerPlugin.eventFire($element,$nepaliDatePicker,"show"),!1}),$nepaliDatePicker.on("click",".next-btn",function(event){event.preventDefault();var preCalendarData={bsYear:$nepaliDatePicker.data().bsYear,bsMonth:$nepaliDatePicker.data().bsMonth,bsDate:$nepaliDatePicker.data().bsDate};return datePickerPlugin.renderNextMonthCalendar($nepaliDatePicker),datePickerPlugin.triggerChangeEvent($element,$nepaliDatePicker,preCalendarData),$nepaliDatePicker.show(),!1}),$nepaliDatePicker.on("click",".prev-btn",function(event){event.preventDefault();var preCalendarData={bsYear:$nepaliDatePicker.data().bsYear,bsMonth:$nepaliDatePicker.data().bsMonth,bsDate:$nepaliDatePicker.data().bsDate};datePickerPlugin.renderPreviousMonthCalendar($nepaliDatePicker);$nepaliDatePicker.data();return datePickerPlugin.triggerChangeEvent($element,$nepaliDatePicker,preCalendarData),$nepaliDatePicker.show(),!1}),$nepaliDatePicker.on("click",".today-btn",function(event){event.preventDefault();var preCalendarData={bsYear:$nepaliDatePicker.data().bsYear,bsMonth:$nepaliDatePicker.data().bsMonth,bsDate:$nepaliDatePicker.data().bsDate};datePickerPlugin.renderCurrentMonthCalendar($nepaliDatePicker);$nepaliDatePicker.data();return datePickerPlugin.triggerChangeEvent($element,$nepaliDatePicker,preCalendarData),$nepaliDatePicker.show(),!1}),$nepaliDatePicker.on("click",".current-year-txt, .current-month-txt",function(){if($(this).find(".drop-down-content").is(":visible"))$(this).find(".drop-down-content").hide();else{$nepaliDatePicker.find(".drop-down-content").hide(),$(this).find(".drop-down-content").show();var $optionWrapper=$(this).find(".option-wrapper");$optionWrapper.scrollTop(0);var scrollTopTo=$optionWrapper.find(".active").position().top;$optionWrapper.scrollTop(scrollTopTo)}return!1}),$nepaliDatePicker.on("click",".current-month-date",function(){if(!$(this).hasClass("disable")){var datePickerData=$nepaliDatePicker.data(),bsYear=datePickerData.bsYear,bsMonth=datePickerData.bsMonth,preDate=datePickerData.bsDate,bsDate=$(this).data("date"),dateText=calendarFunctions.bsDateFormat(datePickerPlugin.options.dateFormat,bsYear,bsMonth,bsDate);return $element.val(dateText),datePickerPlugin.setCalendarDate($nepaliDatePicker,bsYear,bsMonth,bsDate),datePickerPlugin.renderMonthCalendar($nepaliDatePicker),preDate!==bsDate&&datePickerPlugin.eventFire($element,$nepaliDatePicker,"dateChange"),datePickerPlugin.eventFire($element,$nepaliDatePicker,"dateSelect"),datePickerPlugin.options.closeOnDateSelect?$nepaliDatePicker.hide():$nepaliDatePicker.show(),!1}}),$nepaliDatePicker.on("click",".drop-down-content li",function(){var $dropDown=$(this).parents(".drop-down-content");$dropDown.data("value",$(this).data("value")),$dropDown.attr("data-value",$(this).data("value"));var preCalendarData={bsYear:$nepaliDatePicker.data().bsYear,bsMonth:$nepaliDatePicker.data().bsMonth,bsDate:$nepaliDatePicker.data().bsDate},bsMonth=$nepaliDatePicker.find(".month-drop-down").data("value"),bsYear=$nepaliDatePicker.find(".year-drop-down").data("value"),bsDate=preCalendarData.bsDate;datePickerPlugin.setCalendarDate($nepaliDatePicker,bsYear,bsMonth,bsDate),datePickerPlugin.renderMonthCalendar($nepaliDatePicker);$nepaliDatePicker.data();return datePickerPlugin.triggerChangeEvent($element,$nepaliDatePicker,preCalendarData),$nepaliDatePicker.show(),!1})},triggerChangeEvent:function($element,$nepaliDatePicker,preCalendarData){var calendarData=$nepaliDatePicker.data();preCalendarData.bsYear!==calendarData.bsYear&&datePickerPlugin.eventFire($element,$nepaliDatePicker,"yearChange"),preCalendarData.bsMonth!==calendarData.bsMonth&&datePickerPlugin.eventFire($element,$nepaliDatePicker,"monthChange"),preCalendarData.bsDate!==calendarData.bsDate&&datePickerPlugin.eventFire($element,$nepaliDatePicker,"dateChange")},eventFire:function($element,$nepaliDatePicker,eventType){switch(eventType){case"generate":$element.trigger({type:eventType,message:"Nepali date picker initialize",datePickerData:$nepaliDatePicker.data(),time:new Date});break;case"show":$element.trigger({type:eventType,message:"Show nepali date picker",datePickerData:$nepaliDatePicker.data(),time:new Date});break;case"close":$element.trigger({type:eventType,message:"close nepali date picker",datePickerData:$nepaliDatePicker.data(),time:new Date});break;case"dateSelect":$element.trigger({type:eventType,message:"Select date",datePickerData:$nepaliDatePicker.data(),time:new Date});break;case"dateChange":$element.trigger({type:eventType,message:"Change date",datePickerData:$nepaliDatePicker.data(),time:new Date});break;case"monthChange":$element.trigger({type:eventType,message:"Change month",datePickerData:$nepaliDatePicker.data(),time:new Date});break;case"yearChange":$element.trigger({type:eventType,message:"Change year",datePickerData:$nepaliDatePicker.data(),time:new Date})}},setCalendarDate:function($nepaliDatePicker,bsYear,bsMonth,BsDate){$nepaliDatePicker.data(calendarFunctions.getBsMonthInfoByBsDate(bsYear,bsMonth,BsDate,datePickerPlugin.options.dateFormat))},renderMonthCalendar:function($nepaliDatePicker){$nepaliDatePicker.find(".calendar-wrapper").remove(),$nepaliDatePicker.append(datePickerPlugin.getCalendar($nepaliDatePicker)).hide()},getCalendar:function($nepaliDatePicker){var calendarWrapper=$('<div class="calendar-wrapper">');calendarWrapper.append(datePickerPlugin.getCalendarController($nepaliDatePicker));var calendarTable=$("<table>");return calendarTable.append(datePickerPlugin.getCalendarHeader()),calendarTable.append(datePickerPlugin.getCalendarBody($nepaliDatePicker)),calendarWrapper.append(calendarTable),calendarWrapper},getCalendarController:function($nepaliDatePicker){var calendarController=$("<div class='calendar-controller'>");return calendarController.append('<a href="javascript:void(0);" class="prev-btn icon" title="prev"></a>'),calendarController.append('<a href="javascript:void(0);" class="today-btn icon" title=""></a>'),calendarController.append(datePickerPlugin.getMonthDropOption($nepaliDatePicker)),calendarController.append(datePickerPlugin.getYearDropOption($nepaliDatePicker)),calendarController.append('<a href="javascript:void(0);" class="next-btn icon" title="next"></a>'),calendarController},getMonthDropOption:function($nepaliDatePicker){var datePickerData=$nepaliDatePicker.data(),$monthSpan=$('<div class="current-month-txt">');$monthSpan.text(calendarData.bsMonths[datePickerData.bsMonth-1]),$monthSpan.append('<i class="icon icon-drop-down">');for(var data=[],i=0;i<12;i++)data.push({label:calendarData.bsMonths[i],value:i+1});var $monthDropOption=datePickerPlugin.getCustomSelectOption(data,datePickerData.bsMonth).addClass("month-drop-down");return $monthSpan.append($monthDropOption),$monthSpan},getYearDropOption:function($nepaliDatePicker){var datePickerData=$nepaliDatePicker.data(),$yearSpan=$('<div class="current-year-txt">');$yearSpan.text(calendarFunctions.getNepaliNumber(datePickerData.bsYear)),$yearSpan.append('<i class="icon icon-drop-down">');for(var data=[],i=datePickerPlugin.options.yearStart;i<=datePickerPlugin.options.yearEnd;i++)data.push({label:calendarFunctions.getNepaliNumber(i),value:i});var $yearDropOption=datePickerPlugin.getCustomSelectOption(data,datePickerData.bsYear).addClass("year-drop-down");return $yearSpan.append($yearDropOption),$yearSpan},getCustomSelectOption:function(datas,activeValue){var $dropDown=$('<div class="drop-down-content" data-value="'+activeValue+'">'),$dropDownWrapper=$('<div class="option-wrapper">'),$ul=$("<ul>");return $.each(datas,function(index,data){$ul.append('<li data-value="'+data.value+'">'+data.label+"</li>")}),$dropDownWrapper.append($ul),$ul.find('li[data-value="'+activeValue+'"]').addClass("active"),$dropDown.append($dropDownWrapper),$dropDown},getCalendarHeader:function(){for(var calendarHeader=$("<thead>"),tableRow=$("<tr>"),i=0;i<7;i++)tableRow.append("<td>"+calendarData.bsDays[i]+"</td>");return calendarHeader.append(tableRow),calendarHeader},getCalendarBody:function($nepaliDatePicker){var datePickerData=$nepaliDatePicker.data(),weekCoverInMonth=Math.ceil((datePickerData.bsMonthFirstAdDate.getDay()+datePickerData.bsMonthDays)/7),preMonth=datePickerData.bsMonth-1!==0?datePickerData.bsMonth-1:12,preYear=12===preMonth?datePickerData.bsYear-1:datePickerData.bsYear,preMonthDays=preYear>=calendarData.minBsYear?calendarFunctions.getBsMonthDays(preYear,preMonth):30,minBsDate=null,maxBsDate=null;null!==datePickerPlugin.options.minDate&&(minBsDate=calendarFunctions.parseFormattedBsDate(datePickerPlugin.options.dateFormat,datePickerPlugin.options.minDate)),null!==datePickerPlugin.options.maxDate&&(maxBsDate=calendarFunctions.parseFormattedBsDate(datePickerPlugin.options.dateFormat,datePickerPlugin.options.maxDate));for(var calendarBody=$("<tbody>"),i=0;i<weekCoverInMonth;i++){for(var tableRow=$("<tr>"),k=1;k<=7;k++){var calendarDate=7*i+k-datePickerData.bsMonthFirstAdDate.getDay(),isCurrentMonthDate=!0;if(calendarDate<=0?(calendarDate=preMonthDays+calendarDate,isCurrentMonthDate=!1):calendarDate>datePickerData.bsMonthDays&&(calendarDate-=datePickerData.bsMonthDays,isCurrentMonthDate=!1),isCurrentMonthDate){var $td=$('<td class="current-month-date" data-date="'+calendarDate+'" data-weekDay="'+(k-1)+'">'+calendarFunctions.getNepaliNumber(calendarDate)+"</td>");calendarDate==datePickerData.bsDate&&$td.addClass("active"),datePickerPlugin.disableIfOutOfRange($td,datePickerData,minBsDate,maxBsDate,calendarDate),tableRow.append($td)}else tableRow.append('<td class="other-month-date">'+calendarFunctions.getNepaliNumber(calendarDate)+"</td>")}calendarBody.append(tableRow)}return calendarBody},disableIfOutOfRange:function($td,datePickerData,minBsDate,maxBsDate,calendarDate){return null!==minBsDate&&(datePickerData.bsYear<minBsDate.bsYear?$td.addClass("disable"):datePickerData.bsYear===minBsDate.bsYear&&datePickerData.bsMonth<minBsDate.bsMonth?$td.addClass("disable"):datePickerData.bsYear===minBsDate.bsYear&&datePickerData.bsMonth===minBsDate.bsMonth&&calendarDate<minBsDate.bsDate&&$td.addClass("disable")),null!==maxBsDate&&(datePickerData.bsYear>maxBsDate.bsYear?$td.addClass("disable"):datePickerData.bsYear===maxBsDate.bsYear&&datePickerData.bsMonth>maxBsDate.bsMonth?$td.addClass("disable"):datePickerData.bsYear===maxBsDate.bsYear&&datePickerData.bsMonth===maxBsDate.bsMonth&&calendarDate>maxBsDate.bsDate&&$td.addClass("disable")),$td},renderCurrentMonthCalendar:function($nepaliDatePicker){var currentDate=new Date,currentBsDate=calendarFunctions.getBsDateByAdDate(currentDate.getFullYear(),currentDate.getMonth()+1,currentDate.getDate()),bsYear=currentBsDate.bsYear,bsMonth=currentBsDate.bsMonth,bsDate=currentBsDate.bsDate;datePickerPlugin.setCalendarDate($nepaliDatePicker,bsYear,bsMonth,bsDate),datePickerPlugin.renderMonthCalendar($nepaliDatePicker)},renderPreviousMonthCalendar:function($nepaliDatePicker){var datePickerData=$nepaliDatePicker.data(),prevMonth=datePickerData.bsMonth-1>0?datePickerData.bsMonth-1:12,prevYear=12!==prevMonth?datePickerData.bsYear:datePickerData.bsYear-1,prevDate=datePickerData.bsDate;return prevYear<datePickerPlugin.options.yearStart||prevYear>datePickerPlugin.options.yearEnd?null:(datePickerPlugin.setCalendarDate($nepaliDatePicker,prevYear,prevMonth,prevDate),void datePickerPlugin.renderMonthCalendar($nepaliDatePicker))},renderNextMonthCalendar:function($nepaliDatePicker){var datePickerData=$nepaliDatePicker.data(),nextMonth=datePickerData.bsMonth+1<=12?datePickerData.bsMonth+1:1,nextYear=1!==nextMonth?datePickerData.bsYear:datePickerData.bsYear+1,nextDate=datePickerData.bsDate;return nextYear<datePickerPlugin.options.yearStart||nextYear>datePickerPlugin.options.yearEnd?null:(datePickerPlugin.setCalendarDate($nepaliDatePicker,nextYear,nextMonth,nextDate),void datePickerPlugin.renderMonthCalendar($nepaliDatePicker))},renderFormattedSpecificDateCalendar:function($nepaliDatePicker,dateFormat,dateFormattedText){var datePickerDate=calendarFunctions.parseFormattedBsDate(dateFormat,dateFormattedText);datePickerPlugin.setCalendarDate($nepaliDatePicker,datePickerDate.bsYear,datePickerDate.bsMonth,datePickerDate.bsDate),datePickerPlugin.renderMonthCalendar($nepaliDatePicker)}};return this.each(function(){var $element=$(this);datePickerPlugin.init($element)}),datePickerPlugin.addCommonEventHandler(),this}}(jQuery,calendarFunctions);
\ No newline at end of file
+var calendarFunctions = {};
+!(function ($) {
+  var calendarData = {
+      bsMonths: [
+        "बैशाख",
+        "जेठ",
+        "असार",
+        "साउन",
+        "भदौ",
+        "असोज",
+        "कार्तिक",
+        "मंसिर",
+        "पौष",
+        "माघ",
+        "फागुन",
+        "चैत",
+      ],
+      bsDays: ["आइत", "सोम", "मंगल", "बुध", "बिही", "शुक्र", "शनि"],
+      nepaliNumbers: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
+      bsMonthUpperDays: [
+        [30, 31],
+        [31, 32],
+        [31, 32],
+        [31, 32],
+        [31, 32],
+        [30, 31],
+        [29, 30],
+        [29, 30],
+        [29, 30],
+        [29, 30],
+        [29, 30],
+        [30, 31],
+      ],
+      extractedBsMonthData: [
+        [
+          0, 1, 1, 22, 1, 3, 1, 1, 1, 3, 1, 22, 1, 3, 1, 3, 1, 22, 1, 3, 1, 19,
+          1, 3, 1, 1, 3, 1, 2, 2, 1, 3, 1,
+        ],
+        [
+          1, 2, 2, 2, 2, 2, 2, 1, 3, 1, 3, 1, 2, 2, 2, 3, 2, 2, 2, 1, 3, 1, 3,
+          1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 2, 2, 2, 2, 2, 2, 2, 2,
+          2, 2, 2, 1, 3, 1, 2, 2, 2, 2, 2, 1, 1, 1, 2, 2, 2, 2, 2, 1, 3, 1, 1,
+          2,
+        ],
+        [
+          0, 1, 2, 1, 3, 1, 3, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2,
+          2, 2, 1, 3, 1, 3, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 3, 1, 2, 2,
+          2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 3, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 3, 1,
+          1, 2,
+        ],
+        [
+          1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1,
+          3, 1, 3, 1, 3, 1, 2, 2, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 2, 2, 2,
+          1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 2, 2, 1, 3, 1, 2, 2, 2, 1, 2,
+        ],
+        [59, 1, 26, 1, 28, 1, 2, 1, 12],
+        [
+          0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 3, 1, 3, 1, 2, 2, 2,
+          2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
+          3, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 1, 1, 2, 2, 1, 3, 1, 2, 1, 2,
+        ],
+        [
+          0, 12, 1, 3, 1, 3, 1, 5, 1, 11, 1, 3, 1, 3, 1, 18, 1, 3, 1, 3, 1, 18,
+          1, 3, 1, 3, 1, 27, 1, 2,
+        ],
+        [
+          1, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 3, 1, 3, 2, 2, 2, 2, 2, 2, 2,
+          2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2,
+          2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 15, 2, 4,
+        ],
+        [
+          0, 1, 2, 2, 2, 2, 1, 3, 1, 3, 1, 3, 1, 2, 2, 2, 3, 2, 2, 2, 1, 3, 1,
+          3, 1, 3, 1, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 3, 1, 3, 1, 2, 2, 2, 2, 2,
+          2, 2, 2, 2, 1, 3, 1, 3, 1, 2, 2, 2, 15, 2, 4,
+        ],
+        [
+          1, 1, 3, 1, 3, 1, 14, 1, 3, 1, 1, 1, 3, 1, 14, 1, 3, 1, 3, 1, 3, 1,
+          18, 1, 3, 1, 3, 1, 3, 1, 14, 1, 3, 15, 1, 2, 1, 1,
+        ],
+        [
+          0, 1, 1, 3, 1, 3, 1, 10, 1, 3, 1, 3, 1, 1, 1, 3, 1, 3, 1, 10, 1, 3, 1,
+          3, 1, 3, 1, 3, 1, 14, 1, 3, 1, 3, 1, 3, 1, 3, 1, 10, 1, 20, 1, 1, 1,
+        ],
+        [
+          1, 2, 2, 1, 3, 1, 3, 1, 3, 1, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 1, 3,
+          1, 3, 1, 3, 1, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 2, 2,
+          2, 2, 2, 2, 2, 1, 3, 1, 3, 1, 20, 3,
+        ],
+      ],
+      minBsYear: 1970,
+      maxBsYear: 2100,
+      minAdDateEqBsDate: {
+        ad: { year: 1913, month: 3, date: 13 },
+        bs: { year: 1970, month: 1, date: 1 },
+      },
+    },
+    validationFunctions = {
+      validateRequiredParameters: function (requiredParameters) {
+        $.each(requiredParameters, function (key, value) {
+          if ("undefined" == typeof value || null === value)
+            throw new ReferenceError(
+              "Missing required parameters: " +
+                Object.keys(requiredParameters).join(", ")
+            );
+        });
+      },
+      validateBsYear: function (bsYear) {
+        if ("number" != typeof bsYear || null === bsYear)
+          throw new TypeError("Invalid parameter bsYear value");
+        if (bsYear < calendarData.minBsYear || bsYear > calendarData.maxBsYear)
+          throw new RangeError(
+            "Parameter bsYear value should be in range of " +
+              calendarData.minBsYear +
+              " to " +
+              calendarData.maxBsYear
+          );
+      },
+      validateAdYear: function (adYear) {
+        if ("number" != typeof adYear || null === adYear)
+          throw new TypeError("Invalid parameter adYear value");
+        if (
+          adYear < calendarData.minBsYear - 57 ||
+          adYear > calendarData.maxBsYear - 57
+        )
+          throw new RangeError(
+            "Parameter adYear value should be in range of " +
+              (calendarData.minBsYear - 57) +
+              " to " +
+              (calendarData.maxBsYear - 57)
+          );
+      },
+      validateBsMonth: function (bsMonth) {
+        if ("number" != typeof bsMonth || null === bsMonth)
+          throw new TypeError("Invalid parameter bsMonth value");
+        if (bsMonth < 1 || bsMonth > 12)
+          throw new RangeError(
+            "Parameter bsMonth value should be in range of 1 to 12"
+          );
+      },
+      validateAdMonth: function (adMonth) {
+        if ("number" != typeof adMonth || null === adMonth)
+          throw new TypeError("Invalid parameter adMonth value");
+        if (adMonth < 1 || adMonth > 12)
+          throw new RangeError(
+            "Parameter adMonth value should be in range of 1 to 12"
+          );
+      },
+      validateBsDate: function (bsDate) {
+        if ("number" != typeof bsDate || null === bsDate)
+          throw new TypeError("Invalid parameter bsDate value");
+        if (bsDate < 1 || bsDate > 32)
+          throw new RangeError(
+            "Parameter bsDate value should be in range of 1 to 32"
+          );
+      },
+      validateAdDate: function (adDate) {
+        if ("number" != typeof adDate || null === adDate)
+          throw new TypeError("Invalid parameter adDate value");
+        if (adDate < 1 || adDate > 31)
+          throw new RangeError(
+            "Parameter adDate value should be in range of 1 to 31"
+          );
+      },
+      validatePositiveNumber: function (numberParameters) {
+        $.each(numberParameters, function (key, value) {
+          if ("number" != typeof value || null === value || value < 0)
+            throw new ReferenceError(
+              "Invalid parameters: " + Object.keys(numberParameters).join(", ")
+            );
+          if (
+            "yearDiff" === key &&
+            value > calendarData.maxBsYear - calendarData.minBsYear + 1
+          )
+            throw new RangeError(
+              "Parameter yearDiff value should be in range of 0 to " +
+                (calendarData.maxBsYear - calendarData.minBsYear + 1)
+            );
+        });
+      },
+    };
+  $.extend(calendarFunctions, {
+    getNepaliNumber: function (number) {
+      if ("undefined" == typeof number)
+        throw new Error("Parameter number is required");
+      if ("number" != typeof number || number < 0)
+        throw new Error("Number should be positive integer");
+      var prefixNum = Math.floor(number / 10),
+        suffixNum = number % 10;
+      return 0 !== prefixNum
+        ? calendarFunctions.getNepaliNumber(prefixNum) +
+            calendarData.nepaliNumbers[suffixNum]
+        : calendarData.nepaliNumbers[suffixNum];
+    },
+    getNumberByNepaliNumber: function (nepaliNumber) {
+      if ("undefined" == typeof nepaliNumber)
+        throw new Error("Parameter nepaliNumber is required");
+      if ("string" != typeof nepaliNumber)
+        throw new Error("Parameter nepaliNumber should be in string");
+      for (var number = 0, i = 0; i < nepaliNumber.length; i++) {
+        var numIndex = calendarData.nepaliNumbers.indexOf(
+          nepaliNumber.charAt(i)
+        );
+        if (numIndex === -1) throw new Error("Invalid nepali number");
+        number = 10 * number + numIndex;
+      }
+      return number;
+    },
+    getBsMonthInfoByBsDate: function (
+      bsYear,
+      bsMonth,
+      bsDate,
+      dateFormatPattern
+    ) {
+      if (
+        (validationFunctions.validateRequiredParameters({
+          bsYear: bsYear,
+          bsMonth: bsMonth,
+          bsDate: bsDate,
+        }),
+        validationFunctions.validateBsYear(bsYear),
+        validationFunctions.validateBsMonth(bsMonth),
+        validationFunctions.validateBsDate(bsDate),
+        null === dateFormatPattern)
+      )
+        dateFormatPattern = "%D, %M %d, %y";
+      else if ("string" != typeof dateFormatPattern)
+        throw new TypeError("Invalid parameter dateFormatPattern value");
+      var daysNumFromMinBsYear = calendarFunctions.getTotalDaysNumFromMinBsYear(
+          bsYear,
+          bsMonth,
+          bsDate
+        ),
+        adDate = new Date(
+          calendarData.minAdDateEqBsDate.ad.year,
+          calendarData.minAdDateEqBsDate.ad.month,
+          calendarData.minAdDateEqBsDate.ad.date - 1
+        );
+      adDate.setDate(adDate.getDate() + daysNumFromMinBsYear);
+      var bsMonthFirstAdDate = calendarFunctions.getAdDateByBsDate(
+          bsYear,
+          bsMonth,
+          1
+        ),
+        bsMonthDays = calendarFunctions.getBsMonthDays(bsYear, bsMonth);
+      bsDate = bsDate > bsMonthDays ? bsMonthDays : bsDate;
+      var eqAdDate = calendarFunctions.getAdDateByBsDate(
+          bsYear,
+          bsMonth,
+          bsDate
+        ),
+        weekDay = eqAdDate.getDay() + 1,
+        formattedDate = calendarFunctions.bsDateFormat(
+          dateFormatPattern,
+          bsYear,
+          bsMonth,
+          bsDate
+        );
+      return {
+        bsYear: bsYear,
+        bsMonth: bsMonth,
+        bsDate: bsDate,
+        weekDay: weekDay,
+        formattedDate: formattedDate,
+        adDate: eqAdDate,
+        bsMonthFirstAdDate: bsMonthFirstAdDate,
+        bsMonthDays: bsMonthDays,
+      };
+    },
+    getAdDateByBsDate: function (bsYear, bsMonth, bsDate) {
+      validationFunctions.validateRequiredParameters({
+        bsYear: bsYear,
+        bsMonth: bsMonth,
+        bsDate: bsDate,
+      }),
+        validationFunctions.validateBsYear(bsYear),
+        validationFunctions.validateBsMonth(bsMonth),
+        validationFunctions.validateBsDate(bsDate);
+      var daysNumFromMinBsYear = calendarFunctions.getTotalDaysNumFromMinBsYear(
+          bsYear,
+          bsMonth,
+          bsDate
+        ),
+        adDate = new Date(
+          calendarData.minAdDateEqBsDate.ad.year,
+          calendarData.minAdDateEqBsDate.ad.month,
+          calendarData.minAdDateEqBsDate.ad.date - 1
+        );
+      return adDate.setDate(adDate.getDate() + daysNumFromMinBsYear), adDate;
+    },
+    getTotalDaysNumFromMinBsYear: function (bsYear, bsMonth, bsDate) {
+      if (
+        (validationFunctions.validateRequiredParameters({
+          bsYear: bsYear,
+          bsMonth: bsMonth,
+          bsDate: bsDate,
+        }),
+        validationFunctions.validateBsYear(bsYear),
+        validationFunctions.validateBsMonth(bsMonth),
+        validationFunctions.validateBsDate(bsDate),
+        bsYear < calendarData.minBsYear || bsYear > calendarData.maxBsYear)
+      )
+        return null;
+      for (
+        var daysNumFromMinBsYear = 0,
+          diffYears = bsYear - calendarData.minBsYear,
+          month = 1;
+        month <= 12;
+        month++
+      )
+        daysNumFromMinBsYear +=
+          month < bsMonth
+            ? calendarFunctions.getMonthDaysNumFormMinBsYear(
+                month,
+                diffYears + 1
+              )
+            : calendarFunctions.getMonthDaysNumFormMinBsYear(month, diffYears);
+      return (daysNumFromMinBsYear +=
+        bsYear > 2085 && bsYear < 2088
+          ? bsDate - 2
+          : 2085 === bsYear && bsMonth > 5
+          ? bsDate - 2
+          : bsYear > 2088
+          ? bsDate - 4
+          : 2088 === bsYear && bsMonth > 5
+          ? bsDate - 4
+          : bsDate);
+    },
+    getMonthDaysNumFormMinBsYear: function (bsMonth, yearDiff) {
+      validationFunctions.validateRequiredParameters({
+        bsMonth: bsMonth,
+        yearDiff: yearDiff,
+      }),
+        validationFunctions.validateBsMonth(bsMonth),
+        validationFunctions.validatePositiveNumber({ yearDiff: yearDiff });
+      var yearCount = 0,
+        monthDaysFromMinBsYear = 0;
+      if (0 === yearDiff) return 0;
+      for (
+        var bsMonthData = calendarData.extractedBsMonthData[bsMonth - 1], i = 0;
+        i < bsMonthData.length;
+        i++
+      )
+        if (0 !== bsMonthData[i]) {
+          var bsMonthUpperDaysIndex = i % 2;
+          if (!(yearDiff > yearCount + bsMonthData[i])) {
+            (monthDaysFromMinBsYear +=
+              calendarData.bsMonthUpperDays[bsMonth - 1][
+                bsMonthUpperDaysIndex
+              ] *
+              (yearDiff - yearCount)),
+              (yearCount = yearDiff - yearCount);
+            break;
+          }
+          (yearCount += bsMonthData[i]),
+            (monthDaysFromMinBsYear +=
+              calendarData.bsMonthUpperDays[bsMonth - 1][
+                bsMonthUpperDaysIndex
+              ] * bsMonthData[i]);
+        }
+      return monthDaysFromMinBsYear;
+    },
+    getBsMonthDays: function (bsYear, bsMonth) {
+      validationFunctions.validateRequiredParameters({
+        bsYear: bsYear,
+        bsMonth: bsMonth,
+      }),
+        validationFunctions.validateBsYear(bsYear),
+        validationFunctions.validateBsMonth(bsMonth);
+      for (
+        var yearCount = 0,
+          totalYears = bsYear + 1 - calendarData.minBsYear,
+          bsMonthData = calendarData.extractedBsMonthData[bsMonth - 1],
+          i = 0;
+        i < bsMonthData.length;
+        i++
+      )
+        if (0 !== bsMonthData[i]) {
+          var bsMonthUpperDaysIndex = i % 2;
+          if (((yearCount += bsMonthData[i]), totalYears <= yearCount))
+            return (2085 === bsYear && 5 === bsMonth) ||
+              (2088 === bsYear && 5 === bsMonth)
+              ? calendarData.bsMonthUpperDays[bsMonth - 1][
+                  bsMonthUpperDaysIndex
+                ] - 2
+              : calendarData.bsMonthUpperDays[bsMonth - 1][
+                  bsMonthUpperDaysIndex
+                ];
+        }
+      return null;
+    },
+    getBsDateByAdDate: function (adYear, adMonth, adDate) {
+      validationFunctions.validateRequiredParameters({
+        adYear: adYear,
+        adMonth: adMonth,
+        adDate: adDate,
+      }),
+        validationFunctions.validateAdYear(adYear),
+        validationFunctions.validateAdMonth(adMonth),
+        validationFunctions.validateAdDate(adDate);
+      var bsYear = adYear + 57,
+        bsMonth = (adMonth + 9) % 12;
+      bsMonth = 0 === bsMonth ? 12 : bsMonth;
+      var bsDate = 1;
+      if (adMonth < 4) bsYear -= 1;
+      else if (4 === adMonth) {
+        var bsYearFirstAdDate = calendarFunctions.getAdDateByBsDate(
+          bsYear,
+          1,
+          1
+        );
+        adDate < bsYearFirstAdDate.getDate() && (bsYear -= 1);
+      }
+      var bsMonthFirstAdDate = calendarFunctions.getAdDateByBsDate(
+        bsYear,
+        bsMonth,
+        1
+      );
+      if (adDate >= 1 && adDate < bsMonthFirstAdDate.getDate()) {
+        bsMonth = 1 !== bsMonth ? bsMonth - 1 : 12;
+        var bsMonthDays = calendarFunctions.getBsMonthDays(bsYear, bsMonth);
+        bsDate = bsMonthDays - (bsMonthFirstAdDate.getDate() - adDate) + 1;
+      } else bsDate = adDate - bsMonthFirstAdDate.getDate() + 1;
+      return { bsYear: bsYear, bsMonth: bsMonth, bsDate: bsDate };
+    },
+    getBsYearByAdDate: function (adYear, adMonth, adDate) {
+      validationFunctions.validateRequiredParameters({
+        adYear: adYear,
+        adMonth: adMonth,
+        adDate: adDate,
+      }),
+        validationFunctions.validateAdYear(adYear),
+        validationFunctions.validateAdMonth(adMonth),
+        validationFunctions.validateAdDate(adDate);
+      var bsDate = calendarFunctions.getBsDateByAdDate(adYear, adMonth, adDate);
+      return bsDate.bsYear;
+    },
+    getBsMonthByAdDate: function (adYear, adMonth, adDate) {
+      validationFunctions.validateRequiredParameters({
+        adYear: adYear,
+        adMonth: adMonth,
+        adDate: adDate,
+      }),
+        validationFunctions.validateAdYear(adYear),
+        validationFunctions.validateAdMonth(adMonth),
+        validationFunctions.validateAdDate(adDate);
+      var bsDate = calendarFunctions.getBsDateByAdDate(adYear, adMonth, adDate);
+      return bsDate.bsMonth;
+    },
+    bsDateFormat: function (dateFormatPattern, bsYear, bsMonth, bsDate) {
+      validationFunctions.validateRequiredParameters({
+        dateFormatPattern: dateFormatPattern,
+        bsYear: bsYear,
+        bsMonth: bsMonth,
+        bsDate: bsDate,
+      }),
+        validationFunctions.validateBsYear(bsYear),
+        validationFunctions.validateBsMonth(bsMonth),
+        validationFunctions.validateBsDate(bsDate);
+      var eqAdDate = calendarFunctions.getAdDateByBsDate(
+          bsYear,
+          bsMonth,
+          bsDate
+        ),
+        weekDay = eqAdDate.getDay() + 1,
+        formattedDate = dateFormatPattern;
+      return (
+        (formattedDate = formattedDate.replace(
+          /%d/g,
+          calendarFunctions.getNepaliNumber(bsDate)
+        )),
+        (formattedDate = formattedDate.replace(
+          /%y/g,
+          calendarFunctions.getNepaliNumber(bsYear)
+        )),
+        (formattedDate = formattedDate.replace(
+          /%m/g,
+          calendarFunctions.getNepaliNumber(bsMonth)
+        )),
+        (formattedDate = formattedDate.replace(
+          /%M/g,
+          calendarData.bsMonths[bsMonth - 1]
+        )),
+        (formattedDate = formattedDate.replace(
+          /%D/g,
+          calendarData.bsDays[weekDay - 1]
+        ))
+      );
+    },
+    parseFormattedBsDate: function (dateFormat, dateFormattedText) {
+      validationFunctions.validateRequiredParameters({
+        dateFormat: dateFormat,
+        dateFormattedText: dateFormattedText,
+      });
+      for (
+        var diffTextNum = 0,
+          extractedFormattedBsDate = {
+            bsYear: null,
+            bsMonth: null,
+            bsDate: null,
+            bsDay: null,
+          },
+          i = 0;
+        i < dateFormat.length;
+        i++
+      )
+        if ("%" === dateFormat.charAt(i)) {
+          var valueOf = dateFormat.substring(i, i + 2),
+            endChar = dateFormat.charAt(i + 2),
+            tempText = dateFormattedText.substring(i + diffTextNum),
+            endIndex =
+              "" !== endChar ? tempText.indexOf(endChar) : tempText.length,
+            value = tempText.substring(0, endIndex);
+          "%y" === valueOf
+            ? ((extractedFormattedBsDate.bsYear =
+                calendarFunctions.getNumberByNepaliNumber(value)),
+              (diffTextNum += value.length - 2))
+            : "%d" === valueOf
+            ? ((extractedFormattedBsDate.bsDate =
+                calendarFunctions.getNumberByNepaliNumber(value)),
+              (diffTextNum += value.length - 2))
+            : "%D" === valueOf
+            ? ((extractedFormattedBsDate.bsDay =
+                calendarData.bsDays.indexOf(value) + 1),
+              (diffTextNum += value.length - 2))
+            : "%m" === valueOf
+            ? ((extractedFormattedBsDate.bsMonth =
+                calendarFunctions.getNumberByNepaliNumber(value)),
+              (diffTextNum += value.length - 2))
+            : "%M" === valueOf &&
+              ((extractedFormattedBsDate.bsMonth =
+                calendarData.bsMonths.indexOf(value) + 1),
+              (diffTextNum += value.length - 2));
+        }
+      if (!extractedFormattedBsDate.bsDay) {
+        var eqAdDate = calendarFunctions.getAdDateByBsDate(
+          extractedFormattedBsDate.bsYear,
+          extractedFormattedBsDate.bsMonth,
+          extractedFormattedBsDate.bsDate
+        );
+        extractedFormattedBsDate.bsDay = eqAdDate.getDay() + 1;
+      }
+      return extractedFormattedBsDate;
+    },
+  }),
+    ($.fn.nepaliDatePicker = function (options) {
+      var datePickerPlugin = {
+        options: $.extend(
+          {
+            dateFormat: "%D, %M %d, %y",
+            closeOnDateSelect: !0,
+            defaultDate: "",
+            minDate: null,
+            maxDate: null,
+            yearStart: calendarData.minBsYear,
+            yearEnd: calendarData.maxBsYear,
+          },
+          options
+        ),
+        init: function ($element) {
+          $element.prop("readonly_removed", !0);
+          var $nepaliDatePicker = $('<div class="nepali-date-picker">');
+          $("body").append($nepaliDatePicker),
+            "" !== $element.val()
+              ? datePickerPlugin.renderFormattedSpecificDateCalendar(
+                  $nepaliDatePicker,
+                  datePickerPlugin.options.dateFormat,
+                  $element.val()
+                )
+              : datePickerPlugin.renderCurrentMonthCalendar($nepaliDatePicker),
+            datePickerPlugin.addEventHandler($element, $nepaliDatePicker),
+            datePickerPlugin.addCommonEventHandler($nepaliDatePicker);
+        },
+        addCommonEventHandler: function () {
+          var $datePickerWrapper = $(".nepali-date-picker");
+          $(document).click(function (event) {
+            var $targetElement = $(event.target);
+            $targetElement.is($(".nepali-date-picker")) ||
+              ($datePickerWrapper.hide(),
+              $datePickerWrapper.find(".drop-down-content").hide());
+          });
+        },
+        addEventHandler: function ($element, $nepaliDatePicker) {
+          $element.click(function () {
+            if ($(".nepali-date-picker").is(":visible"))
+              return void $(".nepali-date-picker").hide();
+            var inputFieldPosition = $(this).offset();
+            return (function () {
+              var $window = $(window);
+              var windowHeight = $window.height();
+              var windowWidth = $window.width();
+              var pickerHeight = $nepaliDatePicker.outerHeight(true);
+              var pickerWidth = $nepaliDatePicker.outerWidth(true);
+              var inputFieldPosition = $element.offset();
+              var inputFieldHeight = $element.outerHeight(true);
+
+              // Calculate top and left positions
+              var topPosition = inputFieldPosition.top + inputFieldHeight;
+              var leftPosition = inputFieldPosition.left;
+
+              // Check if the picker will go out of the bottom boundary
+              if (topPosition + pickerHeight > windowHeight) {
+                topPosition = inputFieldPosition.top - pickerHeight; // Position above the input field
+              }
+
+              // Check if the picker will go out of the right boundary
+              if (leftPosition + pickerWidth > windowWidth) {
+                leftPosition = windowWidth - pickerWidth; // Adjust to fit within the right boundary
+              }
+
+              // Apply the calculated positions and show the date picker
+              $nepaliDatePicker.css({
+                top: topPosition,
+                left: leftPosition,
+              });
+
+              // Additional actions: render calendar, show picker, trigger event
+              $element.val() &&
+                datePickerPlugin.renderFormattedSpecificDateCalendar(
+                  $nepaliDatePicker,
+                  datePickerPlugin.options.dateFormat,
+                  $element.val()
+                );
+              $nepaliDatePicker.show();
+              datePickerPlugin.eventFire($element, $nepaliDatePicker, "show");
+
+              return !1;
+            })();
+          }),
+            $nepaliDatePicker.on("click", ".next-btn", function (event) {
+              event.preventDefault();
+              var preCalendarData = {
+                bsYear: $nepaliDatePicker.data().bsYear,
+                bsMonth: $nepaliDatePicker.data().bsMonth,
+                bsDate: $nepaliDatePicker.data().bsDate,
+              };
+              return (
+                datePickerPlugin.renderNextMonthCalendar($nepaliDatePicker),
+                datePickerPlugin.triggerChangeEvent(
+                  $element,
+                  $nepaliDatePicker,
+                  preCalendarData
+                ),
+                $nepaliDatePicker.show(),
+                !1
+              );
+            }),
+            $nepaliDatePicker.on("click", ".prev-btn", function (event) {
+              event.preventDefault();
+              var preCalendarData = {
+                bsYear: $nepaliDatePicker.data().bsYear,
+                bsMonth: $nepaliDatePicker.data().bsMonth,
+                bsDate: $nepaliDatePicker.data().bsDate,
+              };
+              datePickerPlugin.renderPreviousMonthCalendar($nepaliDatePicker);
+              $nepaliDatePicker.data();
+              return (
+                datePickerPlugin.triggerChangeEvent(
+                  $element,
+                  $nepaliDatePicker,
+                  preCalendarData
+                ),
+                $nepaliDatePicker.show(),
+                !1
+              );
+            }),
+            $nepaliDatePicker.on("click", ".today-btn", function (event) {
+              event.preventDefault();
+              var preCalendarData = {
+                bsYear: $nepaliDatePicker.data().bsYear,
+                bsMonth: $nepaliDatePicker.data().bsMonth,
+                bsDate: $nepaliDatePicker.data().bsDate,
+              };
+              datePickerPlugin.renderCurrentMonthCalendar($nepaliDatePicker);
+              $nepaliDatePicker.data();
+              return (
+                datePickerPlugin.triggerChangeEvent(
+                  $element,
+                  $nepaliDatePicker,
+                  preCalendarData
+                ),
+                $nepaliDatePicker.show(),
+                !1
+              );
+            }),
+            $nepaliDatePicker.on(
+              "click",
+              ".current-year-txt, .current-month-txt",
+              function () {
+                if ($(this).find(".drop-down-content").is(":visible"))
+                  $(this).find(".drop-down-content").hide();
+                else {
+                  $nepaliDatePicker.find(".drop-down-content").hide(),
+                    $(this).find(".drop-down-content").show();
+                  var $optionWrapper = $(this).find(".option-wrapper");
+                  $optionWrapper.scrollTop(0);
+                  var scrollTopTo = $optionWrapper
+                    .find(".active")
+                    .position().top;
+                  $optionWrapper.scrollTop(scrollTopTo);
+                }
+                return !1;
+              }
+            ),
+            $nepaliDatePicker.on("click", ".current-month-date", function () {
+              if (!$(this).hasClass("disable")) {
+                var datePickerData = $nepaliDatePicker.data(),
+                  bsYear = datePickerData.bsYear,
+                  bsMonth = datePickerData.bsMonth,
+                  preDate = datePickerData.bsDate,
+                  bsDate = $(this).data("date"),
+                  dateText = calendarFunctions.bsDateFormat(
+                    datePickerPlugin.options.dateFormat,
+                    bsYear,
+                    bsMonth,
+                    bsDate
+                  );
+                return (
+                  $element.val(dateText),
+                  datePickerPlugin.setCalendarDate(
+                    $nepaliDatePicker,
+                    bsYear,
+                    bsMonth,
+                    bsDate
+                  ),
+                  datePickerPlugin.renderMonthCalendar($nepaliDatePicker),
+                  preDate !== bsDate &&
+                    datePickerPlugin.eventFire(
+                      $element,
+                      $nepaliDatePicker,
+                      "dateChange"
+                    ),
+                  datePickerPlugin.eventFire(
+                    $element,
+                    $nepaliDatePicker,
+                    "dateSelect"
+                  ),
+                  datePickerPlugin.options.closeOnDateSelect
+                    ? $nepaliDatePicker.hide()
+                    : $nepaliDatePicker.show(),
+                  !1
+                );
+              }
+            }),
+            $nepaliDatePicker.on("click", ".drop-down-content li", function () {
+              var $dropDown = $(this).parents(".drop-down-content");
+              $dropDown.data("value", $(this).data("value")),
+                $dropDown.attr("data-value", $(this).data("value"));
+              var preCalendarData = {
+                  bsYear: $nepaliDatePicker.data().bsYear,
+                  bsMonth: $nepaliDatePicker.data().bsMonth,
+                  bsDate: $nepaliDatePicker.data().bsDate,
+                },
+                bsMonth = $nepaliDatePicker
+                  .find(".month-drop-down")
+                  .data("value"),
+                bsYear = $nepaliDatePicker
+                  .find(".year-drop-down")
+                  .data("value"),
+                bsDate = preCalendarData.bsDate;
+              datePickerPlugin.setCalendarDate(
+                $nepaliDatePicker,
+                bsYear,
+                bsMonth,
+                bsDate
+              ),
+                datePickerPlugin.renderMonthCalendar($nepaliDatePicker);
+              $nepaliDatePicker.data();
+              return (
+                datePickerPlugin.triggerChangeEvent(
+                  $element,
+                  $nepaliDatePicker,
+                  preCalendarData
+                ),
+                $nepaliDatePicker.show(),
+                !1
+              );
+            });
+        },
+        triggerChangeEvent: function (
+          $element,
+          $nepaliDatePicker,
+          preCalendarData
+        ) {
+          var calendarData = $nepaliDatePicker.data();
+          preCalendarData.bsYear !== calendarData.bsYear &&
+            datePickerPlugin.eventFire(
+              $element,
+              $nepaliDatePicker,
+              "yearChange"
+            ),
+            preCalendarData.bsMonth !== calendarData.bsMonth &&
+              datePickerPlugin.eventFire(
+                $element,
+                $nepaliDatePicker,
+                "monthChange"
+              ),
+            preCalendarData.bsDate !== calendarData.bsDate &&
+              datePickerPlugin.eventFire(
+                $element,
+                $nepaliDatePicker,
+                "dateChange"
+              );
+        },
+        eventFire: function ($element, $nepaliDatePicker, eventType) {
+          switch (eventType) {
+            case "generate":
+              $element.trigger({
+                type: eventType,
+                message: "Nepali date picker initialize",
+                datePickerData: $nepaliDatePicker.data(),
+                time: new Date(),
+              });
+              break;
+            case "show":
+              $element.trigger({
+                type: eventType,
+                message: "Show nepali date picker",
+                datePickerData: $nepaliDatePicker.data(),
+                time: new Date(),
+              });
+              break;
+            case "close":
+              $element.trigger({
+                type: eventType,
+                message: "close nepali date picker",
+                datePickerData: $nepaliDatePicker.data(),
+                time: new Date(),
+              });
+              break;
+            case "dateSelect":
+              $element.trigger({
+                type: eventType,
+                message: "Select date",
+                datePickerData: $nepaliDatePicker.data(),
+                time: new Date(),
+              });
+              break;
+            case "dateChange":
+              $element.trigger({
+                type: eventType,
+                message: "Change date",
+                datePickerData: $nepaliDatePicker.data(),
+                time: new Date(),
+              });
+              break;
+            case "monthChange":
+              $element.trigger({
+                type: eventType,
+                message: "Change month",
+                datePickerData: $nepaliDatePicker.data(),
+                time: new Date(),
+              });
+              break;
+            case "yearChange":
+              $element.trigger({
+                type: eventType,
+                message: "Change year",
+                datePickerData: $nepaliDatePicker.data(),
+                time: new Date(),
+              });
+          }
+        },
+        setCalendarDate: function ($nepaliDatePicker, bsYear, bsMonth, BsDate) {
+          $nepaliDatePicker.data(
+            calendarFunctions.getBsMonthInfoByBsDate(
+              bsYear,
+              bsMonth,
+              BsDate,
+              datePickerPlugin.options.dateFormat
+            )
+          );
+        },
+        renderMonthCalendar: function ($nepaliDatePicker) {
+          $nepaliDatePicker.find(".calendar-wrapper").remove(),
+            $nepaliDatePicker
+              .append(datePickerPlugin.getCalendar($nepaliDatePicker))
+              .hide();
+        },
+        getCalendar: function ($nepaliDatePicker) {
+          var calendarWrapper = $('<div class="calendar-wrapper">');
+          calendarWrapper.append(
+            datePickerPlugin.getCalendarController($nepaliDatePicker)
+          );
+          var calendarTable = $("<table>");
+          return (
+            calendarTable.append(datePickerPlugin.getCalendarHeader()),
+            calendarTable.append(
+              datePickerPlugin.getCalendarBody($nepaliDatePicker)
+            ),
+            calendarWrapper.append(calendarTable),
+            calendarWrapper
+          );
+        },
+        getCalendarController: function ($nepaliDatePicker) {
+          var calendarController = $("<div class='calendar-controller'>");
+          return (
+            calendarController.append(
+              '<a href="javascript:void(0);" class="prev-btn icon" title="prev"></a>'
+            ),
+            calendarController.append(
+              '<a href="javascript:void(0);" class="today-btn icon" title=""></a>'
+            ),
+            calendarController.append(
+              datePickerPlugin.getMonthDropOption($nepaliDatePicker)
+            ),
+            calendarController.append(
+              datePickerPlugin.getYearDropOption($nepaliDatePicker)
+            ),
+            calendarController.append(
+              '<a href="javascript:void(0);" class="next-btn icon" title="next"></a>'
+            ),
+            calendarController
+          );
+        },
+        getMonthDropOption: function ($nepaliDatePicker) {
+          var datePickerData = $nepaliDatePicker.data(),
+            $monthSpan = $('<div class="current-month-txt">');
+          $monthSpan.text(calendarData.bsMonths[datePickerData.bsMonth - 1]),
+            $monthSpan.append('<i class="icon icon-drop-down">');
+          for (var data = [], i = 0; i < 12; i++)
+            data.push({ label: calendarData.bsMonths[i], value: i + 1 });
+          var $monthDropOption = datePickerPlugin
+            .getCustomSelectOption(data, datePickerData.bsMonth)
+            .addClass("month-drop-down");
+          return $monthSpan.append($monthDropOption), $monthSpan;
+        },
+        getYearDropOption: function ($nepaliDatePicker) {
+          var datePickerData = $nepaliDatePicker.data(),
+            $yearSpan = $('<div class="current-year-txt">');
+          $yearSpan.text(
+            calendarFunctions.getNepaliNumber(datePickerData.bsYear)
+          ),
+            $yearSpan.append('<i class="icon icon-drop-down">');
+          for (
+            var data = [], i = datePickerPlugin.options.yearStart;
+            i <= datePickerPlugin.options.yearEnd;
+            i++
+          )
+            data.push({
+              label: calendarFunctions.getNepaliNumber(i),
+              value: i,
+            });
+          var $yearDropOption = datePickerPlugin
+            .getCustomSelectOption(data, datePickerData.bsYear)
+            .addClass("year-drop-down");
+          return $yearSpan.append($yearDropOption), $yearSpan;
+        },
+        getCustomSelectOption: function (datas, activeValue) {
+          var $dropDown = $(
+              '<div class="drop-down-content" data-value="' + activeValue + '">'
+            ),
+            $dropDownWrapper = $('<div class="option-wrapper">'),
+            $ul = $("<ul>");
+          return (
+            $.each(datas, function (index, data) {
+              $ul.append(
+                '<li data-value="' + data.value + '">' + data.label + "</li>"
+              );
+            }),
+            $dropDownWrapper.append($ul),
+            $ul.find('li[data-value="' + activeValue + '"]').addClass("active"),
+            $dropDown.append($dropDownWrapper),
+            $dropDown
+          );
+        },
+        getCalendarHeader: function () {
+          for (
+            var calendarHeader = $("<thead>"), tableRow = $("<tr>"), i = 0;
+            i < 7;
+            i++
+          )
+            tableRow.append("<td>" + calendarData.bsDays[i] + "</td>");
+          return calendarHeader.append(tableRow), calendarHeader;
+        },
+        getCalendarBody: function ($nepaliDatePicker) {
+          var datePickerData = $nepaliDatePicker.data(),
+            weekCoverInMonth = Math.ceil(
+              (datePickerData.bsMonthFirstAdDate.getDay() +
+                datePickerData.bsMonthDays) /
+                7
+            ),
+            preMonth =
+              datePickerData.bsMonth - 1 !== 0
+                ? datePickerData.bsMonth - 1
+                : 12,
+            preYear =
+              12 === preMonth
+                ? datePickerData.bsYear - 1
+                : datePickerData.bsYear,
+            preMonthDays =
+              preYear >= calendarData.minBsYear
+                ? calendarFunctions.getBsMonthDays(preYear, preMonth)
+                : 30,
+            minBsDate = null,
+            maxBsDate = null;
+          null !== datePickerPlugin.options.minDate &&
+            (minBsDate = calendarFunctions.parseFormattedBsDate(
+              datePickerPlugin.options.dateFormat,
+              datePickerPlugin.options.minDate
+            )),
+            null !== datePickerPlugin.options.maxDate &&
+              (maxBsDate = calendarFunctions.parseFormattedBsDate(
+                datePickerPlugin.options.dateFormat,
+                datePickerPlugin.options.maxDate
+              ));
+          for (
+            var calendarBody = $("<tbody>"), i = 0;
+            i < weekCoverInMonth;
+            i++
+          ) {
+            for (var tableRow = $("<tr>"), k = 1; k <= 7; k++) {
+              var calendarDate =
+                  7 * i + k - datePickerData.bsMonthFirstAdDate.getDay(),
+                isCurrentMonthDate = !0;
+              if (
+                (calendarDate <= 0
+                  ? ((calendarDate = preMonthDays + calendarDate),
+                    (isCurrentMonthDate = !1))
+                  : calendarDate > datePickerData.bsMonthDays &&
+                    ((calendarDate -= datePickerData.bsMonthDays),
+                    (isCurrentMonthDate = !1)),
+                isCurrentMonthDate)
+              ) {
+                var $td = $(
+                  '<td class="current-month-date" data-date="' +
+                    calendarDate +
+                    '" data-weekDay="' +
+                    (k - 1) +
+                    '">' +
+                    calendarFunctions.getNepaliNumber(calendarDate) +
+                    "</td>"
+                );
+                calendarDate == datePickerData.bsDate && $td.addClass("active"),
+                  datePickerPlugin.disableIfOutOfRange(
+                    $td,
+                    datePickerData,
+                    minBsDate,
+                    maxBsDate,
+                    calendarDate
+                  ),
+                  tableRow.append($td);
+              } else
+                tableRow.append(
+                  '<td class="other-month-date">' +
+                    calendarFunctions.getNepaliNumber(calendarDate) +
+                    "</td>"
+                );
+            }
+            calendarBody.append(tableRow);
+          }
+          return calendarBody;
+        },
+        disableIfOutOfRange: function (
+          $td,
+          datePickerData,
+          minBsDate,
+          maxBsDate,
+          calendarDate
+        ) {
+          return (
+            null !== minBsDate &&
+              (datePickerData.bsYear < minBsDate.bsYear
+                ? $td.addClass("disable")
+                : datePickerData.bsYear === minBsDate.bsYear &&
+                  datePickerData.bsMonth < minBsDate.bsMonth
+                ? $td.addClass("disable")
+                : datePickerData.bsYear === minBsDate.bsYear &&
+                  datePickerData.bsMonth === minBsDate.bsMonth &&
+                  calendarDate < minBsDate.bsDate &&
+                  $td.addClass("disable")),
+            null !== maxBsDate &&
+              (datePickerData.bsYear > maxBsDate.bsYear
+                ? $td.addClass("disable")
+                : datePickerData.bsYear === maxBsDate.bsYear &&
+                  datePickerData.bsMonth > maxBsDate.bsMonth
+                ? $td.addClass("disable")
+                : datePickerData.bsYear === maxBsDate.bsYear &&
+                  datePickerData.bsMonth === maxBsDate.bsMonth &&
+                  calendarDate > maxBsDate.bsDate &&
+                  $td.addClass("disable")),
+            $td
+          );
+        },
+        renderCurrentMonthCalendar: function ($nepaliDatePicker) {
+          var currentDate = new Date(),
+            currentBsDate = calendarFunctions.getBsDateByAdDate(
+              currentDate.getFullYear(),
+              currentDate.getMonth() + 1,
+              currentDate.getDate()
+            ),
+            bsYear = currentBsDate.bsYear,
+            bsMonth = currentBsDate.bsMonth,
+            bsDate = currentBsDate.bsDate;
+          datePickerPlugin.setCalendarDate(
+            $nepaliDatePicker,
+            bsYear,
+            bsMonth,
+            bsDate
+          ),
+            datePickerPlugin.renderMonthCalendar($nepaliDatePicker);
+        },
+        renderPreviousMonthCalendar: function ($nepaliDatePicker) {
+          var datePickerData = $nepaliDatePicker.data(),
+            prevMonth =
+              datePickerData.bsMonth - 1 > 0 ? datePickerData.bsMonth - 1 : 12,
+            prevYear =
+              12 !== prevMonth
+                ? datePickerData.bsYear
+                : datePickerData.bsYear - 1,
+            prevDate = datePickerData.bsDate;
+          return prevYear < datePickerPlugin.options.yearStart ||
+            prevYear > datePickerPlugin.options.yearEnd
+            ? null
+            : (datePickerPlugin.setCalendarDate(
+                $nepaliDatePicker,
+                prevYear,
+                prevMonth,
+                prevDate
+              ),
+              void datePickerPlugin.renderMonthCalendar($nepaliDatePicker));
+        },
+        renderNextMonthCalendar: function ($nepaliDatePicker) {
+          var datePickerData = $nepaliDatePicker.data(),
+            nextMonth =
+              datePickerData.bsMonth + 1 <= 12 ? datePickerData.bsMonth + 1 : 1,
+            nextYear =
+              1 !== nextMonth
+                ? datePickerData.bsYear
+                : datePickerData.bsYear + 1,
+            nextDate = datePickerData.bsDate;
+          return nextYear < datePickerPlugin.options.yearStart ||
+            nextYear > datePickerPlugin.options.yearEnd
+            ? null
+            : (datePickerPlugin.setCalendarDate(
+                $nepaliDatePicker,
+                nextYear,
+                nextMonth,
+                nextDate
+              ),
+              void datePickerPlugin.renderMonthCalendar($nepaliDatePicker));
+        },
+        renderFormattedSpecificDateCalendar: function (
+          $nepaliDatePicker,
+          dateFormat,
+          dateFormattedText
+        ) {
+          var datePickerDate = calendarFunctions.parseFormattedBsDate(
+            dateFormat,
+            dateFormattedText
+          );
+          datePickerPlugin.setCalendarDate(
+            $nepaliDatePicker,
+            datePickerDate.bsYear,
+            datePickerDate.bsMonth,
+            datePickerDate.bsDate
+          ),
+            datePickerPlugin.renderMonthCalendar($nepaliDatePicker);
+        },
+      };
+      return (
+        this.each(function () {
+          var $element = $(this);
+          datePickerPlugin.init($element);
+        }),
+        datePickerPlugin.addCommonEventHandler(),
+        this
+      );
+    });
+})(jQuery, calendarFunctions);