SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

igramtvalueqtycurrect display

Browse Source
This commit is contained in:
venbatechnologies 2018-06-29 14:13:35 +05:30
parent 34a3846913
commit 3c353bf8bf
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
application/controllers/amendmentpurchaseorder.php
View File

@ -378,7 +378,7 @@ class amendmentpurchaseorder extends BaseController
$CostCenter = $this->input->post('costCode'.$i); $CostCenter = $this->input->post('costCode'.$i);
$ServiceFrequency=$this->input->post('Frequency'.$i); $ServiceFrequency=$this->input->post('Frequency'.$i);
$LineItemNo = ''; $LineItemNo = '';
$RecQtyvalue=0; $RecQtyvalue=0.00;
$rowspanvalue=0; $rowspanvalue=0;
if(($Quantity-$preqty)!=0) if(($Quantity-$preqty)!=0)
@ -487,11 +487,11 @@ class amendmentpurchaseorder extends BaseController
$CAD="<tr><td rowspan=". $rowspanvalue .">".$MaterialCode."</td></tr>"; $CAD="<tr><td rowspan=". $rowspanvalue .">".$MaterialCode."</td></tr>";
$CAD.=$CAD2; $CAD.=$CAD2;
} }
$ReceivedQty = $this->purchaseorder_model->GetLineItemReceivedQty($PONO,$MaterialCode); // $ReceivedQty = $this->purchaseorder_model->GetLineItemReceivedQty($PONO,$MaterialCode);
if(count($ReceivedQty)>0) // if(count($ReceivedQty)>0)
{ // {
$RecQtyvalue = $ReceivedQty[0]['ReceivedQuantity']; // $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); $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); $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
$ServiceFrequency=$this->input->post('Frequency'.$i); $ServiceFrequency=$this->input->post('Frequency'.$i);
$LineItemNo = ''; $LineItemNo = '';
$RecQtyvalue=0; $RecQtyvalue=0.00;
$rowspanvalue=0; $rowspanvalue=0;
$ReceivedQty = $this->purchaseorder_model->GetLineItemReceivedQty($PONO,$MaterialCode); // $ReceivedQty = $this->purchaseorder_model->GetLineItemReceivedQty($PONO,$MaterialCode);
if(count($ReceivedQty)>0) // if(count($ReceivedQty)>0)
{ // {
$RecQtyvalue = $ReceivedQty[0]['ReceivedQuantity']; // $RecQtyvalue = $ReceivedQty[0]['ReceivedQuantity'];
} // }
if($Quantity != $beforeQuantity) if($Quantity != $beforeQuantity)
{ {

22
application/views/bankamountreceived.php
View File

@ -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="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?>?>"/> <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" 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>--> <!--<td align="left"><a href="<?= base_url() ?>cashbook/bankreceipt?sid=<?php echo $t->PONO;?>"><span><?php echo $t->PONO?></span></a></td>-->
@ -242,6 +248,7 @@ foreach($financialyear as $item)
<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.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/buttons/1.4.2/js/buttons.colVis.min.js"></script>
<script> <script>
function invoice(i) function invoice(i)
{ {
@ -278,8 +285,20 @@ var bankingbalclear=$('#btc'+i).val();
}); });
} }
</script>
<script>
$(document).ready(function() { $(document).ready(function() {
$.fn.dataTable.moment( 'DD-MM-YYYY' );
table = $('#req').DataTable( { table = $('#req').DataTable( {
"aaSorting": [[ 0, "desc" ]],
"info": true,
"autoWidth": false,
orderCellsTop: true,
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
"<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-6'><'col-md-6'>>" +
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
@ -339,6 +358,7 @@ $( function() {
} }
} ); } );
</script> </script>
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>