new fields added in capital po flow

This commit is contained in:
venbatechnologies@gmail.com 2017-09-05 13:07:46 +05:30
parent f33b7eee27
commit 3a0d778881
4 changed files with 5034 additions and 87 deletions

File diff suppressed because it is too large Load Diff

View File

@ -96,6 +96,7 @@ if(!empty($INRSYMBOL))
$(document).ready(function(){
$("#PaymentMethod").select2();
clearTotalItemValues();
$('#CapitalToatlOrder').val(0);
//Initialize Select2 Elements
@ -254,7 +255,7 @@ function vaildateBeforeOpenModal()
<div class="row">
<div class="col-md-12">
<div class="col-md-3">
<div class="col-md-12">
<div class="col-md-12" style="padding:0px;">
<label>Requistion No</label>
<?php
@ -272,7 +273,7 @@ function vaildateBeforeOpenModal()
?>
</div>
<div class="col-md-12" id="currencyOpt">
<div class="col-md-12" id="currencyOpt" style="padding:0px;">
<label>Currency Type</label>
<div class="form-group">
@ -381,7 +382,7 @@ function vaildateBeforeOpenModal()
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-12">
<div class="col-md-12" style="padding-left: 0px;">
<b><u>Select Delivery By</u></b>
<div style="display:inline-flex;">
@ -401,7 +402,7 @@ function vaildateBeforeOpenModal()
</div>
</div>
<div class="col-md-12" id="Schedulediv" style="padding-top: 3%;"> <br/>
<div class="col-md-12" id="Schedulediv" style="padding-top: 3%;padding-left: 0px;"> <br/>
<label >Schedule By </label>
<?php
@ -410,7 +411,7 @@ function vaildateBeforeOpenModal()
?>
</div>
<div class="col-md-12" id="Deliverydtdiv" style="display:none;padding-top: 3%;"> <br/>
<div class="col-md-12" id="Deliverydtdiv" style="display:none;padding-top: 3%;padding-left: 0px;"> <br/>
<label>Dispatch Instruction</label>
<?php
@ -422,7 +423,7 @@ function vaildateBeforeOpenModal()
?>
</div>
<div class="col-md-12" id="deliverydateby" style="display:none;padding-top: 3%;"> <br/>
<div class="col-md-12" id="deliverydateby" style="display:none;padding-top: 3%;padding-left: 0px;"> <br/>
<label>Delivery Date</label>
<div class="form-group">
<?php
@ -435,7 +436,7 @@ function vaildateBeforeOpenModal()
</div>
</div>
<div class="col-md-12" >
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-3" id="FromOnlineRate">
<a href="http://www.xe.com/" target="_blank"><u>Click here to check Today's Foreign Exchange value</u></a>
@ -471,7 +472,7 @@ function vaildateBeforeOpenModal()
</div>
</div> -->
<div class="col-md-4" id="PlaceOforigindiv">
<div class="col-md-4" id="PlaceOforigindiv" style="padding-left: 0px;">
<label>Place of Origin</label>
<div class="form-group">
<?php
@ -484,7 +485,85 @@ function vaildateBeforeOpenModal()
</div>
</div>
</div>
<div class="col-md-12">
<!--start new fields 1 sep-->
<div class="row">
<div class="col-md-12">
<div class="col-md-3">
<div class="col-md-12" style="padding: 0px;">
<label>Mode Of Shipment</label>
<div class="form-group">
<?php
$data = array('name' => 'addmodeofshipment','value' => set_value('addmodeofshipment'),'id'=>'addmodeofshipment', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-9" style="padding:0px;">
<div class="col-md-4" style="padding:0px;" >
<div class="col-md-12">
<label>Supplier Reference</label>
<div class="form-group">
<?php
$data = array('name' => 'addsupplierreference','value' => set_value('addsupplierreference'),'id'=>'addsupplierreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-12">
<label>Supplier's Offer No</label>
<div class="form-group">
<?php
$data = array('name' => 'addsupplierofferno','value' => set_value('addsupplierofferno'),'id'=>'addsupplierofferno', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;">
<label>Other Reference(S)</label>
<div class="form-group">
<?php
$data = array('name' => 'addotherreference','value' => set_value('addotherreference'),'id'=>'addotherreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'addfincap','value' => set_value('addfincap'),'id'=>'addfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>
</div><!--End new fields 1 sep-->
<div class="col-md-12" style="padding:0px;">
<div class="col-md-3">
@ -510,7 +589,7 @@ function vaildateBeforeOpenModal()
?>
</div>
<div class="col-md-4" id="otheroptiondiv" style="display:none;">
<div class="col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
<div class="form-group">
<?php
@ -566,14 +645,14 @@ function vaildateBeforeOpenModal()
<div class="modal-dialog">
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1060px;">
<div class="modal-content" style="width:1160px;">
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4>Add Capital Purchase Order Item </h4></center>
</div>
<div align="left">
<div class="col-md-12">
<div class="col-md-12">
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-5" style="padding:0px;">
<div class="col-md-6">
<label>Req No</label>
@ -639,8 +718,8 @@ function vaildateBeforeOpenModal()
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-2">
<label>Item Code</label>
<div>
@ -669,8 +748,8 @@ function vaildateBeforeOpenModal()
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-6" style="padding:0px;">
<div class="col-md-3">
<label>Quantity</label>
<div class="form-group">
<?php
@ -679,7 +758,7 @@ function vaildateBeforeOpenModal()
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3" style="padding-right: 0px;">
<label id="RateIn">Rate(In INR /UOM)</label>
<div class="form-group">
<?php
@ -688,7 +767,12 @@ function vaildateBeforeOpenModal()
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Per</label> <?php
$data = array('name' => 'AddPer','value' => set_value('AddPer'),'id'=>'AddPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label id="TotalAmount">Basic value in <?php echo "($INR)"?></label>
<div class="form-group">
<?php
@ -697,6 +781,7 @@ function vaildateBeforeOpenModal()
?>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
@ -1060,6 +1145,60 @@ function vaildateBeforeOpenModal()
</div>
</div>
</div>
<div class="col-md-12" style="padding:0px;">
<div class="col-md-3">
<span>Freight Type </span>
<div>
<?php
$options = array("0"=>'Select Freight Type');
//print_r( $options);
if(!empty($FreightType))
{
foreach ($FreightType as $SID):
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpFreight', $options,set_value('drpFreight'),'id="drpFreight"' ,'class="form-control "');
?>
</div>
</div>
<div class="col-md-3" id="TripsValue" style="display:none;">
<span>NO Of Trips</span>
<div class="form-group">
<?php
$data = array('name' => 'NOOfTrips','value' => set_value('NOOfTrips'),'id'=>'NOOfTrips', 'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<span>Freight Rate </span>
<div class="form-group">
<?php
$data = array('name' => 'txtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<span>Freight Amt In INR</span>
<div class="form-group">
<?php
$data = array('name' => 'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-12">
<center> <label>Cost of the product Per UOM</label></center>
@ -1250,8 +1389,8 @@ function vaildateBeforeOpenModal()
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-6" style="padding: 0px;">
<div class="col-md-3">
<label>Quantity</label>
<div class="form-group">
<?php
@ -1260,7 +1399,7 @@ function vaildateBeforeOpenModal()
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3" style="padding-right: 0px;">
<label id="EditRateIn">Rate(in INR/UOM)</label>
<div class="form-group">
<?php
@ -1269,7 +1408,12 @@ function vaildateBeforeOpenModal()
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Per</label> <?php
$data = array('name' => 'EditPer','value' => set_value('EditPer'),'id'=>'EditPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label id="EditTotalAmount">Basic value in INR</label>
<div class="form-group">
<?php
@ -1277,6 +1421,7 @@ function vaildateBeforeOpenModal()
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>
@ -1640,6 +1785,62 @@ function vaildateBeforeOpenModal()
</div>
</div>
</div>
<!--Start of Adding of Frieght model-->
<div class="col-md-12" style="padding:0px;">
<div class="col-md-3">
<span>Freight Type </span>
<div>
<?php
$options = array("0"=>'Select Freight Type');
//print_r( $options);
if(!empty($FreightType))
{
foreach ($FreightType as $SID):
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpeditFreight', $options,set_value('drpeditFreight'),'id="drpeditFreight"' ,'class="form-control "');
?>
</div>
</div>
<div class="col-md-3" id="editTripsValue" style="display:none;">
<span>NO Of Trips</span>
<div class="form-group">
<?php
$data = array('name' => 'editNOOfTrips','value' => set_value('editNOOfTrips'),'id'=>'editNOOfTrips', 'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<span>Freight Rate </span>
<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);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<span>Freight Amt In INR</span>
<div class="form-group">
<?php
$data = array('name' => 'edittxtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<!--End of Adding of freight in edit model -->
<div class="col-md-12">
<center> <label>Cost of the product Per UOM</label></center>
@ -4496,6 +4697,33 @@ function Reset(){
location.reload();
}
$('#drpFreight').change(function(){
var FreightType = $('#drpFreight').val();
if (FreightType == "PER TRIP")
{
$('#TripsValue').show();
}
else {
$('#TripsValue').hide();
}
});
$('#drpeditFreight').change(function(){
var FreightType = $('#drpeditFreight').val();
if (FreightType == "PER TRIP")
{
$('#editTripsValue').show();
}
else {
$('#editTripsValue').hide();
}
});
</script>

View File

@ -341,7 +341,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
<div class="row">
<div class="col-md-12">
<div class="col-md-3">
<div class="col-md-12">
<div class="col-md-12" style="padding: 0px;">
<label>Requistion No</label>
<?php
@ -359,7 +359,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
?>
</div>
<div class="col-md-12" id="currencyTypeDiv" style="display:none;">
<div class="col-md-12" id="currencyTypeDiv" style="display:none;padding: 0px;"">
<label>Currency Type</label>
<div class="form-group">
@ -458,7 +458,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-4" style="padding:0px;padding-left: 0px;">
<div class="col-md-12">
<b><u>Select Delivery By</u></b>
@ -477,7 +477,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
</div>
<div class="col-md-12" id="Schedulediv" style="display:none;padding-top: 3%;"><br/>
<div class="col-md-12" id="Schedulediv" style="display:none;padding-top: 3%;padding-left: 0px;"><br/>
<label >Schedule By </label>
<input type="hidden" name="beforeSchedule" value="<?php echo $DeliverSchedule;?>">
<?php
@ -486,7 +486,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
?>
</div>
<div class="col-md-12" id="deliverydateby" style="display:none;padding-top: 3%;"> <br/>
<div class="col-md-12" id="deliverydateby" style="display:none;padding-top: 3%;padding-left: 0px;"> <br/>
<label>Delivery Date</label>
<?php if(($DeliverOption==1) || ($DeliverOption==2)){
$Deliverydt=null;
@ -501,7 +501,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
?>
</div>
</div>
<div class="col-md-12" id="Deliverydtdiv" style="padding-top: 3%;"> <br/>
<div class="col-md-12" id="Deliverydtdiv" style="padding-top: 3%;padding-left: 0px;"> <br/>
<label>Dispatch Instruction</label>
<input type="hidden" name="beforeDisins" value="<?php echo $Import_DispatchDetails;?>">
<?php
@ -559,7 +559,83 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
<div class="col-md-12">
<!--start new fields 1 sep-->
<div class="row">
<div class="col-md-12">
<div class="col-md-3">
<div class="col-md-12" style="padding: 0px;">
<label>Mode Of Shipment</label>
<div class="form-group">
<?php
$data = array('name' => 'addmodeofshipment','value' => set_value('addmodeofshipment'),'id'=>'addmodeofshipment', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-9" style="padding:0px;">
<div class="col-md-4" style="padding:0px;" >
<div class="col-md-12">
<label>Supplier Reference</label>
<div class="form-group">
<?php
$data = array('name' => 'amendsupplierreference','value' => set_value('amendsupplierreference'),'id'=>'amendsupplierreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-12">
<label>Supplier's Offer No</label>
<div class="form-group">
<?php
$data = array('name' => 'amendsupplierofferno','value' => set_value('amendsupplierofferno'),'id'=>'amendsupplierofferno', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;">
<label>Other Reference(S)</label>
<div class="form-group">
<?php
$data = array('name' => 'amendotherreference','value' => set_value('amendotherreference'),'id'=>'amendotherreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'amendfincap','value' => set_value('amendfincap'),'id'=>'amendfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>
</div><!--End new fields 1 sep-->
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-3"><input type="hidden" name="beforePaymentmethod" id="beforePaymentmethod" value="<?php echo $PaymentTerms ; ?>">
<label for="payablefrom">Payable Terms</label>
@ -601,7 +677,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
<div class="col-md-4" id="otheroptiondiv" style="display:none;">
<div class="col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
<div class="form-group">
<?php
@ -850,14 +926,14 @@ document.getElementById('dispatchinternational').style.display = 'block';
<div class="modal-dialog">
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1100px;">
<div class="modal-content" style="width:1117px;">
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<center><h4>Edit Capital Purchase Order Item </h4></center>
</div>
<div align="left">
<div class="col-md-12">
<div class="col-md-12">
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" style="padding:0px;">
<div class="col-md-5" style="padding:0px;">
<div class="col-md-6">
<label>Req No</label>
@ -923,8 +999,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" style="padding:0px;">
<div class="col-md-2">
<label>Item Code</label>
<div>
@ -953,8 +1029,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-6" style="padding:0px;">
<div class="col-md-3">
<label>Quantity</label>
<div class="form-group">
<?php
@ -963,7 +1039,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3" style="padding-right: 0px;">
<label id="EditRateIn">Rate(in INR/UOM)</label>
<div class="form-group">
<?php
@ -972,7 +1048,12 @@ document.getElementById('dispatchinternational').style.display = 'block';
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Per</label> <?php
$data = array('name' => 'EditAmendPer','value' => set_value('EditAmendPer'),'id'=>'EditAmendPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label id="EditTotalAmount">Basic value in INR</label>
<div class="form-group">
<?php
@ -982,10 +1063,11 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" id="EDITCAPdiv" style="padding:0px;">
<div class="col-md-12" id=""><!--EDITCAPdiv -->
<div class="col-md-12" id="" style="padding:0px;"><!--EDITCAPdiv -->
<div class="col-md-6" align="right">
CGST In %
@ -1013,7 +1095,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
</div>
<div class="col-md-12" id="EDITCAPdiv1"><!--EDITCAPdiv1 -->
<div class="col-md-12" id="EDITCAPdiv1" style="padding:0px;"><!--EDITCAPdiv1 -->
<div class="col-md-6" align="right">
SGST In %
@ -1042,7 +1124,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
<div class="col-md-12" id="EDITCAPdiv2"><!--EDITCAPdiv2 -->
<div class="col-md-12" id="EDITCAPdiv2" style="padding:0px;"><!--EDITCAPdiv2 -->
<div class="col-md-6" align="right">
IGST In %
@ -1070,7 +1152,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
</div>
<div class="col-md-12" id="EDITCAPdiv3"><!--EDITCAPdiv3 -->
<div class="col-md-12" id="EDITCAPdiv3" style="padding:0px;"><!--EDITCAPdiv3 -->
<div class="col-md-5 col-md-offset-4" align="right">
<label>Other Allowances In INR</label>
</div>
@ -1356,6 +1438,61 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
</div>
</div>
<!--Start of Adding of Frieght model-->
<div class="col-md-12" style="padding:0px;">
<div class="col-md-3">
<span>Freight Type </span>
<div>
<?php
$options = array("0"=>'Select Freight Type');
//print_r( $options);
if(!empty($FreightType))
{
foreach ($FreightType as $SID):
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpamendFreight', $options,set_value('drpamendFreight'),'id="drpamendFreight"' ,'class="form-control "');
?>
</div>
</div>
<div class="col-md-3" id="AmendTripsValue" style="display:none;">
<span>NO Of Trips</span>
<div class="form-group">
<?php
$data = array('name' => 'AmendNOOfTrips','value' => set_value('AmendNOOfTrips'),'id'=>'AmendNOOfTrips', 'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<span>Freight Rate </span>
<div class="form-group">
<?php
$data = array('name' => 'AmendtxtFreight','value' => set_value('AmendtxtFreight'),'id'=>'AmendtxtFreight', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<span>Freight Amt In INR</span>
<div class="form-group">
<?php
$data = array('name' => 'AmendtxtAfterFreight','value' => set_value('AmendtxtAfterFreight'),'id'=>'AmendtxtAfterFreight', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<!--End of Adding of freight in edit model -->
<div class="col-md-12">
<center> <label>Cost of the product Per UOM</label></center>
@ -3598,6 +3735,19 @@ $("#PaymentMethod").change(function() {
$('#otheroptiondiv').hide();
}
});
$('#drpamendFreight').change(function(){
var FreightType = $('#drpamendFreight').val();
if (FreightType == "PER TRIP")
{
$('#AmendTripsValue').show();
}
else {
$('#AmendTripsValue').hide();
}
});
</script>

View File

@ -349,7 +349,7 @@ $("#PaymentMethod").select2();
<div class="row">
<div class="col-md-12">
<div class="col-md-3">
<div class="col-md-12">
<div class="col-md-12" style="padding:0px;">
<label>Requistion No</label>
<?php
@ -367,7 +367,7 @@ $("#PaymentMethod").select2();
?>
</div>
<div class="col-md-12" id="currencyTypeDiv" style="display:none;">
<div class="col-md-12" id="currencyTypeDiv" style="display:none;padding:0px;">
<label>Currency Type</label>
<div class="form-group">
@ -469,7 +469,7 @@ $("#PaymentMethod").select2();
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-12">
<div class="col-md-12" style="padding:0px;">
<b><u>Select Delivery By</u></b>
<div style="display:inline-flex;">
@ -487,7 +487,7 @@ $("#PaymentMethod").select2();
</div>
</div>
<div class="col-md-12" id="Schedulediv" style="display:none;padding-top: 3%;"> <br/>
<div class="col-md-12" id="Schedulediv" style="display:none;padding-top: 3%;padding-left: 0px;"> <br/>
<label >Schedule BY</label>
<?php
@ -496,7 +496,7 @@ $("#PaymentMethod").select2();
?>
</div>
<div class="col-md-12" id="deliverydateby" style="display:none;padding-top: 3%;"> <br/>
<div class="col-md-12" id="deliverydateby" style="display:none;padding-top: 3%;padding-left: 0px;"> <br/>
<label>Delivery Date</label>
<div class="form-group">
<?php
@ -562,7 +562,86 @@ $("#PaymentMethod").select2();
</div>
<div class="col-md-12">
<!--start new fields 1 sep-->
<div class="row">
<div class="col-md-12">
<div class="col-md-3">
<div class="col-md-12" style="padding: 0px;">
<label>Mode Of Shipment</label>
<div class="form-group">
<?php
$data = array('name' => 'editmodeofshipment','value' => set_value('editmodeofshipment'),'id'=>'editmodeofshipment', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-9" style="padding:0px;">
<div class="col-md-4" style="padding:0px;" >
<div class="col-md-12">
<label>Supplier Reference</label>
<div class="form-group">
<?php
$data = array('name' => 'editsupplierreference','value' => set_value('editsupplierreference'),'id'=>'editsupplierreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-12">
<label>Supplier's Offer No</label>
<div class="form-group">
<?php
$data = array('name' => 'editsupplierofferno','value' => set_value('editsupplierofferno'),'id'=>'editsupplierofferno', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;">
<label>Other Reference(S)</label>
<div class="form-group">
<?php
$data = array('name' => 'editotherreference','value' => set_value('editotherreference'),'id'=>'editotherreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'editfincap','value' => set_value('editfincap'),'id'=>'editfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>
</div><!--End new fields 1 sep-->
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-3">
<label for="payablefrom">Payable Terms</label>
@ -829,16 +908,16 @@ $("#PaymentMethod").select2();
<div class="modal-dialog">
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1100px;">
<div class="modal-content" style="width:1080px;">
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4>Add Capital Purchase Order Item </h4></center>
</div>
<div align="left">
<div class="col-md-12">
<div class="col-md-12" style="padding:0px">
<div class="col-md-12">
<div class="col-md-5" style="padding:0px;">
<div class="col-md-6">
<div class="col-md-6" style="padding:0px">
<label>Req No</label>
<div>
@ -902,8 +981,8 @@ $("#PaymentMethod").select2();
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
<div class="col-md-12" style="padding:0px">
<div class="col-md-12" style="padding:0px">
<div class="col-md-2">
<label>Item Code</label>
<div>
@ -932,8 +1011,8 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-6" style="padding: 0px;">
<div class="col-md-3">
<label>Quantity</label>
<div class="form-group">
<?php
@ -942,7 +1021,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3" style="padding-right: 0px;padding-left: 0px;">
<label id="RateIn">Rate(In INR /UOM)</label>
<div class="form-group">
<?php
@ -951,7 +1030,12 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Per</label> <?php
$data = array('name' => 'AddPer','value' => set_value('AddPer'),'id'=>'AddPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label id="TotalAmount">Basic value in INR</label>
<div class="form-group">
<?php
@ -960,10 +1044,11 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12" id="ADDCAPdiv">
<div class="col-md-12" style="padding:0px">
<div class="col-md-12" id="ADDCAPdiv" style="padding:0px">
<div class="col-md-6" align="right">
CGST In %
@ -991,7 +1076,7 @@ $("#PaymentMethod").select2();
</div>
</div>
<div class="col-md-12" id="ADDCAPdiv3">
<div class="col-md-12" id="ADDCAPdiv3" style="padding:0px">
<div class="col-md-6" align="right">
SGST In %
@ -1020,7 +1105,7 @@ $("#PaymentMethod").select2();
</div>
<div class="col-md-12" id="ADDCAPdiv2">
<div class="col-md-12" id="ADDCAPdiv2" style="padding:0px">
<div class="col-md-6" align="right">
IGST In %
@ -1048,7 +1133,7 @@ $("#PaymentMethod").select2();
</div>
</div>
<div class="col-md-12" id="ADDCAPdiv1">
<div class="col-md-12" id="ADDCAPdiv1" style="padding:0px">
<div class="col-md-5 col-md-offset-4" align="right">
<label>Other Allowances In INR</label>
</div>
@ -1320,6 +1405,62 @@ $("#PaymentMethod").select2();
</div>
</div>
</div>
<!--Start of Adding of Frieght model-->
<div class="col-md-12" style="padding:0px;">
<div class="col-md-3">
<span>Freight Type </span>
<div>
<?php
$options = array("0"=>'Select Freight Type');
//print_r( $options);
if(!empty($FreightType))
{
foreach ($FreightType as $SID):
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpaddFreight', $options,set_value('drpaddFreight'),'id="drpaddFreight"' ,'class="form-control "');
?>
</div>
</div>
<div class="col-md-3" id="AddTripsValue" style="display:none;">
<span>NO Of Trips</span>
<div class="form-group">
<?php
$data = array('name' => 'addNOOfTrips','value' => set_value('addNOOfTrips'),'id'=>'addNOOfTrips', 'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<span>Freight Rate </span>
<div class="form-group">
<?php
$data = array('name' => 'addtxtFreight','value' => set_value('addtxtFreight'),'id'=>'addtxtFreight', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<span>Freight Amt In INR</span>
<div class="form-group">
<?php
$data = array('name' => 'addtxtAfterFreight','value' => set_value('addtxtAfterFreight'),'id'=>'addtxtAfterFreight', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<!--End of Adding of freight in edit model -->
<div class="col-md-12">
<center> <label>Cost of the product Per UOM</label></center>
@ -1423,8 +1564,8 @@ $("#PaymentMethod").select2();
<center><h4>Edit Capital Purchase Order Item </h4></center>
</div>
<div align="left">
<div class="col-md-12">
<div class="col-md-12">
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-5" style="padding:0px;">
<div class="col-md-6">
<label>Req No</label>
@ -1519,8 +1660,8 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-6">
<div class="col-md-3">
<label>Quantity</label>
<div class="form-group">
<?php
@ -1529,7 +1670,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label id="EditRateIn">Rate(in INR/UOM)</label>
<div class="form-group">
<?php
@ -1538,7 +1679,12 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Per</label> <?php
$data = array('name' => 'EditPer','value' => set_value('EditPer'),'id'=>'EditPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label id="EditTotalAmount">Basic value in INR</label>
<div class="form-group">
<?php
@ -1547,6 +1693,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
@ -1908,6 +2055,61 @@ $("#PaymentMethod").select2();
</div>
</div>
</div>
<!--Start of Adding of Frieght model-->
<div class="col-md-12" style="padding:0px;">
<div class="col-md-3">
<span>Freight Type </span>
<div>
<?php
$options = array("0"=>'Select Freight Type');
//print_r( $options);
if(!empty($FreightType))
{
foreach ($FreightType as $SID):
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpeditFreight', $options,set_value('drpeditFreight'),'id="drpeditFreight"' ,'class="form-control "');
?>
</div>
</div>
<div class="col-md-3" id="EditTripsValue" style="display:none;">
<span>NO Of Trips</span>
<div class="form-group">
<?php
$data = array('name' => 'editNOOfTrips','value' => set_value('editNOOfTrips'),'id'=>'editNOOfTrips', 'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<span>Freight Rate </span>
<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);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<span>Freight Amt In INR</span>
<div class="form-group">
<?php
$data = array('name' => 'edittxtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<!--End of Adding of freight in edit model -->
<div class="col-md-12">
<center> <label>Cost of the product Per UOM</label></center>
@ -2006,14 +2208,14 @@ $("#PaymentMethod").select2();
<div class="modal-dialog">
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1100px;">
<div class="modal-content" style="width:1110px;">
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4>View Capital Purchase Order Item </h4></center>
</div>
<div align="left">
<div class="col-md-12">
<div class="col-md-12">
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-3">
<label>Req No</label>
@ -2074,8 +2276,8 @@ $("#PaymentMethod").select2();
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-2">
<label>Item Code</label>
<div>
@ -2106,8 +2308,8 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-6" style="padding: 0px;">
<div class="col-md-3">
<label>Quantity</label>
<div class="form-group">
<?php
@ -2116,7 +2318,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3" style="padding-right: 0px;">
<label id="ViewRateIn">Rate(in INR/UOM)</label>
<div class="form-group">
<?php
@ -2125,7 +2327,12 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Per</label> <?php
$data = array('name' => 'ViewPer','value' => set_value('ViewPer'),'id'=>'ViewPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label id="EditTotalAmount">Basic value in INR</label>
<div class="form-group">
<?php
@ -2134,10 +2341,11 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12" id="VIEWCAPdiv">
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-12" id="VIEWCAPdiv" style="padding: 0px;">
<div class="col-md-6" align="right">
CGST In %
@ -2165,7 +2373,7 @@ $("#PaymentMethod").select2();
</div>
</div>
<div class="col-md-12" id="VIEWCAPdiv1">
<div class="col-md-12" id="VIEWCAPdiv1" style="padding: 0px;">
<div class="col-md-6" align="right">
SGST In %
@ -2194,7 +2402,7 @@ $("#PaymentMethod").select2();
</div>
<div class="col-md-12" id="VIEWCAPdiv2">
<div class="col-md-12" id="VIEWCAPdiv2" style="padding: 0px;">
<div class="col-md-6" align="right">
IGST In %
@ -2222,7 +2430,7 @@ $("#PaymentMethod").select2();
</div>
</div>
<div class="col-md-12" id="VIEWCAPdiv3">
<div class="col-md-12" id="VIEWCAPdiv3" style="padding: 0px;">
<div class="col-md-5 col-md-offset-4" align="right">
<label>Other Allowances In INR</label>
</div>
@ -2326,10 +2534,10 @@ $("#PaymentMethod").select2();
</div>
<div class="col-md-12">
<div class="col-md-4">
Excise duty : (b)
Excise duty : (b)<?php echo "($INR)"?>
</div>
<div class="col-md-4">
<div class="form-group"><?php echo "($INR)"?>
<div class="form-group">
<?php
$data = array('name' => 'ViewExcisedutyTax','value' => set_value('ViewExcisedutyTax'),'id'=>'ViewExcisedutyTax', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange();','readonly' => 'true');
echo form_input($data);
@ -2493,6 +2701,61 @@ $("#PaymentMethod").select2();
</div>
</div>
</div>
<!--Start of Adding of Frieght model-->
<div class="col-md-12" style="padding:0px;">
<div class="col-md-3">
<span>Freight Type </span>
<div>
<?php
$options = array("0"=>'Select Freight Type');
//print_r( $options);
if(!empty($FreightType))
{
foreach ($FreightType as $SID):
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpviewFreight', $options,set_value('drpviewFreight'),'id="drpviewFreight"' ,'class="form-control "');
?>
</div>
</div>
<div class="col-md-3" id="ViewTripsValue" style="display:none;">
<span>NO Of Trips</span>
<div class="form-group">
<?php
$data = array('name' => 'viewNOOfTrips','value' => set_value('viewNOOfTrips'),'id'=>'viewNOOfTrips', 'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<span>Freight Rate </span>
<div class="form-group">
<?php
$data = array('name' => 'viewtxtFreight','value' => set_value('viewtxtFreight'),'id'=>'viewtxtFreight', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<span>Freight Amt In INR</span>
<div class="form-group">
<?php
$data = array('name' => 'viewtxtAfterFreight','value' => set_value('viewtxtAfterFreight'),'id'=>'viewtxtAfterFreight', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<!--End of Adding of freight in edit model -->
<div class="col-md-12">
<center> <label>Cost of the product Per UOM</label></center>
@ -5445,6 +5708,44 @@ $("#PaymentMethod").change(function() {
$('#Otherpayment').val('');
}
});
$('#drpviewFreight').change(function(){
var FreightType = $('#drpviewFreight').val();
if (FreightType == "PER TRIP")
{
$('#ViewTripsValue').show();
}
else {
$('#ViewTripsValue').hide();
}
});
$('#drpeditFreight').change(function(){
var FreightType = $('#drpeditFreight').val();
if (FreightType == "PER TRIP")
{
$('#EditTripsValue').show();
}
else {
$('#EditTripsValue').hide();
}
});
$('#drpaddFreight').change(function(){
var FreightType = $('#drpaddFreight').val();
if (FreightType == "PER TRIP")
{
$('#AddTripsValue').show();
}
else {
$('#AddTripsValue').hide();
}
});
</script>