From 16246fbdeb31e35d0f1e2140beafe0c96a7296de Mon Sep 17 00:00:00 2001
From: Sampanna Rimal <smpnnrml51@gmail.com>
Date: Sun, 11 Aug 2024 17:29:32 +0545
Subject: [PATCH] changes

---
 account/application/libraries/Myaccounts.php  |   4 ++--
 .../views/accounts/balances/bygroup.php       |   5 +++--
 account/application/views/fiscalyear/list.php |   2 +-
 .../views/inventory/purchases/view.php        |  21 ++++++++++++++----
 .../views/inventory/sales/view.php            |   6 ++---
 .../views/inventory/stocks/summary.php        |   5 ++---
 account/pdf/ledgers/ledger_21.wpdf            | Bin 17716 -> 17716 bytes
 account/pdf/vouchers/Voucher_2.pdf            | Bin 73546 -> 73566 bytes
 8 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/account/application/libraries/Myaccounts.php b/account/application/libraries/Myaccounts.php
index 52535e5..c03be7b 100644
--- a/account/application/libraries/Myaccounts.php
+++ b/account/application/libraries/Myaccounts.php
@@ -1001,7 +1001,7 @@ 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>
                             <?php //print_r($ci->session->userdata());die; ?>
                             <?php if ($ci->session->userdata('LoggedUser') != 'admin'): ?>
@@ -1351,7 +1351,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/balances/bygroup.php b/account/application/views/accounts/balances/bygroup.php
index 7f57528..2c93472 100644
--- a/account/application/views/accounts/balances/bygroup.php
+++ b/account/application/views/accounts/balances/bygroup.php
@@ -38,6 +38,7 @@ $AccountCategories = $this->myaccounts->getChildAccountCategories();
                                         $drTotal += $AccountCategory->dr;
                                         $crTotal += $AccountCategory->cr;
                                     ?>
+                                    <!-- <?php //print_r($AccountCategory);die; ?> -->
                                         <tr>
                                             <td>
                                                 <a href="<?php echo site_url("accounts/reports/balance_by_ledger") . "?group=" . $AccountCategory->accategory_id; ?>">
@@ -46,8 +47,8 @@ $AccountCategories = $this->myaccounts->getChildAccountCategories();
                                             </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 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>
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/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/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 1833d3b..b4c9564 100644
--- a/account/application/views/inventory/stocks/summary.php
+++ b/account/application/views/inventory/stocks/summary.php
@@ -209,11 +209,10 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                   
                                     <?php $Total = 0;$PTotal=0;$STotal=0;$CTotal=0;
-                                    foreach ($StockRecords as $TableRow) :  ?>
+                                    foreach ($StockRecords as $index=>$TableRow) :  ?>
                                         <tr>
