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

import fixes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-14 15:41:06 +05:30
parent 858baee9a4
commit 67c9c6a156
3 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
application/views/Amendedimportpopdf.php
View File

@ -56,6 +56,18 @@
//$PaymentDays=$PO->PaymentDays; //$PaymentDays=$PO->PaymentDays;
//$PayableAT=$PO->PayableAT; //$PayableAT=$PO->PayableAT;
$PlaceofOrigin=$PO->Import_PlaceofOrgin; $PlaceofOrigin=$PO->Import_PlaceofOrgin;
if($PO->DeliveryOption=='1'){
$DeliveryDate = '';
$DeliverySchedule = $PO->DeliverySchedule;
$Import_DispatchDetails='';
}
else{
$dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata'));
$DeliveryDate = $dtDe->format('d-m-Y');
$DeliverySchedule = '';
$Import_DispatchDetails=$PO->Import_DispatchDetails;
}
} }
} }
//echo $SuplierName; //echo $SuplierName;
@ -146,7 +158,7 @@
</tr> </tr>
<tr> <tr>
<td>PO DATE :&nbsp;<?php echo $Podt?></td> <td>PO DATE :&nbsp;<?php echo $Podt?></td>
<td> DISPATCH INSTRUCTION/SCHEDULE BY :&nbsp;<?php echo $DeliveryDate.$DeliverySchedule;?></td> <td>DISPATCH INSTRUCTION/ SCHEDULE BY :&nbsp;&nbsp;<?php echo $Import_DispatchDetails.$DeliverySchedule;?></td>
<td>PLACE OF ORIGIN:&nbsp; <?php echo $PlaceofOrigin;?></td> <td>PLACE OF ORIGIN:&nbsp; <?php echo $PlaceofOrigin;?></td>
</tr> </tr>
</tbody> </tbody>
@ -234,7 +246,7 @@
<td align="right"><?php echo $record->Rate ; ?></td> <td align="right"><?php echo $record->Rate ; ?></td>
<td align="right"><?php $BasicValue=($record->Quantity*$record->Rate); <td align="right"><?php $BasicValue=($record->Quantity*$record->Rate);
echo number_format($BasicValue,2) ; ?></td> echo number_format($BasicValue,2,'.','') ; ?></td>
<!-- <td align="right"><?php echo $record->TotalOrderValue; ?></td> --> <!-- <td align="right"><?php echo $record->TotalOrderValue; ?></td> -->
<!-- <td align="right"><?php $TotalOrderValue=($record->Quantity*$record->Rate); <!-- <td align="right"><?php $TotalOrderValue=($record->Quantity*$record->Rate);
@ -346,7 +358,7 @@
<table style="border-collapse: collapse;" cellpadding="0" cellspacing="0" border="1" width="100%"> <table style="border-collapse: collapse;" cellpadding="0" cellspacing="0" border="1" width="100%">
<tbody> <tbody>
<tr> <tr>
<td style="text-align: center;" ><strong>Total Amount In Words</strong><br /><br /><em><?php echo $TotalAmountInWords." "."Only.";?></em></td> <td style="text-align: center;" ><strong>Total Amount In Words</strong><br /><br /><em><?php echo $TotalAmountInWords." ";?></em></td>
<td style="text-align: center;" ><strong>Total Amount In <?php echo "$CurrencyCode ($CurrencyName)" ;?> <?php echo "$TotalOrderValue1";?> </strong></td> <td style="text-align: center;" ><strong>Total Amount In <?php echo "$CurrencyCode ($CurrencyName)" ;?> <?php echo "$TotalOrderValue1";?> </strong></td>
</tr> </tr>

2
application/views/editimportpo.php
View File

@ -2636,7 +2636,7 @@ if($PONOStatus == PO_RELEASED)
<!-- <input type="text" name="txttot" id="txtPONO" value=<?php echo "$totalhidden";?>> --> <!-- <input type="text" name="txttot" id="txtPONO" value=<?php echo "$totalhidden";?>> -->
</div> </div>
<input type="hidden" name="txttot" id="txttot" value=""> <input type="hidden" name="txttot" id="txttot" value=<?php echo $totalhidden?>>
<div class="col-md-12"> <div class="col-md-12">

49
application/views/importpo.php
View File

@ -432,34 +432,45 @@ function vaildateBeforeOpenModal()
<?php <?php
$optionsPay = array("0"=>'Select Payment method'); $options1 = array("0"=>'Select Payment method');
if(!empty($Payment)) // if(!empty($Payment))
{ // {
foreach ($Payment as $pay2) // foreach ($Payment as $pay2)
if($Terms==$pay2->PaymentID){ // if($Terms==$pay2->PaymentID){
//echo "$Terms"; // //echo "$Terms";
//echo "$pay2->PaymentTerms"; // //echo "$pay2->PaymentTerms";
?>
<input type="hidden" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms?>"> // <?php
<?php
$optionsPay[$pay2->PaymentID] = $pay2->PaymentTerms; // $optionsPay[$pay2->PaymentID] = $pay2->PaymentTerms;
} // }
foreach ($Payment as $pay1): // foreach ($Payment as $pay1):
if($Terms!=$pay1->PaymentID){ // if($Terms!=$pay1->PaymentID){
$optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms; // $optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms;
} // }
endforeach; // endforeach;
} echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"' ,'required="true"' ,'class="form-control select2'); ?> // } echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"' ,'required="true"' ,'class="form-control select2');
if(!empty($Payment))
{
foreach ($Payment as $payment):
$options1[$payment->PaymentID] = $payment->PaymentTerms;
endforeach;
}
echo form_dropdown('PaymentTerms', $options1,set_value('PaymentTerms'),'id="PaymentTerms"' ,'class="form-control"'); ?>
</div> </div>
@ -1891,6 +1902,8 @@ $('#drpSupplier').change(function() {
$("#SupAddress").val(obj.Address); $("#SupAddress").val(obj.Address);
PaymentID = obj.PaymentID; PaymentID = obj.PaymentID;
PaymentID = obj.PaymentID;
$('#PaymentTerms').val(obj.PaymentTerms);
} }
}); });