From 0372efa232e83c43a56d0ecd43a645bbfe1d437b Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbinfotech.com>
Date: Wed, 6 Jun 2018 10:18:28 +0530
Subject: [PATCH] reorder level po bug

---
 application/models/cashbook_model.php       |  56 +++---
 application/views/BatchcardMaintListing.php | 101 +++++-----
 application/views/bankdebit.php             |   6 +-
 application/views/bankinvoice.php           |   4 +-
 application/views/bankstatement.php         | 194 +++++++++++++-------
 application/views/editOldRawmaterial.php    |  10 +-
 application/views/includes/header.php       |  16 +-
 application/views/materialadjustment.php    |   1 +
 8 files changed, 245 insertions(+), 143 deletions(-)

diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php
index 76d1d0cc..c66435c0 100755
--- a/application/models/cashbook_model.php
+++ b/application/models/cashbook_model.php
@@ -276,15 +276,11 @@ function bankstatement($fdate,$tdate,$fa,$aa){
 }
 function clearedbalance(){
 
-	$sql = 'SELECT SUM(cbalancetocleared) as credit,SUM(Balancetocleared)  as debit FROM T_bankreport';
-	// $sql = 'SELECT SUM(Clearbalance) - SUM(CClearbalance)  as creditdebit FROM T_bankreport';
+		$sql = 'SELECT SUM(cbalancetocleared) as credit,SUM(Balancetocleared)  as debit FROM T_bankreport';
+
+		$query = $this->db->query($sql);
+		return $query->result();   
 
-// $row = mysql_fetch_array($sql);
-// $sum = $row['total'];
-$query = $this->db->query($sql);
-	return $query->result();   
-// print_r($sum);
-// die();
 
 }
    
@@ -306,19 +302,25 @@ $query = $this->db->query($sql);
           $this->db->join('T_PurchaseOrder_AdvanceRequest PUADV','POM.PONO=PUADV.PONO','left');
           
 		  $this->db->join ('T_Bankporeport BR','BR.PONO = POM.PONO','left');
