From cd8589f9929323f788bb2872a22d39cae594b934 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 2 Apr 2018 19:55:24 +0530
Subject: [PATCH] paidleave and stockdetails issues fixed in header

---
 application/views/attendance.php      |  6 ++-
 application/views/includes/header.php | 68 ++++++++++++++++-----------
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/application/views/attendance.php b/application/views/attendance.php
index 6fa04d89..9f61fb74 100755
--- a/application/views/attendance.php
+++ b/application/views/attendance.php
@@ -701,8 +701,10 @@ function myFunction(p,i,v)
 			}
 			else
 			{
-				absent = paidleave-2;
-				paidleave = 2;
+				// absent = paidleave-2;
+				// paidleave = 2;
+				absent = paidleave-1;
+				paidleave = 1;
 			}
 			document.getElementById(totalhrsid).textContent = parseFloat(totalworkingHrs).toFixed(2);// == ''?0:parseFloat(totalworkingHrs));
 			document.getElementById(totalothrsid).textContent = parseFloat(totalOTHrs).toFixed(2);// == ''?0:parseFloat(totalOTHrs));
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index ea324c85..dcd375b4 100644
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -807,7 +807,7 @@
 				<?php if($check ==1){break;}}}?>
 			<!-- Billing Menus and Cashbook Menus Ends -->
 
-			<!-- Inspection(IGR,MRIR) Menus and Stock Details Menus Starts-->
+			<!-- Inspection(IGR,MRIR) Menus Starts-->
 				<?php if(empty($DepAccesslist)){ 
 						if($DEPCode == STORE || $DEPCode == QUALITY || $DEPCode == SECURITY){ ?>
 					
@@ -850,7 +850,7 @@
 
 						<?php }?>
 
-						<?php if($DEPCode == QUALITY){?>
+						<!-- <?php if($DEPCode == QUALITY){?>
 						<li><a href="<?php echo base_url(); ?>quality">
 								<i class="fa fa-list-alt"></i>
 								<span>Product Test Specification Master</span>
@@ -869,7 +869,7 @@
 							  </a>
 							</li> 
 						<?php }?>
-                       
+                        -->
 						<?php }?>
 
 							<!-- <?php if($DEPCode == SECURITY){?>
@@ -893,18 +893,6 @@
 
 				        </ul>
                         </li>
-                        <?php if($DEPCode == STORE){?>
-							<li class="treeview">
-							<a href="<?php echo base_url(); ?>Stock">
-										<i class="fa fa-list-alt"></i>
-										<span>Stock Details</span>
-										<span class="pull-right-container">
-											<i class="fa fa-angle-right pull-right"></i>
-										</span>
-									</a>
-							</li>
-
-                        <?php }?> 
                      <?php }?>
                     <?php }
 
@@ -956,21 +944,9 @@
                         </ul>
                     </li> 
 
-                    <?php if($assd == STORE || $DEPCode == STORE){?>
-                  
-						<li class="treeview">
-						<a href="<?php echo base_url(); ?>Stock">
-									<i class="fa fa-list-alt"></i>
-									<span>Stock Details</span>
-									<span class="pull-right-container">
-										<i class="fa fa-angle-right pull-right"></i>
-									</span>
-								</a>
-						</li>
-                   <?php }?>
                     <?php }?>
                     <?php if($check ==1){break;}}}?>
-					<!-- Inspection(IGR,MRIR) Menus and Stock Details  Menus Ends-->
+					<!-- Inspection(IGR,MRIR) Menus Ends-->
 
 
 					<!-- Payslip Menus Starts -->
@@ -1174,6 +1150,42 @@
                   
                  <?php }?>
 				 <!-- Attendances Menus Ends -->
+				 <!-- Stock Details Menu Start -->
+				 <?php if(empty($DepAccesslist)){?>
+					<?php if($DEPCode == STORE){?>
+						<li class="treeview">
+						<a href="<?php echo base_url(); ?>Stock">
+									<i class="fa fa-list-alt"></i>
+									<span>Stock Details</span>
+									<span class="pull-right-container">
+										<i class="fa fa-angle-right pull-right"></i>
+									</span>
+								</a>
+						</li>
+                 <?php }?>
+                 <?php }
+
+                 else{?>
+
+                 <?php foreach($DepAccesslist as $dep){
+							$assd= $dep->AssDep;?>
+							<?php if($assd == STORE || $DEPCode == STORE){?>
+								<li class="treeview">
+						       <a href="<?php echo base_url(); ?>Stock">
+									<i class="fa fa-list-alt"></i>
+									<span>Stock Details</span>
+									<span class="pull-right-container">
+										<i class="fa fa-angle-right pull-right"></i>
+									</span>
+								</a>
+						  </li>
+							<?php }?>
+
+						 <?php }?>
+                  
+                 <?php }?>
+				<!-- Stock Details  Menus Ends -->
+
 
 			     <!-- Reports Menu Start -->
 				 <?php if(empty($DepAccesslist)){?>