diff --git a/application/controllers/assetdetails.php b/application/controllers/assetdetails.php
index 1b7d1761..87300668 100755
--- a/application/controllers/assetdetails.php
+++ b/application/controllers/assetdetails.php
@@ -65,13 +65,30 @@ class assetdetails extends BaseController
     }
 	
 	
-	function getpo()
+	function getpodetails()
 	{
-		$po = $this->input->post('PONO');
-		$data = $this->assetdetails_model->getpo($po);
+	    $PO= $this->input->post('PONO');
+       
+		$data = $this->assetdetails_model->getpodetails($PO);
+		//print_r($data);
 		
-		echo json_encode($data);
-		die();
+		$HTML = "<option value='0'>SelectMaterialCode</option>";
+		   if(count($data) > 0)
+           {
+           for ($j = 0; $j < count($data); $j++)
+           {
+                $Code = $data[$j]->LineItemNo;
+                $Name = $data[$j]->MaterialCode;
+                
+               
+                
+                $HTML .="<option value='".$Code."'>".$Code."-".$Name."</option>";
+                }    
+           }
+         //echo $HTML;
+            die(json_encode(array($HTML))); 
+		//echo json_encode($data);
+		//die();
 	}
 	
 	function getline()
@@ -226,7 +243,7 @@ class assetdetails extends BaseController
 				
 				
 					$asset = array('AssetName'=>$AssetName, 'Description'=>$Description,'DEPCode'=>$Department,'Location'=>$Location,'UserName'=>$User,'SupplierCode'=>$SupplierName,'DateOfPurchase'=>$DOPurchase,'DateOfCommison'=>$DOCommission,'AssetValue'=>$AssetValue,'AssetStatus'=>$AssetStatus,'IsActive'=>$IsActive,'Remarks'=>$Remarks,'CreatedBy'=>$CreatedBy,'PONO'=>$PONO,'POLineItem'=>$lineitem,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity);  
-				//print_r($asset);die();
+			//print_r($asset);die();
                 $result = $this->assetdetails_model->addNewasset($asset);
                // print_r($result);die();
                 if($result > 0)
@@ -314,11 +331,13 @@ class assetdetails extends BaseController
 				$Asset_Code = $this->input->post('AssetCode');
                 $AssetName = strtoupper( $this->input->post('AssetName'));
                 $Description = $this->input->post('Description');
-                $Department = $this->input->post('Department');
+                $Department = $this->input->post('AssetDept');
                 $Location = $this->input->post('Location');
                 $User = $this->input->post('User');
                 $SupplierName = $this->input->post('SupplierName');
                 $DateOfPurchase = $this->input->post('DateOfPurchase');
+
+               // $DateOfPurchase  = $DateOfPurchase ->format('d-m-y');
                 $DateOfCommission = $this->input->post('DateOfCommission');
                 $UpdatedBy = $this->session->userdata('userId');
                 $AssetValue = $this->input->post('Assetvalue');
@@ -369,7 +388,7 @@ class assetdetails extends BaseController
 	function getDateformat($Val)
 	{
 		       $date = new DateTime($Val);
-				$retDate = $date->format('Y-m-d H:i:s');
+				$retDate = $date->format('d-m-y H:i:s');
 				return $retDate;
 	}
 	
diff --git a/application/models/assetdetails_model.php b/application/models/assetdetails_model.php
index a17e977e..eb86ce78 100755
--- a/application/models/assetdetails_model.php
+++ b/application/models/assetdetails_model.php
@@ -16,6 +16,7 @@ class assetdetails_model extends CI_Model
         $this->db->from('T_Asset_Details asd');
         $this->db->join('T_DepartmentDetails dep', ' dep.DEPCode = asd.DEPCode','left');
 		$this->db->join ('T_SupplierDetailsN sup','sup.SupplierID  = asd.SupplierCode');
+		
         
         $query = $this->db->get();
         
@@ -51,7 +52,7 @@ class assetdetails_model extends CI_Model
         
         return $query->result();
     }
