'AMENDMENT'
This commit is contained in:
velz2020
parent
b392311a33
commit
b86ba943cf
@ -1252,9 +1252,9 @@ function GetCurrencytype()
|
||||
function getCapitalPurchaseOrderDetails($PONO = '')
|
||||
{
|
||||
|
||||
$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,
|
||||
Mat.UOM,Quantity,Rate,Req.Status,ROUND((ServiceTax.ServiceTax + ServiceTax.EducessTax + ServiceTax.SecHigherEducessTax + ServiceTax.KrishiKalyantax + ServiceTax.SwachhBharattax),2) as ServiceTaxamount
|
||||
,ServiceTax.TotalValue,ServiceTax,EducessTax,ServiceTax.SecHigherEducessTax,ServiceTax.KrishiKalyantax,ServiceTax.SwachhBharattax,
|
||||
$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
|
||||
Mat.UOM,Quantity,Rate,Req.Status,ROUND((ServiceTax.After_CGST + ServiceTax.After_SGST + ServiceTax.After_IGST + ServiceTax.otherallowance),2) as ServiceTaxamount
|
||||
,ServiceTax.TotalValue,ServiceTax.CGST,ServiceTax.After_CGST,ServiceTax.SGST,ServiceTax.After_SGST,ServiceTax.IGST,ServiceTax.After_IGST,ServiceTax.otherallowance,
|
||||
ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess,AfterCustomEdCess,ROUND((POMast.ExchangeRate*BasicPriceInMTon*Quantity),2) as BasicINRValue,Tax.TotalValue as ImportTotalValue,POMast.CurrencyType,
|
||||
|
||||
Req.CostCenterCode,Dept.DepartmentName FROM T_PurchaseOrder_LineItem LineItem
|
||||
@ -1316,9 +1316,9 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
|
||||
function getDomesticCapitalPurchaseOrderDetails($PONO = '')
|
||||
{
|
||||
|
||||
$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,
|
||||
Mat.UOM,Quantity,Rate,Req.Status,ROUND((ServiceTax.ServiceTax + ServiceTax.EducessTax + ServiceTax.SecHigherEducessTax + ServiceTax.KrishiKalyantax + ServiceTax.SwachhBharattax),2) as ServiceTaxamount
|
||||
,ServiceTax.TotalValue,ServiceTax,EducessTax,ServiceTax.SecHigherEducessTax,ServiceTax.KrishiKalyantax,ServiceTax.SwachhBharattax,
|
||||
$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
|
||||
Mat.UOM,Quantity,Rate,Req.Status,ROUND((ServiceTax.After_CGST + ServiceTax.After_SGST + ServiceTax.After_IGST + ServiceTax.otherallowance),2) as ServiceTaxamount
|
||||
,ServiceTax.TotalValue,ServiceTax.CGST,ServiceTax.After_CGST,ServiceTax.SGST,ServiceTax.After_SGST,ServiceTax.IGST,ServiceTax.After_IGST,ServiceTax.otherallowance,
|
||||
POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,ROUND((POMast.TotalOrderValue),2) as BasicINRValue,POMast.CurrencyType,
|
||||
|
||||
Req.CostCenterCode,Dept.DepartmentName FROM T_PurchaseOrder_LineItem LineItem
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -874,22 +874,39 @@ body {
|
||||
<div class="col-md-3">
|
||||
<span for="payablefrom">Payable Terms</span>
|
||||
<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms;?>">
|
||||
<select class="form-control required" id="PaymentTerms" name="PaymentTerms">
|
||||
|
||||
|
||||
<option value="<?php echo $Terms;?>" ><?php echo $Terms;?></option>
|
||||
|
||||
<?php
|
||||
if(!empty($payment))
|
||||
{
|
||||
foreach ($payment as $rl)
|
||||
{
|
||||
?>
|
||||
<option value="<?php echo $rl->ConfigValue ?>"><?php echo $rl->ConfigValue ?></option>
|
||||
<?php
|
||||
}
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
<?php
|
||||
|
||||
|
||||
|
||||
if(!empty($Payment))
|
||||
{
|
||||
|
||||
foreach ($Payment as $pay2)
|
||||
|
||||
if($Terms==$pay2->PaymentTerms){
|
||||
echo "$Terms";
|
||||
echo "$pay2->PaymentTerms";
|
||||
|
||||
$optionsPay[$pay2->PaymentTerms] = $pay2->PaymentTerms;
|
||||
|
||||
}
|
||||
|
||||
foreach ($Payment as $pay1):
|
||||
|
||||
if($Terms!=$pay1->PaymentTerms){
|
||||
|
||||
$optionsPay[$pay1->PaymentTerms] = $pay1->PaymentTerms;
|
||||
|
||||
}
|
||||
endforeach;
|
||||
}
|
||||
|
||||
echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"' ,'required="true"' ,'class="form-control select2');
|
||||
|
||||
?>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
@ -2198,14 +2215,14 @@ $('#Scheduleby').change(function(){
|
||||
|
||||
});
|
||||
});
|
||||
var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
|
||||
//console.log(Detail);
|
||||
// var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
|
||||
// //console.log(Detail);
|
||||
|
||||
$.each(Detail, function (index, value)
|
||||
{
|
||||
$("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
|
||||
// $.each(Detail, function (index, value)
|
||||
// {
|
||||
// $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
|
||||
|
||||
|
||||
|
||||
} );
|
||||
// } );
|
||||
</script>
|
||||
@ -116,8 +116,16 @@ foreach ($PaymentTerms as $TER)
|
||||
?>
|
||||
|
||||
<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
|
||||
<script src="<?php echo base_url() ?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
|
||||
tinymce.init({
|
||||
selector: "textarea#txtSpcialInstruction",
|
||||
|
||||
plugins: "link image"
|
||||
});
|
||||
var DelOpt = '<?php echo $DeliverOption; ?>';
|
||||
var SchName = '<?php echo $DeliverSchedule; ?>';
|
||||
var DelDt = '<?php echo $Deliverydt; ?>';
|
||||
@ -137,6 +145,14 @@ $('#Scheduleby').val(SchName);
|
||||
}
|
||||
});
|
||||
</script>
|
||||
<script src="<?php echo base_url() ?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
|
||||
<script>
|
||||
tinymce.init({
|
||||
selector: "textarea#ScopeofWork",
|
||||
|
||||
plugins: "link image"
|
||||
});
|
||||
</script>
|
||||
<script>
|
||||
|
||||
|
||||
@ -694,16 +710,16 @@ $(document).ready(function () {
|
||||
{
|
||||
//print_r($WorkStatus);
|
||||
foreach ($WorkStatus as $WorkSID):
|
||||
if($WrkStatus==$WorkSID->ConfigValue){
|
||||
if($WrkStatus==$WorkSID->StatusName){
|
||||
|
||||
$optionsWork[$WorkSID->ConfigValue] = $WorkSID->ConfigValue;
|
||||
$optionsWork[$WorkSID->StatusName] = $WorkSID->StatusName;
|
||||
}
|
||||
|
||||
|
||||
endforeach;
|
||||
foreach ($WorkStatus as $SID):
|
||||
if($WrkStatus!=$SID->ConfigValue){
|
||||
$optionsWork[$SID->ConfigValue] = $SID->ConfigValue;
|
||||
if($WrkStatus!=$SID->StatusName){
|
||||
$optionsWork[$SID->StatusName] = $SID->StatusName;
|
||||
}
|
||||
|
||||
|
||||
@ -750,19 +766,21 @@ $(document).ready(function () {
|
||||
if(!empty($Payment))
|
||||
{
|
||||
|
||||
foreach ($Payment as $pay2):
|
||||
foreach ($Payment as $pay2)
|
||||
|
||||
if($Terms==$pay2->ConfigValue){
|
||||
if($Terms==$pay2->PaymentTerms){
|
||||
//echo "$Terms";
|
||||
//echo "$pay2->PaymentTerms";
|
||||
|
||||
$optionsPay[$pay2->ConfigValue] = $pay2->ConfigValue;
|
||||
$optionsPay[$pay2->PaymentTerms] = $pay2->PaymentTerms;
|
||||
|
||||
}
|
||||
endforeach;
|
||||
|
||||
foreach ($Payment as $pay1):
|
||||
|
||||
if($Terms!=$pay1->ConfigValue){
|
||||
if($Terms!=$pay1->PaymentTerms){
|
||||
|
||||
// $optionsPay[$pay1->ConfigValue] = $pay1->ConfigValue;
|
||||
$optionsPay[$pay1->PaymentTerms] = $pay1->PaymentTerms;
|
||||
|
||||
}
|
||||
endforeach;
|
||||
@ -1019,7 +1037,7 @@ $(document).ready(function () {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-5 col-md-offset-4" align="right">
|
||||
<label><?php echo "Total Order Value ($INRSYM)";?></label>>
|
||||
<label><?php echo "Total Order Value ($INRSYM)";?></label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
@ -1947,15 +1965,15 @@ function calculateIgstTax(varBasicValue,Igst)
|
||||
return TAXval;// $('#AfterServiceTax').val(TAXval);
|
||||
|
||||
}
|
||||
var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
|
||||
//console.log(Detail);
|
||||
// var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
|
||||
// //console.log(Detail);
|
||||
|
||||
$.each(Detail, function (index, value)
|
||||
{
|
||||
$("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
|
||||
// $.each(Detail, function (index, value)
|
||||
// {
|
||||
// $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
|
||||
|
||||
|
||||
|
||||
} );
|
||||
// } );
|
||||
|
||||
</script>
|
||||
Loading…
Reference in New Issue
Block a user