AMENDMENT PO'S

This commit is contained in:
velz2020 2017-07-07 20:29:08 +05:30
parent ba4e6ba405
commit 90d2ba19be
2 changed files with 4518 additions and 32 deletions

File diff suppressed because it is too large Load Diff

View File

@ -103,7 +103,6 @@ if(!empty($AvlBudAmt))
$AvlAmount = $AvlBudAmt;
}
?>
<style>
.modal
@ -151,11 +150,16 @@ window.onload = function()
document.getElementById('ExchangeRateOnDiv').style.display = 'none';
document.getElementById('ExchangeRateOnDiv').style.display = 'none';
document.getElementById('ExchangeRateDiv').style.display = 'none';
document.getElementById('currencyTypeDiv').style.display = 'none';
document.getElementById('ExchangeRateModalDiv').style.display = 'none';
document.getElementById('ExchangeRateModalEditDiv').style.display = 'none';
document.getElementById('ExchangeRateDiv').style.display = 'none';
document.getElementById('currencyTypeDiv').style.display = 'none';
document.getElementById('ExchangeRateModalDiv').style.display = 'none';
document.getElementById('ExchangeRateModalEditDiv').style.display = 'none';
document.getElementById('HideImportTaxTotal').style.display = 'none';
document.getElementById('ModalImportTaxHide').style.display = 'none';
document.getElementById('EditModalImportTaxHide').style.display = 'none';
capitalType='Domestic';
@ -549,23 +553,15 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
<input type="hidden" name="<?php echo 'materialName'.$index ?>" id="<?php echo 'materialName'.$index ?>" value="<?php echo $record->MaterialName ; ?>" />
<input type="hidden" name="<?php echo 'uom'.$index ?>" id="<?php echo 'uom'.$index ?>" value="<?php echo $record->UOM ; ?>" />
<input type="hidden" name="<?php echo 'quantity'.$index ?>" id="<?php echo 'quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
<input type="hidden" name="<?php echo 'rateInUs'.$index ?>" id="<?php echo 'rateInUs'.$index ?>" value="<?php echo $record->BasicPriceInMTon ; ?>" />
<input type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" />
<input type="hidden" name="<?php echo 'basicval'.$index ?>" id="<?php echo 'basicval'.$index ?>" value="<?php echo $record->BasicValue ; ?>" />
<?php if($CapitalRange=='1'){ ?>
<input type="hidden" name="<?php echo 'rateInUs'.$index ?>" id="<?php echo 'rateInUs'.$index ?>" value="<?php echo $record->Rate ; ?>" />
<?php } ?>
<?php if($CapitalRange=='0'){ ?>
<input type="hidden" name="<?php echo 'rateInUs'.$index ?>" id="<?php echo 'rateInUs'.$index ?>" value="<?php echo $record->BasicPriceInMTon ; ?>" />
<input type="hidden" name="<?php echo 'basicvalInINR'.$index ?>" id="<?php echo 'basicvalInINR'.$index ?>" value="<?php echo $record->ProductPrice ; ?>" />
<input type="hidden" name="<?php echo 'AfterServiceTax'.$index ?>" id="<?php echo 'AfterServiceTax'.$index ?>" value="<?php echo $record->ServiceTax ; ?>" />
<input type="hidden" name="<?php echo 'AfterEduCess'.$index ?>" id="<?php echo 'AfterEduCess'.$index ?>" value="<?php echo $record->EducessTax ; ?>" />
<input type="hidden" name="<?php echo 'AfterSecHighTax'.$index ?>" id="<?php echo 'AfterSecHighTax'.$index ?>" value="<?php echo $record->SecHigherEducessTax ; ?>" />
<input type="hidden" name="<?php echo 'AfterKrishiTax'.$index ?>" id="<?php echo 'AfterKrishiTax'.$index ?>" value="<?php echo $record->KrishiKalyantax ; ?>" />
<input type="hidden" name="<?php echo 'AfterSwachhTax'.$index ?>" id="<?php echo 'AfterSwachhTax'.$index ?>" value="<?php echo $record->SwachhBharattax ; ?>" />
<input type="hidden" name="<?php echo 'ServiceTotalOrderValue'.$index ?>" id="<?php echo 'ServiceTotalOrderValue'.$index ?>" value="<?php echo $record->ServiceTaxamount ; ?>" />
<input type="hidden" name="<?php echo 'beforeLanding'.$index ?>" id="<?php echo 'beforeLanding'.$index ?>" value="<?php echo $record->LandingCharge; ?>" />
<input type="hidden" name="<?php echo 'landingCharge'.$index ?>" id="<?php echo 'landingCharge'.$index ?>" value="<?php echo $record->AfterLandingCharge; ?>" />
<input type="hidden" name="<?php echo 'beforeHighSeasSalesCharge'.$index ?>" id="<?php echo 'beforeHighSeasSalesCharge'.$index ?>" value="<?php echo $record->HighSeasSalesCharge ; ?>" />
@ -606,6 +602,23 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
<input type="hidden" name="<?php echo 'PurQuantity'.$index ?>" id="<?php echo 'PurQuantity'.$index ?>" value="<?php echo $record->QuantityKG; ?>" />
<input type="hidden" name="<?php echo 'PerKgExpense'.$index ?>" id="<?php echo 'PerKgExpense'.$index ?>" value="<?php echo $record->ImportTotalValue; ?>" />
<?php } ?>
<input type="hidden" name="<?php echo 'basicval'.$index ?>" id="<?php echo 'basicval'.$index ?>" value="<?php echo $record->BasicValue ; ?>" />
<input type="hidden" name="<?php echo 'AfterServiceTax'.$index ?>" id="<?php echo 'AfterServiceTax'.$index ?>" value="<?php echo $record->ServiceTax ; ?>" />
<input type="hidden" name="<?php echo 'AfterEduCess'.$index ?>" id="<?php echo 'AfterEduCess'.$index ?>" value="<?php echo $record->EducessTax ; ?>" />
<input type="hidden" name="<?php echo 'AfterSecHighTax'.$index ?>" id="<?php echo 'AfterSecHighTax'.$index ?>" value="<?php echo $record->SecHigherEducessTax ; ?>" />
<input type="hidden" name="<?php echo 'AfterKrishiTax'.$index ?>" id="<?php echo 'AfterKrishiTax'.$index ?>" value="<?php echo $record->KrishiKalyantax ; ?>" />
<input type="hidden" name="<?php echo 'AfterSwachhTax'.$index ?>" id="<?php echo 'AfterSwachhTax'.$index ?>" value="<?php echo $record->SwachhBharattax ; ?>" />
<input type="hidden" name="<?php echo 'ServiceTotalOrderValue'.$index ?>" id="<?php echo 'ServiceTotalOrderValue'.$index ?>" value="<?php echo $record->ServiceTaxamount ; ?>" />
@ -630,7 +643,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
$TotalSummary = $TotalSummary+$record->ServiceTaxamount;
$TotalBasicAmount = $TotalBasicAmount+$record->BasicValue;
$ServiceDescription = $ServiceDescription;
if($CapitalRange=='0'){
$TotalLanding = $TotalLanding + $record->AfterLandingCharge;
$tothighseas = $tothighseas + $record->AfterHighSeasSalesCharge;
$totcustom = $totcustom + $record->AfterCustomDuty;
@ -647,6 +660,10 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
$totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty;
$ExchangeRate=$record->ExchangeRate;
}
// $totorder=$totorder+$record->TotalOrderValue;
$totalCapitalOrder = $totalCapitalOrder+$record->BasicValue;
@ -858,7 +875,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
</div>
</div>
<div class="col-md-12" style="padding:1%;" ></div>
<div class="col-md-12" style="border:1px solid #000;padding:0px;">
<div class="col-md-12" style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide" style="display:none;">
<br/>
<div class="col-md-6" style="padding:0px;">
<div class="col-md-12">
@ -1396,7 +1413,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
</div>
</div>
<div class="col-md-12" style="padding:1%;" ></div>
<div class="col-md-12" style="border:1px solid #000;padding:0px;">
<div class="col-md-12" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" style="display:none;">
<br/>
<div class="col-md-6" style="padding:0px;">
<div class="col-md-12">
@ -1805,7 +1822,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
</div>
<div class="col-md-12" style="padding:1%;" ></div>
<div class="col-md-12" style="border: 1px solid;padding:1% 0%;">
<div class="col-md-12" style="border: 1px solid;padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
<div class="col-md-4">
<label >Total Landing Charge :</label>
@ -1980,9 +1997,12 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset">
<?php if($POStatus == PO_DRAFT) {?>
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset">
<?php }else {?>
<input type="reset" class="btn btn-primary" value = "OK"> <?php } ?>
</div>
<br/>
@ -2886,7 +2906,7 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
var exchangeRate = $("#ExchangeRtModal").val();
var quantity = $("#CPQuantity").val();
var convertRate = $("#CPRate").val();
var itemRate = parseFloat(convertRate * exchangeRate).toFixed(2);
var itemRate = parseFloat(convertRate).toFixed(2);
var basicval = parseFloat($("#CPTotalAmount").val()).toFixed(2);
var AfterServiceTax = $("#AfterServiceTax").val();
var AfterEduCess = $("#AfterEduCess").val();
@ -3785,7 +3805,6 @@ $('#txtStatus').val(stat);
success:function(data) {
if(data)
{
alert(data);
$('#content').loader('hide');
$('#txtRowCount').val('');
@ -3793,8 +3812,8 @@ $('#txtStatus').val(stat);
$('#SpcialInstruction').val('');
$('#txtDeliveryAddress').val('');
// clearAfterAddLineItemAdd();
//window.location ="purchaseorderListing";
clearAfterAddLineItemAdd();
window.location ="purchaseorderListing";
}
else
@ -4059,7 +4078,7 @@ function clearAfterAddLineItemAdd(){
var exchangeRate = $("#EditExchangeRtModal").val();
var quantity = $("#EditCPQuantity").val();
var convertRate = $("#EditCPRate").val();
var itemRate = convertRate * exchangeRate;
var itemRate = convertRate;
var basicval = $("#EditCPTotalAmount").val();
var AfterServiceTax = $("#EditAfterServiceTax").val();
var AfterEduCess = $("#EditAfterEduCess").val();