diff --git a/application/views/importpo.php b/application/views/importpo.php
index 3cecb5ba..59ba7d1b 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -137,10 +137,10 @@ function vaildateBeforeOpenModal()
 		$('#DeliveryAddr').focus();
 		return false;
 	}
-	else if($('#Deliverydt').val() == '' && $('#Scheduleby').val() == '')
+	else if($('#Dispatch').val() == '' && $('#Scheduleby').val() == '')
 	{
 		alert('Please Enter the Dispatch Instruction');
-		$('#Deliverydt').focus();
+		$('#Dispatch').focus();
 		return false;
 	}
 	else if($('#currencytype').val() == '0')
@@ -156,6 +156,21 @@ function vaildateBeforeOpenModal()
 		return false;
 	}
 
+  else if($('#PlaceOforigin').val()== '')
+  {
+    alert('Please Enter Place Of Origin');
+    $('#PlaceOforigin').focus();
+    return false;
+  }
+
+  else if($('#PaymentTerms').val()=='')
+  {
+    alert('Please Select Payment Terms');
+    $('#PaymentTerms').focus();
+    return false;
+
+  }
+
     
 	else 
 	{
@@ -1834,6 +1849,10 @@ var NilType = '<?php echo NILTYPE;?>';
 
 
 $('#drpSupplier').change(function() {
+
+  var supPaymentTerms='';
+     var supPaymentAT='';
+    var subPaymentDate='';
     
  var id = $('#drpSupplier').val();
 
@@ -1847,23 +1866,29 @@ $('#drpSupplier').change(function() {
         $.each(y, function(idx, obj) {
             if(obj.SupplierID === id)
             {
-                $("#SupAddress").val(obj.Address);
-               // $("#PayableAT").val(obj.PayableAT);
-                $("#PaymentTerms").val(obj.PaymentTerms);
-                //var a=obj.PaymentDays;
-                //console.log(a);
-                // if (a=="After") 
-                // {
-                //   //alert();
-                //   document.getElementById("After").checked = true;
+               //  $("#SupAddress").val(obj.Address);
+               // // $("#PayableAT").val(obj.PayableAT);
+               //  $("#PaymentTerms").val(obj.PaymentTerms);
+               //  var a=obj.PaymentTerms;
+               //  console.log(a);
+               //  // if (a=="After") 
+               //  // {
+               //  //   //alert();
+               //  //   document.getElementById("After").checked = true;
 
-                // }
-                // else
-                //   document.getElementById("Before").checked = true;
+               //  // }
+               //  // else
+               //  //   document.getElementById("Before").checked = true;
               
-               //var a=$("PayableAT").val();
+               // //var a=$("PayableAT").val();
                
-                //$("#PaymentTerms").append( $('<option></option>').val(obj.PaymentTerms).html(obj.PaymentTerms) );
+               //  $("#PaymentTerms").append( $('<option></option>').val(obj.PaymentTerms).html(obj.PaymentTerms) );
+
+
+                $("#SupAddress").val(obj.Address);
+                supPaymentTerms=obj.PaymentTerms;
+                supPaymentAT=obj.PayableAT;
+                subPaymentDate=obj.PaymentDays;
 
                 
                 
@@ -3888,12 +3913,13 @@ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
   
        $.each(Detail, function (index, value) 
        {
+
+        
            $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
 
-
          
+
        } ); 
 
- 
 </script>