fixed bugs related to puchase and employee module
This commit is contained in:
parent
fb9b4f6eb8
commit
f5d27440e3
@ -90,7 +90,7 @@
|
||||
function alpha(evt) {
|
||||
var k;
|
||||
document.all ? k = evt.keyCode : k = evt.which;
|
||||
return ((k > 64 && k < 91) || (k > 96 && k < 123) || k == 8 || k == 32 || k == 33 || (k >= 48 && k <= 57));
|
||||
return ((k > 64 && k < 91) || (k > 96 && k < 123) || k == 8 || k == 32 || (k >= 48 && k <= 57));
|
||||
}
|
||||
|
||||
//PAN Validate
|
||||
@ -582,22 +582,6 @@
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- <div class="col-md-4 pad">
|
||||
<label>Emergency Contact Name</label>
|
||||
<input type="text" id="emergencycontactname"
|
||||
onkeypress="return onlyAlphabets(event);" maxlength="100"
|
||||
name="emergencycontactname" class="form-control">
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label>Emergency Contact Number</label>
|
||||
<input type="text" id="emergencycontactnumber"
|
||||
name="emergencycontactnumber"
|
||||
onchange="return getValidEmergencyNumber();" pattern="(.){10,10}"
|
||||
maxlength="10" class="form-control"
|
||||
onkeypress="return isNumberKey(event)">
|
||||
</div> -->
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@ -778,6 +762,7 @@
|
||||
<div class="col-md-3"><label>IFSC Code</label></span><span
|
||||
class="badge">*</span>
|
||||
<input type="text" id="ifsccode" name="ifsccode"
|
||||
title="Only letters and numbers are allowed"
|
||||
class="form-control" onkeypress="return alpha(event);"
|
||||
style="text-transform: uppercase" required>
|
||||
</div>
|
||||
|
||||
@ -3290,16 +3290,7 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" id="TripsValue" style="display:none;">
|
||||
<label>NO Of Trips<span class="badge mandatory"></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label>Freight Rate <span class="badge mandatory"></label>
|
||||
<div class="form-group">
|
||||
@ -3320,6 +3311,19 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-9"></div>
|
||||
<div class="col-md-3" id="TripsValue" style="display:none;">
|
||||
<label>NO Of Trips<span class="badge mandatory"></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6"></div>
|
||||
<div class="col-md-3">
|
||||
|
||||
@ -232,7 +232,7 @@
|
||||
<th>Ordered Quantity</th>
|
||||
<th>Received Quantity</th>
|
||||
<th>Balance Quantity</th>
|
||||
<th>Invoice Quantity</th>
|
||||
<th>Invoice Quantity<span class="text-danger">*</span></th>
|
||||
<th>Remarks</th>
|
||||
<th> </th>
|
||||
</tr>
|
||||
|
||||
@ -197,24 +197,9 @@ if (!empty($INRSYMBOL)) {
|
||||
};
|
||||
var CollIndex = 0;
|
||||
|
||||
// alert(new Date(year,month,day));
|
||||
$(function() {
|
||||
// $("#PODate").datepicker({
|
||||
// minDate: d,
|
||||
// maxDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '-100:+0'
|
||||
// });
|
||||
|
||||
// $("#Deliverydt").datepicker({
|
||||
// minDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '0:+10'
|
||||
// });
|
||||
$(function() {
|
||||
|
||||
|
||||
$('#PoTypeOptions').change(function() {
|
||||
var potypeval = $('#PoTypeOptions').val();
|
||||
@ -3556,6 +3541,7 @@ if (!empty($INRSYMBOL)) {
|
||||
$('#TotalOrderValue' + userid).val(TotalOrderValue);
|
||||
$('#Service_Description' + userid).val(Service_Description);
|
||||
populateValueMainFormForEditRevenueTax();
|
||||
$('#EDITREVENUE').modal('hide');
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
@ -247,9 +247,9 @@
|
||||
<td align="right"><?php
|
||||
$date = new DateTime($record->DeliveryChellanDate);
|
||||
echo $date->format('d-m-Y'); ?></td>
|
||||
<td><?php echo $record->itemCount ?></td>
|
||||
<td><?php echo $record->ReceivedQuantity ?></td>
|
||||
<td><?php echo $record->NetWeight ?></td>
|
||||
<td align="center"><?php echo $record->itemCount ?></td>
|
||||
<td align="right"><?php echo $record->ReceivedQuantity ?></td>
|
||||
<td align="center"><?php echo $record->NetWeight ?></td>
|
||||
<td><?php echo $record->VehicleNo ?></td>
|
||||
<td><?php echo $record->DriverName ?></td>
|
||||
<td><?php echo $record->TransporterName ?></td>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user