From c8d3e82f416d52b2bc2a44ec06c84cfd6d0afce4 Mon Sep 17 00:00:00 2001
From: gandhimathi Bharathirajan <gandhimathi.b@venbainfotech.com>
Date: Mon, 19 Jun 2017 18:34:44 +0530
Subject: [PATCH] Fixes

---
 application/controllers/requisitionform.php      |  9 +++++----
 application/controllers/servicepurchaseorder.php | 14 +++-----------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php
index e4b7447f..46f1259e 100755
--- a/application/controllers/requisitionform.php
+++ b/application/controllers/requisitionform.php
@@ -39,6 +39,9 @@ class requisitionform extends BaseController
           $data['TotNoOfLine'] =$this->requistion_model->getRequistionList($userID);
 
 
+
+
+
          $this->loadViews("requisitionlisting", $this->global, $data, NULL);
      }
     /**
@@ -94,11 +97,9 @@ class requisitionform extends BaseController
 		   $userID =  $this->session->userdata ( 'userId' );
 		 
 		   $data['ReqDetails'] = $this->requistion_model->getRequistDetails($ReqNo,'Yes');
-		  
 		   
-		   $data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);   
-		   //print_r( $data['LineItem']);
 		   
+		   $data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);  		   
 		   $data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID);  
 		   $data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType);
            
@@ -318,7 +319,7 @@ class requisitionform extends BaseController
 			        //echo 'Not Exists';
 					$Request = array('ReqType'=>$RequestType, 'Requestedby'=>$Requestedby,'ReqDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Status'=>$Status,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy);
 					
-					print_r($Request);
+					//print_r($Request);
 					
 					$Req  = $this->requistion_model->addRequistion($Request);
 				 }
diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php
index 09d6ed91..72dbcade 100755
--- a/application/controllers/servicepurchaseorder.php
+++ b/application/controllers/servicepurchaseorder.php
@@ -1,3 +1,5 @@
+
+
 <?php if(!defined('BASEPATH')) exit('No direct script access allowed');
 
 require APPPATH . '/libraries/BaseController.php';
@@ -69,15 +71,6 @@ class servicepurchaseorder extends BaseController
 				$DeliveryAddr = $this->input->post('DeliveryAddr');
 				$dt = $this->input->post('Deliverydt');
 				$Deliverydt = $this->getDateformat($dt);
-$DeliveryOption = $this->input->post('DateRange');
-        if($DeliveryOption==1){
-         $Deliverydt = '';
-        $DeliverySchedule = $this->input->post('Scheduleby');
-        }
-         else{
-         $Deliverydt = $this->getDateformat($dt);
-        $DeliverySchedule = '';
-        }
 				$POType = $this->input->post('POType');
 								
 				$SpcialInstruction = $this->input->post('txtSpcialInstruction');
@@ -93,8 +86,7 @@ $DeliveryOption = $this->input->post('DateRange');
 				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
 				$createddt =  $dt->format('Y-m-d H:i:s');
 				// PO Master
-								$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,Delivery'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt );
-
+				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt );
 					
 					$POMaster  = $this->purchaseorder_model->addPOMaster($POList);