From 3c353bf8bf27457723bf8f9b9150bfedda29a86c Mon Sep 17 00:00:00 2001
From: venbatechnologies <venbatechnologies@gmail.com>
Date: Fri, 29 Jun 2018 14:13:35 +0530
Subject: [PATCH] igramtvalueqtycurrect display

---
 .../controllers/amendmentpurchaseorder.php    | 24 +++++++++----------
 application/views/bankamountreceived.php      | 22 ++++++++++++++++-
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php
index 7b8f7002..b3897f09 100755
--- a/application/controllers/amendmentpurchaseorder.php
+++ b/application/controllers/amendmentpurchaseorder.php
@@ -378,7 +378,7 @@ class amendmentpurchaseorder extends BaseController
 								$CostCenter	= $this->input->post('costCode'.$i);
 								$ServiceFrequency=$this->input->post('Frequency'.$i);				
 								$LineItemNo = '';
-								$RecQtyvalue=0;
+								$RecQtyvalue=0.00;
 								$rowspanvalue=0;
 								
 								if(($Quantity-$preqty)!=0)
@@ -487,11 +487,11 @@ class amendmentpurchaseorder extends BaseController
 									$CAD="<tr><td rowspan=". $rowspanvalue .">".$MaterialCode."</td></tr>";
 									$CAD.=$CAD2;
 								}
-							    $ReceivedQty =  $this->purchaseorder_model->GetLineItemReceivedQty($PONO,$MaterialCode);
-                                if(count($ReceivedQty)>0)
-                                {
-                                         $RecQtyvalue =  $ReceivedQty[0]['ReceivedQuantity'];
-                                }
+							    // $ReceivedQty =  $this->purchaseorder_model->GetLineItemReceivedQty($PONO,$MaterialCode);
+           //                      if(count($ReceivedQty)>0)
+           //                      {
+           //                               $RecQtyvalue =  $ReceivedQty[0]['ReceivedQuantity'];
+           //                      }
 								
 								$POLineItemList = array('PONO'=>$NewPO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'ReceivedQuantity'=>$RecQtyvalue,'Quantity'=>$Quantity,'Per'=>$per,'ServiceMaterialDescription'=>$servicematerialdescription,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'AmendedDetails'=>$CAD);
 									
@@ -648,14 +648,14 @@ class amendmentpurchaseorder extends BaseController
 					$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
 					$ServiceFrequency=$this->input->post('Frequency'.$i);				
 					$LineItemNo = '';
-					$RecQtyvalue=0;
+					$RecQtyvalue=0.00;
 					$rowspanvalue=0;
-				    $ReceivedQty =  $this->purchaseorder_model->GetLineItemReceivedQty($PONO,$MaterialCode);
+				  //   $ReceivedQty =  $this->purchaseorder_model->GetLineItemReceivedQty($PONO,$MaterialCode);
 					
-					 if(count($ReceivedQty)>0)
-					 {
-						$RecQtyvalue =  $ReceivedQty[0]['ReceivedQuantity'];
-					 }
+					 // if(count($ReceivedQty)>0)
+					 // {
+						// $RecQtyvalue =  $ReceivedQty[0]['ReceivedQuantity'];
+					 // }
 					 
 					 if($Quantity != $beforeQuantity)
 					 {
diff --git a/application/views/bankamountreceived.php b/application/views/bankamountreceived.php
index 9de759ed..34c331f5 100644
--- a/application/views/bankamountreceived.php
+++ b/application/views/bankamountreceived.php
@@ -156,7 +156,13 @@ foreach($financialyear as $item)
 					    <input type="hidden" name="btc" id="btc<?php echo $i ?>" value="<?php echo $ap->cbalancetocleared?>"/>
 						 <input type="hidden" name="mapid" id="mapid<?php echo $i ?>" value="<?php echo  $ap->ID?>?>"/>
 					   
-						<td align="left" id="date<?php echo $i ?>"><span><?php echo  $ap->indate?></span></td>
+						<!-- <td align="left" id="date<?php echo $i ?>"><span><?php echo  $ap->indate?></span></td> -->
+
+  <td align="left"><?php  $Pdt = new DateTime($ap->indate);
+                    $Created_Date =  $Pdt->format('d-m-Y');
+          echo $Created_Date
+          ?></td>
+
 						<td align="left" id="invno<?php echo $i ?>"><a href="<?= base_url() ?>cashbook/mappingcredit?sid=<?php echo $ap->invoiceno;?>"><span><?php echo  $ap->invoiceno?></span></a></td>
 						<!--<td align="left"><a href="<?= base_url() ?>cashbook/bankreceipt?sid=<?php echo $t->PONO;?>"><span><?php echo  $t->PONO?></span></a></td>-->
 						
@@ -241,6 +247,7 @@ 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> 
 function invoice(i)
@@ -278,8 +285,20 @@ var bankingbalclear=$('#btc'+i).val();
 	 	  });
 
 }
+</script>
+
+<script>
 	$(document).ready(function() {
+    $.fn.dataTable.moment( 'DD-MM-YYYY' );
+
     table = $('#req').DataTable( {
+
+ "aaSorting": [[ 0, "desc" ]],
+      "info": true,
+
+        "autoWidth": false,
+        orderCellsTop: true,
+
         "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>>",
@@ -339,6 +358,7 @@ $( function() {
 		}
 	} );
 </script>
+<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>