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

Revenue AmendmentPO Change

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-07-20 14:41:09 +05:30
parent 1ce1ed91b6
commit cf8c4a042d
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
application/views/Amendrevenuepopdf.php
View File

@ -53,10 +53,16 @@
$PaymentTerms = $PO->PaymentTerms; $PaymentTerms = $PO->PaymentTerms;
$PaymentDays=$PO->PaymentDays; $PaymentDays=$PO->PaymentDays;
$PayableAT=$PO->PayableAT; $PayableAT=$PO->PayableAT;
} }
} }
$currencyName='INR';
$currencyName='INR';
$currencyCode =''; $currencyCode ='';
if(!empty($CurrencySymbol)) if(!empty($CurrencySymbol))
{ {
@ -106,7 +112,7 @@
?> ?>
</div> </div>
<div>&nbsp;</div> <div>&nbsp;</div>
<center> <span style="font-size:24px;">SIDDHARTH INDUSTRIES - PURCHASE ORDER - <a style="color:#515151">PO NO:<?php echo $PONO?> </a></span></center> <center> <span style="font-size:24px;">SIDDHARTH INDUSTRIES - PURCHASE ORDER </span><br><span style="font-size:18px;">PO NO : <?php echo $PONO?></span></center>
<div style="border:1px solid;"> <div style="border:1px solid;">
<table width="100%"> <table width="100%">
<tbody> <tbody>
@ -268,12 +274,12 @@ $OrderValue = (( $SubTotalAmount + $AfterVAT +$AfterGST+$AfterOtherTaxes +$Insu
<table style="border-collapse: collapse;font-size:12px;" cellpadding="0" cellspacing="0" border="1" width="100%"> <table style="border-collapse: collapse;font-size:12px;" cellpadding="0" cellspacing="0" border="1" width="100%">
<tbody> <tbody>
<tr> <tr>
<td style="text-align: center;" colspan="4"> <td style="text-align: center;" colspan="3">
<p>Amended Details</p> <p>Amended Details</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="4"> <td colspan="3">
<?php <?php
if(!empty($POItem)) if(!empty($POItem))
{ {
@ -287,15 +293,17 @@ $OrderValue = (( $SubTotalAmount + $AfterVAT +$AfterGST+$AfterOtherTaxes +$Insu
</tr> </tr>
<tr> <tr>
<td style="text-align: center;"><strong>Item Description</strong></td> <td style="text-align: center;"><strong>Item Description</strong></td>
<td style="text-align: center;">previous Details</td><td style="text-align: center;" colspan="2">Current Details</td> <td style="text-align: center;" rowspan="2"><strong>Previous Details</strong></td><td style="text-align: center;" rowspan="2" ><strong>Current Details</strong></td>
</tr> </tr>
<?php if(!empty($POItem)) <?php if(!empty($POItem))
{ {
foreach($POItem as $record) foreach($POItem as $record)
{ {
echo $record->lineamd ;?> echo $record->LineAmend ;
}
<?php }
} ?> } ?>
</tbody> </tbody>
</table> </table>
@ -303,18 +311,18 @@ $OrderValue = (( $SubTotalAmount + $AfterVAT +$AfterGST+$AfterOtherTaxes +$Insu
<table style="border-collapse: collapse;font-size:12px;" cellpadding="0" cellspacing="0" border="1" width="100%"> <table style="border-collapse: collapse;font-size:12px;" cellpadding="0" cellspacing="0" border="1" width="100%">
<tbody> <tbody>
<tr> <tr>
<td style="text-align: center;" rowspan="3"><strong>Total Amount In Words</strong><br /><br /><b><i><?php echo $TotalAmountInWords." "."Only.";?></i></b></td> <td style="text-align: center;" rowspan="3"><strong>Total Amount In Words :</strong><br /><br /><b><i><?php echo $TotalAmountInWords." "."Only.";?></i></b></td>
<td style="text-align: right;">&nbsp;<strong>Total Amount Before Tax In INR&nbsp;&nbsp; <?php echo number_format($SubTotalAmount,2); ?></strong></td> <td style="text-align: right;">&nbsp;<strong>Total Amount Before Tax In INR : <?php echo number_format($SubTotalAmount,2); ?></strong></td>
</tr> </tr>
<tr> <tr>
<td style="text-align: right;">&nbsp;<strong>Total Tax Amount In INR&nbsp;&nbsp;<?php echo number_format(($OrderValue - $SubTotalAmount),2);?><strong></td> <td style="text-align: right;">&nbsp;<strong>Total Tax Amount In INR :<?php echo number_format(($OrderValue - $SubTotalAmount),2);?><strong></td>
</tr> </tr>
<tr> <tr>
<td style="text-align: right;">&nbsp;<strong>Total Amount After Tax In INR&nbsp;&nbsp; <?php echo number_format($OrderValue,2);?></strong></td> <td style="text-align: right;">&nbsp;<strong>Total Amount After Tax In INR : <?php echo number_format($OrderValue,2);?></strong></td>
</tr> </tr>
<tr> <tr>
<td> <td>
<p>&nbsp;Payment Terms</p> <p> <b>Payment Terms :</b> </p>
<p><?php echo $PaymentTerms;?></p> <p><?php echo $PaymentTerms;?></p>
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">

26
application/views/editRevenueAmendPO.php
View File

@ -72,7 +72,7 @@ if(!empty($POMaster))
$Pdt = new DateTime($Req->PODate); $Pdt = new DateTime($Req->PODate);
$PODate = $Pdt->format('Y-m-d'); $PODate = $Pdt->format('Y-m-d');
$DeliverOption = $Req->DeliveryOption; $DeliverOption = $Req->DeliveryOption;
$DeliverSchedule = $Req->DeliverySchedule; $DeliverSchedule = $Req->DeliverySchedule;
$Ddt = new DateTime($Req->DeliveryDate); $Ddt = new DateTime($Req->DeliveryDate);
$Deliverydt = $Ddt->format('Y-m-d'); $Deliverydt = $Ddt->format('Y-m-d');
@ -95,7 +95,7 @@ if(!empty($RequistionDetails))
//$Status=$ReqDet->Status; //$Status=$ReqDet->Status;
} }
} }
//echo $ServiceDescription;
foreach ($POSTATUS as $PST ) foreach ($POSTATUS as $PST )
{ {
@ -128,15 +128,14 @@ foreach ($POSTATUS as $PST )
</style> </style>
<!-- Latest compiled and minified CSS --> <!-- Latest compiled and minified CSS -->
<script src="<?php echo base_url()?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
<script src="<?php echo base_url() ?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
tinymce.init({ tinymce.init({
selector: "textarea#txtSpcialInstruction", selector: "textarea#txtSpcialInstruction"//,
plugins: "link image" //plugins: "link image"
}); });
</script> </script>
@ -1611,9 +1610,10 @@ body {
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-12"> <div class="col-md-12">
<label>Special Instructions </label> <?php <label>Special Instructions </label> <?php
$data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction', 'class' => 'form-control','rows' => '3', 'cols' => '40' ); $data = array('name' => 'txtSpcialInstruction','id'=>'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription), 'rows'=>'8','class' => 'form-control' );
echo form_textarea($data); echo form_textarea($data);
?> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="<?php echo $ServiceDescription;?>"> ?>
<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="<?php echo $ServiceDescription;?>">
</div> </div>
</div> </div>
<div class="row" style="padding: 2% 0%"> <div class="row" style="padding: 2% 0%">
@ -2112,11 +2112,11 @@ function Save(status)
//alert('Inside else'); //alert('Inside else');
stat = '<?php echo PO_RELEASED; ?>'; stat = '<?php echo PO_RELEASED; ?>';
var splinstr = $('#txtSpcialInstruction').val();
var deladd = $('#DeliveryAddr').val(); var deladd = $('#DeliveryAddr').val();
$('#txtStatus').val(stat); $('#txtStatus').val(stat);
tinyMCE.triggerSave();
var splinstr = $('#txtSpcialInstruction').val();
$('#SpcialInstruction').val(splinstr); $('#SpcialInstruction').val(splinstr);
$('#txtDeliveryAddress').val(deladd); $('#txtDeliveryAddress').val(deladd);
@ -2155,7 +2155,7 @@ $('#txtDeliveryAddress').val(deladd);
$('#txtStatus').val(''); $('#txtStatus').val('');
$('#SpcialInstruction').val(''); $('#SpcialInstruction').val('');
$('#txtDeliveryAddress').val('') $('#txtDeliveryAddress').val('')
window.location = "amendmentpurchaseorder"; //window.location = "amendmentpurchaseorder";
} }
else else