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

pdf

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-11-07 17:31:45 +05:30
parent 7e2c1ac2fa
commit 350d7fabe0
3 changed files with 1250 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1226
application/logs/log-2017-11-07.php
View File

File diff suppressed because it is too large Load Diff

2
application/models/purchaseorder_model.php
View File

@ -1663,7 +1663,7 @@ left join T_Employee_Details emp on Req.Requestedby = emp.EmpID
else if($CapitalRange==0){
$taxQuery ='SELECT group_concat(pl.MaterialCode ORDER BY pl.MaterialCode ASC) as Itemcode,
SUM(it.`AfterFreightValue`) AS TotalFreight,it.FreightValue,it.AfterFreightValue,
SUM(it.`IGST`) AS TotalIGST,SUM(it.AfterIGST) as AfterIGST1 FROM T_Import_Tax it
it.IGST AS TotalIGSTPer,SUM(it.AfterIGST) as AfterIGST1,it.AfterIGST as AIgst FROM T_Import_Tax it
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=?

35
application/views/capitalpopdf.php
View File

@ -360,11 +360,15 @@
<td style="text-align: center;"> <?php echo '-'; ?> </td>
<?php } ?>
<?php } else if($CapitalRange==0) {
<?php }
else if($CapitalRange==0) {
$TotalCgst='-';
$TotalSgst='-';
// $TotalIgst='-';
$TotalIgst=$TotalIgst+$st->TotalIGST;
$TotalIgst=$st->TotalIGSTPer;
$TotalIgst1=$TotalIgst1+$st->AIgst;
$TotalDiscount='-';
$TotalOtherAllowance='-';
$TotalFreight=$TotalFreight+$st->TotalFreight;
@ -372,16 +376,18 @@
<td style="text-align: center;"><?php echo '-';?></td>
<td style="text-align: center;"><?php echo '-';?></td>
<td style="text-align: center;"><?php echo '-';?></td>
<?php if($st->TotalIGST>0 && $st->TotalIGST!='') { ?>
<td> <?php echo $st->TotalIGST; ?> </td>
<?php } else { ?>
<td style="text-align: center;"> <?php echo '-'; ?> </td>
<?php } ?>
<!-- <td><?php echo '-';?></td> -->
<td> <?php echo $st->TotalIGSTPer; ?> </td>
<td style="text-align: center;"><?php echo '-';?></td>
<?php if($st->TotalFreight>0 && $st->TotalFreight!='') { ?>
<?php
if($st->TotalFreight>0 && $st->TotalFreight!='')
{ ?>
<td> <?php echo number_format($st->TotalFreight,2); ?> </td>
<?php } else { ?>
<?php }
else
{ ?>
<td style="text-align: center;"> <?php echo '-'; ?> </td>
<?php } ?>
<!-- <td><?php echo $st->TotalFreight;?></td> -->
@ -392,6 +398,11 @@
} ?>
</tbody>
</table>
<?php if($CapitalRange==1)
{ $TotalCgst1=$TotalCgst;
$TotalSgst1=$TotalSgst;
@ -402,7 +413,7 @@
}
else if($CapitalRange==0){
$TotalIgst1=$st->AfterIGST1;
$TotalIgst1=$TotalIgst1;
$TotalFreight1=$TotalFreight;