CHANGE_TRACKER_ISSUE_5_CONFLICT

This commit is contained in:
aadhavan valli 2024-09-17 18:33:57 +05:30
commit bb07cb8dbb
5 changed files with 3474 additions and 3327 deletions

View File

@ -562,7 +562,11 @@
<div class="col-md-4 pad" style="margin-top: 18px;">
<input type="checkbox" id="checksame" name="sameaddress"
> Current address same as permanent address
>
<label for="checksame">
Current address same as permanent address
</label>
</div>
<div class="col-md-4 pad">
<label>Permanent Address</label><span
@ -748,14 +752,16 @@
<div class="col-md-3" style="margin-top: 18px;">
<div class="form-group">
<span
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">Management
Team</span>
<label class="switch">
<input type="checkbox" name="is_management_team" value="0"
onchange="updateSwitchValue(this)" />
<span class="slider"></span>
</label>
<label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">Management
Team
</label>
</div>
</div>
<br>
@ -931,27 +937,35 @@
<div class="col-md-3">
<div class="form-group">
<label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">ESI
Applicable</label>
<label class="switch">
<input type="checkbox" name="esi_applicable" value="0"
onchange="updateSwitchValue(this)" />
<span class="slider"></span>
</label>
<label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">ESI
Applicable</label>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">PF
Applicable</label>
<label class="switch">
<input type="checkbox" name="pf_applicable" value="0"
onchange="updateSwitchValue(this)" />
<span class="slider"></span>
</label>
<label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">PF
Applicable</label>
</div>
</div>

View File

