diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js
index 48c6f81..ec09420 100644
--- a/app/partials/customers/customers.controller.js
+++ b/app/partials/customers/customers.controller.js
@@ -441,7 +441,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 	        $scope.fuelData.fuelOn = $scope.order.fuelOn;
 	        $scope.fuelData.invoiced = $scope.order.invoiced;
 	        $scope.fuelData.volume = $scope.order.volume; 
-	        $scope.fuelData.source = $scope.order.source; 
+	       // $scope.fuelData.source = $scope.order.source; 
 	       
 	        $scope.fuelData.total = $scope.order.total;
 	        //tier no use
@@ -480,9 +480,18 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 	            
 	             $scope.fuelData.status = $scope.order.status;
 	          } 
-          
+          		
+          	 if($scope.baseTenant && $scope.contractFuelVendor ){
+                $scope.fuelData.source = "Tenant/Base Customer CAA Member" ;
+              }else if($scope.baseTenant)
+              {
+                $scope.fuelData.source = "Tenant/Base Customer";
+              }else if($scope.contractFuelVendor){
+                $scope.fuelData.source = "CAA Member";
+              }
+
             $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
-            // console.log("=====$scope.fueldata======",$scope.fuelData)
+             //console.log("=====$scope.fueldata======",$scope.fuelData)
             fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
                 $scope.showLoader = false;
                 $scope.order = {};
@@ -553,10 +562,14 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
 		$('#demo-modal-4').css('display', '');
 	}
 
