diff --git a/account_manage.php b/account_manage.php
index e7a8833..211774d 100644
--- a/account_manage.php
+++ b/account_manage.php
@@ -270,7 +270,7 @@ $view .= '<div class="content-block tab-content">
 //Dropdown
 
 $partner_data = json_decode($_SESSION['partnerhierarchy']);
-$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$accounthierarchy->soldto);
+$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$accounthierarchy->soldto,'');
 
 $view .= '<div class="content-block tab-content">
         
diff --git a/assets/functions.php b/assets/functions.php
index 196997c..014e56b 100644
--- a/assets/functions.php
+++ b/assets/functions.php
@@ -1943,7 +1943,7 @@ function serviceReport($history, $request, $country_code)
 //------------------------------------------
 // LIST PARTNER 
 //------------------------------------------
-function listPartner($partnertype, $user_right, $input)
+function listPartner($partnertype, $user_right, $input, $required)
 {
   include dirname(__FILE__,2).'/settings/settings.php';
 
@@ -1974,7 +1974,7 @@ if ($input !='' && !empty($input)){
 }
 
 $view ='
-    <input list="'.$partnertype.'" name="'.$partnertype.'" placeholder="'.$input.'" class="datalist">
+    <input list="'.$partnertype.'" name="'.$partnertype.'" placeholder="'.$input.'" value="'.$input.'" class="datalist" '.((isset($required) && $required != '') ? ' required' : '').'>
     <datalist id="'.$partnertype.'">
     '.$partner_available.'
 ';
diff --git a/contract_manage.php b/contract_manage.php
index c84ca5c..d08f9cb 100644
--- a/contract_manage.php
+++ b/contract_manage.php
@@ -251,10 +251,10 @@ $view .='   </div>
 $partner_data = json_decode($contract['accounthierarchy']);
 
 //BUID UP DROPDOWNS
-$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid);
-$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto);
-$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto);
-$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location);
+$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid,'');
+$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto,'');
+$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto,'');
+$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location,'');
 
 //DISPLAY
 $view .= '<div class="content-block tab-content">
diff --git a/equipment_manage.php b/equipment_manage.php
index f2553ea..ad64876 100644
--- a/equipment_manage.php
+++ b/equipment_manage.php
@@ -219,10 +219,10 @@ $view .= '<div class="content-block tab-content active">
 //GET PARTNERDATA
 $partner_data = json_decode($equipment['accounthierarchy']);
 //BUID UP DROPDOWNS
-$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid);
-$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto);
-$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto);
-$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location);
+$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid,'');
+$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto,'');
+$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto,'');
+$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location,'');
 if (isset($partner_data->section)){$section = getPartnerName($partner_data->section) ?? 'Not specified';} else {$section = 'Not specified';}
 
 
diff --git a/equipments_mass_update.php b/equipments_mass_update.php
index f3473b5..c5198b0 100644
--- a/equipments_mass_update.php
+++ b/equipments_mass_update.php
@@ -161,11 +161,14 @@ $view .= '<form action="" method="post">
             <div class="content-block-wrapper">
             ';
 
+
 //BUID UP DROPDOWNS
-$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],'');
-$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],'');
-$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],'');
-$location_dropdown = listPartner('location',$_SESSION['permission'],'');
+$partner = json_decode($_SESSION['partnerhierarchy'],true);
+
+$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner['salesid'],'yes');
+$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],'','yes');
+$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],'','');
+$location_dropdown = listPartner('location',$_SESSION['permission'],'','');
 
 $view .='<div class="content-block order-details">
             <div class="block-header">
@@ -202,7 +205,7 @@ $view .= '  <div class="content-block order-details">
                     <h3><label for="status">'.$equipment_label11.'</label></h3>
                 </div>
                 <div class="order-detail">    
-                    <input id="name" type="text" name="order_ref">
+                    <input id="name" type="text" name="order_ref" required>
                 </div>
                 <div class="order-detail">
                     <h3><label for="status">'.$equipment_label3.'</label></h3>
diff --git a/partner.php b/partner.php
index 0b3dfa5..66d5dda 100644
--- a/partner.php
+++ b/partner.php
@@ -159,8 +159,8 @@ $view .= '</div>
 //GET PARTNERDATA
 $partner_data = json_decode($partner['salesID'])?? json_decode($_SESSION['partnerhierarchy']) ;
 //BUID UP DROPDOWNS
-$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid);
-$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto);
+$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid,'');
+$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto,'');
 
 //DISPLAY
 $view .= '<div class="content-block tab-content">
diff --git a/user.php b/user.php
index e134d91..9614f78 100644
--- a/user.php
+++ b/user.php
@@ -266,10 +266,10 @@ $view .= '</div>
 //GET PARTNERDATA
 $partner_data = json_decode($user['partnerhierarchy'])?? json_decode($_SESSION['partnerhierarchy']) ;
 //BUID UP DROPDOWNS
-$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid);
-$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto);
-$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto);
-$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location);
+$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid,'');
+$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto,'');
+$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto,'');
+$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location,'');
 
 //DISPLAY
 $view .= '<div class="content-block tab-content">