diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php
index 14b2b16d..c132269a 100755
--- a/application/controllers/requisitionform.php
+++ b/application/controllers/requisitionform.php
@@ -356,8 +356,9 @@ class requisitionform extends BaseController
$comma_separated = explode(':', $DeletedRow);
$serviceSchedule = $this->input->post('serviceSchedule');
- $servicePeriod = $this->input->post('servicePeriod');
- $noOfService = $this->input->post('noOfService');
+ $servicePeriod = $this->input->post('serviceSchedule');
+ // $noOfService = $this->input->post('noOfService');
+ $noOfService = 1;
$IsExists = $this->requistion_model->RequistionIsExists($Requestedby);
// print_r($IsExists);
@@ -440,8 +441,9 @@ class requisitionform extends BaseController
$DeletedRow = $this->input->post('txtDeletedRow');
$RowCount = $this->input->post('txtRowCount');
$serviceSchedule = $this->input->post('serviceSchedule');
- $servicePeriod = $this->input->post('servicePeriod');
- $noOfService = $this->input->post('noOfService');
+ $servicePeriod = $this->input->post('serviceSchedule');
+ // $noOfService = $this->input->post('noOfService');
+ $noOfService = 1;
if(strlen($Status) > 1)
{
$Request = array( 'Status'=>$Status,'CreatedDate'=>$updatedDate,'CreatedBy'=>$UpdatedBy,'CostCenterCode'=>$CostCenter,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod);
@@ -664,4 +666,4 @@ class requisitionform extends BaseController
}
}
-?>
\ No newline at end of file
+?>
diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php
index 9357ec69..d1e05064 100755
--- a/application/views/alterpurchaseorder.php
+++ b/application/views/alterpurchaseorder.php
@@ -6346,9 +6346,10 @@ function populateValueMainFormForDeleteItem(rowid)
*/
function clearServiceModalFields()
{
+
// To reset the Modal controls
- $('#ServiceMaterialCode').val("0") ;
+ $('#ServiceMaterialCode').val("0");
$("#ServiceDescription").val('');
$('#ServiceUOM').val('');
$('#ServiceQuantity').val('');
@@ -6734,7 +6735,7 @@ $('#content').loader('hide');
$.each(JSON.parse(materialData), function (index, value) {
if (value.MaterialCode==materialCode) {
- $("#ServiceMaterialCode").append( $('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) );
+ // $("#ServiceMaterialCode").append( $('').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) );
}
@@ -7481,8 +7482,8 @@ document.getElementById('NoServices').style.display = 'none';
$('#ServiceNo').val(1);
}
else{
-document.getElementById('ServicePeriodOption').style.display = 'block';
-document.getElementById('NoServices').style.display = 'block';
+document.getElementById('ServicePeriodOption').style.display = 'none';
+document.getElementById('NoServices').style.display = 'none';
document.getElementById('ServiceNo').value = 1;
//$('#Frequency').val($('#ServiceOptions').val()+' - ' + $('#ServiceNo').val());
//$('#FrequencyNo').val($('#ServiceNo').val());
@@ -7602,3 +7603,4 @@ $("#PaymentMethod").change(function() {
+