From f488c286bdfd659c412aa48cbb21f6b63660d0ec Mon Sep 17 00:00:00 2001
From: Sampanna Rimal <smpnnrml51@gmail.com>
Date: Wed, 21 Aug 2024 13:47:09 +0545
Subject: [PATCH] daterangefix and vouchertextremove

---
 .../controllers/accounts/Ledger.php           |   2 ++
 .../controllers/accounts/Vouchers.php         |   2 ++
 .../application/helpers/bibhelper_helper.php  |   4 +--
 account/application/libraries/Myaccounts.php  |  31 ++++++++++++++++--
 .../views/accounts/ledger/partywise.php       |   2 +-
 .../views/accounts/vouchers/create.php        |   2 +-
 .../views/accounts/vouchers/listvouchers.php  |   5 +--
 account/pdf/ledgers/ledger_29.wpdf            | Bin 17710 -> 17709 bytes
 8 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/account/application/controllers/accounts/Ledger.php b/account/application/controllers/accounts/Ledger.php
index f68d59c..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'];
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/helpers/bibhelper_helper.php b/account/application/helpers/bibhelper_helper.php
index ecdbd98..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
 }
diff --git a/account/application/libraries/Myaccounts.php b/account/application/libraries/Myaccounts.php
index 2c388ee..06dfebb 100644
--- a/account/application/libraries/Myaccounts.php
+++ b/account/application/libraries/Myaccounts.php
@@ -664,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;
@@ -699,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>
@@ -776,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)
@@ -926,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();
@@ -1041,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>
@@ -1119,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
         }
         ?>
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/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/pdf/ledgers/ledger_29.wpdf b/account/pdf/ledgers/ledger_29.wpdf
index 69fdce499f22bdc4efe7a8efa49d4f8713cb3172..68176c4c7c4f9cd60b05c17c7aa5c13875923afe 100644
GIT binary patch
delta 653
zcmZ42#kjVMaY94Ashu5HaY<2XVlG$3oZd<P`L`Sdj=rzyvfRebZ@u|{@#aR45JAt0
zSF>F=EHvqwyJJh}{@QZhDW;2rA`ad9di(yFedav#-I%tv-d|j<FiFF<<AX-?lSav2
z=4>4=-q+z0=Q)?@*2syf_Ppop2;|T(H_(18#@+wsU{&umr^tit^)-9*>dmSvR;<pw
zdvMv?2bEX%T-f(-<MaN2I{SHV5|cQTd*fOk@v(m2uzc6;t)g3I2Xwfq<+zD`%Z&-#
ze~DSCS(;(0QVB~K=M(30|GVpMUKh17D;Hd3^w3C6qP=yoPx}7~CR^6<N&oYz*XEX8
z)R2ygYB0;NNon7^u8rwl^TzsUj^`?_<+_4iH_MIAp1!#;qTqU_$g391Is3Z`#pZe&
z#*3w&FgzpN>U-viR@(`M;!}}NPN&A5lNX-Dvu&c~!!-`y<!6N$Nll8&3p;b#*t1pN
z>7GN-L$-5EmYggylU)$gapitf5!YIuK-Yg0^wm0FI#$-^9sB+%$-Q_@))M!{@l`ig
zRoyi``JqrER-8qRFGi$h@1Lbf$rnDa%}TY++7-F>aV>8!kA>{dNB*}OCmY^&G5Z;|
zK3*^Nly=CRQ=hhPU-#Ga0_$mKv6>BYo8R7R_$D*?<?Hp^OfTI0y1(%}=Znp;OkR%c
zMuvt)MyAG-*Ey$&8YvinfI^-E7nosaZfImaS<}VJ&cG5)%D~Xj#27=&$jlH!%-Gyy
j@<JD3O;a=(Lvu{khUUh`7L)I~cyd^9sj9mAyKw;kF^UYa

delta 673
zcmZ46#kj7EaY94AnVlV1aY<2XVlG$3oZd;k`L`Sd+TQ=^vfRebZ@u~c&YKP@t2&mP
zc(qmOMu5~&znELA{_oq(c1kLcGx}53_4jthpU)Z8NO4{ftLwkl=&|UF!lBhXli1Tt
z_||OHFkKU$Xrn%3+lR`KDF*x072FgT+&QqO$6d!}6Z>n^DDG5N`T9>^cm2Kj=HbG1
z+e+DIZ)<)Y`q}CCujBLVoqqnU*xcT!*ke*9+GH(q=kUB&dDp`(<T)vb&D<avd1HH_
z`(Ho)4xT)Q5ThxH2ecY%PP|)r+w}LYrsL1_oI=!M)NFbV9}8S&^p9QSh31V(HM`$#
z-E-4*c}~O@hTIDkC-~B1d0F?c*Qak6c<0&mElO$1CjZn~(>Et?NLYVa;|gc-j(X9@
zI#$z@_UW9PkZkTRVzyB;+|Y$>X7D+sc)ia>|7JW$`OtfYGo5wU{|iedU7WCGN2H<t
zc@@!r9F@$Ttz2_FJtsfSv2w6<dY<oS*&4QNg;M<q@ySQNEZAdb@wmFOaFL~(>7~U9
zfwnoJd*97U`DJlt9XC^RU)90ur`1KJo9E?+YQGM=d^St=wW-g>gD=mB*I(k9)3et%
zWpe)4Ur&RU?QuG~Qm4N9^{sg3*bO#cn)tUBZ@4RcVP10juOF*(c}vRv>Q8vjrLsAO
z$;*-5z|zpj)Wmf1TIV!TV+8{cP{>o@0y7NF4UH@&Yq(g|8ycWV85kOxm|%z*nHgb-
n8JnA8h?!WLp@|uqW9l_DH#W8etDF4L#f8I?OI6j?-;E0Z2oV*H