diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php
index 3c10ab53..e2918332 100755
--- a/application/controllers/emergencypurchaseorder.php
+++ b/application/controllers/emergencypurchaseorder.php
@@ -216,11 +216,18 @@ class emergencypurchaseorder extends BaseController
             	$ReqDetails = array('ReqNo'=>$RegNo, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Status'=>$RegDetailsStatus,'UpdatedBy'=>$CreateBy,'UpdatedOn'=>$createddt);
 								
       					
-								$ReqDetQuery = $this->requistion_model->addRequistionDetails($ReqDetails);
-								
+					$ReqDetQuery = $this->requistion_model->addRequistionDetails($ReqDetails,$RegNo);
+				
+			
+				 $ItemNo = '';
+				if(count($ReqDetQuery)>0)
+				{
+					$ItemNo =  $ReqDetQuery[0]['ItemNo'];
+				}			
 							
+                $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$RegNo,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceMaterialDescription'=>$ServiceMaterialDescription,'ServiceFrequency'=>$ServiceFrequency,'Per'=>$Per,'ItemNo'=>$ItemNo);							
 							
-                $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$RegNo,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceMaterialDescription'=>$ServiceMaterialDescription,'ServiceFrequency'=>$ServiceFrequency,'Per'=>$Per);
+				
                 $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
                 $LineItemNo = '';
                 if(count($POLineItem)>0)
diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php
index b8ebf7d0..5ebf00f0 100755
--- a/application/controllers/requisitionform.php
+++ b/application/controllers/requisitionform.php
@@ -99,9 +99,22 @@ class requisitionform extends BaseController
 		   $ReqPOType = '';
 		   if(count($POType) > 0)
 		   {
-			  $ReqPOType =  $POType[0]['POType'];
+			   for($i=0;$i<count($POType);$i++)
+			   {
+				 if($POType[$i]['POType'] == $ReqType)
+				{
+				   $ReqPOType = '';
+				   break;
+			     }
+				 else
+				 {
+					$ReqPOType =  $POType[$i]['POType']; 
+				 }
+			   }
+			  
 		   }
-		  
+		   //print_r($POType);
+		  // echo 'ReqType'.$ReqPOType;
 		   $data['ReqPOType'] =  $ReqPOType =='' ? $ReqType:$ReqPOType;		  
 		   $data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);  		   
 		   $data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID);  
@@ -344,9 +357,8 @@ class requisitionform extends BaseController
 				
 				$comma_separated = explode(':', $DeletedRow);	
 				$serviceSchedule = $this->input->post('serviceSchedule'); 
-                                  $servicePeriod = $this->input->post('serviceSchedule'); 
-                               // $noOfService = $this->input->post('noOfService'); 
-				$noOfService = 1; 
+                                $servicePeriod = $this->input->post('servicePeriod'); 
+                                $noOfService = $this->input->post('noOfService'); 
 				
 				 $IsExists = $this->requistion_model->RequistionIsExists($Requestedby);
 				// print_r($IsExists);
@@ -401,7 +413,7 @@ class requisitionform extends BaseController
 							$Quantity = $this->input->post('Quantity'.$i); 
 					 
 							$ReqDetails = array('ReqNo'=>$ReqNumber, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity);
-								$this->requistion_model->addRequistionDetails($ReqDetails);
+								$this->requistion_model->addRequistionDetails($ReqDetails,$ReqNumber);
 						   } 								
 					 
 					}	
@@ -429,9 +441,8 @@ class requisitionform extends BaseController
 				$DeletedRow =  $this->input->post('txtDeletedRow'); 
 				$RowCount =  $this->input->post('txtRowCount'); 
 				$serviceSchedule = $this->input->post('serviceSchedule'); 