-		  $this->db->where_in('POM.Status',[ST044,ST056]);
-		  $this->db->where('POM.Paymentstatus !=','ST057');
-		  //$this->db->or_where('POM.Status',ST056);
-		  
-		  
-		 
-		   $this->db->where('POM.PODate BETWEEN "'. date('Y-m-d', strtotime($fdate)). '" and "'. date('Y-m-d', strtotime($tdate)).'"');
-		    $this->db->or_where('supp.SupplierID',$Supplierid);
-		 
-          $this->db->group_by('POM.PONO');
-		  $query = $this->db->get();
-          return $query->result();
-          
+		//   $this->db->where_in('POM.Status',[ST044,ST056]);
+		//   $this->db->where('POM.Paymentstatus !=','ST057');
+
+			if ($fdate and $tdate != ''){
+			$fromdate= date("Y-m-d",strtotime($fdate));
+			$todate=date("Y-m-d",strtotime($tdate));
+			$date = "date(igr.CreatedDate) >= '".$fromdate."'
+			and date(igr.CreatedDate) <= '".$todate."'";
+			$this->db->where($date);
+			}
+			if ($Supplierid != ''){
+			$this->db->where('supp.SupplierID',$Supplierid);
+			}
+			$this->db->where_in('POM.Status',[ST044,ST056]);
+			
+			$this->db->group_by('POM.PONO');
+			$query = $this->db->get();
+			return $query->result();
+			
     } 
 	function bankinvoice($Customer,$fdate,$tdate)
    {
@@ -332,10 +334,16 @@ $query = $this->db->query($sql);
 		  //$this->db->where('iva.receivedstatus !=','ST065');
 		  $this->db->where('iv.invoice_status_id','2');
 		  $this->db->where('iv.receivedstatus !=','ST065');
+		  if ($fdate and $tdate != ''){
+			$fromdate= date("Y-m-d",strtotime($fdate));
+			$todate=date("Y-m-d",strtotime($tdate));
+			$date = "date(iv.invoice_date_created) >= '".$fromdate."'
+			and date(iv.invoice_date_created) <= '".$todate."'";
+			$this->db->where($date);
+		   }
+		   if ($Customer != ''){
 		   $this->db->where('ic.client_id',$Customer);
-		  $this->db->or_where('iv.invoice_date_created BETWEEN "'. date('Y-m-d', strtotime($fdate)). '" and "'. date('Y-m-d', strtotime($tdate)).'"');
-		 
-		  
+		   }
 		   $this->db->group_by('iva.invoice_id');
           //$this->db->where('inc.type','PAYMENT');
 		  $query = $this->db->get();
diff --git a/application/views/BatchcardMaintListing.php b/application/views/BatchcardMaintListing.php
index 4549f477..94291e92 100755
--- a/application/views/BatchcardMaintListing.php
+++ b/application/views/BatchcardMaintListing.php
@@ -1,18 +1,29 @@
 
 
 <head>
-    <!-- <link rel="stylesheet" href=" https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
-    <link rel="stylesheet" href="     https://cdn.datatables.net/buttons/1.5.1/css/buttons.dataTables.min.css">
+    <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
 <style>
 
 
   .dataTables_wrapper .dt-buttons {
   float:none;  
   text-align:right;
+  margin:3px;
+ 
 }
 .dataTables_filter {
 text-align: right !important;
 }
+button.dt-button, div.dt-button, a.dt-button{
+
+  border: 1px solid blue;
+    border-radius: 2px;
+    background-color:orange;
+    color:black;
+    font-size:13px;
+}
+
+
 </style>
 
 </head>
@@ -76,7 +87,7 @@ text-align: right !important;
                               <input type="submit" class="btn btn-success" name="btn_submit"
                                      value="View Report">
      
-      </div> 
+                                  </div> 
       </div> 
 
 </form>
@@ -91,7 +102,7 @@ text-align: right !important;
             <div class="col-xs-12 col-md-12">
         
                
-                        <table id="mnttable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
+                        <table id="mnttable" class="table table-hover table-bordered" width="100%"  style="background-color:#fff;font-size:12px;" >
                         <thead style="background-color:#ddf">
                         <tr>
                         <th  colspan="4"><center>Maintenance Details</center></th>
@@ -120,6 +131,7 @@ text-align: right !important;
                               {
                                 //, Type, , , , , , ,   
                           ?>
+                              <tr>
                                                 
                       <td><?php if($ml->Type == 0){ echo "MAINTENANCES"; }else{echo "BREAKDOWN";} ?></td>
                       <!-- <td><?php echo $ml->Maint_Date ?></td>
@@ -140,39 +152,48 @@ text-align: right !important;
                       ?>
                     </tbody>
                     </table>
-                                               
-           
-          
-		</div>
-  </div>
- 
-  
-</form>
-</div>
-</section>
+                    </div>
+                    </div>
+                    </div>
+        </form>
+       </div>
+      </div>
+     </div>
+    </section>
 </div>
 
+ 
 <script type="text/javascript">
    
-  $(function () {
-   
-    $('#mnttable').DataTable({
-      dom: 'lBfrtip',
+   $(document).ready(function() {
+    table = $('#mnttable').DataTable( {
+        "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
+"<'row'<'col-md-6'><'col-md-6'>>" +
+"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
         buttons: [
-              'pdf'
-        ],
-      "paging": true,
-      "lengthChange": true,
-      "searching": true,
-      "ordering": true,
-      "info": true,
-      "autoWidth": true,
-      
-      
-     
-    }); 
-  });
-  
+            
+            {
+              
+                extend: 'pdf',
+                customize: function(doc) {
+  doc.content[1].margin = [ -25, 0, -25, 0 ] //left, top, right, bottom
+},
+               
+                text: 'Save pdf',
+				// footer: 'true',
+				// messageTop: $('h3').text(),
+				title: 'Maintenance/Breakdown Report',
+                exportOptions: {
+                columns: ':visible'
+					
+                }
+            },
+            
+            //  'colvis'
+            
+        ]
+    } );
+} );
 </script>
 <script>
 
@@ -215,13 +236,9 @@ $( function() {
 		}
 	} );
       </script>
