From 8ab38e64975310023f9167275f72775e43ba0a7b Mon Sep 17 00:00:00 2001
From: venbatechnologies <venbatechnologies@gmail.com>
Date: Sat, 10 Mar 2018 10:37:03 +0530
Subject: [PATCH] reports

---
 .../views/Report_Material_inward_Register.php | 116 +++++++++---------
 1 file changed, 57 insertions(+), 59 deletions(-)

diff --git a/application/views/Report_Material_inward_Register.php b/application/views/Report_Material_inward_Register.php
index a7959d2c..d3d290f0 100644
--- a/application/views/Report_Material_inward_Register.php
+++ b/application/views/Report_Material_inward_Register.php
@@ -153,7 +153,7 @@
 					   <th style="text-align:center">invoice Delivery Challan Date</th>
 					   <th style="text-align:center">Vehicle No</th>
 					   <th style="text-align:center">Time Inward</th>
-					 <!--   <th style="text-align:center">Time Outward</th> -->
+					   <th style="text-align:center">Time Outward</th>
 					 
                       </tr>
                     </thead>
@@ -168,66 +168,64 @@
 
 
 					  <tr>
-                       <td style="text-align:center;"><?php echo ++$i;?></td> 
+											<td style="text-align:center;"><?php echo ++$i;?></td>
+											<td ><?php
+												$CreatedDate=date("d-m-Y",strtotime($gmir->CreatedDate));
+												echo $CreatedDate;
+												?>
+											</td>
+											
+											<!-- <td><?php echo $gmir->CreatedDate;?></td>  <br><?php echo $gmir->Address ?>-->
+											<td><?php echo $gmir->SupplierName;?></td>
+											<td><?php echo $gmir->MaterialName;?></td>
+											<td><?php echo $gmir->Per;?></td>
+											<td><?php echo $gmir->Quantity;?></td>
+											<td><?php echo $gmir->ReceivedQuantity;?></td>
+											
+											
+											
+											<td style="text-align:right"><span><?php
+																		if($gmir->Quantity  >= $gmir->ReceivedQuantity){
+												
+												$Quantity= round($gmir->Quantity);
+												$ReceivedQuantity= round($gmir->ReceivedQuantity);
+												$Shortage=$Quantity - $ReceivedQuantity;
+																		echo  $Shortage;
+																		}else
+																		{
+																			echo '-';
+																		}
+											?></span></td>
+											<td style="text-align:right"><span><?php
+												if($gmir->Quantity  <= $gmir->ReceivedQuantity){
+												$Quantity= round($gmir->Quantity);
+												$ReceivedQuantity= round($gmir->ReceivedQuantity);
+												$Excess= $ReceivedQuantity -$Quantity ;
+												echo $Excess;
+												}else
+												{
+													echo '-';
+												}
+											?></span></td>
 
+                                            <td><?php echo $gmir->DeliveryChellanOrInvoiceNo;?></td>
+											<td ><?php
+												$DeliveryChellanDate=date("d-m-Y",strtotime($gmir->DeliveryChellanDate));
+												echo $DeliveryChellanDate;
+												?>
+											</td>
+											
+											<td><?php echo $gmir->VehicleNo;?></td>
 
-                        <td ><?php  
-                $CreatedDate=date("d-m-Y",strtotime($gmir->CreatedDate));
-                echo $CreatedDate;
-                 ?>
-                </td> 
-					  
-					  <!-- <td><?php echo $gmir->CreatedDate;?></td>  -->
-					  					     <td><?php echo $gmir->SupplierName;?></td>
-					   <td><?php echo $gmir->MaterialName;?></td>
-					     <td><?php echo $gmir->Per;?></td>
-					   <td><?php echo $gmir->Quantity;?></td>
-					     <td><?php echo $gmir->ReceivedQuantity;?></td>
-
-					    
-
-              <td style="text-align:right;"><?php 
-
-              if ($gmir->Quantity  >= $gmir->ReceivedQuantity){
-
-                $Quantity= round($gmir->Quantity);
-                   $ReceivedQuantity= round($gmir->ReceivedQuantity);
-                   $Shortage=$Quantity - $ReceivedQuantity;
-
-
-                echo   $Shortage;} else  ?></td> 
-
-                <!-- number_format($Rating, 2, '.', ' ') -->
-               <!--  h:i:sa -->
-
-					  
-					    <td><?php 
-					    {
-
-                $Quantity= round($gmir->Quantity);
-                   $ReceivedQuantity= round($gmir->ReceivedQuantity);
-                   $Excess= $ReceivedQuantity -$Quantity ;
-
-
-                echo   $Excess;}?></td>
-
-
-
-
-
-					   <td><?php echo $gmir->DeliveryChellanOrInvoiceNo;?></td>
-					     <td><?php echo $gmir->DeliveryChellanDate;?></td>
-					   <td><?php echo $gmir->VehicleNo;?></td>
-
-					            <td ><?php  
-                $time=date("g:i",strtotime($gmir->DeliveryChellanDate));
-                echo $time;
-                 ?>
-                </td>
-
-					   
-					
-					  </tr>
+											<td ><?php
+												$time=date('g:i a',strtotime($gmir->DeliveryChellanDate));
+												echo $time;
+												?>
+											</td>
+											<td>        </td>
+											
+											
+										</tr>
 			           <?php
 					   }