new field in import, edit, amendment

This commit is contained in:
venbatechnologies@gmail.com 2017-09-07 10:17:08 +05:30
parent a0bc514809
commit 42d88da290
5 changed files with 330 additions and 17 deletions

View File

@ -1150,6 +1150,20 @@ function UpdateAmendServicePurchaseOrder()
$PaymentTerms=$this->input->post('PaymentTerms');
$beforePaymentTerms=$this->input->post('beforePaymentterms');
$Shipmentmode=$this->input->post('addmodeofshipment');
$SupplierRef=$this->input->post('amendsupplierreference');
$SupplierOffer=$this->input->post('amendsupplierofferno');
$otherRef=$this->input->post('amendotherreference');
$finCap=$this->input->post('amendfincap');
// addmodeofshipment
// amendsupplierreference
// amendsupplierofferno
// amendotherreference
// amendfincap
//echo $beforePaymentTerms;
//die();
if($PaymentTerms!=$beforePaymentTerms)
@ -1175,7 +1189,7 @@ function UpdateAmendServicePurchaseOrder()
//echo $RowCount;
// PO Master
// PO Master
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'POType'=>$POType,'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'Import_PlaceofOrgin'=>$Palaceoforigin,'AmendedDetails'=>$MAD);
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'POType'=>$POType,'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'Import_PlaceofOrgin'=>$Palaceoforigin,'Mode_Of_Shipment'=>$Shipmentmode,'Supplier_Reference'=>$SupplierRef,'Supplier_Offer_No'=>$SupplierOffer,'Other_Reference'=>$otherRef,'Fincap'=>$finCap,'AmendedDetails'=>$MAD);
//print_r($POMaster);
//die();

View File

@ -201,7 +201,7 @@ class purchaseorder extends BaseController
$AvlimportBudget = $this->purchaseorder_model->GetAvailableImportBudgetAmount($CostCode,$FYdt,$ReqType);
print_r($AvlimportBudget);
//print_r($AvlimportBudget);
// $AvlBudget = $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$Year,$ReqType);
@ -1343,12 +1343,18 @@ function addNewImportPurchaseOrder()
$Palaceoforigin=$this->input->post('PlaceOforigin');
// $Payableat=$this->input->post('PayableAT');
$Shipmentmode=$this->input->post('addmodeofshipment');
$SupplierRef=$this->input->post('addsupplierreference');
$SupplierOffer=$this->input->post('addsupplierofferno');
$otherRef=$this->input->post('addotherreference');
$finCap=$this->input->post('addfincap');
// $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType);
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin,'PaymentOtherDescription'=>$OtherPayment);
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin,'PaymentOtherDescription'=>$OtherPayment,'Mode_Of_Shipment'=>$Shipmentmode,'Supplier_Reference'=>$SupplierRef,'Supplier_Offer_No'=>$SupplierOffer,'Other_Reference'=>$otherRef,'Fincap'=>$finCap);
//print_r($POList);
//die();
@ -1547,13 +1553,20 @@ function addNewImportPurchaseOrder()
$OtherPayment=$this->input->post('Otherpayment');
$Palaceoforigin=$this->input->post('PlaceOforigin');
// $Payableat=$this->input->post('PayableAT');
$Shipmentmode=$this->input->post('editmodeofshipment');
$SupplierRef=$this->input->post('editsupplierreference');
$SupplierOffer=$this->input->post('editsupplierofferno');
$otherRef=$this->input->post('editotherreference');
$finCap=$this->input->post('editfincap');
// PO Master
// PO Master
// $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$updateddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms);
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin,'PaymentOtherDescription'=>$OtherPayment);
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin,'PaymentOtherDescription'=>$OtherPayment,'Mode_Of_Shipment'=>$Shipmentmode,'Supplier_Reference'=>$SupplierRef,'Supplier_Offer_No'=>$SupplierOffer,'Other_Reference'=>$otherRef,'Fincap'=>$finCap);
//echo $PONO;
//echo $TotalOrder;
//print_r($POList);

View File