-	function getPO($PO){
+	function getpodetails($PO){
 		
 		
 			 $this->db->distinct();
@@ -68,9 +69,24 @@ class assetdetails_model extends CI_Model
 		return $query->result();
 		
 	}
+	function getPO($PO)
+	{
+ $this->db->distinct();
+		$this->db->select(' POM.PONO,DeliveryDate,PODate,sup.SupplierName,POM.SupplierID');	
+		$this->db->from('T_PurchaseOrder_Master POM');
+	$this->db->join ('T_PurchaseOrder_LineItem POL ',' POL.PONO = POM.PONO');
+	$this->db->join ('T_SupplierDetailsN sup ',' sup.SupplierID = POM.SupplierID');
+
+		if(!empty($PO)){
+		$this->db->where('POM.PONO', $PO);
+		}
+		$query = $this->db->get();
+        //print_r($this->db->last_query());
+		return $query->result();
+	}
 	
 	function getlineitemre($line){
-		$this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POL.Quantity,POM.POType,re.TotalValue,req.ReqNo,emp.firstname,emp.Departmentcode,dep.DepartmentName');
+		$this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POL.Quantity,POM.POType,re.TotalValue,req.ReqNo,emp.firstname,emp.Departmentcode,dep.DepartmentName,sup.SupplierName,POM.DeliveryDate,POM.PODate,POM.SupplierID');
 		$this->db->from('T_PurchaseOrder_LineItem POL');
 		$this->db->join('T_Requestion_Master req','req.ReqNo = POL.ReqNo','left');
 		$this->db->join('T_PurchaseOrder_Master POM','POM.PONO=POL.PONO','left');
@@ -78,6 +94,7 @@ class assetdetails_model extends CI_Model
 			$this->db->join('T_Employee_Details emp','emp.EmpID = req.Requestedby','left');
 			$this->db->join('T_DepartmentDetails dep','dep.DEPCode = emp.Departmentcode','left');
 			$this->db->join ('T_Revenue_Tax re','re.LineItemNo = POL.LineItemNo','left');
+			$this->db->join('T_SupplierDetailsN sup','sup.SupplierID = POM.SupplierID','left');
 			$this->db->where('POL.LineItemNo',$line);
 			
 			$query = $this->db->get();
@@ -87,7 +104,7 @@ class assetdetails_model extends CI_Model
 	}
 	
 	function getlineitemser($line){
-		$this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,ser.TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode');
+		$this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,ser.TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,POM.DeliveryDate,POM.PODate,POM.SupplierID');
 		$this->db->from('T_PurchaseOrder_LineItem POL');
 		$this->db->join('T_Requestion_Master req','req.ReqNo = POL.ReqNo','left');
 		$this->db->join('T_PurchaseOrder_Master POM','POM.PONO=POL.PONO','left');
@@ -95,6 +112,7 @@ class assetdetails_model extends CI_Model
 			$this->db->join('T_Employee_Details emp','emp.EmpID = req.Requestedby','left');
 			$this->db->join('T_DepartmentDetails dep','dep.DEPCode = emp.Departmentcode','left');
 			$this->db->join ('T_Service_Tax ser','ser.LineItemNo = POL.LineItemNo','left');
+			$this->db->join('T_SupplierDetailsN sup','sup.SupplierID = POM.SupplierID','left');
 			$this->db->where('POL.LineItemNo',$line);
 			
 			$query = $this->db->get();
@@ -103,7 +121,7 @@ class assetdetails_model extends CI_Model
         return $result;
 	}
 	function getlineitemimport($line){
-		$this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,ser.TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode');
+		$this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,ser.TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,,POM.DeliveryDate,POM.PODate,POM.SupplierID');
 		$this->db->from('T_PurchaseOrder_LineItem POL');
 		$this->db->join('T_Requestion_Master req','req.ReqNo = POL.ReqNo','left');
 		$this->db->join('T_PurchaseOrder_Master POM','POM.PONO=POL.PONO','left');
@@ -111,6 +129,7 @@ class assetdetails_model extends CI_Model
 			$this->db->join('T_Employee_Details emp','emp.EmpID = req.Requestedby','left');
 			$this->db->join('T_DepartmentDetails dep','dep.DEPCode = emp.Departmentcode','left');
 			$this->db->join ('T_Import_Tax ser','ser.LineItemNo = POL.LineItemNo','left');
+			$this->db->join('T_SupplierDetailsN sup','sup.SupplierID = POM.SupplierID','left');
 			$this->db->where('POL.LineItemNo',$line);
 			
 			$query = $this->db->get();
@@ -120,7 +139,7 @@ class assetdetails_model extends CI_Model
 	}
 	
 	function getlineitemcap($line){
-		$this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,sum(ser.TotalValue+imp.TotalValue) as TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode');
+		$this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,sum(ser.TotalValue+imp.TotalValue) as TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,POM.DeliveryDate,POM.PODate,POM.SupplierID');
 		$this->db->from('T_PurchaseOrder_LineItem POL');
 		$this->db->join('T_Requestion_Master req','req.ReqNo = POL.ReqNo','left');
 		$this->db->join('T_PurchaseOrder_Master POM','POM.PONO=POL.PONO','left');
@@ -129,6 +148,7 @@ class assetdetails_model extends CI_Model
 			$this->db->join('T_DepartmentDetails dep','dep.DEPCode = emp.Departmentcode','left');
 			$this->db->join ('T_Import_Tax imp','imp.LineItemNo = POL.LineItemNo','left');
 			$this->db->join ('T_Service_Tax ser','ser.LineItemNo = POL.LineItemNo','left');
+			$this->db->join('T_SupplierDetailsN sup','sup.SupplierID = POM.SupplierID','left');
 			$this->db->where('POL.LineItemNo',$line);
 			
 			$query = $this->db->get();
diff --git a/application/views/addasset.php b/application/views/addasset.php
index 95f4d68b..261a2231 100755
--- a/application/views/addasset.php
+++ b/application/views/addasset.php
@@ -83,16 +83,16 @@ $("#DeliveryDate").datepicker({
 								<div class="col-md-12">
 								<div class="col-md-3">                                
                                      
-                                        <div class="form-group">
-                                        <span for="Asset_Name">Asset Name</span>
-                                        <input type="text" class="form-control required"   required style="text-transform:uppercase;" id="AssetName" name="AssetName"  value="<?php echo isset($_POST['AssetName']) ? $_POST['AssetName'] : '' ?>">
+                                        <div class="form-group"><b>
+                                        <span for="Asset_Name">Asset Name </span><span style="color:red">*</span></b>
+                                        <input type="text" class="form-control "   required style="text-transform:uppercase;" id="AssetName" name="AssetName"  value="<?php echo isset($_POST['AssetName']) ? $_POST['AssetName'] : '' ?>">
 										</div>
  
 									</div>
                                     <div class="col-md-3">                                
                                     <div class="form-group">
-                                        
-                                        <span for="Description">Asset Description</span>
+                                        <b>
+                                        <span for="Description">Asset Description</span></b><span style="color:red">*</span>
                                         <input type="text" class="form-control required" id="Description"  required name="Description" value="<?php echo isset($_POST['Description']) ? $_POST['Description'] : '' ?>">
                                     
                                     </div>
@@ -101,7 +101,8 @@ $("#DeliveryDate").datepicker({
 									<div class="col-md-3">                                
                                     <div class="form-group">
                                       
-                                        <span for="AssetOwner">Asset User</span>
+                                        <b><span for="AssetOwner">Asset User</span></b>
+                                    <span style="color:red">*</span>
                                         <input type="text" class="form-control required" required id="User" name="User" value= "<?php echo isset($_POST['User']) ? $_POST['User'] : '' ?>">
                                      
                                     </div>
@@ -109,8 +110,9 @@ $("#DeliveryDate").datepicker({
                                 </div>
 								<div class="col-md-3">                                
                                     <div class="form-group">
-                                        
-                                        <span for="Location">Asset Location</span>
+                                        <b>
+                                        <span for="Location">Asset Location</span></b>
+                                      <span style="color:red">*</span>
                                         <input type="text" class="form-control required"  required id="Location" name="Location" value= "<?php echo isset($_POST['Location']) ? $_POST['Location'] : '' ?>">
                                      
                                     </div>
@@ -120,11 +122,10 @@ $("#DeliveryDate").datepicker({
 								</div>
 								<div class="col-md-12">
 									<div class="col-md-3">
-										<div class="form-group">
-											<span for="PONO">Purchase Order Number</span>
-											
-											<select class="form-control required select2"  id="PONO" name="PONO">
-												<option value="-1">Select PO Number</option>
+										<div class="form-group"><b>
+											<span for="PONO">Purchase Order Number</span> </b>  <span style="color:red">*</span>	
+											<select class="form-control required "  required id="PONO"  required name="PONO">
+												<option value="" >Select PO Number</option>
 												<?php
 												if(!empty($po))
 												{
@@ -151,18 +152,19 @@ $("#DeliveryDate").datepicker({
 									<div class="col-md-3" style="padding:0px;">
 									<div class="col-md-6">
 										<div class="form-group">
+										<b>
 											<span for="SelectMaterialCode">select Material Code</span>
-											
-											<select class="form-control required select2"  id="SelectMaterialCode" name="lineitem">
-												<option >select Material Code</option>
+											</b>
+											<select class="form-control required select2" required="" id="SelectMaterialCode" name="lineitem">
+												<option value="-1">select Material Code</option>
 												
 											</select>
 										</div>
 										</div>
 										<div class="col-md-6" >                                
 										<div class="form-group">
-											 
-											<span for="MaterialCode">Material Code</span>
+											 <b>
+											<span for="MaterialCode">Material Code</span></b>
 											<input type="text" class="form-control required" id="MaterialCode"  readonly name="MaterialCode" value="">
 										 
 										</div>
@@ -172,16 +174,16 @@ $("#DeliveryDate").datepicker({
 									<div class="col-md-3" style="padding:0px;">                                
 									<div class="col-md-6">                                
 										<div class="form-group">
-											 
-											<span for="UOM">UOM</span>
+											 <b>
+											<span for="UOM">UOM</span></b>
 											<input type="text" class="form-control required" id="UOM"  readonly name="UOM" value="">
 										 
 										</div>
 										</div>
 										<div class="col-md-6">
 										 
-											<div class="form-group">
-											<span for="Quantity">Quantity</span>
+											<div class="form-group"><b>
+											<span for="Quantity">Quantity</span></b>
 											<input type="text" class="form-control required" id="Quantity"  name="Quantity" value="">
 										 
 										</div>
@@ -189,8 +191,8 @@ $("#DeliveryDate").datepicker({
 										</div>
 									<div class="col-md-3">                                
                                     <div class="form-group">
-                                         
-                                        <span for="PODescription">Description</span>
+                                         <b>
+                                        <span for="PODescription">Description</span></b>
                                         <input type="text" class="form-control required" id="PODescription"  readonly name="PODescription" value="<?php echo isset($_POST['PODescription']) ? $_POST['PODescription'] : '' ?>">
                                     
                                     </div>
@@ -202,8 +204,8 @@ $("#DeliveryDate").datepicker({
 								
 											 
 												<div class="form-group">
-												<input type="hidden" name="AssetDept" id="depcode">
-												<span for="AssetDept">Asset Department</span>
+												<input type="hidden" name="AssetDept" id="depcode"><b>
+												<span for="AssetDept">Asset Department</span></b>
 												<input type="text" class="form-control required" id="AssetDept" readonly name="" value="">
 											
 											</div>
@@ -212,14 +214,16 @@ $("#DeliveryDate").datepicker({
 								<div class="col-md-3">
                                    
                                         <div class="form-group">
-                                        <span for="DateOfPurchase">Purchase Date</span>
-                                        <input  id="DateOfPurchase" required name="DateOfPurchase"  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo isset($_POST['DateOfPurchase']) ? $_POST['DateOfPurchase'] : '' ?>">
+                                        <b>
+                                        <span for="DateOfPurchase">Purchase Date</span></b>
+                                        <input  id="DateOfPurchase"  name="DateOfPurchase"  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo isset($_POST['DateOfPurchase']) ? $_POST['DateOfPurchase'] : '' ?>">
                                     </div>
                                     </div>
 									<div class="col-md-3">
                                    
                                         <div class="form-group">
-                                        <span for="DateOfPurchase">Supplier Name</span>
+                                        <b>
+                                        <span for="DateOfPurchase">Supplier Name</span></b>
 										<input type="hidden" name="SupplierName" id="SupID">
                                         <input  id="SupplierName" readonly  name=""  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo isset($_POST['SupplierName']) ? $_POST['SupplierName'] : '' ?>">
                                     </div>
@@ -227,13 +231,15 @@ $("#DeliveryDate").datepicker({
 								<div class="col-md-3" style="padding:0px;">	
 								<div class="col-md-6">
 								 <div class="form-group">
+								 <b>
                                         <span for="DeliveryDate">Delivery Date</span>
-                                        <input  id="DeliveryDate" required name="DeliveryDate"  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo isset($_POST['DeliveryDate']) ? $_POST['DeliveryDate'] : '' ?>">
+                                 </b>
+                                        <input  id="DeliveryDate"  name="DeliveryDate"  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo isset($_POST['DeliveryDate']) ? $_POST['DeliveryDate'] : '' ?>">
                                     </div>
 								</div>
 								<div class="col-md-6">
-                                    <div class="form-group">
-                                        <span for="DateOfCommission">Date Of Commission</span>
+                                    <div class="form-group"><b>
+                                        <span for="DateOfCommission">Date Of Commission</span></b><span style="color:red">*</span>
 										<input  id="DateOfCommission" required name="DateOfCommission"  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo isset($_POST['DateOfCommission']) ? $_POST['DateOfCommission'] : '' ?>">
 
 										</div>
@@ -245,17 +251,20 @@ $("#DeliveryDate").datepicker({
 									
 										<div class="col-md-3">
 										<div class="form-group">
+										<b>
 											<span for="Assetvalue">Asset Value</span>
-											<input type="text" class="form-control required" id="Assetvalue" name="Assetvalue" required onkeypress="return isNumberKey(event)" title="Please Enter currency value" maxlength="255" value= "<?php echo isset($_POST['Assetvalue']) ? $_POST['Assetvalue'] : '' ?>">
+											</b>
+											<input type="text" class="form-control" id="Assetvalue" name="Assetvalue"onkeypress="return isNumberKey(event)" title="Please Enter currency value" maxlength="255" value= "<?php echo isset($_POST['Assetvalue']) ? $_POST['Assetvalue'] : '' ?>">
 											
 										</div>
 									
 									</div>
 									  <div class="col-md-3">
 										<div class="form-group">
-											<span for="AssetStatus">Asset Status</span>
-											<select class="form-control required select2" id="AssetStatus" name="AssetStatus">
-												<option value="-1" >Select Asset Status</option>
+										<b>
+											<span for="AssetStatus">Asset Status</span></b><span style="color:red">*</span>
+											<select class="form-control required select2" required  id="AssetStatus" name="AssetStatus">
+												<option value="" >Select Asset Status</option>
 												<?php
 												if(!empty($AssetStatus))
 												{
@@ -281,7 +290,8 @@ $("#DeliveryDate").datepicker({
 									</div>
 									<div class="col-md-6">
 									<div class="form-group">
-											<span for="Remarks">Remarks</span>
+									<b>
+											<span for="Remarks">Remarks</span></b>
 											 
 											<input type="text" class="form-control required"  id="Remarks" name="Remarks" maxlength="500" value= "<?php echo isset($_POST['Remarks']) ? $_POST['Remarks'] : '' ?>">
 										</div>
@@ -295,7 +305,7 @@ $("#DeliveryDate").datepicker({
 							</div><!-- /.box-body -->
 						
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-info" value="Submit" />
+                            <input type="submit" onclick="validate();"class="btn btn-info" value="Submit" />
                             <input type="reset" class="btn btn-info" value="Reset" />
                         </div>
                    
@@ -342,39 +352,37 @@ $("#DeliveryDate").datepicker({
 
 	
 	$('#PONO').on('change',function(){
-		
-        var PONO = $(this).val();
+		        var PONO = $(this).val();
+       // alert(PONO);
         if(PONO){
+        	
+        	
             $.ajax({
                 type:'POST',
-                url:"<?php echo base_url() ?>assetdetails/getpo",
+                url:"<?php echo base_url() ?>assetdetails/getpodetails",
                 data:'PONO='+PONO,
+                	dataType: 'json',
                 success:function(data){
-                  // alert(data);
-					var line ='';
-				
+                   //alert(data);
+             	
+				 var line ='';
 					$('#SelectMaterialCode').empty();
-					
-					$.each(JSON.parse(data), function (i, item) {
-							//alert(item.LineItemNo);
-							line ='<option>select Material Code</option>';	
-						line +='<option value='+item.LineItemNo+'>'+item.LineItemNo+'-'+item.MaterialCode+'</option>';
+					//alert('before');
+					$.each(data, function (i, item) {
+							//alert(item);
+
+							//line ='<option>select Material Code</option>';	
+						//line +='<option value='+item.LineItemNo+'>'+item.LineItemNo+'-'+item.MaterialCode+'</option>';
 								//$('#DeliveryDate').val(item.DeliveryDate);
+								line+=item;
+								
+								
 								
-								$('#SupplierName').val(item.SupplierName);
-								$('#SupID').val(item.SupplierID);
-								$('#DateOfPurchase').val(item.PODate);
 								
 								 
-var date = new Date(item.DeliveryDate);
              
-            var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
-             $("#DeliveryDate").val(date1);
-			 var date = new Date(item.PODate);
-             var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
-             $("#DateOfPurchase").val(date3);
 								
-								$('#SelectMaterialCode').append(line);
+			 $('#SelectMaterialCode').append(line);
 								
 					});
 					
@@ -382,6 +390,7 @@ var date = new Date(item.DeliveryDate);
                 }
             });
 		}
+	
 		
 
 });		
@@ -398,13 +407,18 @@ var date = new Date(item.DeliveryDate);
                 url:"<?php echo base_url() ?>assetdetails/getline",
                 data:'line='+line,
                 success:function(data){
-                    //alert(data);
+                   // alert(data);
 					
 							var id = $('#SelectMaterialCode').val();
 					 $.each(JSON.parse(data), function (i, item) {
 							 if(id == item.LineItemNo){
 								// alert(item.MaterialCode);
-								 //alert(item.Departmentcode);
+								 // alert(item.DeliveryDate);
+								 // alert(item.DateOfPurchase);
+								 $('#DateOfPurchase').val(item.PODate);
+								$('#DeliveryDate').val(item.DeliveryDate);
+								 $('#SupplierName').val(item.SupplierName);
+								$('#SupID').val(item.SupplierID);
 								 $('#MaterialCode').val(item.MaterialCode);
 								 $('#UOM').val(item.UOM);
 								 $('#Quantity').val(item.Quantity);
@@ -414,6 +428,13 @@ var date = new Date(item.DeliveryDate);
 								 //alert(item.TotalValue);
 								 $('#Assetvalue').val(item.TotalValue);
 								 
+								 var date = new Date(item.DeliveryDate);
+             
+             var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
+             $("#DeliveryDate").val(date1);
+			 var date = new Date(item.PODate);
+             var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
+             $("#DateOfPurchase").val(date3);
 							 }
 							
 						 
@@ -430,4 +451,66 @@ var date = new Date(item.DeliveryDate);
 
 });		
    
+</script>
+<script>
+
+function validate()
+{
+	if($("#AssetName").val().length <1)
+	{   
+		alert('Please Enter the AssetName');
+        $("#AssetName").focus();
+		return false;
+	}
+   if($('#Description').val().length <1)
+	{
+		alert('Please Enter the Asset Description');
+		$("#Description").focus();
+		return false;
+	}
+
+    if($('#User').val().length <1)
+	{
+		alert('Please Enter the Asset User');
+		$("#User").focus();
+		return false;
+	}
+	if($('#Location').val().length <1)
+	{
+		alert('Please Enter the Asset Location');
+		$("#Location").focus();
+		return false;
+	}
+	 if($("#PONO option:selected").val() == "")
+	{
+		alert('Please Select PO Number ');
+		$("#PONO").focus();
+		return false;
+	}
+
+	 if($("option:selected", $("#SelectMaterialCode")).val() == '-1')
+	{
+		alert('Please Select MaterialCode');
+		return false;
+	}
+
+    if($('#DateOfCommission').val().length <1)
+	{
+		alert('Please Enter the DateOfCommission');
+		$("#DateOfCommission").focus();
+		return false;
+	}
+
+	 if($("option:selected", $("#AssetStatus")).val() == '-1')
+	{
+		alert('Please Select AssetStatus');
+		return false;
+	}
+ 
+   
+
+
+
+
+}
 </script>
\ No newline at end of file
diff --git a/application/views/assetListing.php b/application/views/assetListing.php
index f8ff559c..f64655ff 100755
--- a/application/views/assetListing.php
+++ b/application/views/assetListing.php
@@ -29,7 +29,7 @@
                       <th>Location</th>
                       <th>Asset User</th>
                       <th>Supplier Name</th>
-                      <th>Date Of Purchase</th>
+                      <th>Received Date</th>
                       <th>Asset Value</th>                      
                       <th>Asset Status</th>
                      
@@ -44,7 +44,7 @@
                         {
                     ?>
                     <tr>
-					<td><u><a   href="<?php echo base_url().'assetdetails/editOldasset/?AssetID='.$record->AssetCode; ?>" data-toggle="tooltip" title="<?php echo $record->AssetCode; ?>  -  Click here to view Asset details"><?php echo $record->AssetCode ?>
+					<td><u><a   href="<?php echo base_url().'assetdetails/editOldasset/?AssetID='.$record->AssetCode ?>" data-toggle="tooltip" title="<?php echo $record->AssetCode; ?>  -  Click here to view Asset details"><?php echo substr($record->AssetCode, 5) ?>
                       <td><?php echo $record->AssetName ?></td>
                       <td><?php echo $record->Description ?></td>
                       <td><?php echo $record->DepartmentName ?></td>
diff --git a/application/views/editOldasset.php b/application/views/editOldasset.php
index ef51c2f1..099ce41d 100755
--- a/application/views/editOldasset.php
+++ b/application/views/editOldasset.php
@@ -7,7 +7,7 @@ $Department = '';
 $Location = '';
 $User = '';
 $SupplierName = '';
-$DOPurchase = '';
+$DateOfPurchase = '';
 $DateOfCommison = '';
 $AssetValue = '';
 $AssetStatus = '';
@@ -139,13 +139,13 @@ $("#DeliveryDate").datepicker({
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>Siddharth Industries - Edit Asset Details</center>        
+        <center>Siddharth Industries - Edit Asset Details-<?php echo $AssetCode ; ?></center>        
       </h1>
     </section>
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php base_url() ?>assetListing" class="btn btn-info" value="Back"/>Back</a>
+    <a href="<?php echo base_url()?>assetListing" class="btn btn-info"value="Back">Back</a>
 	</div>
 	<br>
         <div class="row">
@@ -165,9 +165,9 @@ $("#DeliveryDate").datepicker({
 								<div class="col-md-12">
 								<div class="col-md-3">                                
                                     <div class="form-group">
-                                         
+                                         <b>
                                         <span for="Asset_Name">Asset Name</span>
-										
+										</b>
                                         <input type="text" class="form-control required" id="AssetName" name="AssetName" value="<?php echo $AssetName;?>" style="text-transform:uppercase;">
 										 <input type="hidden" name="AssetCode" id="AssetCode"  class="form-control" readonly  value="<?php echo $AssetCode;?>">   
 										 
@@ -175,8 +175,8 @@ $("#DeliveryDate").datepicker({
 									</div>
                                     <div class="col-md-3">                                
                                     <div class="form-group">
-                                         
-                                        <span for="Description">Asset Description</span>
+                                         <b>
+                                        <span for="Description">Asset Description</span></b>
                                         <input type="text" class="form-control required" id="Description" name="Description"
 										value="<?php echo $Description; ?>">
                                   
@@ -185,8 +185,8 @@ $("#DeliveryDate").datepicker({
 									</div>
 									<div class="col-md-3">                                
                                     <div class="form-group">
-                                         
-                                        <span for="AssetOwner">Asset User</span>
+                                         <b>
+                                        <span for="AssetOwner">Asset User</span></b>
                                           <input type="text" class="form-control required" id="User" name="User" value="<?php echo $User;?>">
                                     
                                     </div>
@@ -194,8 +194,8 @@ $("#DeliveryDate").datepicker({
                                 </div>
 								<div class="col-md-3">                                
                                     <div class="form-group">
-                                         
-                                        <span for="Location">Asset Location</span>
+                                         <b>
+                                        <span for="Location">Asset Location</span></b>
                                        <input type="text" class="form-control required" id="Location" name="Location"
 										value="<?php echo $Location;?>">
  
@@ -207,7 +207,8 @@ $("#DeliveryDate").datepicker({
 								<div class="col-md-12">
 									<div class="col-md-3">
 										<div class="form-group">
-											<span for="PONO">Purchase Order Number</span>
+										<b>
+											<span for="PONO">Purchase Order Number</span></b>
 											
 											<select class="form-control required select2"  id="PONO" name="PONO">
 												<option value="<?php echo $PONO;?>"><?php echo $PONO;?></option>
@@ -237,7 +238,9 @@ $("#DeliveryDate").datepicker({
 									<div class="col-md-3" style="padding:0px;">
 									<div class="col-md-6">
 										<div class="form-group">
+										<b>
 											<span for="SelectMaterialCode" value=""> select Material Code</span>
+											</b>
 											
 											<select class="form-control required select2"  id="SelectMaterialCode" name="lineitem">
 												<option value="<?php echo $POLineItem;?>"><?php echo $POLineItem;?></option>
@@ -247,8 +250,8 @@ $("#DeliveryDate").datepicker({
 										</div>
 										<div class="col-md-6">                                
 										<div class="form-group">
-											 
-											<span for="MaterialCode">Material Code</span>
+											 <b>
+											<span for="MaterialCode">Material Code</span></b>
 											<input type="text" class="form-control required" id="MaterialCode"  readonly name="MaterialCode" value="<?php echo $MaterialCode;?>">
 										</div>
 										</div>
@@ -256,15 +259,15 @@ $("#DeliveryDate").datepicker({
 										<div class="col-md-3" style="padding:0px;">                                
 										<div class="col-md-6">                                
 										<div class="form-group">
-											 
-											<span for="UOM">UOM</span>
+											 <b>
+											<span for="UOM">UOM</span></b>
 											<input type="text" class="form-control required" id="UOM"value="<?php echo $UOM;?>"readonly name="UOM" value="">
 										</div>
 										</div>
 										<div class="col-md-6">                                
 										<div class="form-group">
-											 
-											<span for="Quantity">Quantity</span>
+											 <b>
+											<span for="Quantity">Quantity</span></b>
 											<input type="text" class="form-control required" id="Quantity" value="<?php echo $Quantity;?>"  name="Quantity" value="">
 										</div>
 										</div>
@@ -275,8 +278,8 @@ $("#DeliveryDate").datepicker({
 									 
 									<div class="col-md-3">                                
                                     <div class="form-group">
-                                         
-                                        <span for="Description">Description</span>
+                                         <b>
+                                        <span for="Description">Description</span></b>
                                         <input type="text" class="form-control required" id="PODescription"  readonly name="PODescription" value="<?php echo $MaterialName;?>">
                                     
                                     </div>
@@ -289,7 +292,8 @@ $("#DeliveryDate").datepicker({
 											 
 												<div class="form-group">
 												<input type="hidden" name="AssetDept" id="depcode">
-												<span for="AssetDept">Asset Department</span>
+												<b>
+												<span for="AssetDept">Asset Department</span></b>
 												<input type="text" class="form-control required" value="<?php echo $Department;?>" id="AssetDept" readonly name="" value="">
 											
 											</div>
@@ -298,28 +302,30 @@ $("#DeliveryDate").datepicker({
 								<div class="col-md-3">
                                    
                                         <div class="form-group">
-                                        <span for="DateOfPurchase">Purchase Date</span>
+                                        <b>
+                                        <span for="DateOfPurchase">Purchase Date</span></b>
                                         <input  id="DateOfPurchase" required name="DateOfPurchase"  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo $DateOfPurchase;?>">
                                     </div>
                                     </div>
 									<div class="col-md-3">
                                    
                                         <div class="form-group">
-                                        <span for="DateOfPurchase">Supplier Name</span>
+                                        <b>
+                                        <span for="DateOfPurchase">Supplier Name</span></b>
 										<input type="hidden" name="SupplierName" id="SupID">
                                         <input  id="SupplierName" required name=""  readonly onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo $SupplierName ?>">
                                     </div>
                                     </div>
 								<div class="col-md-3" style="padding:0px;">	
 								<div class="col-md-6">
-								 <div class="form-group">
-                                        <span for="DeliveryDate">Delivery Date</span>
+								 <div class="form-group"><b>
+                                        <span for="DeliveryDate">Delivery Date</span></b>
                                         <input  id="DeliveryDate" required name="DeliveryDate"  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo $DeliveryDate;?>">
                                     </div>
 								</div>
 								<div class="col-md-6">
-                                    <div class="form-group">
-                                        <span for="DateOfCommission">Date Of Commission</span>
+                                    <div class="form-group"><b>
+                                        <span for="DateOfCommission">Date Of Commission</span></b>
 										<input  id="DateOfCommission" required name="DateOfCommission"  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo $DateOfCommison;?>">
 
 										</div>
@@ -330,16 +336,16 @@ $("#DeliveryDate").datepicker({
 								<div class="col-md-12">
 									
 										<div class="col-md-3">
-										<div class="form-group">
+										<div class="form-group"><b>
 											<span for="Assetvalue">Asset Value</span>
-											 <input type="text" class="form-control required" id="Assetvalue" name="Assetvalue" onkeypress="return isNumberKey(event)" maxlength="255"  value="<?php echo $AssetValue;?>">
+											</b> <input type="text" class="form-control required" id="Assetvalue" name="Assetvalue" onkeypress="return isNumberKey(event)" maxlength="255"  value="<?php echo $AssetValue;?>">
 											
 										</div>
 									
 									</div>
 									  <div class="col-md-3">
-										<div class="form-group">
-											<span for="AssetStatus">Asset Status</span>
+										<div class="form-group"><b>
+											<span for="AssetStatus">Asset Status</span></b>
 											<select class="form-control required" id="AssetStatus" name="AssetStatus">
                                             <option   value="<?php echo $AssetStatus; ?>"><?php echo $AssetStatus; ?></option>
                                             <?php
@@ -357,9 +363,9 @@ $("#DeliveryDate").datepicker({
 										</div>
 									</div>
 									<div class="col-md-6">
-									<div class="form-group">
+									<div class="form-group"><b>
 											<span for="Remarks">Remarks</span>
-											 
+											 </b>
 											<input type="text" class="form-control required" id="Remarks" name="Remarks" maxlength="500" value="<?php echo $Remarks; ?>">
 										</div>
 									</div>
@@ -421,37 +427,35 @@ $("#DeliveryDate").datepicker({
 	$('#PONO').on('change',function(){
 		
         var PONO = $(this).val();
+       // alert(PONO);
         if(PONO){
+        	//alert("INSIDE IF");
             $.ajax({
                 type:'POST',
-                url:"<?php echo base_url() ?>assetdetails/getpo",
+                url:"<?php echo base_url() ?>assetdetails/getpodetails",
                 data:'PONO='+PONO,
+                	dataType: 'json',
                 success:function(data){
-                  // alert(data);
-					var line ='';
-				
+                   //alert(data);
+             	
+				 var line ='';
 					$('#SelectMaterialCode').empty();
-					
-					$.each(JSON.parse(data), function (i, item) {
-							//alert(item.LineItemNo);
-							line ='<option>select Material Code</option>';	
-						line +='<option value='+item.LineItemNo+'>'+item.LineItemNo+'-'+item.MaterialCode+'</option>';
+					//alert('before');
+					$.each(data, function (i, item) {
+							//alert(item);
+
+							//line ='<option>select Material Code</option>';	
+						//line +='<option value='+item.LineItemNo+'>'+item.LineItemNo+'-'+item.MaterialCode+'</option>';
 								//$('#DeliveryDate').val(item.DeliveryDate);
+								line+=item;
+								
+								
 								
-								$('#SupplierName').val(item.SupplierName);
-								$('#SupID').val(item.SupplierID);
-								$('#DateOfPurchase').val(item.PODate);
 								
 								 
-var date = new Date(item.DeliveryDate);
              
-            var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
-             $("#DeliveryDate").val(date1);
-			 var date = new Date(item.PODate);
-             var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
-             $("#DateOfPurchase").val(date3);
 								
-								$('#SelectMaterialCode').append(line);
+			 $('#SelectMaterialCode').append(line);
 								
 					});
 					
@@ -481,7 +485,12 @@ var date = new Date(item.DeliveryDate);
 					 $.each(JSON.parse(data), function (i, item) {
 							 if(id == item.LineItemNo){
 								// alert(item.MaterialCode);
-								 //alert(item.Departmentcode);
+								 // alert(item.DeliveryDate);
+								 // alert(item.DateOfPurchase);
+								 $('#DateOfPurchase').val(item.PODate);
+								$('#DeliveryDate').val(item.DeliveryDate);
+								 $('#SupplierName').val(item.SupplierName);
+								$('#SupID').val(item.SupplierID);
 								 $('#MaterialCode').val(item.MaterialCode);
 								 $('#UOM').val(item.UOM);
 								 $('#Quantity').val(item.Quantity);
@@ -491,6 +500,13 @@ var date = new Date(item.DeliveryDate);
 								 //alert(item.TotalValue);
 								 $('#Assetvalue').val(item.TotalValue);
 								 
+								 var date = new Date(item.DeliveryDate);
+             
+             var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
+             $("#DeliveryDate").val(date1);
+			 var date = new Date(item.PODate);
+             var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
+             $("#DateOfPurchase").val(date3);
 							 }