-                                 $servicePeriod = $this->input->post('serviceSchedule'); 
-                               // $noOfService = $this->input->post('noOfService'); 
-				$noOfService = 1;
+                                $servicePeriod = $this->input->post('servicePeriod'); 
+                                $noOfService = $this->input->post('noOfService'); 
 				if(strlen($Status) > 1)
 				{
 					$Request = array( 'Status'=>$Status,'CreatedDate'=>$updatedDate,'CreatedBy'=>$UpdatedBy,'CostCenterCode'=>$CostCenter,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod);
@@ -476,7 +487,7 @@ class requisitionform extends BaseController
 							{	
 						       $ReqDetails = array('ReqNo'=>$ReqNumber, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDate);
 							  
-								$this->requistion_model->addRequistionDetails($ReqDetails);
+								$this->requistion_model->addRequistionDetails($ReqDetails,$ReqNumber);
 							}
 							else
 							{
@@ -548,6 +559,7 @@ class requisitionform extends BaseController
 			}
 				
 			$FYdt = $FYStart." - ".$FYEnd ; 
+			$this->load->model('purchaseorder_model');
 			if(count($ReqList)>0)
 			{
 			
@@ -555,16 +567,43 @@ class requisitionform extends BaseController
 				
 				$CostCode = $ReqList[0]['CostCenterCode'];	
 			}
-			$this->load->model('purchaseorder_model');
+			
+			$POType=  $this->purchaseorder_model->GetPOType($ReqNo);
+			
+		   $ReqPOType = '';
+		   if(count($POType) > 0)
+		   {
+			   for($i=0;$i<count($POType);$i++)
+			   {
+				 if($POType[$i]['POType'] == $ReqType)
+				{
+				   $ReqPOType = '';
+				   break;
+			     }
+				 else
+				 {
+					$ReqPOType =  $POType[$i]['POType']; 
+				 }
+			   }
+			  
+		   }
+			
+			$RequestType='';
+			$RequestType=  $ReqPOType =='' ? $ReqType:$ReqPOType;		
+			 
 			$AvlBudget = array();
 			
 			if($ReqType== CAPITAL)
 			{
-				 $AvlBudget = $this->purchaseorder_model->GetAvailableCapitalBudgetAmount($CostCode,$FYdt,$ReqType);
+				 $AvlBudget = $this->purchaseorder_model->GetAvailableCapitalBudgetAmount($CostCode,$FYdt,$RequestType);
+			}
+			else if($ReqType== IMPORT)
+			{
+				 $AvlBudget = $this->purchaseorder_model->GetAvailableImportBudgetAmount($CostCode,$FYdt,$RequestType);
 			}
 			else
 			{				
-				$AvlBudget = $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$FYdt,$ReqType);
+				$AvlBudget = $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$FYdt,$RequestType);
 			}
 			
 			
@@ -602,4 +641,4 @@ class requisitionform extends BaseController
     }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php
index acd90d4e..6a2ed7a0 100755
--- a/application/controllers/servicepurchaseorder.php
+++ b/application/controllers/servicepurchaseorder.php
@@ -276,10 +276,17 @@ class servicepurchaseorder extends BaseController
 								 }
 								  if($SkipInsert == "False")
 									{
+								 $this->load->model('requistion_model');
+								 
+								 $RetItemNo = $this->requistion_model->getItemNumber($Reqnumber,$MaterialCode);
+							    
+								   $ItemNo = '';
+									if(count($RetItemNo)>0)
+									{
+										$ItemNo =  $RetItemNo[0]['ItemNo'];
+									}	
 								
-								$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription,'Per'=>$Per);
-								//print_r($POLineItemList);
-								//die();
+								$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription,'Per'=>$Per,'ItemNo'=>$ItemNo);							
 					
 								$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
 					
@@ -404,8 +411,16 @@ class servicepurchaseorder extends BaseController
 				{
 					if(strlen($POLineItemNo) == 0)
 					{
-
-						$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription,'Per'=>$Per);
+								$this->load->model('requistion_model');
+								 
+								 $RetItemNo = $this->requistion_model->getItemNumber($Reqnumber,$MaterialCode);
+							    
+								   $ItemNo = '';
+									if(count($RetItemNo)>0)
+									{
+										$ItemNo =  $RetItemNo[0]['ItemNo'];
+									}	
+						$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription,'Per'=>$Per,'ItemNo'=>$ItemNo);
 
 						$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
 						if(count($POLineItem)>0)
@@ -420,7 +435,7 @@ class servicepurchaseorder extends BaseController
 						$LineItemNo = $POLineItemNo;	
 						
 						$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceMaterialDescription'=>$ItemDescription,'Per'=>$Per);
-						$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);					
+						$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);			
 						
 					}