diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php
index f4c69c1c..3c10ab53 100755
--- a/application/controllers/emergencypurchaseorder.php
+++ b/application/controllers/emergencypurchaseorder.php
@@ -135,8 +135,9 @@ class emergencypurchaseorder extends BaseController
$ServiceWorkStatus=$this->input->post('workStatus');
$ServiceScheduleType = $this->input->post('ScheduleType');
- $ServiceScheduleOptions = $this->input->post('ServiceOptions');
- $ServiceServiceNo = $this->input->post('ServiceNo');
+ $ServiceScheduleOptions = $this->input->post('ScheduleType');
+ //$ServiceServiceNo = $this->input->post('ServiceNo');
+ $ServiceServiceNo = 1;
$ModeOfShipment=$this->input->post('emergmodeofshipment');
$SupplierReference=$this->input->post('emergsupplierreference');
$SuppliersOfferNo=$this->input->post('emergsupplierofferno');
diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php
index 6f35e8de..b8ebf7d0 100755
--- a/application/controllers/requisitionform.php
+++ b/application/controllers/requisitionform.php
@@ -344,8 +344,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);
@@ -428,8 +429,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);
@@ -600,4 +602,4 @@ class requisitionform extends BaseController
}
}
-?>
\ No newline at end of file
+?>
diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php
index 28405660..8e68e185 100755
--- a/application/views/EditservicePurchaseorder.php
+++ b/application/views/EditservicePurchaseorder.php
@@ -1152,7 +1152,7 @@ $(document).ready(function () {
-
+
'Frequency','value' => set_value('Frequency'),'id'=>'Frequency', 'class' => 'form-control','readonly' => 'true' );
@@ -1422,7 +1422,7 @@ $(document).ready(function () {
-
+
'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control' ,'readonly' => 'true');
@@ -1695,7 +1695,7 @@ $(document).ready(function () {
-
+
'ViewFrequency','value' => set_value('ViewFrequency'),'id'=>'ViewFrequency', 'class' => 'form-control' ,'readonly' => 'true');
@@ -1963,7 +1963,7 @@ $(document).ready(function () {
-
+
@@ -2966,7 +2966,7 @@ for(i=2;i<=rows;i++){
$("#deptName").val(obj.DepartmentName);
$("#CostCenter").val(obj.CostCenterCode);
if(obj.Service_Period!='' && obj.Service_Period!=null){
- $("#Frequency").val(obj.Service_Period +'-' + obj.NumberOfService);
+ $("#Frequency").val(obj.Service_Period);
$("#FrequencyNo").val(obj.NumberOfService);
}
@@ -3232,3 +3232,4 @@ $('#insuranceNo').val('');
+
diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php
index cf873afb..b4280773 100755
--- a/application/views/alterpurchaseorder.php
+++ b/application/views/alterpurchaseorder.php
@@ -2815,7 +2815,7 @@ function populateValueMainFormForDeleteItem(rowid)
-
+
-
+
-
+
'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control' ,'readonly' => 'true');
@@ -1649,7 +1649,7 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$("#EditFrequencyNo").val(1);
}
else{
- $('#EditFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
+ $('#EditFrequency').val($('#Frequency'+userid).val());
$("#EditFrequencyNo").val($('#FrequencyValue'+userid).val());
}
@@ -2281,3 +2281,4 @@ $("#PaymentTerms").change(function() {
});
+
diff --git a/application/views/editrequisitionform.php b/application/views/editrequisitionform.php
index 9b0182e2..d3759e36 100755
--- a/application/views/editrequisitionform.php
+++ b/application/views/editrequisitionform.php
@@ -55,8 +55,8 @@ if(!empty($ReqPOType))
}
else{
document.getElementById('DisplayScheduleDiv').style.display = 'block';
- document.getElementById('ServicePeriodOption').style.display = 'block';
- document.getElementById('NoServices').style.display = 'block';
+ document.getElementById('ServicePeriodOption').style.display = 'none';
+ document.getElementById('NoServices').style.display = 'none';
}
@@ -65,7 +65,7 @@ if(!empty($ReqPOType))
}
else
{
- document.getElementById('DisplayScheduleDiv').style.display = 'none';
+ document.getElementById('DisplayScheduleDiv').style.display = 'block';
document.getElementById('ServicePeriodOption').style.display = 'none';
document.getElementById('NoServices').style.display = 'none';
@@ -1022,10 +1022,11 @@ document.getElementById('NoServices').style.display = 'none';
}
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';
}
});
+
diff --git a/application/views/requisitionform.php b/application/views/requisitionform.php
index dfce8983..30ea45f2 100755
--- a/application/views/requisitionform.php
+++ b/application/views/requisitionform.php
@@ -1,4 +1,3 @@
-
EmpID ;
+ $EmpID = $Emp->EmpID;
$FirstName = $Emp->FirstName ;
$Designation = $Emp->Designation;
$DepartmentName =$Emp->DepartmentName;
@@ -607,7 +606,7 @@ function Save()
else{
var serviceSchedule='';
var servicePeriod='';
- var noOfService='';
+ noOfService='';
}
$('#content').loader('show');
$.ajax({
@@ -906,10 +905,11 @@ document.getElementById('NoServices').style.display = 'none';
$('#ServiceNo').val('');
}
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;
}
});
+
diff --git a/application/views/requisitionlisting.php b/application/views/requisitionlisting.php
index ef1fb274..df6907f4 100755
--- a/application/views/requisitionlisting.php
+++ b/application/views/requisitionlisting.php
@@ -85,7 +85,7 @@ span.highlight {
Requisition Type |
Tot No.OfLineItem |
Po CreatedLineItem |
- Partical PoCreatedLineItem |
+ Partially PoCreatedLineItem |
NewLine Item |
Status |
Requisted Date |
diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php
index 66bb0852..d1518446 100755
--- a/application/views/servicePurchaseorder.php
+++ b/application/views/servicePurchaseorder.php
@@ -204,7 +204,7 @@ $("#txtBasicValue").val('');
$("#deptName").val(obj.DepartmentName);
$("#CostCenter").val(obj.CostCenterCode);
if(obj.Service_Period!='' && obj.Service_Period!=null){
- $("#Frequency").val(obj.Service_Period +'-' + obj.NumberOfService);
+ $("#Frequency").val(obj.Service_Period);
$("#FrequencyNo").val(obj.NumberOfService);
}
@@ -1050,7 +1050,7 @@ function clearEditTaxField()
-
+
'Frequency','value' => set_value('Frequency'),'id'=>'Frequency', 'class' => 'form-control' ,'readonly' => 'true');
@@ -1324,7 +1324,7 @@ function clearEditTaxField()
-
+
'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control','readonly' => 'true' );
@@ -2511,3 +2511,4 @@ $('#insuranceNo').val('');
+