SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

done capital po pdf changes

Browse Source
This commit is contained in:
gandhimathi 2017-09-15 10:53:51 +05:30
parent 52d45d34fd
commit c554b250e2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/models/purchaseorder_model.php
View File

@ -1599,14 +1599,14 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
}
// get capital tax listing by po no
function GetCapitalTaxListDetails($PONO = '',$CapitalRange=''){
function GetCapitalTaxListDetails($PONO = '',$CapitalRange=''){
if($CapitalRange==1){
$taxQuery ='SELECT group_concat(pl.MaterialCode ORDER BY pl.MaterialCode ASC) as Itemcode,SUM(st.`After_CGST`) AS TotalCGST,SUM(st.`After_SGST`) AS TotalSGST,SUM(st.`After_IGST`) AS TotalIGST,SUM(st.`otherallowance`) AS TotalOtherAllowance,SUM(st.`Afterdiscountval`) AS TotalDiscount,st.discountval,st.Afterdiscountval,st.CGST,st.SGST,st.IGST,st.otherallowance FROM kasiram9_SIADEV.T_Service_Tax st
join T_PurchaseOrder_LineItem pl on pl.LineItemNo=st.LineItemNo
join T_PurchaseOrder_Master pm on pm.PONO=pl.PONO
where pm.POType=? and pm.PONO=?
group by st.discountval,st.CGST,st.SGST,st.IGST,st.otherallowance ORDER BY st.LineItemNo ASC';
group by st.Afterdiscountval,st.CGST,st.SGST,st.IGST,st.otherallowance ORDER BY st.LineItemNo ASC';
$query = $this->db->query($taxQuery,array("CAPITAL",$PONO));
return $query->result();
@ -1616,7 +1616,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_PurchaseOrder_LineItem pl on pl.LineItemNo=it.LineItemNo
join T_PurchaseOrder_Master pm on pm.PONO=pl.PONO
where pm.POType=? and pm.PONO=?
group by it.FreightValue ORDER BY it.LineItemNo ASC';
group by it.AfterFreightValue ORDER BY it.LineItemNo ASC';
$query = $this->db->query($taxQuery,array("CAPITAL",$PONO));
return $query->result();

14
application/views/capitalpopdf.php
View File

@ -245,7 +245,7 @@
<td><?php $date = new DateTime($ReqDetails['ReqDate'],new DateTimeZone('Asia/Kolkata')); $date=$date->format("d-m-Y"); echo $date; ?></td>
<td><strong>Dept:</strong> <?php echo $ReqDetails['RequestedDept']; ?></td>
<td><strong>CCD: </strong><?php echo $ReqDetails['CostCenterCode']; ?></td>
<td><strong>Fin cap:</strong><!-- <?php echo $finCap; ?> --></td>
<td><strong>Fin cap:</strong><?php echo $finCap; ?></td>
</tr>
<?php } } ?>
</tbody>
@ -254,8 +254,8 @@
<div class="page" style="height:98%;border:2px solid;font-size:12px;border-bottom:0px;">
<p><strong>Mode of Shipment</strong>: By road</p><!--data should be come-->
<p><strong>Insurance : </strong></p>
<p><strong>Mode of Shipment</strong>: <?php echo $modShp; ?></p><!--data should be come-->
<p><strong>Insurance : <?php echo $insNo; ?></strong></p>
<p>Please arrange to deliver the materials listed below as per schedule to our works</p>
<table style="border-collapse: collapse; height: 36px; width: 100.3%;" border="1" cellspacing="0" cellpadding="0">
<tbody>
@ -396,11 +396,11 @@
$TotalFreight='-';
?>
<td><?php echo $st->discountval;?></td><!--data should be come-->
<td><?php echo $st->TotalDiscount;?></td><!--data should be come-->
<td><?php echo $st->CGST;?></td><!--data should be come-->
<td><?php echo $st->SGST;?></td><!--data should be come-->
<td><?php echo $st->IGST;?></td><!--data should be come-->
<td><?php echo $st->otherallowance;?></td><!--data should be come-->
<td><?php echo $st->TotalOtherAllowance;?></td><!--data should be come-->
<td><?php echo '-';?></td><!--data should be come-->
<?php } else if($CapitalRange==0) {
$TotalCgst='-';
@ -415,7 +415,7 @@
<td><?php echo '-';?></td><!--data should be come-->
<td><?php echo '-';?></td><!--data should be come-->
<td><?php echo '-';?></td><!--data should be come-->
<td><?php echo $st->FreightValue;?></td><!--data should be come-->
<td><?php echo $st->TotalFreight;?></td><!--data should be come-->
<?php } ?>
@ -477,4 +477,4 @@
</div>
</body>
<?php die(); ?>