-      <!-- <!-- <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-      <script src=" https://code.jquery.com/jquery-3.3.1.js"></script> -->
-      <!-- <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script> -->
-  <script src="https://cdn.datatables.net/buttons/1.5.1/js/dataTables.buttons.min.js"></script>
-  <script src="https://cdn.datatables.net/buttons/1.5.1/js/buttons.flash.min.js"></script> -->
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
-   <script src="https://cdn.datatables.net/buttons/1.5.1/js/buttons.html5.min.js"></script>
- <script src="https://cdn.datatables.net/buttons/1.5.1/js/buttons.print.min.js"></script>
\ No newline at end of file
+    <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+    <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
\ No newline at end of file
diff --git a/application/views/bankdebit.php b/application/views/bankdebit.php
index bcb0002f..9d73653e 100644
--- a/application/views/bankdebit.php
+++ b/application/views/bankdebit.php
@@ -130,7 +130,7 @@ foreach($financialyear as $item)
 					   <th>Supplier Name</th>
 					   <th>Total PO Amount (&#8377;)</th>
 					   <th>Balance payable (&#8377;)</th>
-					   <th>Balance Paid (&#8377;)</th>
+					   <th>Amount Paid (&#8377;)</th>
                       </tr>
                    </thead>
 				   <tbody>
@@ -218,6 +218,8 @@ foreach($financialyear as $item)
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
+	<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
+
 	
 <script> 
 	$(document).ready(function() {
@@ -241,7 +243,7 @@ foreach($financialyear as $item)
 	  		$('#bankid').val(bid);
 	  		document.getElementById("bid").innerHTML='Payment ID:' +bid;
          });/** foreach closed */
-		 
+		 $.fn.dataTable.moment( 'DD-MM-YYYY' );
     	table = $('#req').DataTable( {
         "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
 				"<'row'<'col-md-6'><'col-md-6'>>" +
diff --git a/application/views/bankinvoice.php b/application/views/bankinvoice.php
index 8cd18e37..a06df88f 100644
--- a/application/views/bankinvoice.php
+++ b/application/views/bankinvoice.php
@@ -229,6 +229,8 @@ foreach($financialyear as $item)
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
+	<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
+
 	
 <script> 
 	$(document).ready(function() {
@@ -250,7 +252,7 @@ foreach($financialyear as $item)
 	  		
 			  document.getElementById("bid").innerHTML='Payment ID:' +bid;
          });/** foreach closed */
-		
+		$.fn.datatable.moment('DD-MM-YYYY');
     	table = $('#req').DataTable( {
         		"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
 						"<'row'<'col-md-6'><'col-md-6'>>" +
diff --git a/application/views/bankstatement.php b/application/views/bankstatement.php
index 1039a1cb..da7c046b 100644
--- a/application/views/bankstatement.php
+++ b/application/views/bankstatement.php
@@ -32,20 +32,13 @@ $finyear  = $item->financial_year;
 
 
  
-     <!--<div class="row">
-        <div class="col-md-12">
-          <div id="container"></div>
-
-	</div>
- </div>-->
  <div class="content-wrapper">
      <section class="content" style="font-size: 12px;">
              <div id="content"></div>       
            
 
  
-        <!-- Left col -->
-        <!-- <div class="col-md-12"> -->
+      
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <!--<div class="box-header with-border">-->
@@ -63,8 +56,8 @@ $finyear  = $item->financial_year;
             // echo form_open($this->config->base_url().'/cashbook/bankdebitdata/',$attributes); ?>
 						<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>"> 
 
-			  <div class="row">
-			  <div class="modal" id="myModal" role="dialog">
+			 
+			 <div class="modal" id="myModaldebit" role="dialog">
 							<div class="modal-dialog modal-sm">
 							
 							  <!-- Modal content-->
@@ -76,15 +69,19 @@ $finyear  = $item->financial_year;
 								<div class="modal-body">
 										<div class="row">
 												<div class="col-md-12">
-												<div class="col-md-6">
-													   <select name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" title="Select Your Option">                             
-																 <option value="-1" style="color:#FFF;">Select Option</option>
+												<div class="col-md-12">
+													   <div  title="Select Your Option">                             
+																 <!-- <option value="-1" style="color:#FFF;">Select Option</option>
 																 <option value="1">Sales Receipts</option>
 																 <option value="2">Purchase Payments</option>
-																 <option value="3">Income/Expense</option>
-																 
-																 
-															 </select>
+																 <option value="3">Income/Expense</option> -->
+																
+																<!-- <input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="1"> <label for="contactChoice2">Sales Receipts</label><br>-->
+																 <input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="2"> <label for="contactChoice2">Purchase Payments</label><br>
+																 <input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="3"> <label for="contactChoice2">Income/Expense</label><br>
+
+
+															 </div>
 														 </div>
 												<div class="col-md-2">
 												<input type="hidden" name="Rowid" id="Rowid">
@@ -98,7 +95,7 @@ $finyear  = $item->financial_year;
 												</div>
 								</div>
 								<div class="modal-footer">
-								  <button type="button" id="myCheckBoxCancel" class="btn btn-default" data-dismiss="modal">Close</button>
+								  <button type="button" id="myCheckBoxCanceldebit" class="btn btn-default" data-dismiss="modal">Close</button>
 								</div>
 							  </div>
 							  
@@ -106,7 +103,64 @@ $finyear  = $item->financial_year;
 						  </div>
 						  
 						</div>
-						
+
+						<div class="row">
+
+
+				
+<div class="modal" id="myModalcredit" role="dialog">
+			  <div class="modal-dialog modal-sm">
+			  
+				<!-- Modal content-->
+				<div class="modal-content">
+				  <div class="modal-header">
+					<!-- <button type="button" class="close" data-dismiss="modal">&times;</button> -->
+					
+				  </div>
+				  <div class="modal-body">
+						  <div class="row">
+								  <div class="col-md-12">
+								  <div class="col-md-12">
+										 <div  title="Select Your Option">                             
+												   <!-- <option value="-1" style="color:#FFF;">Select Option</option>
+												   <option value="1">Sales Receipts</option>
+												   <option value="2">Purchase Payments</option>
+												   <option value="3">Income/Expense</option> -->
+												  
+												   <input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="1"> <label for="contactChoice2">Sales Receipts</label><br>
+												   <!--<input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="2"> <label for="contactChoice2">Purchase Payments</label><br>-->
+												   <input type="radio" name="selectedId" id="selectedId<?php echo $i?>" onchange="checkscreen(<?php echo $i?>);" value="3"> <label for="contactChoice2">Income/Expense</label><br>
+
+
+											   </div>
+										   </div>
+								  <div class="col-md-2">
+								  <input type="hidden" name="Rowid" id="Rowid">
+								  </div>
+								   
+								  <div class="col-md-2">
+								  <input type="hidden" id="addvalue" name="addvalue">
+								  </div>
+								 
+								  </div>
+								  </div>
+				  </div>
+				  <div class="modal-footer">
+					<button type="button" id="myCheckBoxCancelcredit" class="btn btn-default" data-dismiss="modal">Close</button>
+				  </div>
+				</div>
+				
+			  </div>
+			</div>
+			
+		  </div>
+	  
+  
+
+
+					
+				
+				
 			  
 			  
 			  <div class="col-md-2">
@@ -168,7 +222,7 @@ $finyear  = $item->financial_year;
                                value="View Report">
                         
 							</div> 
-							</div>
+							
 			   </form>
 			  
 			   
@@ -292,8 +346,9 @@ $finyear  = $item->financial_year;
 						
 						
 						
-						<td align="left"><span><?php echo  $t->Status?></span></td>
-						
+						<!-- <td align="left"><span><?php echo  $t->Status?></span></td> -->
+						<td align="left" id="dsta<?php echo $i ?>"><span><?php echo  $t->Status?></span></td>
+
 						
 						
 						
@@ -309,8 +364,9 @@ $finyear  = $item->financial_year;
 						
 						<td align="left" id="credited<?php echo $i ?>"><span><?php echo ($t->Credit)-($t->cclearbalance);?></span></td>
 						
-						
-						<td><?php echo $t->cstatus;?></td>
+						<td align="left" id="csta<?php echo $i ?>"><span><?php echo  $t->cstatus?></span></td>
+
+						<!-- <td><?php echo $t->cstatus;?></td> -->
 						<td><?php echo $t->Balance;?></td>
 
 				        
@@ -335,6 +391,7 @@ $finyear  = $item->financial_year;
 			       <input type="hidden" name="bankid1" id="bankid1">
 				</div>
 			   </div>
+			</div>
 			  </section>
 			</div>
      
@@ -368,39 +425,66 @@ var tcpaid='';
 // }
 
 
+
 function checkamount(type,ide)
 {
+	//alert(type);
 	//$('#addvalue').val('0.00');
 	// alert(ide);
 	globalModelValue = ide;
-	// var val = '#checkboxcheckbox'+globalModelValue;
+	
 	var checkInput = document.getElementById("checkboxcheckbox"+ide);
-	// console.log(checkInput.id);
-	// $('#checkboxcheckbox'+ide).on('change', function () {
-	if ($(checkInput).is(':checked')) {
-        $("#myModal").modal({
+	
+
+	var id=$('#dsta'+ide).text();
+	 var idc=$('#csta'+ide).text();
+	
+	if ($(checkInput).is(':checked'))
+	{
+		if(type==1 && id!= "CLOSE" )
+		{
+//alert(type)
+			//alert("debit");
+        $("#myModaldebit").modal({
             backdrop: 'static',
             eyboard: false
         });
+		}
+		   else if(type==0 && idc!= "CLOSE")
+		   {
+			//alert(type)
+			   //alert("credit");
+			$("#myModalcredit").modal({
+            backdrop: 'static',
+            eyboard: false
+        });
+		   }
+		else
+		{
+        //    alert('status is ddd closed');
+		}
     }
-// });
 
-// $('#myCheckBoxCancel').click(function() {
-// 	$('#checkboxcheckbox'+globalModelValue).attr('checked', false);
-// });
-$('#myCheckBoxCancel').click(function() {
+$('#myCheckBoxCanceldebit').click(function() {
 	
-	overalltype = undefined;
+	//overalltype = undefined;
+	$('#checkboxcheckbox'+globalModelValue).attr('checked', false);
+	location.reload();
+});
+
+$('#myCheckBoxCancelcredit').click(function() {
+	
+	//overalltype = undefined;
 	$('#checkboxcheckbox'+globalModelValue).attr('checked', false);
 	location.reload();
 });
 	var value=ide;
 	//alert('row id'+value);
 	i1=value;
+	//alert(i1)
 	type2= type;
 	amounttype=type2;
-	//alert(amounttype);
-	//alert('Type of row'+type2+'-'+amounttype);
+
  var totalpaid= document.getElementById("totalpaid"+value).innerText;
  tpaid=totalpaid;
  //alert('Paid Amount'+tpaid);
@@ -442,14 +526,7 @@ if (x==true)
 								 total=parseFloat(debit)+parseFloat(total);
 								 $('#addvalue').val(parseFloat(total).toFixed(2)); 
 									 });
-				//tot11=0;
-			    //tot11=parseFloat(tot11);
-			   
-			   //alert('tot11'+tot11);
-			   //tot11=parseFloat(tot11)+parseFloat(debit)
-			   //alert('afetr add tot11'+tot11);
-			   //alert(tot11+'checkvalue');
-			   //$('#addvalue').val(parseFloat(tot11));
+			
 			   if(debit==0)
 			   {
 				   alert('status is closed');
@@ -461,12 +538,9 @@ if (x==true)
 			
 			                 overalltype = 0;
 			                  var id=document.getElementById ("bankid"+value).innerText;
-							  //alert('value of current row id'+value);
-							   // var amount=document.getElementById ("credited"+value).innerText;
-							   // alert(amount+'rk');
+							  
 							  var tempid = "credited"+value;
-							 // alert(tempid+'creditlatest');
-							  //alert('Tempid ='+tempid)
+							 
 							  var credit=parseFloat(document.getElementById(tempid).innerText);
 							  //alert(credit+'credit');
 							  credit1=credit;
@@ -481,18 +555,12 @@ if (x==true)
 								
 								 var bankidc=credited[0];
 								 var creditc=credited[1];
-								// alert(creditc+'if');
+								
 								 totalcredit=parseFloat(creditc)+parseFloat(totalcredit);
-								// alert(totalc+'add');
+								
 								 $('#addvalue').val(parseFloat(totalcredit).toFixed(2)); 
 									 });
-							  
-							  // tot11=parseFloat(tot11);
-							  // tot11=0;
-							  // //alert('tot11-'+tot11);
-							  // tot11=parseFloat(tot11)+parseFloat(credit)
-							  // //alert('afetr add tot11-'+tot11);
-							  // $('#addvalue').val(tot11);
+							 
 			 
 		 }
 		 
@@ -563,15 +631,9 @@ if (x==true)
 				
 			}
 	
-	//$('#addvalue').val('');
-	  //$('#addvalue').val('0.00');
-	
-    // $('#addvalue').val(parseFloat(afterdeltot).toFixed(2));
-	  
 	 }
 		
-	}
-	
+	}	
 	
 	
 	
diff --git a/application/views/editOldRawmaterial.php b/application/views/editOldRawmaterial.php
index 80a09b51..39f6cb61 100755
--- a/application/views/editOldRawmaterial.php
+++ b/application/views/editOldRawmaterial.php
@@ -61,8 +61,16 @@ if(!empty($currentstock))
     }
 }
 
-
 ?>
+
+<?php 
+
+if($currentstock <= $reorder){
+      
+    echo '<script type="text/javascript">alert("Current Stock Low ");</script>';
+   
+}
+    ?>
 <script> 
 
 
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 4ad8c746..acd747e1 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -121,9 +121,9 @@ $(function() {
   height: 600px;
   overflow: auto;
 }
-::-webkit-scrollbar {
+/* ::-webkit-scrollbar {
 display: none;
-}
+} */
 		
     </style>
 
@@ -1892,11 +1892,13 @@ else{
                  <?php }?>
                  <?php }
 
-                 else{?>
+                
+                  else{?>
+								  <?php $check =0;?>
 
                  <?php foreach($DepAccesslist as $dep){
 							$assd= $dep->AssDep;?>
-							<?php if($assd == MANAGEMENT || $DEPCode == MANAGEMENT){?>
+							<?php if($assd == MANAGEMENT || $DEPCode == MANAGEMENT){$check = $check+1;?>
                               <li class="treeview">
                    				<a href="<?php echo base_url(); ?>reports">
                 				<i class="fa fa-dashboard"></i> <span>ReportList</span> 
@@ -1905,7 +1907,7 @@ else{
 
 							<?php }?>
 
-						 <?php }?>
+						 <?php if($check ==1){break;} }?>
                   
                  <?php }?>
         
@@ -1927,7 +1929,7 @@ else{
 					<li>
 					 
 								  <a href="<?php echo base_url(); ?>attendance">
-									<i class="fa fa-refresh fa-spin "></i>
+									<i class="fa fa-clock-o "></i>
 									<span>Monthly Attendance</span>
 								  </a>
 								</li>
@@ -1959,7 +1961,7 @@ else{
 										 <ul class="treeview-menu">
 							<li>
 								  <a href="<?php echo base_url(); ?>attendance">
-									<i class="fa fa-refresh fa-spin "></i>
+									<i class="fa fa-clock-o "></i>
 									<span>Monthly Attendance</span>
 								  </a>
 								</li>
diff --git a/application/views/materialadjustment.php b/application/views/materialadjustment.php
index 299af28b..957d3a8f 100644
--- a/application/views/materialadjustment.php
+++ b/application/views/materialadjustment.php
@@ -281,6 +281,7 @@ $('.getdetails').click(function()
    	   	  {
               addqty = obj.Addqty;
               reduceqty = obj.ReduceQty;
+             
 
               if(addqty == null)
               {