bug fixes in purchase module - 15-03-2025
This commit is contained in:
parent
2259226a1d
commit
07be88b958
@ -1715,7 +1715,10 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
</div><!-- EDITSERVICE.6 form-row closed here -->
|
||||
<div class="form-row">
|
||||
<div class="col-md-5 col-md-offset-4" align="right">
|
||||
<div class="col-md-6">
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 col-md-offset-4" align="right">
|
||||
<label>Other Allowances <?php echo "($INRSYM)" ?></label>
|
||||
</div><!-- EDITSERVICE.7.1 col-md-5 col-md-offset-4 closed here -->
|
||||
<div class="form-group col-md-3">
|
||||
@ -1728,7 +1731,10 @@ if (!empty($INRSYMBOL)) {
|
||||
</div><!-- EDITSERVICE.7.2 col-md-3 closed here -->
|
||||
</div><!-- EDITSERVICE.7 form-row closed here -->
|
||||
<div class="form-row">
|
||||
<div class="col-md-5 col-md-offset-4" align="right">
|
||||
<div class="col-md-6">
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 col-md-offset-4" align="right">
|
||||
<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
@ -1752,11 +1758,11 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="modal-footer">
|
||||
<div class="form-row">
|
||||
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||
<a class="btn btn-success font EditService" ID="Edit"> <span class="bold">Update Service</span></a>
|
||||
<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a>
|
||||
<a class="btn btn-info waves-effect waves-light font EditService" ID="Edit"> <span class="bold">Update Service</span></a>
|
||||
</div>
|
||||
</div><!-- EDITSERVICE modal-footer closed here -->
|
||||
</form><!-- EDITSERVICE form closed here -->
|
||||
@ -1805,106 +1811,111 @@ if (!empty($INRSYMBOL)) {
|
||||
});
|
||||
|
||||
|
||||
$(document).ready(function() {
|
||||
|
||||
$(document).on("shown.bs.modal", "#EDITSERVICE", function (e) {
|
||||
|
||||
console.log("Worng");
|
||||
userid = $(e.relatedTarget).data('userid');
|
||||
|
||||
var tr = document.getElementById(userid);
|
||||
|
||||
var cellval = tr.cells;
|
||||
//alert(userid)
|
||||
var id = $('#Reqnumber' + userid).val();
|
||||
|
||||
$('#EditReqNo').val($('#Reqnumber' + userid).val());
|
||||
$('#EditdeptName').val($('#departmentName' + userid).val());
|
||||
$("#EditCostCenter").val($('#costCode' + userid).val());
|
||||
$('#EditAvlBudAmt').val($('#AvilBudget' + userid).val());
|
||||
|
||||
$('#EditItemName').val($('#materialName' + userid).val());
|
||||
$('#EditUOM').val($('#uom' + userid).val());
|
||||
$('#EditPer').val($('#per' + userid).val());
|
||||
$('#EditQuantity').val($('#quantity' + userid).val());
|
||||
RequistQuantity = $('#quantity' + userid).val();
|
||||
$('#EditRate').val($('#itemRate' + userid).val());
|
||||
$('#txtEditBasicValue').val(cellval[7].innerHTML);
|
||||
$('#EditCgst').val($('#Cgst' + userid).val());
|
||||
$('#EditAfterCgst').val($('#AfterCgst' + userid).val());
|
||||
$('#EditSgst').val($('#Sgst' + userid).val());
|
||||
$('#EditAfterSgst').val($('#AfterSgst' + userid).val());
|
||||
$('#EditIgst').val($('#Igst' + userid).val());
|
||||
$('#EditAfterIgst').val($('#AfterIgst' + userid).val());
|
||||
|
||||
if ($('#FrequencyValue' + userid).val() == 1) {
|
||||
$('#EditFrequency').val($('#Frequency' + userid).val());
|
||||
$("#EditFrequencyNo").val(1);
|
||||
} else {
|
||||
|
||||
|
||||
$('#EditFrequency').val($('#Frequency' + userid).val());
|
||||
$("#EditFrequencyNo").val($('#FrequencyValue' + userid).val());
|
||||
}
|
||||
|
||||
$("#EDITSERVICE").on("shown.bs.modal", function(e) {
|
||||
$('#EditTotalOrderValue').val(cellval[9].innerHTML);
|
||||
$('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
|
||||
|
||||
console.log("Worng");
|
||||
userid = $(e.relatedTarget).data('userid');
|
||||
|
||||
var tr = document.getElementById(userid);
|
||||
|
||||
var cellval = tr.cells;
|
||||
//alert(userid)
|
||||
var id = $('#Reqnumber' + userid).val();
|
||||
|
||||
$('#EditReqNo').val($('#Reqnumber' + userid).val());
|
||||
$('#EditdeptName').val($('#departmentName' + userid).val());
|
||||
$("#EditCostCenter").val($('#costCode' + userid).val());
|
||||
$('#EditAvlBudAmt').val($('#AvilBudget' + userid).val());
|
||||
|
||||
$('#EditItemName').val($('#materialName' + userid).val());
|
||||
$('#EditUOM').val($('#uom' + userid).val());
|
||||
$('#EditPer').val($('#per' + userid).val());
|
||||
$('#EditQuantity').val($('#quantity' + userid).val());
|
||||
RequistQuantity = $('#quantity' + userid).val();
|
||||
$('#EditRate').val($('#itemRate' + userid).val());
|
||||
$('#txtEditBasicValue').val(cellval[7].innerHTML);
|
||||
$('#EditCgst').val($('#Cgst' + userid).val());
|
||||
$('#EditAfterCgst').val($('#AfterCgst' + userid).val());
|
||||
$('#EditSgst').val($('#Sgst' + userid).val());
|
||||
$('#EditAfterSgst').val($('#AfterSgst' + userid).val());
|
||||
$('#EditIgst').val($('#Igst' + userid).val());
|
||||
$('#EditAfterIgst').val($('#AfterIgst' + userid).val());
|
||||
|
||||
if ($('#FrequencyValue' + userid).val() == 1) {
|
||||
$('#EditFrequency').val($('#Frequency' + userid).val());
|
||||
$("#EditFrequencyNo").val(1);
|
||||
} else {
|
||||
$('#EditOtheritemDescription').val($('#OtherServiceDescription' + userid).val());
|
||||
|
||||
|
||||
$('#EditFrequency').val($('#Frequency' + userid).val());
|
||||
$("#EditFrequencyNo").val($('#FrequencyValue' + userid).val());
|
||||
}
|
||||
|
||||
$('#EditTotalOrderValue').val(cellval[9].innerHTML);
|
||||
$('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
|
||||
|
||||
$('#EditOtheritemDescription').val($('#OtherServiceDescription' + userid).val());
|
||||
var desval = $('#OtherServiceDescription' + userid).val();
|
||||
//alert(desval)
|
||||
if (desval == '') {
|
||||
$('#EditotherDescription').hide();
|
||||
} else {
|
||||
$('#EditotherDescription').show();
|
||||
}
|
||||
|
||||
|
||||
var desval = $('#OtherServiceDescription' + userid).val();
|
||||
//alert(desval)
|
||||
if (desval == '') {
|
||||
$('#EditotherDescription').hide();
|
||||
} else {
|
||||
$('#EditotherDescription').show();
|
||||
}
|
||||
tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
|
||||
//$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
|
||||
|
||||
$("#EditMaterialCode").empty();
|
||||
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
|
||||
// For Binding Material list center for the selected Requistion Number
|
||||
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
|
||||
var isAdded = "0";
|
||||
for (i = 0; i < Material.length; i++) {
|
||||
$.each(Material[i], function(idx, obj) {
|
||||
|
||||
if (obj.ReqNo === id) {
|
||||
|
||||
$.each(SelectedMaterialList.Mat, function(idx1, el) {
|
||||
if (id == el.ReqNo) {
|
||||
|
||||
if (el.materialCode == obj.MaterialCode) {
|
||||
|
||||
isAdded = "1";
|
||||
return false;
|
||||
} else {
|
||||
isAdded = "0";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
|
||||
//$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
|
||||
});
|
||||
|
||||
$("#EditMaterialCode").empty();
|
||||
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
|
||||
// For Binding Material list center for the selected Requistion Number
|
||||
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
|
||||
var isAdded = "0";
|
||||
for (i = 0; i < Material.length; i++) {
|
||||
$.each(Material[i], function(idx, obj) {
|
||||
|
||||
if (obj.ReqNo === id) {
|
||||
if (isAdded == "0") {
|
||||
|
||||
$.each(SelectedMaterialList.Mat, function(idx1, el) {
|
||||
if (id == el.ReqNo) {
|
||||
|
||||
if (el.materialCode == obj.MaterialCode) {
|
||||
|
||||
isAdded = "1";
|
||||
return false;
|
||||
} else {
|
||||
isAdded = "0";
|
||||
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
if (isAdded == "0") {
|
||||
|
||||
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
$('.AddService').click(function() {
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user