@ -140,7 +140,12 @@ if(!empty($POMaster))
$DeliverySchedule=$Req->DeliverySchedule;
$ServiceDescription=$Req->ServiceDescription;
$DeliveryOption=$Req->DeliveryOption;
$Orderedsum=$Req->TotalOrderValue;
$Orderedsum=$Req->TotalOrderValue;
$Shipmentmode=$Req->Mode_Of_Shipment;
$SupplierRef=$Req->Supplier_Reference;
$SupOfferno=$Req->Supplier_Offer_No;
$Otherref=$Req->Other_Reference;
$Fincap=$Req->Fincap;
}
}
@ -571,7 +576,7 @@ if(!empty($RequistionDetails))
<div class="form-group">
<?php
$data = array('name' => 'addmodeofshipment','value' => set_value('addmodeofshipment'),'id'=>'addmodeofshipment', 'class' => 'form-control');
$data = array('name' => 'addmodeofshipment','value' => set_value('addmodeofshipment',$Shipmentmode),'id'=>'addmodeofshipment', 'class' => 'form-control');
echo form_input($data);
?>
</div>
@ -587,7 +592,7 @@ if(!empty($RequistionDetails))
<div class="form-group">
<?php
$data = array('name' => 'amendsupplierreference','value' => set_value('amendsupplierreference'),'id'=>'amendsupplierreference', 'class' => 'form-control');
$data = array('name' => 'amendsupplierreference','value' => set_value('amendsupplierreference',$SupplierRef),'id'=>'amendsupplierreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
@ -603,7 +608,7 @@ if(!empty($RequistionDetails))
<div class="form-group">
<?php
$data = array('name' => 'amendsupplierofferno','value' => set_value('amendsupplierofferno'),'id'=>'amendsupplierofferno', 'class' => 'form-control');
$data = array('name' => 'amendsupplierofferno','value' => set_value('amendsupplierofferno',$SupOfferno),'id'=>'amendsupplierofferno', 'class' => 'form-control');
echo form_input($data);
?>
</div>
@ -617,7 +622,7 @@ if(!empty($RequistionDetails))
<div class="form-group">
<?php
$data = array('name' => 'amendotherreference','value' => set_value('amendotherreference'),'id'=>'amendotherreference', 'class' => 'form-control');
$data = array('name' => 'amendotherreference','value' => set_value('amendotherreference',$Otherref),'id'=>'amendotherreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
@ -627,7 +632,7 @@ if(!empty($RequistionDetails))
<div class="form-group">
<?php
$data = array('name' => 'amendfincap','value' => set_value('amendfincap'),'id'=>'amendfincap', 'class' => 'form-control');
$data = array('name' => 'amendfincap','value' => set_value('amendfincap',$Fincap),'id'=>'amendfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>

View File

@ -74,7 +74,7 @@ if(!empty($INRSYMBOL))
//$Exchangerate=$ExchangeRate;
$index = 0;
$index = 0;
$SupId = '';
$SupName = '';
$Address = '';
@ -110,6 +110,11 @@ $Import_PlaceofOrgin='';
$DeliveryOption='';
$Orderedsum='';
$PaymentTermsCode='';
$Shipmentmode='';
$SupplierRef='';
$SupOfferno='';
$Otherref='';
$Fincap='';
if(!empty($POMaster))
{
@ -148,6 +153,11 @@ if(!empty($POMaster))
$ServiceDescription=$Req->ServiceDescription;
$Orderedsum=$Req->TotalOrderValue;
$PaymentTermsCode=$Req->PaymentOtherDescription;
$Shipmentmode=$Req->Mode_Of_Shipment;
$SupplierRef=$Req->Supplier_Reference;
$SupOfferno=$Req->Supplier_Offer_No;
$Otherref=$Req->Other_Reference;
$Fincap=$Req->Fincap;
}
}
//echo $ServiceDescription;
@ -551,7 +561,7 @@ if(!empty($RequistionDetails))
<div class="form-group">
<?php
$data = array('name' => 'editmodeofshipment','value' => set_value('editmodeofshipment'),'id'=>'editmodeofshipment', 'class' => 'form-control');
$data = array('name' => 'editmodeofshipment','value' => set_value('editmodeofshipment',$Shipmentmode),'id'=>'editmodeofshipment', 'class' => 'form-control');
echo form_input($data);
?>
</div>
@ -567,7 +577,7 @@ if(!empty($RequistionDetails))
<div class="form-group">
<?php
$data = array('name' => 'editsupplierreference','value' => set_value('editsupplierreference'),'id'=>'editsupplierreference', 'class' => 'form-control');
$data = array('name' => 'editsupplierreference','value' => set_value('editsupplierreference',$SupplierRef),'id'=>'editsupplierreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
@ -583,7 +593,7 @@ if(!empty($RequistionDetails))
<div class="form-group">
<?php
$data = array('name' => 'editsupplierofferno','value' => set_value('editsupplierofferno'),'id'=>'editsupplierofferno', 'class' => 'form-control');
$data = array('name' => 'editsupplierofferno','value' => set_value('editsupplierofferno',$SupOfferno),'id'=>'editsupplierofferno', 'class' => 'form-control');
echo form_input($data);
?>
</div>
@ -597,7 +607,7 @@ if(!empty($RequistionDetails))
<div class="form-group">
<?php
$data = array('name' => 'editotherreference','value' => set_value('editotherreference'),'id'=>'editotherreference', 'class' => 'form-control');
$data = array('name' => 'editotherreference','value' => set_value('editotherreference',$Otherref),'id'=>'editotherreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
@ -607,7 +617,7 @@ if(!empty($RequistionDetails))
<div class="form-group">
<?php
$data = array('name' => 'editfincap','value' => set_value('editfincap'),'id'=>'editfincap', 'class' => 'form-control');
$data = array('name' => 'editfincap','value' => set_value('editfincap',$Fincap),'id'=>'editfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>

View File

@ -186,6 +186,50 @@ function vaildateBeforeOpenModal()
}
else if($('#addmodeofshipment').val()=='')
{
alert('Please Enter Mode of Shipment');
$('#addmodeofshipment').focus();
return false;
}
else if($('#addsupplierreference').val()=='')
{
alert('Please Enter Supplier Reference');
$('#addsupplierreference').focus();
return false;
}
else if($('#addsupplierofferno').val()=='')
{
alert('Please Enter Supplier Offer No');
$('#addsupplierofferno').focus();
return false;
}
else if($('#addotherreference').val()=='')
{
alert('Please Enter Other Reference');
$('#addotherreference').focus();
return false;
}
else if($('#addfincap').val()=='')
{
alert('Please Enter Value In Fincap Field');
$('#addfincap').focus();
return false;
}
else
{
@ -1700,7 +1744,7 @@ function vaildateBeforeOpenModal()
<label>Freight Rate </label>
<div class="form-group">
<?php
$data = array('name' => 'edittxtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
$data = array('name' => 'txtEditFreight','value' => set_value('txtEditFreight'),'id'=>'txtEditFreight', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
echo form_input($data);
?>
</div>
@ -3490,6 +3534,233 @@ function EditCalculateCtable()
$('#drpFreight').change(function() {
var FreightType =$("#drpFreight").val();
if (FreightType == "PER TRIP")
{
$('#TripsValue').show();
}
else {
$('#TripsValue').hide();
}
if($('#Rate').val() != '' && $('#MaterialCode').val() != "0" )
{
selValue = $("#drpFreight").val() ;
$('#txtFreight').val('');
$('#txtAfterFreight').val('');
if (selValue == NilType)
{
$('#txtFreight').attr('readonly', 'true');
$('#txtFreight').val('0.00');
}
else
{
$('#txtFreight').removeAttr( 'readonly','true' );
$('#txtFreight').val('');
}
}
else
{
alert('Please Select MaterialCode and Rate Field Value');
$('#drpFreight').val("0");
$('#Rate').focus();
}
calculateFreight(0);
});
function calculateFreight(isEdit)
{
//alert();
if(isEdit == '0')
{
if($('#MaterialCode').val() == "0")
{
alert('Please Select the Material Code');
$('#MaterialCode').focus();
$('#txtFreight').val('') ;
return false;
}
else if($('#Rate').val() == '')
{
alert('Please Enter the Rate value');
$('#Rate').focus();
$('#txtFreight').val('') ;
return false;
}
else
{
var basicValue = parseFloat($('#txtBasicValue').val());
var FreightType =$("#drpFreight").val();
if(FreightType == "0")
{
alert('Please select Freight Type');
$('#txtFreight').val('');
$("#drpFreight").focus();
}
else if( $('#txtFreight').val() != "0" && $('#txtFreight').val() != '')
{
var FreightValue = parseFloat($('#txtFreight').val());
var UOM = parseFloat($('#UOM').val());
var Quantity = parseFloat($('#Quantity').val());
//alert(FreightType);
var AfterFreight = 0.0;
if(FreightType == PercentageType)
{
AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
}
else if(FreightType == NilType)
{
AfterFreight = 0.0;
}
else if(FreightType == '<?php echo LUMPSUM;?>')
{
AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;
}
else if(FreightType == '<?php echo PERUOM;?>')
{
AfterFreight = <?php echo FREIGHT_PERUOM;?>;
}
else if(FreightType == '<?php echo PERTRIP;?>')
{
if($('#NOOfTrips').val()==''){
alert('Please Enter No of Trip');
$("#NOOfTrips").focus();
$('#txtFreight').val(0)
AfterFreight=0;
$('#txtAfterFreight').val("0.00");
return false;
}
else{
var noOftrip = $("#NOOfTrips").val();
AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
}
}
else {
AfterFreight = $("#txtFreight").val();
}
var AfterFreightval = parseFloat(AfterFreight).toFixed(2);
$('#txtAfterFreight').val(AfterFreightval);
}
else
{
$('#txtAfterFreight').val("0.00");
}
}
// calculateTotalValue();
}
else
{
if($('#EditMaterialCode').val() == "0")
{
alert('Please Select the Material Code');
$('#EditMaterialCode').focus();
$('#txtEditFreight').val('');
return false;
}
else if($('#EditRate').val() == '')
{
alert('Please Enter the Rate value');
$('#EditRate').focus();
$('#txtEditFreight').val('');
return false;
}
else
{
var basicValue = parseFloat($('#txtEditBasicValue').val());
var FreightType =$("#drpEditFreight").val();
if(FreightType == "0")
{
alert('Please select Freight Type');
$('#txtEditFreight').val('');
$("#drpEditFreight").focus();
}
else if( $('#txtEditFreight').val() != "0" && $('#txtEditFreight').val() != '')
{
var FreightValue = parseFloat($('#txtEditFreight').val());
var UOM = parseFloat($('#EditUOM').val());
var Quantity = parseFloat($('#EditQuantity').val());
//alert(FreightType);
var AfterFreight = 0.0;
if(FreightType == PercentageType)
{
AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;
}
else if(FreightType == NilType)
{
AfterFreight = 0.0;
}
else if(FreightType == '<?php echo LUMPSUM;?>')
{
AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;
}
else if(FreightType == '<?php echo PERUOM;?>')
{
AfterFreight = <?php echo FREIGHT_PERUOM;?>;
}
else if(FreightType == '<?php echo PERTRIP;?>')
{
if($('#EditNOOfTrips').val()==''){
alert('Please Enter No of Trip');
$("#EditNOOfTrips").focus();
$('#txtEditFreight').val(0)
AfterFreight=0;
$('#txtEditAfterFreight').val("0.00");
return false;
}
else{
var noOftrip = $("#EditNOOfTrips").val();
AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
}
}
else {
AfterFreight = $("#txtEditFreight").val();
}
var AfterFreightval = parseFloat(AfterFreight).toFixed(2);
$('#txtEditAfterFreight').val(AfterFreightval);
}
else
{
$('#txtEditAfterFreight').val("0.00");
}
}
// calculateEditTotalValue();
}
}
$('.AddImport').click(function()
{