-	$scope.setFuel = function(companyName,certificateType) {
+	$scope.setFuel = function(companyName,baseTenant,contractFuelVendor,fuelerlinxCustomer,certificateType) {
 		$('#demo-modal-4').css('display', 'block');
 		$scope.order.defaultCompanyName = companyName;
-		$scope.order.certificateType = certificateType; 
+		$scope.order.certificateType = certificateType;
+		$scope.baseTenant = baseTenant;
+		$scope.contractFuelVendor = contractFuelVendor;
+		$scope.fuelerlinxCustomer = fuelerlinxCustomer;
+		//console.log("===values of checkbox===",baseTenant,contractFuelVendor,fuelerlinxCustomer) 
 		$scope.getAircraft(companyName);
 	//  event.stopPropagation();
 	//  $state.go('app.updateFuelManager');
diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html
index 0154c82..71a38c8 100644
--- a/app/partials/customers/customers.html
+++ b/app/partials/customers/customers.html
@@ -130,7 +130,7 @@
                               {{row.marginAllIn | number : 4}}
                              </td>
                              <td data-title="''">
-                              <button type="button" class="btn btn-info btn-xs" ng-click="setFuel(row.companyName,row.certificateType)">Setup Fuel</button>
+                              <button type="button" class="btn btn-info btn-xs" ng-click="setFuel(row.companyName,row.baseTenant,row.contractFuelVendor,row.fuelerlinxCustomer,row.certificateType)">Setup Fuel</button>
                              </td>
                            </tr>
                          </table>
@@ -715,7 +715,6 @@
                           </div>
                               <div class="clearfix"></div><br>
 
-
                             <div class="col-xs-12">
 
                                  <div class="col-md-6">
@@ -751,12 +750,14 @@
                                          <label class="new-input-label"><b>Source</b></label>
                                       </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <select class="form-control" ng-model="order.source"  style="width: 100%;">
+                                       <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div>
+                                       <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div>
+                                       <!-- <select class="form-control" ng-model="order.source"  style="width: 100%;">
                                             <option value="" disabled selected hidden>Select Source</option>
                                             <option value="Tenant">Tenant</option>
                                             <option value="CAA">CAA</option>
                                             <option value="Tenant/CAA">Tenant/CAA</option>
-                                        </select>
+                                        </select> -->
                                     </div>
                                     <div class="clearfix"></div>
                               </div>
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.controller.js b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
index d3f900f..52c7f3f 100644
--- a/app/partials/enterFuelOrder/enterFuelOrder.controller.js
+++ b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
@@ -12,6 +12,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 	enterFuelOrderService.getAllCompanies().then(function(result) {
 		$scope.showLoader = false;
 		$scope.companyList = result;
+		//console.log("===company====",result)
 	})
 
 	$scope.order = {};
@@ -26,10 +27,16 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 
 	$scope.getAircraft = function(company){
 		$scope.selectedCompanyName = company;
+
 		
 		$scope.showLoader = true;
 		for (var i = 0; i < $scope.companyList.length; i++) {
 			if ($scope.companyList[i].companyName == company) {
+					$scope.order.certificateType = $scope.companyList[i].certificateType;
+					$scope.baseTenant = $scope.companyList[i].baseTenant;
+					$scope.contractFuelVendor = $scope.companyList[i].contractFuelVendor;
+					$scope.fuelerlinxCustomer = $scope.companyList[i].fuelerlinxCustomer;
+
 				if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){
 					enterFuelOrderService.getFuelCost($scope.companyList[i].id).then(function(margins) {
 						$scope.marginList = margins;
@@ -112,6 +119,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 
 	$scope.dispatchFuel = function(){
 		$scope.showLoader = true;
+		
 		$scope.order.companyId = $scope.selectedCompanyId;
 		$scope.order.companyName = $scope.order.companyName; 
 		var aircraftObj =JSON.parse($scope.order.aircraftName);
@@ -122,7 +130,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 
 		$scope.order.invoiced = $scope.order.invoiced;
 		$scope.order.volume = $scope.order.volume; 
-        $scope.order.source = $scope.order.source; 
+       // $scope.order.source = $scope.order.source; 
         
         $scope.order.total = $scope.order.total;
 
@@ -159,6 +167,16 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 			
 			$scope.order.status = $scope.order.status;
 		}
+
+		if($scope.baseTenant && $scope.contractFuelVendor ){
+			$scope.order.source = "Tenant/Base Customer CAA Member" ;
+		}else if($scope.baseTenant)
+		{
+			$scope.order.source = "Tenant/Base Customer";
+		}else if($scope.contractFuelVendor){
+			$scope.order.source = "CAA Member";
+		}
+
 		//console.log("===order====",$scope.order);
 		
 		$scope.dispatchOrder.fuelOrderList.push($scope.order);
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.html b/app/partials/enterFuelOrder/enterFuelOrder.html
index 5bd3665..22ab7eb 100644
--- a/app/partials/enterFuelOrder/enterFuelOrder.html
+++ b/app/partials/enterFuelOrder/enterFuelOrder.html
@@ -191,12 +191,14 @@
 	                                       <label class="new-input-label"><b>Source</b></label>
 	                                    </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <select class="form-control" ng-model="order.source"  style="width: 100%;">
+                                       <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div>
+                                       <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div>
+                                       <!-- <select class="form-control" ng-model="order.source"  style="width: 100%;">
                                             <option value="" disabled selected hidden>Select Source</option>
                                             <option value="Tenant">Tenant</option>
                                             <option value="CAA">CAA</option>
                                             <option value="Tenant/CAA">Tenant/CAA</option>
-                                        </select>
+                                        </select> -->
                                     </div>
                                     <div class="clearfix"></div>
 	                         		</div>
@@ -211,7 +213,7 @@
                                        <label class="new-input-label"><b>Certificate Type</b></label>
                                     </div>
 		                                 <div class="pull-left" style="width: calc(100% - 110px);">
-		                                      <select class="form-control" ng-model="order.certificateType"  style="width: 100%;">
+		                                      <select class="form-control" disabled ng-model="order.certificateType"  style="width: 100%;">
 		                                       <option value="" disabled selected hidden>Select...</option>
 		                                       <option value="corporate">Part 91 (Corporate)</option>
 		                                       <option value="charter">Part 135 (Charter)</option>
diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js
index 62d45f6..43c0723 100644
--- a/app/partials/fuelOrders/fuelOrders.controller.js
+++ b/app/partials/fuelOrders/fuelOrders.controller.js
@@ -278,7 +278,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
   }                
 
    $scope.addFuelData = function() {
-            $scope.showLoader = true;
+          //  $scope.showLoader = true;
             $scope.fuelData = {};
             $scope.fuelData.companyId = $scope.selectedCompanyId;
 
@@ -290,7 +290,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
             $scope.fuelData.fuelOn = $scope.order.fuelOn;
             $scope.fuelData.invoiced = $scope.order.invoiced;
             $scope.fuelData.volume = $scope.order.volume; 
-            $scope.fuelData.source = $scope.order.source; 
+           // $scope.fuelData.source = $scope.order.source; 
            
             $scope.fuelData.total = $scope.order.total;
             //tier no use
@@ -329,9 +329,18 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
                 
                  $scope.fuelData.status = $scope.order.status;
               } 
-          
+            
+            if($scope.baseTenant && $scope.contractFuelVendor ){
+                $scope.fuelData.source = "Tenant/Base Customer CAA Member" ;
+              }else if($scope.baseTenant)
+              {
+                $scope.fuelData.source = "Tenant/Base Customer";
+              }else if($scope.contractFuelVendor){
+                $scope.fuelData.source = "CAA Member";
+              }
+
             $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
-           // console.log("=====$scope.fueldata======",$scope.fuelData)
+          //  console.log("=====$scope.fueldata======",$scope.fuelData)
             fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
                 $scope.showLoader = false;
                 $scope.order = {};
@@ -447,6 +456,11 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
       //$scope.showLoader = true;
       for (var i = 0; i < $scope.companyList.length; i++) {
         if ($scope.companyList[i].companyName == company) {
+            $scope.order.certificateType = $scope.companyList[i].certificateType;
+            $scope.baseTenant = $scope.companyList[i].baseTenant;
+            $scope.contractFuelVendor = $scope.companyList[i].contractFuelVendor;
+            $scope.fuelerlinxCustomer = $scope.companyList[i].fuelerlinxCustomer;
+
           if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){
             fuelOrdersService.getFuelCost($scope.companyList[i].id).then(function(margins) {
               $scope.marginList = margins;
diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html
index 965145b..bb62abd 100644
--- a/app/partials/fuelOrders/fuelOrders.html
+++ b/app/partials/fuelOrders/fuelOrders.html
@@ -708,12 +708,14 @@
                                          <label class="new-input-label"><b>Source</b></label>
                                       </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <select class="form-control" ng-model="order.source"  style="width: 100%;">
+                                      <div style="font-weight: normal;" ng-if="baseTenant">Tenant/Base Customer</br></div>
+                                      <div style="font-weight: normal;" ng-if="contractFuelVendor">CAA Member</div>
+                                       <!-- <select class="form-control" ng-model="order.source"  style="width: 100%;">
                                             <option value="" disabled selected hidden>Select Source</option>
                                             <option value="Tenant">Tenant</option>
                                             <option value="CAA">CAA</option>
                                             <option value="Tenant/CAA">Tenant/CAA</option>
-                                        </select>
+                                        </select> -->
                                     </div>
                                     <div class="clearfix"></div>
                               </div>
@@ -728,7 +730,7 @@
                                        <label class="new-input-label"><b>Certificate Type</b></label>
                                     </div>
                                      <div class="pull-left" style="width: calc(100% - 110px);">
-                                          <select class="form-control" ng-model="order.certificateType"  style="width: 100%;">
+                                          <select class="form-control" disabled ng-model="order.certificateType"  style="width: 100%;">
                                            <option value="" disabled selected hidden>Select...</option>
                                            <option value="corporate">Part 91 (Corporate)</option>
                                            <option value="charter">Part 135 (Charter)</option>
diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js
index 7b3ae55..0847744 100644
--- a/app/partials/viewCompany/viewCompany.controller.js
+++ b/app/partials/viewCompany/viewCompany.controller.js
@@ -154,6 +154,7 @@ angular.module('acufuel')
         function getCompanyDetail() {
             $scope.showLoader = true;
             ViewCompanyService.getCompany(companyId).then(function(result) {
+                console.log("===getCompanyDetail====",result)
                 $scope.companyData = result;
                 $scope.isGlobal = result.global;
                 if (result.global == true) {
@@ -451,6 +452,7 @@ angular.module('acufuel')
         }
 
         $scope.editData = function(inputName) {
+            console.log("===input===",inputName)
             //console.log($scope.companyData)
             $scope.showLoader = true;
             /*if(inputName == 'showNoteData'){
diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html
index ec4b745..90b429d 100644
--- a/app/partials/viewCompany/viewCompany.html
+++ b/app/partials/viewCompany/viewCompany.html
@@ -274,13 +274,15 @@
                               <div class="col-md-5" style="padding-left: 0;">
                                  <input type="checkbox" name="" ng-model="companyData.baseTenant" ng-change="checkboxStatus(companyData.baseTenant)"> Tenant/Base Customer
                               </div>
-                              <div class="col-md-5" style="padding-left: 0;">
+                              <!--fuelerlinxCustomer later use not to be deleted just hidden-->
+                              <!-- <div class="col-md-5" style="padding-left: 0;">
                                  <input type="checkbox" name="" ng-model="companyData.fuelerlinxCustomer" ng-change="fuelercheckboxStatus(companyData.fuelerlinxCustomer)"> FuelerLinx Customer
-                              </div>
-                           </div>
+                              </div> 
+                           </div>-->
                            <div>
                               <input type="checkbox" name="" ng-model="companyData.contractFuelVendor" ng-change="checkboxStatus(companyData.contractFuelVendor)"> CAA Member
                            </div>
+                         </div>
                            </br>
                            <div class="new-address">
                               <p ng-show="showAddress"><i class="fa fa-map-marker"></i>