-<td></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>
diff --git a/account/pdf/ledgers/ledger_21.wpdf b/account/pdf/ledgers/ledger_21.wpdf
index d95d7efe471e93c2efac3a582a87d51947995b1f..1e5128b540b1ae1f30e73e84643d5223410e54d6 100644
GIT binary patch
delta 445
zcmV;u0Yd(?iUG8W0g#Y?Z`wc*hVT4}IW`9mJG0-p*?dS;5uwQHwW8Qi+6E^UX_bH9
zT?1l`sDv$fwd;4EnR#azJ`V(H3x5Z1KqOIm5aCq@$pbSQ2i91W8rCl`oDqy0_%bL;
z7)}X@Q3xnEFe&2^Ifq_@^%|{(vVu?fdfmM55Aal1+q#8K(?b3ZUhNJrt!r4UK33m<
z*AJ5&0Xl#4{xL#SCR|1Y!?1Cbsf_IzD9}@IC;7J9TY0mKhS{)a0otJPkR8w38VYy|
z25%wUlN4RHL?~sK$~Z44r(nTlr%|Xg=6L@m##wYO#eAJ#Ag89DDQseIZeoZGGN+t*
zzFg+z>^Z^7;2W7U&I)w@p-Cm9A!%`wVpd*AD*S&D@(z*;6*!ZUM$5^#hjN6@--B`r
ztxQox{*=#0iRnRkdvJzRd3B;WMm5r-Q5|emz3leM^l_M77X$_!b%Jl#PbxMBJ>RQV
z)}yAo)jHN|m|}y|nJ+%l44jO;O=P1V_4?PfOnHThQ(6A{+BScBx?p+e1s`qaV7oV<
nJ;x5tbn#c)8tCHsKcTD)ZnI+oN<j!QF)=eTF*7r>wL^aaD2>iL

delta 445
zcmV;u0Yd(?iUG8W0g#Y?kJ>;ChVT3eAKOFB*z?_6!iPk)VkwGxttbhUwo7&+w$=Xo
z&IDK{h)N_<Ml*TmvHjW%p9cc9g};LrAd)COi0~?d<bfHD18Xcw4eKWu&Ira0d>Ira
z45tLdC<K%nn3VB|oI|g{dX3gXS;2>Vy>4Fj2Y9HfZQa7AX(4|Ot#${P)-^0vZ>#UW
z>yMKi0Xl!<{!@ggOt?&V7>13bOlABI6zD0qlYHClt-RSq!)#cz0Bz8C$c|@i4F$Xe
zgSQawNs2C8B9yXAWt^9jQ?TH&(<sy#bG&~O<19LtV!qBVkW*976gIIpH!(y8nN!X@
zUoP`<_L$&g@QutFX9c?d(4>;lkhHi-F)J@575;w+c?U^_3Y<wvqvd4WLpeg{??E|*
zR;H*Tf5_*f#Pp!NJvhUuygJbwqZ;Yas1CNOo_70W`Z&z43j%|VI>EQ=Clwomp6^vF
z>rvC)Y8~q}OtHb~%olHI22RG_CbH3wdj0EKro2MMsVskfZks<nU9dd#f{(Uyu-zNb
no?{MYy7;SY4Rmq+AF}QYbF*UtN<j!PIWaXeFf}x@wL^aa{sz{N

diff --git a/account/pdf/vouchers/Voucher_2.pdf b/account/pdf/vouchers/Voucher_2.pdf
index 0472f3b1107cc34ea61368e31564667210dc6b2b..171fa1229eaf76639ca88542c5a19b6246f3c307 100644
GIT binary patch
delta 1265
zcmZXUv1(O85QbSvbwNQcSB%~pu0@n|Gdnvwvq*{*Nh{VqfrWxk5b_8i#gx%fY!u5#
zKs(b}*$F;_MM`rvDFXYS<{bW6zL|e!_FSBA{5jwF{O|1K$L|Lx|Igm{_t#I~-n`lo
zTT_45Z`ZTykK)1&wBoV%FwJ)rk9&sWjfh7?V~gXCC;}m61+BV+<~9Cygp?tqlxeI?
zNu1zZrQpp8;bVbHO~)#fS@MWrp*XrmR0!1ySaunWXeN$d9nru@7K4mg6^vxd@#Il&
zCu9_6=!N7qwq2!Iyz2->gbQRWge@-Y@x3D|^rC1%%`$3@;{M|_KXeFbHq?rO5v^FQ
zI)ejk4YbO3qusl`0u!&qm#L=R45O<?<GO2g<QiF|Wp6Hw(~5uvt8gvUT;pX&;JUjA
z?5ZoFRxLg()3fC9bD5qmU|A+N6q~E`^iHPOTc!B|CTYYHuUF~xu)tb*%aF5WSif47
p$4O2aY=12dS9VHYZ*s)tGTmLkpT(F;eB4Sg%cQgI?fn-AvnzEn|G@wN

delta 1292
zcmZuxJ&P4V5M<z@7nmFeqVJApaEgLB{W(2|fq|xCY-C_67#hgKpCASuin)Pu7@Z!N
z`X3bh4aS1AUZ8Kvjh61(ny%`a{eHIh^=$9`&(qhxPT!rJe0u)qfZL`n&*tf7_2)%{
zd)~cR_V0K=%LU<4JK%cctA)a3ZgpX-X*a;R=Z`_LRhn8>D=E|{=E<yzSHRhSaLw_I
zF6Sd{|2ktt#4{mr%<_%Y9dM39C}_6WsP~<3Z;hoGQv<~;2E(vPUb!@UufWTlL8R0U
zrU|!vwoo9uxFAIkcr0W4Uk1e%T~N^-b&EJP##*abi-4L{Jj2+|aToqsovGyG%R?59
zYpsI>>kVp7mLC=h26NreaCZ!bN6WHa%mpJG3#_v#&3DC`b3R-s1QHR1_acPmt7V~)
zZwE!O{J1XHis!d=xqSfnXf+~l9+s;&C}xsY6*k!_QNB1VZ=S$U#iG}l!a70xTy;18
oBOtB@>30p!mq%s)y3Vw%TFmY?s+^yXO0I^I)$#GY2lrRM0X@S4EC2ui