PO section

This commit is contained in:
VE10-Sanjeev 2024-08-31 11:37:11 +00:00
parent 86fb6b5099
commit e2885dd7dc
12 changed files with 1729 additions and 1950 deletions

View File

@ -869,7 +869,7 @@ if (!empty($getlogpodtl)) {
<label>Delivery Date<span class="text-danger">*</span></label> <label>Delivery Date<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type'=>'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1497,7 +1497,7 @@ if (!empty($getlogpodtl)) {
<!-- Model for servicepo --> <!-- Model for servicepo -->
<div id="SERVICE" class="modal fade" tabindex="-1" role="dialog" <div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Add Service Purchase Order Item</h4> <h4 class="modal-title">Add Service Purchase Order Item</h4>
@ -1740,7 +1740,7 @@ if (!empty($getlogpodtl)) {
<!-- Service Special PO Modal Starts Here --> <!-- Service Special PO Modal Starts Here -->
<div id="EditServiceSplPOModel" class="modal fade" tabindex="-1" role="dialog" <div id="EditServiceSplPOModel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Update Bill <span id="bill"><span> Details</h4> <h4 class="modal-title">Update Bill <span id="bill"><span> Details</h4>
@ -1775,7 +1775,7 @@ if (!empty($getlogpodtl)) {
<!-- Edit Service Modal content Starts Here--> <!-- Edit Service Modal content Starts Here-->
<div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog" <div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Service Purchase Order Item</h4> <h4 class="modal-title">Edit Service Purchase Order Item</h4>
@ -2038,7 +2038,7 @@ if (!empty($getlogpodtl)) {
<!-- View Service Modal content Starts Here--> <!-- View Service Modal content Starts Here-->
<div id="VIEWSERVICE" class="modal fade" tabindex="-1" role="dialog" <div id="VIEWSERVICE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">View Service Purchase Order Item</h4> <h4 class="modal-title">View Service Purchase Order Item</h4>
@ -2319,7 +2319,7 @@ if (!empty($getlogpodtl)) {
<script type="text/html" id="ServiceList"> <!-- <script type="text/html" id="ServiceList">
<tr id="<%=index%>"> <tr id="<%=index%>">
<td align="left"><%=index%></td> <td align="left"><%=index%></td>
<td align="left"><%=ReqNo%></td> <td align="left"><%=ReqNo%></td>
@ -2335,7 +2335,7 @@ if (!empty($getlogpodtl)) {
<a data-target='#EDITSERVICE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a> <a data-target='#EDITSERVICE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
</td> </td>
</tr> </tr>
</script> </script> -->
<script> <script>
var index = <?php echo $index; ?>; var index = <?php echo $index; ?>;
var userid = ''; var userid = '';
@ -2421,21 +2421,48 @@ if (!empty($getlogpodtl)) {
index = parseInt(index) + 1; index = parseInt(index) + 1;
var template = jQuery("#ServiceList").html(); // var template = jQuery("#ServiceList").html();
$('#ServiceAppend').append(_.template(template, { // $('#ServiceAppend').append(_.template(template, {
index: temp, // index: temp,
ReqNo: Reqnumber, // ReqNo: Reqnumber,
MaterialCode: materialCode, // MaterialCode: materialCode,
MaterialName: materialName, // MaterialName: materialName,
Quantity: quantity, // Quantity: quantity,
UOM: uom, // UOM: uom,
Rate: itemRate, // Rate: itemRate,
BasicAmount: basicval, // BasicAmount: basicval,
Taxvalue: TotalTaxValue, // Taxvalue: TotalTaxValue,
TotalValue: TotalOrderValue // TotalValue: TotalOrderValue
})); // }));
var rowHtml = `
<tr id="${temp}">
<td align="left">${temp}</td>
<td align="left">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${materialName}</td>
<td align="left">${quantity}</td>
<td align="left">${uom}</td>
<td align="left">${itemRate}</td>
<td align="left">${basicval}</td>
<td align="left">${TotalTaxValue}</td>
<td align="left">${TotalOrderValue}</td>
<td>
<a data-target='#EDITSERVICE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITSERVICE">
<i class="ri-pencil-fill" data-toggle="tooltip" ></i>
</a>
&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
<span class="ri-delete-bin-7-fill"></span>
</a>
</td>
</tr>
`;
// Append the generated HTML to your table body
$('#ServiceAppend').append(rowHtml);
@ -3195,6 +3222,7 @@ if (!empty($getlogpodtl)) {
id = ''; id = '';
}); });
$(document).ready(function() {
$("#EDITSERVICE").on("shown.bs.modal", function(e) { $("#EDITSERVICE").on("shown.bs.modal", function(e) {
@ -3393,7 +3421,7 @@ if (!empty($getlogpodtl)) {
}); });
} }
}); });});
$("#insuranceStatus").change(function() { $("#insuranceStatus").change(function() {
var InsNo = '<?php echo $InsuranceNumber; ?>'; var InsNo = '<?php echo $InsuranceNumber; ?>';

View File

@ -134,29 +134,29 @@
$("#MaterialCode").select2(); $("#MaterialCode").select2();
$("#currencytype").select2(); $("#currencytype").select2();
$("#PODate").datepicker({ // $("#PODate").datepicker({
//minDate : d, // //minDate : d,
maxDate: 'now', // maxDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '-100:+0' // yearRange: '-100:+0'
}); // });
$("#Deliverydt").datepicker({ // $("#Deliverydt").datepicker({
minDate: 'now', // minDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '0:+10' // yearRange: '0:+10'
}); // });
$("#Exchangerateon").datepicker({ // $("#Exchangerateon").datepicker({
//minDate : d, // //minDate : d,
maxDate: 'now', // maxDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '-100:+0' // yearRange: '-100:+0'
}); // });
$('#Date').click(function() { $('#Date').click(function() {
//for Dispatch range selection //for Dispatch range selection
@ -395,7 +395,7 @@
<label>Delivery Date<span class="text-danger">*</span></label> <label>Delivery Date<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
$data = array('name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type'=>'date','name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -452,7 +452,7 @@
<label>Purchase Order Date</label> <label>Purchase Order Date</label>
<div> <div>
<?php <?php
$data = array('name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type'=>"date",'name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>

View File

@ -372,29 +372,29 @@
$("#MaterialCode").select2(); $("#MaterialCode").select2();
$("#currencytype").select2(); $("#currencytype").select2();
$("#PODate").datepicker({ // $("#PODate").datepicker({
//minDate : d, // //minDate : d,
maxDate: 'now', // maxDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '-100:+0' // yearRange: '-100:+0'
}); // });
$("#Deliverydate").datepicker({ // $("#Deliverydate").datepicker({
minDate: 'now', // minDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '0:+10' // yearRange: '0:+10'
}); // });
$("#Exchangerateon").datepicker({ // $("#Exchangerateon").datepicker({
minDate: 'now', // minDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '0:+10' // yearRange: '0:+10'
}); // });
$('#Date').click(function() { $('#Date').click(function() {
//for Date range selection //for Date range selection
$('#Schedulediv').hide(); $('#Schedulediv').hide();
@ -575,7 +575,7 @@
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Deliverydate', 'value' => set_value('Deliverydate', $Deliverydt), 'id' => 'Deliverydate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type'=>'date','name' => 'Deliverydate', 'value' => set_value('Deliverydate', $Deliverydt), 'id' => 'Deliverydate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -613,7 +613,7 @@
<label>Exchange Rate On</label> <label>Exchange Rate On</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type'=>'date','name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -647,7 +647,7 @@
<label>Purchase Order Date</label> <label>Purchase Order Date</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -857,9 +857,12 @@
</div> </div>
<br> <br>
</div> </div>
<div class="box-body"> <div class="form-row">
<table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;"> <div class="table-responsive">
<thead> <table id="serviceTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead>
<tr> <tr>
<th>SNo</th> <th>SNo</th>
<th>Requisition No</th> <th>Requisition No</th>
@ -1213,6 +1216,7 @@
?> ?>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<table class="table table-bordered" style="border:1px solid #333"> <table class="table table-bordered" style="border:1px solid #333">
@ -2252,7 +2256,7 @@
</div> <!-- content --> </div> <!-- content -->
</div> </div>
<script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script> <script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
<script type="text/html" id="CapitalList"> <!-- <script type="text/html" id="CapitalList">
<tr id="<%=index%>"> <tr id="<%=index%>">
<td align="left"><%=index%></td> <td align="left"><%=index%></td>
<td align="left"><%=ReqNo%></td> <td align="left"><%=ReqNo%></td>
@ -2271,7 +2275,7 @@
</td> </td>
</tr> </tr>
</script> </script> -->
<script> <script>
var RequistQuantity = ''; var RequistQuantity = '';
var AvilBudAmt = ''; var AvilBudAmt = '';

View File

@ -382,41 +382,41 @@
$("#MaterialCode").select2(); $("#MaterialCode").select2();
$("#currencytype").select2(); $("#currencytype").select2();
$("#PODate").datepicker({ // $("#PODate").datepicker({
//minDate : d, // //minDate : d,
// maxDate : 'now', // // maxDate : 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true // changeYear: true
}); //,yearRange: '-100:+0' // }); //,yearRange: '-100:+0'
$("#Deliverydt").datepicker({ // $("#Deliverydt").datepicker({
minDate: 'now', // minDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '0:+10' // yearRange: '0:+10'
}); // });
$("#Exchangerateon").datepicker({ // $("#Exchangerateon").datepicker({
//minDate : d, // //minDate : d,
maxDate: 'now', // maxDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '-100:+0' // yearRange: '-100:+0'
}); // });
$('#Date').click(function() { $('#Date').click(function() {
//for Dispatch range selection //for Dispatch range selection
$('#Schedulediv').hide(); $('#Schedulediv').hide();
$('#Deliverydtdiv').show(); $('#Deliverydtdiv').show();
$('#deliverydateby').hide(); $('#deliverydateby').hide();
}); });
$("#Deliverydate").datepicker({ // $("#Deliverydate").datepicker({
minDate: 'now', // minDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '0:+10' // yearRange: '0:+10'
}); // });
$('#Schedule').click(function() { $('#Schedule').click(function() {
//for schedule range selection //for schedule range selection
@ -578,7 +578,7 @@
<label>Delivery Date<span class="text-danger">*</span></label> <label>Delivery Date<span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type'=>'date','name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -614,7 +614,7 @@
<label>Exchange Rate On</label> <label>Exchange Rate On</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type'=>'date','name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -649,7 +649,7 @@
<label>PO Date</label> <label>PO Date</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>"> ?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
</div> </div>
@ -3806,7 +3806,7 @@
</div> <!-- content --> </div> <!-- content -->
</div> </div>
<script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script> <script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
<script type="text/html" id="CapitalList"> <!-- <script type="text/html" id="CapitalList">
<tr id="<%=index%>"> <tr id="<%=index%>">
<td align="left"><%=index%></td> <td align="left"><%=index%></td>
<td align="left"><%=ReqNo%></td> <td align="left"><%=ReqNo%></td>
@ -3827,7 +3827,7 @@
</td> </td>
</tr> </tr>
</script> </script> -->
<script> <script>
var RequistQuantity = ''; var RequistQuantity = '';
var AvilBudAmt = ''; var AvilBudAmt = '';
@ -3868,21 +3868,21 @@
$(function() { $(function() {
$("#PODate").datepicker({ // $("#PODate").datepicker({
minDate: d, // minDate: d,
maxDate: 'now', // maxDate: 'now',
dateFormat: 'mm/dd/yy', // dateFormat: 'mm/dd/yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '-100:+0' // yearRange: '-100:+0'
}); // });
$("#Deliverydt").datepicker({ // $("#Deliverydt").datepicker({
minDate: 'now', // minDate: 'now',
dateFormat: 'mm/dd/yy', // dateFormat: 'mm/dd/yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '0:+10' // yearRange: '0:+10'
}); // });
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>; var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
//alert(capital); //alert(capital);
@ -4880,24 +4880,52 @@
index = parseInt(index) + 1; index = parseInt(index) + 1;
var template = jQuery("#CapitalList").html(); // var template = jQuery("#CapitalList").html();
$('#capitalAppend').append(_.template(template, { // $('#capitalAppend').append(_.template(template, {
index: temp, // index: temp,
ReqNo: Reqnumber, // ReqNo: Reqnumber,
MaterialCode: materialCode, // MaterialCode: materialCode,
MaterialName: materialName, // MaterialName: materialName,
Quantity: quantity, // Quantity: quantity,
UOM: uom, // UOM: uom,
Rate: itemRate, // Rate: itemRate,
BasicAmount: basicval, // BasicAmount: basicval,
Taxvalue: TotalTaxValue, // Taxvalue: TotalTaxValue,
TotalValue: Total, // TotalValue: Total,
ActualQuantity: quantity, // ActualQuantity: quantity,
ReceivedQuantity: 0, // ReceivedQuantity: 0,
PendingQuantity: quantity // PendingQuantity: quantity
})); // }));
var rowHtml = `
<tr id="${temp}">
<td align="left">${temp}</td>
<td align="left">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${materialName}</td>
<td align="left">${quantity}</td>
<td align="left">${uom}</td>
<td align="left">${itemRate}</td>
<td align="left">${basicval}</td>
<td align="left">${TotalTaxValue}</td>
<td align="left">${Total}</td>
<td align="left">${quantity}</td>
<td align="left">0</td>
<td align="left">${quantity}</td>
<td>
<a data-target='#EDITCAPITAL' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
<i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
</a>&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
<span class="glyphicon glyphicon-trash"></span>
</a>
</td>
</tr>
`;
// Append the generated row HTML to the target element
$('#capitalAppend').append(rowHtml);
var theForm = $(".CapitalPO"); var theForm = $(".CapitalPO");

File diff suppressed because it is too large Load Diff

View File

@ -965,7 +965,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Supplier Address</label> <label>Supplier Address</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40'); $data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
echo Form_textarea($data); echo Form_textarea($data);
@ -998,9 +998,9 @@ if (!empty($INRSYMBOL)) {
?> ?>
<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt; ?>"> <input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt; ?>">
<label>Delivery Date<span class="text-danger">*</span></label> <label>Delivery Date<span class="text-danger">*</span></label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type' => 'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;','min' => date('d-m-Y'),);
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1015,7 +1015,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Delivery Address</label> <label>Delivery Address</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'readonly' => 'true'); $data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'readonly' => 'true');
echo Form_textarea($data); echo Form_textarea($data);
@ -1033,7 +1033,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Mode Of Shipment</label> <label>Mode Of Shipment</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $modeofshipment), 'id' => 'addmodeofshipment', 'class' => 'form-control', 'readonly' => 'readonly'); $data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $modeofshipment), 'id' => 'addmodeofshipment', 'class' => 'form-control', 'readonly' => 'readonly');
@ -1046,7 +1046,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Contact Reference</label> <label>Contact Reference</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $supplierref), 'id' => 'amendsupplierreference', 'class' => 'form-control', 'readonly' => 'readonly', 'maxlength' => '40'); $data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $supplierref), 'id' => 'amendsupplierreference', 'class' => 'form-control', 'readonly' => 'readonly', 'maxlength' => '40');
@ -1056,7 +1056,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Supplier's Offer No</label> <label>Supplier's Offer No</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $suppofferno), 'id' => 'amendsupplierofferno', 'class' => 'form-control', 'readonly' => 'readonly'); $data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $suppofferno), 'id' => 'amendsupplierofferno', 'class' => 'form-control', 'readonly' => 'readonly');
@ -1069,7 +1069,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Other Reference(S)</label> <label>Other Reference(S)</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $otherref), 'id' => 'amendotherreference', 'class' => 'form-control', 'readonly' => 'readonly'); $data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $otherref), 'id' => 'amendotherreference', 'class' => 'form-control', 'readonly' => 'readonly');
@ -1079,7 +1079,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Revenue Type Options<span class="text-danger">*</span></label> <label>Revenue Type Options<span class="text-danger">*</span></label>
<div class="form-group"> <div>
<?php <?php
@ -1153,7 +1153,6 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label for="insurance">Insurance<span class="text-danger">*</span></label> <label for="insurance">Insurance<span class="text-danger">*</span></label>
<?php <?php
@ -1163,7 +1162,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3" id="InsuranceNumberdiv" style="display:block;"> <div class="form-group col-md-3" id="InsuranceNumberdiv" style="display:block;">
<label>Insurance No / Insurance Details<span class="text-danger">*</span></label> <label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true'); $data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true');
echo form_input($data); echo form_input($data);
@ -1190,8 +1189,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
</div> </div>
</div>
</div> </div>
<br>
<div class="form-row"> <div class="form-row">
<div class="table-responsive"> <div class="table-responsive">
<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;"> <table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
@ -1290,7 +1289,7 @@ if (!empty($INRSYMBOL)) {
<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to Amend the <?php echo $record->ReqNo; ?> Requisition details"></i></a> <td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill" data-toggle="tooltip"></i></a>
<!-- <td> <a data-toggle="tooltip" href="#"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="<?php //echo $record->ReqNo; <!-- <td> <a data-toggle="tooltip" href="#"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="<?php //echo $record->ReqNo;
?> - Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a> </td> --> ?> - Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a> </td> -->
@ -1445,12 +1444,13 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12">
<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata')); <?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
$Reqon = $Reqon->format('d-m-Y'); ?> $Reqon = $Reqon->format('d-m-Y'); ?>
<label>Request On :</label><?php echo $Reqon; ?><br> <label>Request On :</label><?php echo $Reqon; ?><br>
<?php if ($RequesterName != '' || $RequesterName != null) { ?> <?php if ($RequesterName != '' || $RequesterName != null) { ?>
<label>Request By : </label><?php echo $RequesterName; ?> <label>Request By : </label><?php echo $RequesterName; ?><br />
<?php } ?><br /> <?php } ?>
<label>Status : </label><?php <label>Status : </label><?php
$statusMappings = [ $statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE', 'PO APPROVED' => 'AWAITING APPROVE',
@ -1469,6 +1469,7 @@ if (!empty($INRSYMBOL)) {
echo "Status not provided"; echo "Status not provided";
} }
?> ?>
</div>
</div> </div>
</div> <!-- end card body--> </div> <!-- end card body-->
@ -1499,7 +1500,7 @@ if (!empty($INRSYMBOL)) {
</form> </form>
</div> </div>
<div class="modal-footer"> <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" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a> <a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
</div> </div>
</div> </div>
@ -1534,7 +1535,7 @@ if (!empty($INRSYMBOL)) {
</div><!-- /.modal --> </div><!-- /.modal -->
<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog" <div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4> <h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
@ -1560,7 +1561,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Department Name</label> <label>Department Name</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName', 'class' => 'form-control', 'readonly' => 'true'); $data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -1569,7 +1570,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Cost Center Code</label> <label>Cost Center Code</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control', 'readonly' => 'true'); $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -1579,7 +1580,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Avl Bud Amt</label> <label>Avl Bud Amt</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -1605,26 +1606,25 @@ if (!empty($INRSYMBOL)) {
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName', 'class' => 'form-control', 'readonly' => 'true'); $data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-1">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM', 'class' => 'form-control', 'readonly' => 'true'); $data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-6" style="padding:0px;"> <div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label> <label>Quantity<span class="text-danger">*</span></label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;'); $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
@ -1632,37 +1632,36 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-2">
<label>Rate <?php echo "($INRSYM)" ?><span class="text-danger">*</span></label> <label>Rate <?php echo "($INRSYM)" ?><span class="text-danger">*</span></label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;'); $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-1">
<label>Per</label> <?php <label>Per</label> <?php
$data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer', 'class' => 'form-control'); $data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer', 'class' => 'form-control');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
<div class="form-group col-md-3" style="padding-left: 0px;"> <div class="form-group col-md-2" style="padding-left: 0px;">
<label>Basic Amt <?php echo "($INRSYM)" ?></label> <label>Basic Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"></div> <div class="form-group col-md-4"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label>Discount Type </label> <label>Discount Type </label>
<div>
<?php <?php
$options = array("0" => 'Select Discount Type'); $options = array("0" => 'Select Discount Type');
//print_r( $options); //print_r( $options);
@ -1679,25 +1678,24 @@ if (!empty($INRSYMBOL)) {
echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"'); echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"');
?> ?>
</div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Discount Rate </label> <label>Discount Rate </label>
<div class="form-group">
<?php <?php
$data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount();', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount();', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Discounted Amt <?php echo "($INRSYM)" ?></label> <label>Discounted Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group">
<?php <?php
$data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
@ -1725,7 +1723,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-2" id="EditTripsValue" style="display:none;"> <div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
<label>NO Of Trips</label> <label>NO Of Trips</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight();'); $data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight();');
echo form_input($data); echo form_input($data);
@ -1734,7 +1732,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Freight Rate </label> <label>Freight Rate </label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight();', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight();', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
@ -1743,7 +1741,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Freight Amt <?php echo "($INRSYM)" ?></label> <label>Freight Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
@ -1776,7 +1774,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Packaging Rate </label> <label>Packaging Rate </label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'txtEditPackaging', 'value' => set_value('txtEditPackaging'), 'id' => 'txtEditPackaging', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging();', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditPackaging', 'value' => set_value('txtEditPackaging'), 'id' => 'txtEditPackaging', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging();', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
@ -1785,63 +1783,54 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Packaging Amt <?php echo "($INRSYM)" ?></label> <label>Packaging Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group">
<?php <?php
$data = array('name' => 'txtEditAfterPackaging', 'value' => set_value('txtEditAfterPackaging'), 'id' => 'txtEditAfterPackaging', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditAfterPackaging', 'value' => set_value('txtEditAfterPackaging'), 'id' => 'txtEditAfterPackaging', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div>
</div> </div>
</div> </div>
<div class="form-row" id="CGSTArea"> <div class="form-row" id="CGSTArea">
<div class="form-group col-md-8"></div> <div class="form-group col-md-8"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>CGST in %</label> <label>CGST in %</label>
<div class="form-group">
<?php <?php
$data = array('name' => 'txtEditGST', 'value' => set_value('txtEditGST'), 'id' => 'txtEditGST', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(1);', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditGST', 'value' => set_value('txtEditGST'), 'id' => 'txtEditGST', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(1);', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>CGST Amt <?php echo "($INRSYM)" ?></label> <label>CGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group">
<?php <?php
$data = array('name' => 'txtEditAfterGST', 'value' => set_value('txtEditAfterGST'), 'id' => 'txtEditAfterGST', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditAfterGST', 'value' => set_value('txtEditAfterGST'), 'id' => 'txtEditAfterGST', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div>
</div> </div>
</div> </div>
<div class="form-row" id="SGSTModel"> <div class="form-row" id="SGSTModel">
<div class="form-group col-md-8"></div> <div class="form-group col-md-8"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>SGST in %</label> <label>SGST in %</label>
<div class="form-group">
<?php <?php
$data = array('name' => 'txtEditVat', 'value' => set_value('txtEditVat'), 'id' => 'txtEditVat', 'class' => 'form-control num', 'onchange' => 'calculateVat();', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditVat', 'value' => set_value('txtEditVat'), 'id' => 'txtEditVat', 'class' => 'form-control num', 'onchange' => 'calculateVat();', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>SGST Amt <?php echo "($INRSYM)" ?></label> <label>SGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group">
<?php <?php
$data = array('name' => 'txtEditAfterVat', 'value' => set_value('txtEditAfterVat'), 'id' => 'txtEditAfterVat', 'class' => 'form-control num', 'readonly' => 'true', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditAfterVat', 'value' => set_value('txtEditAfterVat'), 'id' => 'txtEditAfterVat', 'class' => 'form-control num', 'readonly' => 'true', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div>
</div> </div>
</div> </div>
<div class="form-row" id="IGSTModel" style="display:none;"> <div class="form-row" id="IGSTModel" style="display:none;">
<div class="form-group col-md-8"></div> <div class="form-group col-md-8"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>IGST in %</label> <label>IGST in %</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
@ -1850,7 +1839,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>IGST Amt <?php echo "($INRSYM)" ?></label> <label>IGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
@ -1865,7 +1854,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-group col-md-8"></div> <div class="form-group col-md-8"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label> Insurance Amt <?php echo "($INRSYM)" ?>(if Any)</label> <label> Insurance Amt <?php echo "($INRSYM)" ?>(if Any)</label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'txtEditInsurance', 'value' => set_value('txtEditInsurance'), 'id' => 'txtEditInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateEditTotalValue(1);', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditInsurance', 'value' => set_value('txtEditInsurance'), 'id' => 'txtEditInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateEditTotalValue(1);', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
@ -1874,21 +1863,18 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12">
<div class="col-md-4 col-md-offset-8">
<label>Total Order Amt <?php echo "($INRSYM)" ?></label> <label>Total Order Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group">
<?php <?php
$data = array('name' => 'txtEditTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12">
<label><?php echo "Revenue Description"; ?></label> <label><?php echo "Revenue Description"; ?></label>
<div class="form-group">
<?php <?php
$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100'); $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);;
@ -2027,6 +2013,7 @@ if (!empty($INRSYMBOL)) {
$("#EDITREVENUE").on("shown.bs.modal", function(e) { $("#EDITREVENUE").on("shown.bs.modal", function(e) {
var AvlBudAmt = '<?php echo $AvlAmount ?>'; var AvlBudAmt = '<?php echo $AvlAmount ?>';
AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>'; AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';

View File

@ -1958,7 +1958,7 @@ if (!empty($getlogpodtl)) {
<label>Delivery Date<span class="text-danger">*</span></label> <label>Delivery Date<span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type' => 'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
@ -1986,7 +1986,7 @@ if (!empty($getlogpodtl)) {
<label>Purchase Order Date</label> <label>Purchase Order Date</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>"> ?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
</div> </div>
@ -2136,27 +2136,23 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div align="right"> <div align="form-group col-md-12" align="right">
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?> <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?> <?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<div class="form-group col-md-3 col-md-offset-7" align="right" style="padding:5px">
<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT <input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
</div>
<?php } else { ?> <?php } ?>
<div class="form-group col-md-3 col-md-offset-7" align="right" style="padding:5px">
</div>
<?php } ?>
<div class="form-group" align="right">
<!-- <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> -->
<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd">Select Line Item</button> </a> <a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd">Select Line Item</button> </a>
</div>
<?php } ?> <?php } ?>
</div> </div>
</div> </div>
<br>
<div class="form-row"> <div class="form-row">
<table id="revenueTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;"> <div class="table-responsive">
<thead style="background-color: #ddd;"> <table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead>
<tr> <tr>
<th>SNo</th> <th>SNo</th>
<th>Requisition No</th> <th>Requisition No</th>
@ -2236,7 +2232,9 @@ if (!empty($getlogpodtl)) {
<?php <?php
if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?> if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></span></a> <td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" ></i></a>
&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
<?php <?php
} else { ?> } else { ?>
<td> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td> <td> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
@ -2264,7 +2262,7 @@ if (!empty($getlogpodtl)) {
} }
?> ?>
</tbody> </tbody>
</table> </table><br></div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -2618,7 +2616,7 @@ if (!empty($getlogpodtl)) {
<!-- Add Model for revenue po --> <!-- Add Model for revenue po -->
<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4> <h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
@ -2963,7 +2961,7 @@ if (!empty($getlogpodtl)) {
<!-- Edit Model for revenue po --> <!-- Edit Model for revenue po -->
<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog" <div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4> <h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
@ -3328,7 +3326,7 @@ if (!empty($getlogpodtl)) {
<!-- View Model for revenue po --> <!-- View Model for revenue po -->
<div id="VIEWREVENUE" class="modal fade" tabindex="-1" role="dialog" <div id="VIEWREVENUE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">View Revenue Purchase Order Line Item</h4> <h4 class="modal-title">View Revenue Purchase Order Line Item</h4>
@ -3850,7 +3848,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div><!-- /.modal --> </div><!-- /.modal -->
<!-- Revenue Special PO Modal Ends Here --> <!-- Revenue Special PO Modal Ends Here -->
<script type="text/html" id="RevenueList"> <!-- <script type="text/html" id="RevenueList">
<tr id="<%=index%>"> <tr id="<%=index%>">
<td align="left"><%=index%></td> <td align="left"><%=index%></td>
<td align="left"><%=ReqNo%></td> <td align="left"><%=ReqNo%></td>
@ -3870,7 +3868,7 @@ if (!empty($getlogpodtl)) {
</td> </td>
</tr> </tr> -->
</div> </div>
</section> </section>
</div> </div>
@ -3974,26 +3972,57 @@ if (!empty($getlogpodtl)) {
}); });
index = parseInt(index) + 1; index = parseInt(index) + 1;
var template = jQuery("#RevenueList").html(); // var template = jQuery("#RevenueList").html();
$('#RevenueAppend').append(_.template(template, { // $('#RevenueAppend').append(_.template(template, {
index: temp, // index: temp,
ReqNo: Reqnumber, // ReqNo: Reqnumber,
MaterialCode: materialCode, // MaterialCode: materialCode,
MaterialName: materialName, // MaterialName: materialName,
Quantity: quantity, // Quantity: quantity,
UOM: uom, // UOM: uom,
Rate: itemRate, // Rate: itemRate,
AddPer: PER, // AddPer: PER,
Add_Service_Description: service_description, // Add_Service_Description: service_description,
BasicAmount: basicval, // BasicAmount: basicval,
Taxvalue: TotalTaxValue, // Taxvalue: TotalTaxValue,
TotalValue: TotalOrderValue, // TotalValue: TotalOrderValue,
ActualQuantity: quantity, // ActualQuantity: quantity,
ReceivedQuantity: 0, // ReceivedQuantity: 0,
PendingQuantity: quantity // PendingQuantity: quantity
})); // }));
var rowHtml = `
<tr id="${temp}">
<td align="left">${temp}</td>
<td align="left">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${materialName}</td>
<td align="right">${quantity}</td>
<td align="left">${uom}</td>
<td align="right">${itemRate}</td>
<td align="right">${PER}</td>
<td align="right">${service_description}</td>
<td align="right">${basicval}</td>
<td align="right">${TotalTaxValue}</td>
<td align="right">${TotalOrderValue}</td>
<td align="right">${quantity}</td>
<td align="right">0</td>
<td align="right">${quantity}</td>
<td>
<a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
<i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
</a>
&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow('${temp}')" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
<span class="ri-delete-bin-7-fill"></span>
</a>
</td>
</tr>
`;
$('#RevenueAppend').append(rowHtml);
var theForm = $(".CreatePO"); var theForm = $(".CreatePO");
@ -4540,7 +4569,6 @@ if (!empty($getlogpodtl)) {
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails", url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
success: function(data) { success: function(data) {
if (data) { if (data) {
$('#content').loader('hide');
alert(data); alert(data);
} else { } else {
@ -4653,7 +4681,6 @@ if (!empty($getlogpodtl)) {
return false; return false;
} else { } else {
var formData = new FormData($('.CreatePO')[0]); var formData = new FormData($('.CreatePO')[0]);
$('#content').loader('show');
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "<?php echo base_url() ?>purchaseorder/EditRevenuePurchaseOrder", url: "<?php echo base_url() ?>purchaseorder/EditRevenuePurchaseOrder",
@ -4662,7 +4689,6 @@ if (!empty($getlogpodtl)) {
contentType: false, contentType: false,
success: function(data) { success: function(data) {
if (data) { if (data) {
$('#content').loader('hide');
alert(data); alert(data);
$('#txtRowCount').val(''); $('#txtRowCount').val('');
$('#txtDeletedRow').val(''); $('#txtDeletedRow').val('');
@ -4672,7 +4698,6 @@ if (!empty($getlogpodtl)) {
window.location = "purchaseorderListing"; window.location = "purchaseorderListing";
} else { } else {
$('#content').loader('hide');
alert("Error"); alert("Error");
} }
@ -4703,21 +4728,6 @@ if (!empty($getlogpodtl)) {
}); });
$(function() {
$('#revenueTax').DataTable({
"paging": false,
"lengthChange": false,
"searching": false,
//"ordering": true,
// "info": true,
"autoWidth": false
});
});
function RevenueChangeSgst() { function RevenueChangeSgst() {
var getTypeOfTax = $("input:radio[name='Range']:checked").val(); var getTypeOfTax = $("input:radio[name='Range']:checked").val();
if (getTypeOfTax == 0) { if (getTypeOfTax == 0) {
@ -4896,6 +4906,8 @@ if (!empty($getlogpodtl)) {
id = ''; id = '';
}); });
$(document).ready(function() {
$("#EDITREVENUE").on("shown.bs.modal", function(e) { $("#EDITREVENUE").on("shown.bs.modal", function(e) {
var AvlBudAmt = '<?php echo $AvlAmount ?>'; var AvlBudAmt = '<?php echo $AvlAmount ?>';
@ -5072,6 +5084,7 @@ if (!empty($getlogpodtl)) {
}); });
});
</script> </script>
<script> <script>
$('#insurancestatus').change(function() { $('#insurancestatus').change(function() {
@ -5101,7 +5114,6 @@ if (!empty($getlogpodtl)) {
formData.append('param2', param2); formData.append('param2', param2);
$('.content').loader('show');
$.ajax({ $.ajax({
data: formData, data: formData,
type: "POST", type: "POST",
@ -5113,7 +5125,6 @@ if (!empty($getlogpodtl)) {
if (data) { if (data) {
alert(data); alert(data);
window.location.reload(); window.location.reload();
$('.content').loader('hide');
// $('#spl').find('td').eq(5).text(filename[2]); // $('#spl').find('td').eq(5).text(filename[2]);
$('#billModel').modal('hide'); $('#billModel').modal('hide');
} }
@ -5146,7 +5157,6 @@ if (!empty($getlogpodtl)) {
formData.append('param7', param7); formData.append('param7', param7);
$('.content').loader('show');
$.ajax({ $.ajax({
data: formData, data: formData,
type: "POST", type: "POST",
@ -5158,7 +5168,6 @@ if (!empty($getlogpodtl)) {
if (data) { if (data) {
alert(data); alert(data);
window.location.reload(); window.location.reload();
$('.content').loader('hide');
// $('#spl').find('td').eq(5).text(filename[2]); // $('#spl').find('td').eq(5).text(filename[2]);
$('#EditRevenueSplPOModel').modal('hide'); $('#EditRevenueSplPOModel').modal('hide');
} }
@ -5181,7 +5190,6 @@ if (!empty($getlogpodtl)) {
formData.append('count', counter); formData.append('count', counter);
formData.append('igr', igr); formData.append('igr', igr);
$('.content').loader('show');
$.ajax({ $.ajax({
data: formData, data: formData,
type: "POST", type: "POST",
@ -5193,7 +5201,6 @@ if (!empty($getlogpodtl)) {
if (data) { if (data) {
alert(data); alert(data);
window.location.reload(); window.location.reload();
$('.content').loader('hide');
// $('#spl').find('td').eq(5).text(filename[2]); // $('#spl').find('td').eq(5).text(filename[2]);
$('#billModel').modal('hide'); $('#billModel').modal('hide');
} }

View File

@ -225,21 +225,21 @@ foreach ($PaymentTerms as $TER) {
Mat: [] Mat: []
}; };
$(function() { $(function() {
$("#PODate").datepicker({ // $("#PODate").datepicker({
minDate: d, // minDate: d,
maxDate: 'now', // maxDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '-100:+0' // yearRange: '-100:+0'
}); // });
$("#Deliverydt").datepicker({ // $("#Deliverydt").datepicker({
minDate: 'now', // minDate: 'now',
dateFormat: 'dd-mm-yy', // dateFormat: 'dd-mm-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '0:+10' // yearRange: '0:+10'
}); // });
$('#drpSupplier').change(function() { $('#drpSupplier').change(function() {
@ -792,7 +792,7 @@ foreach ($PaymentTerms as $TER) {
<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt ?>"> <input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt ?>">
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type'=>'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1002,7 +1002,7 @@ foreach ($PaymentTerms as $TER) {
<!-- Model for servicepo --> <!-- Model for servicepo -->
<div class="modal fade" id="EDITSERVICE" role="dialog"> <div class="modal fade" id="EDITSERVICE" role="dialog">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<!-- Modal content--> <!-- Modal content-->
<form> <form>
<div class="modal-content" style="width:900px;"> <div class="modal-content" style="width:900px;">
@ -1577,7 +1577,7 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
<script type="text/html" id="ServiceList"> <!-- <script type="text/html" id="ServiceList">
<tr id="<%=index%>"> <tr id="<%=index%>">
<td align="left"><%=index%></td> <td align="left"><%=index%></td>
<td align="left"><%=ReqNo%></td> <td align="left"><%=ReqNo%></td>
@ -1599,7 +1599,7 @@ foreach ($PaymentTerms as $TER) {
</td> </td>
</tr> </tr>
</script> </script> -->
<script> <script>
var index = $('#txtRowCount').val();; var index = $('#txtRowCount').val();;
var userid = ''; var userid = '';
@ -1614,7 +1614,7 @@ foreach ($PaymentTerms as $TER) {
$('#EditotherDescription').hide(); $('#EditotherDescription').hide();
$(document).ready(function() {
$("#EDITSERVICE").on("shown.bs.modal", function(e) { $("#EDITSERVICE").on("shown.bs.modal", function(e) {
var AvlBudAmt = '<?php echo $AvlAmount ?>'; var AvlBudAmt = '<?php echo $AvlAmount ?>';
@ -1711,7 +1711,7 @@ foreach ($PaymentTerms as $TER) {
} }
}); });
});
$('.EditService').click(function() { $('.EditService').click(function() {
@ -2168,13 +2168,13 @@ foreach ($PaymentTerms as $TER) {
// this function is used to clear data changing schedule option // this function is used to clear data changing schedule option
$('#Scheduleby').change(function() { $('#Scheduleby').change(function() {
$("#Deliverydt").datepicker({ // $("#Deliverydt").datepicker({
minDate: 'now', // minDate: 'now',
dateFormat: 'mm-dd-yy', // dateFormat: 'mm-dd-yy',
changeMonth: true, // changeMonth: true,
changeYear: true, // changeYear: true,
yearRange: '0:+10' // yearRange: '0:+10'
}); // });
}); });

View File

@ -3072,39 +3072,6 @@ if (!empty($getlogpodtl)) {
</div> <!-- content --> </div> <!-- content -->
</div> </div>
<script type="text/html" id="ImportList">
<tr id="<%=index%>">
<td align="left"><%=index%></td>
<td align="left"><%=ReqNo%></td>
<td align="left"><%=MaterialCode%></td>
<td align="left"><%=Description%></td>
<td align="left"><%=Quantity%></td>
<td align="left"><%=UOM%></td>
<td align="left"><%=Rate%></td>
<td align="left"><%=BasicAmount%></td>
<td align="left"><%=ReceivedQty%></td>
<td align="left"><%=RejectedQty%></td>
<td align="left"><%=PendingQty%></td>
<!-- <td align="left"><%=index%></td>
<td align="left"><%=ReqNo%></td>
<td align="left"><%=ItemName%></td>
<td align="left"><%=Quantity%></td>
<td align="left"><%=UOM%></td>
<td align="left"><%=Rate%></td>
<td align="left"><%=BasicAmount%></td> -->
<!-- <td align="left"><%=Taxvalue%></td>
<td align="left"><%=TotalValue%></td> -->
<td>
<a data-target='#editimportpomodel' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#editimportpomodel"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
</td>
</tr>
</script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
@ -4370,29 +4337,32 @@ if (!empty($getlogpodtl)) {
//alert('in'); //alert('in');
var template = jQuery("#ImportList").html(); var rowHtml = `
$('#ImportAppend').append(_.template(template, { <tr id="${temp}">
index: temp, <td align="left">${temp}</td>
ReqNo: Reqnumber, <td align="left">${Reqnumber}</td>
MaterialCode: materialCode, <td align="left">${materialCode}</td>
Description: materialName, <td align="left">${materialName}</td>
Quantity: quantity, <td align="left">${quantity}</td>
UOM: uom, <td align="left">${uom}</td>
Rate: itemRate, <td align="left">${itemRate}</td>
BasicAmount: BasicAmt, <td align="left">${BasicAmt}</td>
Taxvalue: taxamt, <td align="left">${receivedqty}</td>
TotalValue: totalexp, <td align="left">${rejectedqty}</td>
ReceivedQty: receivedqty, <td align="left">${pendingqty}</td>
RejectedQty: rejectedqty, <td>
PendingQty: pendingqty <a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
})); <i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
//alert(JSON.strigify(BasicAmt)); </a>&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
<span class="glyphicon glyphicon-trash"></span>
</a>
</td>
</tr>
`;
// Append the generated row HTML to the target element
//$('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,ItemName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp})); $('#ImportAppend').append(rowHtml);
//clearTaxField();
//from above defined variables
var theForm = $(".ImportPO"); var theForm = $(".ImportPO");

View File

@ -714,7 +714,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div> </div>
<div id="IMPORT" class="modal fade" tabindex="-1" role="dialog" <div id="IMPORT" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Add Import Purchase Order Item</h4> <h4 class="modal-title">Add Import Purchase Order Item</h4>
@ -1290,7 +1290,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div><!-- /.modal --> </div><!-- /.modal -->
<div id="editimportpomodel" class="modal fade" tabindex="-1" role="dialog" <div id="editimportpomodel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Import Purchase Order Item</h4> <h4 class="modal-title">Edit Import Purchase Order Item</h4>
@ -1878,30 +1878,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div> </div>
</div><!-- /.modal --> </div><!-- /.modal -->
<script type="text/html" id="ImportList">
<tr id="<%=index%>">
<td align="left"><%=index%></td>
<td align="left"><%=ReqNo%></td>
<td align="left"><%=MaterialCode%></td>
<td align="left"><%=Description%></td>
<td align="left"><%=Quantity%></td>
<td align="left"><%=UOM%></td>
<td align="left"><%=Rate%></td>
<td align="left"><%=BasicAmount%></td>
<td align="left"><%=ReceivedQty%></td>
<td align="left"><%=RejectedQty%></td>
<td align="left"><%=PendingQty%></td>
<!-- <td align="left"><%=Taxvalue%></td>
<td align="left"><%=TotalValue%></td> -->
<td>
<a data-target='#editimportpomodel' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
</td>
</tr>
</script>
@ -3315,22 +3291,51 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
index = parseInt(index) + 1; index = parseInt(index) + 1;
//alert('in'); //alert('in');
var template = jQuery("#ImportList").html(); // var template = jQuery("#ImportList").html();
$('#ImportAppend').append(_.template(template, { // $('#ImportAppend').append(_.template(template, {
index: temp, // index: temp,
ReqNo: Reqnumber, // ReqNo: Reqnumber,
MaterialCode: materialCode, // MaterialCode: materialCode,
Description: materialName, // Description: materialName,
Quantity: quantity, // Quantity: quantity,
UOM: uom, // UOM: uom,
Rate: itemRate, // Rate: itemRate,
BasicAmount: BasicAmt, // BasicAmount: BasicAmt,
Taxvalue: taxexp, // Taxvalue: taxexp,
TotalValue: totalexp, // TotalValue: totalexp,
ReceivedQty: receivedqty, // ReceivedQty: receivedqty,
RejectedQty: rejectedqty, // RejectedQty: rejectedqty,
PendingQty: pendingqty // PendingQty: pendingqty
})); // }));
var rowHtml = `
<tr id="${temp}">
<td align="left">${temp}</td>
<td align="left">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${materialName}</td>
<td align="left">${quantity}</td>
<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>
<td>
<a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
<i class="fas fa-pencil-alt" data-toggle="tooltip"></i>
</a>&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
<span class="glyphicon glyphicon-trash"></span>
</a>
</td>
</tr>
`;
// Append the generated row HTML to the target element
$('#ImportAppend').append(rowHtml);
//alert(JSON.strigify(BasicAmt)); //alert(JSON.strigify(BasicAmt));

View File

@ -2183,7 +2183,7 @@ if (!empty($INRSYMBOL)) {
</div> <!-- content --> </div> <!-- content -->
</div> </div>
<!-- Modal for Packing Calculation --> <!-- Modal for Packing Calculation -->
<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog" <div id="packagingcalmodel" class="modal fade" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">
@ -2212,7 +2212,7 @@ if (!empty($INRSYMBOL)) {
<!-- Modal for freight Calculation--> <!-- Modal for freight Calculation-->
<div id="freightcalmodel" class="modal fade" tabindex="-1" role="dialog" <div id="freightcalmodel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Freight Calculation On</h4> <h4 class="modal-title">Freight Calculation On</h4>
@ -2242,7 +2242,7 @@ if (!empty($INRSYMBOL)) {
<!-- Modal for Excise Duty Calculation--> <!-- Modal for Excise Duty Calculation-->
<div id="ExciseDutyCalModel" class="modal fade" tabindex="-1" role="dialog" <div id="ExciseDutyCalModel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Excise Duty Calculation On</h4> <h4 class="modal-title">Excise Duty Calculation On</h4>
@ -2277,7 +2277,7 @@ if (!empty($INRSYMBOL)) {
<!-- Modal for Vat Calculation --> <!-- Modal for Vat Calculation -->
<div id="VatCalModel" class="modal fade" tabindex="-1" role="dialog" <div id="VatCalModel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Vat Calculation On</h4> <h4 class="modal-title">Vat Calculation On</h4>
@ -2306,7 +2306,7 @@ if (!empty($INRSYMBOL)) {
<!-- Modal for CST Calculation --> <!-- Modal for CST Calculation -->
<div id="CSTCalModel" class="modal fade" tabindex="-1" role="dialog" <div id="CSTCalModel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">CST Calculation On</h4> <h4 class="modal-title">CST Calculation On</h4>
@ -2334,7 +2334,7 @@ if (!empty($INRSYMBOL)) {
<!-- Model for revenue po --> <!-- Model for revenue po -->
<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4> <h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
@ -2348,7 +2348,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label> <label>Req No<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
$RL = array("0" => 'Select Req No'); $RL = array("0" => 'Select Req No');
@ -2393,7 +2393,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label> <label>Item Code<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
$options = array("0" => 'Item Code'); $options = array("0" => 'Item Code');
@ -2423,14 +2423,14 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Qty<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label> <label>Qty<span class="text-danger">*</span></label>
<?php <?php
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()'); $data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-1">
<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label> <label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label>
<!-- <label>Rate</label> --> <!-- <label>Rate</label> -->
<?php <?php
$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()'); $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
@ -2686,7 +2686,7 @@ if (!empty($INRSYMBOL)) {
<!-- Edit Model for revenue po --> <!-- Edit Model for revenue po -->
<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog" <div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Revenue Purchase Order Line Item </h4> <h4 class="modal-title">Edit Revenue Purchase Order Line Item </h4>
@ -2738,7 +2738,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label> <label>Item Code<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
$options = array("0" => 'Item Code'); $options = array("0" => 'Item Code');
@ -2758,7 +2758,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-1">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2767,8 +2767,8 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-2">
<label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label> <label>Quantity<span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;'); $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
@ -2776,8 +2776,8 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-2">
<label><?php echo "Rate ($INRSYM)" ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label> <label><?php echo "Rate ($INRSYM)" ?><span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;'); $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
@ -2785,12 +2785,12 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-1">
<label>Per</label> <?php <label>Per</label> <?php
$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control'); $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-2">
<label><?php echo "Basic Amt ($INRSYM)" ?></label> <label><?php echo "Basic Amt ($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3106,7 +3106,7 @@ if (!empty($INRSYMBOL)) {
}); });
$(document).ready(function() {
$("#EDITREVENUE").on("shown.bs.modal", function(e) { $("#EDITREVENUE").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid'); userid = $(e.relatedTarget).data('userid');
@ -3213,7 +3213,7 @@ if (!empty($INRSYMBOL)) {
$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked'); $("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
}); });});
$('.AddRevenue').click(function() { $('.AddRevenue').click(function() {
tinyMCE.triggerSave(); tinyMCE.triggerSave();
if (validateRevenueTax() && ExceedQuantityCheck()) { if (validateRevenueTax() && ExceedQuantityCheck()) {
@ -3749,7 +3749,7 @@ $('#RevenueAppend').append(rowHtml);
var finalBasicAmount = txtTotBasicAmount - txtTotalDiscount; var finalBasicAmount = txtTotBasicAmount - txtTotalDiscount;
//alert(txtTotBasicAmount+"--"+txtTotalDiscount+"--"+finalBasicAmount+"--"+AvlBudAmt); //alert(txtTotBasicAmount+"--"+txtTotalDiscount+"--"+finalBasicAmount+"--"+AvlBudAmt);
if (validate()) { if (validate()) {
if (document.getElementById('revenueTax').rows.length < 3) { if (document.getElementById('revenueTax').rows.length < 1) {
alert('Please Select Line item to Create PO'); alert('Please Select Line item to Create PO');
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
@ -3776,7 +3776,7 @@ $('#RevenueAppend').append(rowHtml);
var formData = new FormData($('.CreatePO')[0]); var formData = new FormData($('.CreatePO')[0]);
$('#content').loader('show');
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "<?php echo base_url() ?>purchaseorder/addNewPurchaseOrder", url: "<?php echo base_url() ?>purchaseorder/addNewPurchaseOrder",
@ -3785,7 +3785,7 @@ $('#RevenueAppend').append(rowHtml);
contentType: false, contentType: false,
success: function(data) { success: function(data) {
if (data) { if (data) {
$('#content').loader('hide');
alert(data); alert(data);
$('#txtRowCount').val(''); $('#txtRowCount').val('');
$('#txtDeletedRow').val(''); $('#txtDeletedRow').val('');

View File

@ -2232,7 +2232,6 @@ $('#ServiceAppend').append(rowHtml);
return false; return false;
} else { } else {
$('#content').loader('show');
var formData = new FormData($('.ServicePO')[0]); var formData = new FormData($('.ServicePO')[0]);
$.ajax({ $.ajax({
@ -2244,7 +2243,6 @@ $('#ServiceAppend').append(rowHtml);
contentType: false, contentType: false,
success: function(data) { success: function(data) {
if (data) { if (data) {
$('#content').loader('hide');
alert(data); alert(data);
$('#txtRowCount').val(''); $('#txtRowCount').val('');
$('#txtDeletedRow').val(''); $('#txtDeletedRow').val('');
@ -2253,7 +2251,6 @@ $('#ServiceAppend').append(rowHtml);
window.location = "purchaseorderListing"; window.location = "purchaseorderListing";
} else { } else {
$('#content').loader('hide');
alert("Error"); alert("Error");
} }