@ -227,8 +227,7 @@ if (!empty($INRSYMBOL)) {
$.each(y, function (idx, obj) {
if(obj.SupplierID === id)
{
if (obj.SupplierID === id) {
$("#SupAddress").val(obj.Address);
}
@ -251,8 +250,7 @@ if (!empty($INRSYMBOL)) {
$("#CostCenter").empty();
$("#MaterialCode").empty();
resetTaxField();
if(id != '0')
{
if (id != '0') {
var y = <?php //echo json_encode($RequistionDetails, JSON_PRETTY_PRINT)
?>;
var cost = <?php //echo json_encode($CostList, JSON_PRETTY_PRINT)
@ -262,8 +260,7 @@ if (!empty($INRSYMBOL)) {
// For Binding DepartmentName
$.each(y, function (idx, obj) {
if(obj.ReqNo === id)
{
if (obj.ReqNo === id) {
$("#deptName").val(obj.DepartmentName);
}
@ -271,8 +268,7 @@ if (!empty($INRSYMBOL)) {
// For Binding Cost center for the selected department
$("#CostCenter").append($('<option></option>').val("0").html("Select Cost Center"));
$.each(cost, function (idx, obj) {
if(obj.ReqNo === id)
{
if (obj.ReqNo === id) {
$("#CostCenter").append($('<option></option>').val(obj.CostCenterCode).html(obj.CostCenterCode + "-" + obj.CostCenterName));
}
@ -281,8 +277,7 @@ if (!empty($INRSYMBOL)) {
// For Binding Material list center for the selected Requistion Number
$("#MaterialCode").append($('<option></option>').val("0").html("Select Material Code"));
$.each(Material, function (idx, obj) {
if(obj.ReqNo === id)
{
if (obj.ReqNo === id) {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
@ -290,8 +285,7 @@ if (!empty($INRSYMBOL)) {
});
}
else
{
else {
alert('Please select the Requisition Number');
return false;
}
@ -302,15 +296,13 @@ if (!empty($INRSYMBOL)) {
var id = $('#MaterialCode').val();
RequistQuantity = '';
resetTaxField();
if(id != '0')
{
if (id != '0') {
var y = <?php //echo json_encode($MaterialList, JSON_PRETTY_PRINT)
?>;
$.each(y, function (idx, obj) {
if(obj.MaterialCode === id)
{
if (obj.MaterialCode === id) {
$("#ItemName").val(obj.MaterialName);
$("#UOM").val(obj.UOM);
$("#Quantity").val(obj.Quantity);
@ -318,8 +310,7 @@ if (!empty($INRSYMBOL)) {
}
});
}
else
{
else {
alert('Please select the MaterialCode');
return false;
}
@ -331,21 +322,18 @@ if (!empty($INRSYMBOL)) {
var id = $('#CostCenter').val();
$("#AvlBudAmt").val('');
if(id != '0')
{
if (id != '0') {
var cost = <?php //echo json_encode($CostList, JSON_PRETTY_PRINT)
?>;
$.each(cost, function (idx, obj) {
if(obj.CostCenterCode === id)
{
if (obj.CostCenterCode === id) {
$("#AvlBudAmt").val(obj.BudgetAmount);
}
});
}
else
{
else {
alert('Please select the MaterialCode');
return false;
}
@ -1946,6 +1934,7 @@ if (!empty($INRSYMBOL)) {
$('#POType').val(this.value);
if (this.value == 'REVENUE') //Revenue po
{
$("#potaxes").show();
$("#QualityChecked").show();
$("#revenuepotaxes").show();
$("#currencyexchange").hide();
@ -1962,6 +1951,7 @@ if (!empty($INRSYMBOL)) {
$('#typeOptions').html('Revenue Type Options');
} else if (this.value == 'SERVICE') // Service po
{
$("#potaxes").show();
$("#QualityChecked").hide();
$("#servicepotaxes").show();
$("#Deliveryby").show();
@ -1977,6 +1967,7 @@ if (!empty($INRSYMBOL)) {
} else if (this.value == 'IMPORT') // Import po
{
$("#potaxes").show();
$("#currencyexchange").show();
$("#revenuepotaxes").hide();
@ -1985,6 +1976,7 @@ if (!empty($INRSYMBOL)) {
$('#typeOptions').html('Import Type Options');
} else if (this.value == 'CAPITAL') // Capital po
{
$("#potaxes").show();
$("#currencyexchange").show();
$("#revenuepotaxes").hide();
@ -1993,6 +1985,7 @@ if (!empty($INRSYMBOL)) {
$('#typeOptions').html('Capital Type Options');
} else // Default
{
$("#potaxes").show();
$("#currencyexchange").hide();
$("#revenuepotaxes").hide();
@ -2333,7 +2326,14 @@ if (!empty($INRSYMBOL)) {
endforeach;
}
echo form_dropdown('RequestType', $options, set_value('ConfigValue'), 'id="purpose"', 'class = "form-control select2"', 'required="true"');
echo form_dropdown(
'RequestType',
$options,
set_value('ConfigValue'),
'id="purpose"',
'class = "form-control select2"',
'required="true"'
);
?>
</div>
@ -2452,7 +2452,8 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="col-md-3">
<a href="http://www.xe.com/" target="_blank"><u>To check Today's Foreign Exchange value</u></a>
<a href="http://www.xe.com/" target="_blank"><u>To check Today's Foreign
Exchange value</u></a>
</div>
</div>
</div>
@ -2501,7 +2502,9 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-3" style="display:none;">
<label>Available Budget <?php echo "($INRSYM)" ?></label><img id="AlertImg" src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image" width="25px" style="display:none;" />
<label>Available Budget <?php echo "($INRSYM)" ?></label><img id="AlertImg"
src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image"
width="25px" style="display:none;" />
<div class="form-group">
<?php
$data = array('name' => 'AvalBuget', 'value' => set_value('AvalBuget'), 'id' => 'AvalBuget', 'class' => 'form-control num', 'readonly' => 'true');
@ -2609,7 +2612,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-3">
<label id="typeOptions">Service Type Options<span class="badge mandatory">*</span></label>
<label id="typeOptions">Service Type Options<span
class="badge mandatory">*</span></label>
<div class="form-group">
<?php
@ -2688,7 +2692,8 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="col-md-3" id="insuranceTxtDiv" style="display:block;">
<label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
<label>Insurance No / Insurance Details<span
class="badge mandatory">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber'), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true');
@ -2710,38 +2715,47 @@ if (!empty($INRSYMBOL)) {
<div class="row justify-content-end align-items-center" style="padding:10px">
<div class="col-auto">
<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT
<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1"> IS THIS OPEN
ORDER FORMAT
</div>
<div class="col-auto">
<a data-toggle="modal" onclick="showmodel();" class="btn btn-success">Select Line Item</a>
<a data-toggle="modal" onclick="showmodel();" class="btn btn-success">Select Line
Item</a>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="card">
<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false" style="display: none;">
aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false"
style="display: none;">
<div class="modal-dialog modal-lg">
<div class="modal-content" style="border: 1px solid #ddd; margin-top: 73px; box-shadow: 0 0 40px rgb(0 0 0 / 43%);">
<div class="modal-content"
style="border: 1px solid #ddd; margin-top: 73px; box-shadow: 0 0 40px rgb(0 0 0 / 43%);">
<div class="modal-header">
<h4 class="modal-title">Packing Calculation On <span id="WeightTitle"></span></h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
</div>
<div class="modal-body p-4">
<div class="form-group row">
<label><input type="radio" name="optPackaging" checked="checked" value="0" id="optPackaging"> Basic Amount</label>
<label><input type="radio" name="optPackaging" checked="checked" value="0"
id="optPackaging"> Basic Amount</label>
</div>
<div class="form-group row">
<label><input type="radio" name="optPackaging" id="optPackaging" value="1"> After Discount Amount</label>
<label><input type="radio" name="optPackaging" id="optPackaging" value="1">
After Discount Amount</label>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</button>
<button type="button" class="btn btn-info waves-effect waves-light" onclick="SetPackagingOption()">Save</button>
<button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal"
value="Cancel">Cancel</button>
<button type="button" class="btn btn-info waves-effect waves-light"
onclick="SetPackagingOption()">Save</button>
</div>
</div>
</div>
@ -2749,7 +2763,8 @@ if (!empty($INRSYMBOL)) {
<!-- Modal for Packing Calculation -->
<div id="submitmodel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel">
<div id="submitmodel" class="modal fade" data-backdrop-limit="1" role="dialog"
aria-labelledby="myModalLabel">
<div class="modal-dialog">
<!-- Modal content-->
@ -2762,15 +2777,20 @@ if (!empty($INRSYMBOL)) {
<form>
<div class="modal-body p-4">
<div class="form-group row">
<label><input type="radio" name="optsubmit" value="1" id="optsubmit"> YES</label>
<label><input type="radio" name="optsubmit" value="1" id="optsubmit">
YES</label>
</div>
<div class="form-group row">
<label><input type="radio" name="optsubmit" checked="checked" id="optsubmit" value="0"> NO</label>
<label><input type="radio" name="optsubmit" checked="checked" id="optsubmit"
value="0"> NO</label>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</button>
<button type="button" class="btn btn-info waves-effect waves-light" ID="PackagingOption" onclick="submitoption();dropdownselect();">Save</button>
<button type="button" class="btn btn-secondary waves-effect"
data-dismiss="modal" value="Cancel">Cancel</button>
<button type="button" class="btn btn-info waves-effect waves-light"
ID="PackagingOption"
onclick="submitoption();dropdownselect();">Save</button>
</div>
</form>
</div>
@ -2778,7 +2798,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
</div>
<div id="filemodel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel">
<div id="filemodel" class="modal fade" data-backdrop-limit="1" role="dialog"
aria-labelledby="myModalLabel">
<div class="modal-dialog">
<!-- Modal content-->
@ -2795,7 +2816,8 @@ if (!empty($INRSYMBOL)) {
</div>-->
<div class="col-md-4 pad"><strong>Delivery Challan /Inv No</strong>
<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12" class="form-control" value="" required onkeypress="return isNumberKey(event)">
<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12"
class="form-control" value="" required onkeypress="return isNumberKey(event)">
</div>
<div class="col-md-4 pad"><strong>Delivery Challan /Inv Date</strong>
<!-- <input type="Date" name="Date1" onkeypress="return onlyAlphabets(event);" maxlength="100" id="Date1" class="form-control" required value="2"> -->
@ -2823,15 +2845,18 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" id="splrow" value="sample" name="splrow" />
<div class="col-md-4 pad"><strong>Vehicle No</strong>
<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13" class="form-control" value="" required>
<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13"
class="form-control" value="" required>
</div>
<div class="col-md-4 pad"><strong>Courier No</strong>
<input type="text" name="CourierNo" id="CourierNo" maxlength="12" class="form-control" value="" required>
<input type="text" name="CourierNo" id="CourierNo" maxlength="12"
class="form-control" value="" required>
</div>
<div class="col-md-4" id="QualityChecked"><strong>Is Quality Check Required</strong>
<div class="radio">
<label><input type="radio" name="Quality" checked="checked" value='0' id="Quality">Yes</label>
<label><input type="radio" name="Quality" checked="checked" value='0'
id="Quality">Yes</label>
</div>
<div class="radio">
<label><input type="radio" name="Quality" id="Quality" value='1'>No</label>
@ -2853,7 +2878,8 @@ if (!empty($INRSYMBOL)) {
<!-- <legend>Multiple File</legend> -->
<div class="col-md-offset-10 col-md-1">
<input type="button" class="btn btn-success" id="addmorebutton" value=" + ADD FILES..">
<input type="button" class="btn btn-success" id="addmorebutton"
value=" + ADD FILES..">
</div>
@ -2871,7 +2897,8 @@ if (!empty($INRSYMBOL)) {
</div>
<table id="specialtable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
<table id="specialtable" class="table table-hover table-bordered"
style="background-color:#fff;font-size:12px;">
<!--<thead>
@ -2899,8 +2926,10 @@ if (!empty($INRSYMBOL)) {
<div class="col-md-4 col-md-offset-8">
<a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
<a class="btn btn-success ok" ID="ExciseOption12" onclick="rfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-cancel" data-dismiss="modal"
onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
<a class="btn btn-success ok" ID="ExciseOption12"
onclick="rfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div>
</div>
@ -2910,7 +2939,8 @@ if (!empty($INRSYMBOL)) {
<!-- </form> -->
</div>
<div id="servicemodel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel">
<div id="servicemodel" class="modal fade" data-backdrop-limit="1" role="dialog"
aria-labelledby="myModalLabel">
<div class="modal-dialog">
<!-- Modal content-->
@ -2935,7 +2965,8 @@ if (!empty($INRSYMBOL)) {
<!-- <legend>Multiple File</legend> -->
<div class="col-md-offset-0 col-md-1">
<input type="button" class="btn btn-success" id="addemorebutton" value=" + ADD FILES..">
<input type="button" class="btn btn-success" id="addemorebutton"
value=" + ADD FILES..">
</div>
@ -2954,8 +2985,10 @@ if (!empty($INRSYMBOL)) {
<div class="modal-footer">
<div class="col-md-12 text-right">
<a class="btn btn-secondary waves-effect" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
<a class="btn btn-success ok" ID="ExciseOption12" onclick="sfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-secondary waves-effect" data-dismiss="modal"
onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
<a class="btn btn-success ok" ID="ExciseOption12"
onclick="sfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div>
</div>
@ -2968,7 +3001,8 @@ if (!empty($INRSYMBOL)) {
<div id="freightmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div id="freightmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel">
<div class="modal-dialog">
<!-- Modal content-->
@ -2981,16 +3015,20 @@ if (!empty($INRSYMBOL)) {
<form>
<div class="radio">
<label><input type="radio" name="optfreight" checked="checked" value='0' id="optfreight"> Basic Amount</label>
<label><input type="radio" name="optfreight" checked="checked" value='0'
id="optfreight"> Basic Amount</label>
</div>
<div class="radio">
<label><input type="radio" name="optfreight" id="optfreight" value='1'> After Discount Amount</label>
<label><input type="radio" name="optfreight" id="optfreight" value='1'> After
Discount Amount</label>
</div>
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="freightOption" onclick="setfreightOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;"
value="Cancel">Cancel</a>
<a class="btn btn-success" ID="freightOption" onclick="setfreightOption();"
style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
</div>
</div>
@ -3010,23 +3048,29 @@ if (!empty($INRSYMBOL)) {
<div class="modal-body">
<form>
<div class="radio">
<label><input type="radio" name="optExcise" checked="checked" value="0" id="optExcise">From Basic Amount</label>
<label><input type="radio" name="optExcise" checked="checked" value="0"
id="optExcise">From Basic Amount</label>
</div>
<div class="radio">
<label><input type="radio" name="optExcise" value="1" id="optExcise">Basic Amount - Discount Amount</label>
<label><input type="radio" name="optExcise" value="1" id="optExcise">Basic
Amount - Discount Amount</label>
</div>
<div class="radio">
<label><input type="radio" name="optExcise" value="2" id="optExcise">(Basic Amount - Discount Amount ) + Packing Cost</label>
<label><input type="radio" name="optExcise" value="2" id="optExcise">(Basic
Amount - Discount Amount ) + Packing Cost</label>
</div>
<div class="radio">
<label><input type="radio" name="optExcise" value="3" id="optExcise">Basic Amount + Packing Cost</label>
<label><input type="radio" name="optExcise" value="3" id="optExcise">Basic
Amount + Packing Cost</label>
</div>
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();"
style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="ExciseOption" onclick="SetExciseCalculation();"
style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
</div>
</div>
@ -3048,16 +3092,20 @@ if (!empty($INRSYMBOL)) {
<form>
<div class="radio">
<label><input type="radio" name="optVat" checked="checked" value="0" id="optVat">Basic Amount</label>
<label><input type="radio" name="optVat" checked="checked" value="0"
id="optVat">Basic Amount</label>
</div>
<div class="radio">
<label><input type="radio" name="optVat" value="1" id="optVat">Excise Duty</label>
<label><input type="radio" name="optVat" value="1" id="optVat">Excise
Duty</label>
</div>
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="VatOption" onclick="SetVatCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;"
value="Cancel">Cancel</a>
<a class="btn btn-success" ID="VatOption" onclick="SetVatCalculation();"
style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
</div>
</div>
@ -3077,16 +3125,20 @@ if (!empty($INRSYMBOL)) {
<form>
<div class="radio">
<label><input type="radio" name="optCST" checked="checked" value="0" id="optCST">Basic Amount</label>
<label><input type="radio" name="optCST" checked="checked" value="0"
id="optCST">Basic Amount</label>
</div>
<div class="radio">
<label><input type="radio" name="optCST" value="1" id="optCST">Excise Duty</label>
<label><input type="radio" name="optCST" value="1" id="optCST">Excise
Duty</label>
</div>
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="CSTOption" onclick="SetCSTCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;"
value="Cancel">Cancel</a>
<a class="btn btn-success" ID="CSTOption" onclick="SetCSTCalculation();"
style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
</div>
</div>
@ -3138,7 +3190,9 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-3" style="display:none;">
<label>Available Budget Amount</label><img id="AlertImg" src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image" width="25px" style="display:none;" />
<label>Available Budget Amount</label><img id="AlertImg"
src="<?php echo base_url(); ?>public/assets/dist/img/red.png"
alt="your image" width="25px" style="display:none;" />
<div class="form-group">
<?php
$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
@ -3257,7 +3311,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-3">
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
<label><?php echo "Rate ($INRSYM)"; ?><span
class="badge mandatory">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
@ -3359,7 +3414,8 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
echo form_input($data);
?>
<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />
<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo"
value="EditFrequencyNo" />
</div>
</div>
@ -3393,7 +3449,8 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="row" style="padding: 0px 30px 10px 30px;">
<div class="col-md-12">
<label>Service Description<span class="badge mandatory">*</span></label> <?php
<label>Service Description<span class="badge mandatory">*</span></label>
<?php
$data = array('name' => 'EdittxtSpcialInstructionSingle', 'value' => set_value('EdittxtSpcialInstructionSingle'), 'id' => 'EdittxtSpcialInstructionSingle', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?>
</div>
@ -3407,7 +3464,8 @@ if (!empty($INRSYMBOL)) {
<div class="modal-footer">
<div class="col-md-12 text-right">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span
class="bold">Update Service</span></a>
</div>
</div>
</div>
@ -3417,7 +3475,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<!-- Edit Revenue Modal -->
<div id="EDITREVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="overflow-y:scroll !important">
<div id="EDITREVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
style="overflow-y:scroll !important">
<div class="modal-dialog">
<!-- Modal content-->
<form>
@ -3510,7 +3569,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-2" style="padding-right: 0px;">
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
<label><?php echo "Rate ($INRSYM)"; ?><span
class="badge mandatory">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'EditRevenueRate', 'value' => set_value('EditRate'), 'id' => 'EditRevenueRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
@ -3770,7 +3830,8 @@ if (!empty($INRSYMBOL)) {
<label><?php echo "Revenue Description"; ?></label>
<?php
$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100');
echo form_textarea($data);;
echo form_textarea($data);
;
?>
</div>
</div>
@ -3780,8 +3841,10 @@ if (!empty($INRSYMBOL)) {
<!-- footer for revenue po -->
<div class="modal-footer">
<div class="col-md-12 text-right">
<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
<a class="btn btn-secondary waves-effect" data-dismiss="modal"
value="Cancel">Cancel</a>
<a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span
class="bold">Edit Revenue</span></a>
</div>
</div>
</div>
@ -3799,7 +3862,8 @@ if (!empty($INRSYMBOL)) {
<div align="right" style="padding-right:10px">
<!-- Model for revenue PO -->
<div id="REVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div id="REVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel"
aria-hidden="true">
<div class="modal-dialog">
<!-- Modal content-->
<form>
@ -3849,7 +3913,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-2">
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory"></label>
<label><?php echo "Rate ($INRSYM)"; ?><span
class="badge mandatory"></label>
<div class="form-group">
<?php
$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
@ -3866,7 +3931,9 @@ if (!empty($INRSYMBOL)) {
<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
<div class="form-group">
<?php
$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue', 'class' => 'form-control num', 'readonly' => 'true');
$data = array('name' => 'txtBasicValue',
'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue',
'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
@ -3878,7 +3945,8 @@ if (!empty($INRSYMBOL)) {
<div class="row">
<div class="col-md-4"></div>
<div class="col-md-4">
<label>Discount Type <span class="badge mandatory"></span></label>
<label>Discount Type <span
class="badge mandatory"></span></label>
<div>
<?php
$options = array("0" => 'Select Discount Type');
@ -3899,7 +3967,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-2">
<label>Discount Rate<span class="badge mandatory"></span> </label>
<label>Discount Rate<span class="badge mandatory"></span>
</label>
<div class="form-group">
<?php
$data = array('name' => 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();calculateDiscount(0);');
@ -3920,7 +3989,8 @@ if (!empty($INRSYMBOL)) {
<div class="row" style="text-align:left;">
<div class="col-md-4"></div>
<div class="col-md-4">
<label>Packaging Type <span class="badge mandatory"></span></label>
<label>Packaging Type <span
class="badge mandatory"></span></label>
<div>
<?php
$options = array("0" => 'Select Packaging Type');
@ -3941,7 +4011,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-2">
<label>Packaging Rate <span class="badge mandatory"></span></label>
<label>Packaging Rate <span
class="badge mandatory"></span></label>
<div class="form-group">
<?php
$data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging(0);change();');
@ -4111,14 +4182,17 @@ if (!empty($INRSYMBOL)) {
<label><?php echo "Revenue Description"; ?></label>
<?php
$data = array('name' => 'Add_Service_Description', 'value' => set_value('Add_Service_Description'), 'id' => 'Add_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100');
echo form_textarea($data);;
echo form_textarea($data);
;
?>
</div>
</div>
<div class="col-12 text-right">
<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
<a class="btn btn-secondary waves-effect" data-dismiss="modal"
value="Cancel">Cancel</a>
<a class="btn btn-success font AddRevenue" ID="AddRevenue">
&nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
</div>
</div>
@ -4126,7 +4200,9 @@ if (!empty($INRSYMBOL)) {
</div>
<!-- footer for revenue po -->
<div class="modal-footer"></div>
<div class="modal-footer">
</div>
</div>
</form>
</div>
@ -4210,7 +4286,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-3">
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
<label><?php echo "Rate ($INRSYM)"; ?><span
class="badge mandatory">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'ServiceRate', 'value' => set_value('ServiceRate'), 'id' => 'ServiceRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
@ -4385,7 +4462,9 @@ if (!empty($INRSYMBOL)) {
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
<label>Service Description<span class="badge mandatory">*</span></label> <?php
<label>Service Description<span
class="badge mandatory">*</span></label>
<?php
$data = array('name' => 'txtSpcialInstructionSingle', 'value' => set_value('txtSpcialInstructionSingle'), 'id' => 'txtSpcialInstructionSingle', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?>
</div>
@ -4397,8 +4476,11 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="modal-footer">
<div class="col-md-12 text-right">
<button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</button>
<button type="button" class="btn btn-info waves-effect waves-light font AddService" ID="PackagingOption" ID="AddService">Save</button>
<button type="button" class="btn btn-secondary waves-effect"
data-dismiss="modal" value="Cancel">Cancel</button>
<button type="button"
class="btn btn-info waves-effect waves-light font AddService"
ID="PackagingOption" ID="AddService">Save</button>
</div>
</div>
</div>
@ -4901,7 +4983,8 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
<a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span
class="bold">Add Import</span></a>
</div>
</div>
</form>
@ -5360,7 +5443,8 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
<a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span
class="bold">Add Capital</span></a>
</div>
</div>
</form>
@ -5393,16 +5477,19 @@ if (!empty($INRSYMBOL)) {
<tbody id="RevenueAppend"></tbody>
</table>
</div>
</table>
<!-- /.box-body -->
</div>
</table>
<div class="container-fluid">
<div class="row " id="potaxes" style="display:none;" >
<div class="col-md-12">
<div class="card">
<div class="card-body">
<div class="row">
<!-- Revenue po taxes -->
<div class="col-md-12" style='border : 1px solid; display:none;' id="revenuepotaxes">
<div class="col-md-12" style='border : 1px solid; display:none;'
id="revenuepotaxes">
<br />
<div class="row">
<div class="col-md-3">
@ -5498,8 +5585,13 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="txtSpecial" id="txtSpecial" />
<input type="hidden" name="txtQuality" id="txtQuality" />
<!-- <a class="btn btn-success Save" ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-reset Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>" style="background-color: red;color: white;">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="showsubmit()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-reset Save" ID="Cancel"
href="<?php echo base_url() . 'EmergencyPO'; ?>"
style="background-color: red;color: white;">&nbsp;&nbsp;<span
class="bold">Reset</span></a>
<a class="btn btn-success Submit" ID="Submit"
onclick="showsubmit()">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
</div>
@ -5509,39 +5601,48 @@ if (!empty($INRSYMBOL)) {
</div>
<!-- Service po taxes -->
<div class="col-md-12" style="border: 1px solid; display:none;" id="servicepotaxes">
<div class="col-md-12" style="border: 1px solid; display:none;"
id="servicepotaxes">
<br>
<div class="row">
<div class="col-md-3">
<label>Basic Amount ()</label>
<input type="text" name="txtTotBasicAmount" value="" id="txtTotBasicAmount" class="form-control num" readonly="true">
<input type="text" name="txtTotBasicAmount" value=""
id="txtTotBasicAmount" class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>CGST ()</label>
<input type="text" name="txtTotCgst" value="" id="txtTotCgst" class="form-control num" readonly="true">
<input type="text" name="txtTotCgst" value="" id="txtTotCgst"
class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>SGST ()</label>
<input type="text" name="txtTotSgst" value="" id="txtTotSgst" class="form-control num" readonly="true">
<input type="text" name="txtTotSgst" value="" id="txtTotSgst"
class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>IGST ()</label>
<input type="text" name="txtTotIgst" value="" id="txtTotIgst" class="form-control num" readonly="true">
<input type="text" name="txtTotIgst" value="" id="txtTotIgst"
class="form-control num" readonly="true">
</div>
</div>
<div class="row">
<div class="col-md-3">
<label>Other Allowances ()</label>
<input type="text" name="txtTotOtherAllo" value="" id="txtTotOtherAllo" class="form-control num" readonly="true">
<input type="text" name="txtTotOtherAllo" value=""
id="txtTotOtherAllo" class="form-control num" readonly="true">
</div>
<div class="col-md-3">
<label>Total Order Value ()</label>
<input type="text" name="txtTotalOrderValueSummaryService" value="" id="txtTotalOrderValueSummaryService" class="form-control num" readonly="true">
<input type="text" name="txtTotalOrderValueSummaryService" value=""
id="txtTotalOrderValueSummaryService" class="form-control num"
readonly="true">
</div>
</div>
<div class="row">
<div class="col-md-12">
<label>Description Of Service <span class="badge mandatory">*</span></label>
<label>Description Of Service <span
class="badge mandatory">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'emergdescofpo', 'value' => set_value('emergdescofpo'), 'id' => 'emergdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
@ -5567,12 +5668,19 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="txtStatus" id="txtStatus">
<input type="hidden" name="txtRowCount" id="txtRowCount">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow">
<input type="hidden" name="SpcialInstruction" id="SpcialInstruction">
<input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress">
<input type="hidden" name="txtSpecialservice" id="txtSpecialservice">
<input type="hidden" name="SpcialInstruction"
id="SpcialInstruction">
<input type="hidden" name="txtDeliveryAddress"
id="txtDeliveryAddress">
<input type="hidden" name="txtSpecialservice"
id="txtSpecialservice">
<input type="hidden" name="txtworkstatus" id="txtworkstatus">
<a class="btn btn-reset Save" id="Cancel" href="http://localhost/ria/EmergencyPO">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Submit" id="Submit" onclick="showsubmit()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-reset Save" id="Cancel"
href="http://localhost/ria/EmergencyPO">&nbsp;&nbsp;<span
class="bold">Reset</span></a>
<a class="btn btn-success Submit" id="Submit"
onclick="showsubmit()">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
</div>
</div>
<div class="row" style="padding:0px;"><br>
@ -5580,9 +5688,17 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

View File

@ -307,21 +307,21 @@
foreach ($ReqList as $record) {
?>
<tr id="<?php echo $index; ?>">
<td><input type="checkbox" name="chk<?php echo $index; ?>" id="chk<?php echo $index; ?>" onclick="selectReqNo(<?php echo $index; ?>)" />&nbsp;</td>
<td align="right">
<td align="center"><input type="checkbox" name="chk<?php echo $index; ?>" id="chk<?php echo $index; ?>" onclick="selectReqNo(<?php echo $index; ?>)" />&nbsp;</td>
<td align="center">
<?php
$dt = new DateTime($record->ReqDate);
$RequestedDate = $dt->format('d-m-Y');
echo $RequestedDate;
?>
</td>
<td><a data-toggle="modal" data-target="#RequisitionDtlsModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><u><?php echo $record->ReqNo; ?> </u></a></td>
<td><?php echo $record->ReqType; ?></td>
<td align="center"><a data-toggle="modal" data-target="#RequisitionDtlsModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><u><?php echo $record->ReqNo; ?> </u></a></td>
<td align="center"><?php echo $record->ReqType; ?></td>
<td><?php echo $record->FirstName; ?></td>
<td align="right"><?php echo $record->TotalNoofLineItems; ?></td>
<td align="right"><?php echo $record->PolineItems; ?></td>
<td align="right"><?php echo $record->PartilallyLineItems; ?></td>
<td align="right"><?php echo $record->newLineItem; ?></td>
<td align="center"><?php echo $record->TotalNoofLineItems; ?></td>
<td align="center"><?php echo $record->PolineItems; ?></td>
<td align="center"><?php echo $record->PartilallyLineItems; ?></td>
<td align="center"><?php echo $record->newLineItem; ?></td>
<td><?php echo $record->StatusName; ?></td>
<td><?php echo $record->DepartmentName; ?></td>
<td><?php echo $record->Designation; ?></td>

View File

@ -207,20 +207,22 @@ if (!empty($EmpDetails)) {
<div class="col-md-2">
<div class="row">
<div class="form-row">
<div class="box-header">
<img id="profilepicture"
src="<?php echo base_url() . $ProfilePic; ?>" alt="your image"
style="width: 139px;" />
</div>
</div>
<br/>
</div>
</div>
<div class="row">
<div class="form-row">
<label for="photo">Select profile picture<br /><small>(only .jpg or
.png)</small>
@ -254,10 +256,14 @@ if (!empty($EmpDetails)) {
class="form-control w-50" readonly>
</div>
<div class="row" style="margin-top: 18px;">
<br>
<div class="form-row" >
<input type="checkbox" id="isactive" <?php echo $IsActive; ?>
name="isactive" value="1"> Is Active
name="isactive" value="1">&nbsp;&nbsp;
<label style="margin-top:8px;" >
Is Active
</label>
</div>
@ -279,7 +285,7 @@ if (!empty($EmpDetails)) {
</div>
<div class="col-md-4 pad">
<label>Father / Husband Name</lab><span class="badge">*</span>
<label>Father / Husband Name</label><span class="badge">*</span>
<input type="text" name="FatherName" id="FatherName"
maxlength="200" value="<?php echo $FatherName; ?>"
placeholder="Father / Husband Name" class="form-control"
@ -336,7 +342,7 @@ if (!empty($EmpDetails)) {
</div>
<div class="col-md-4 pad">
<label>Age</l><span class="badge">*</span>
<label>Age</label><span class="badge">*</span>
<input type="text" name="age" placeholder="Age" id="age"
value="<?php echo $Age; ?>" class="form-control" readonly>
</div>
@ -402,8 +408,9 @@ if (!empty($EmpDetails)) {
<div class="col-md-4 pad" style="margin-top: 18px;">
<input type="checkbox" id="checksame" name="sameaddress"
onclick="CheckClick"> Current address same as permanent
address
onclick="CheckClick">
<label> Current address same as permanent
address</label>
</div>
<div class="col-md-4 pad">
@ -638,16 +645,18 @@ if (!empty($EmpDetails)) {
<div class="col-md-3" style="margin-top: 18px;">
<div class="form-group">
<label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">
Management
Team</label>
<label class="switch">
<input type="checkbox" name="is_management_team"
value="<?= $is_management_team; ?>" <?php echo $is_management_team == '1' ? 'checked' : ''; ?>
onchange="updateSwitchValue(this)" />
<span class="slider"></span>
</label>
<label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">
Management
Team</label>
</div>
</div>
<br>
@ -839,29 +848,37 @@ if (!empty($EmpDetails)) {
<div class="row">
<div class="col-md-3">
<div class="form-group">
<label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">ESI
Applicable</label>
<label class="switch">
<input type="checkbox" name="esi_applicable"
value="<?= $esi_applicable; ?>" <?php echo $esi_applicable == '1' ? 'checked' : ''; ?>
onchange="updateSwitchValue(this)" />
<span class="slider"></span>
</label>
<label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">ESI
Applicable</label>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">PF
Applicable</label>
<label class="switch">
<input type="checkbox" name="pf_applicable"
value="<?= $pf_applicable; ?>" <?php echo $pf_applicable == '1' ? 'checked' : ''; ?>
onchange="updateSwitchValue(this)" />
<span class="slider"></span>
</label>
<label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">PF
Applicable</label>
</div>
</div>
</div>
@ -1032,12 +1049,12 @@ if (!empty($EmpDetails)) {
} else { ?>
<div class="row">
<div class="col-md-4">
<span>File Name</span>
<label>File Name</label>
<input type="text" id="file_name" name="file_name[]"
maxlength="255" class="form-control">
</div>
<div class="col-md-4">
<span>File</span>
<label>File</label>
<input type="file" name="emp_file[]" class="form-control">
</div>
<div class="col-md-4" style="margin-top: 23px;">
@ -1066,6 +1083,7 @@ if (!empty($EmpDetails)) {
<!-- </li> -->
</ul>
</div>
</div>
</div> <!-- tab-content -->
</div> <!-- end #rootwizard-->
@ -1090,6 +1108,7 @@ if (!empty($EmpDetails)) {
reader.readAsDataURL(input.files[0]);
$('#ModifyImage').val(input.files[0]['name']);
}
}

View File

@ -3461,8 +3461,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<td align="left">${uom}</td>
<td align="left">${itemRate}</td>
<td align="left">${BasicAmt}</td>
<td align="left">${taxexp}</td>
<td align="left">${totalexp}</td>
<td align="left">${receivedqty}</td>
<td align="left">${rejectedqty}</td>
<td align="left">${pendingqty}</td>