diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index e1736fa0..7153b17b 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -869,7 +869,9 @@ QuantityRejected,ROUND(ReceivedQuantity-QuantityRejected)as PendingQty,
  join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo 
  join T_Employee_Details emp on Req.Requestedby = emp.EmpID 
  
- left join T_MRIR_Details Det on Det.MaterialCode=LineItem.MaterialCode
+ left join T_MRIR_Master Mast on POMast.PONO=Mast.PONO
+ 
+ left join T_MRIR_Details Det on Det.MaterialCode=LineItem.MaterialCode and Mast.MRIRNO=Det.MRIRNO
  
  join T_DepartmentDetails Dept on emp.Departmentcode = Dept.DEPCode where LineItem.PONO =?';
 				//print_r($subQuery);
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 1d4e4f20..76b85f68 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -2465,7 +2465,7 @@ if($PONOStatus == PO_RELEASED)
                                 $totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty;
                                 $ExchangeRate=$record->ExchangeRate;
                                 //$totorder=$totorder+$record->ProductPrice;
-                                $totorder=$totorder+$record->BasicValue;
+                                $totorder=$totorder+$record->ProductPrice;
                                 //$ServiceDescription=$record->ServiceDescription;
 
                                  //alert($totorder);
@@ -4086,7 +4086,7 @@ $('.AddImport').click(function()
                
   //alert('in');
    var template = jQuery("#ImportList").html();
-   $('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,Description:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp,ReceivedQty:receivedqty,RejectedQty:rejectedqty,PendingQty:pendingqty}));
+   $('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,Description:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp,ReceivedQty:receivedqty,RejectedQty:rejectedqty,PendingQty:pendingqty}));
    //alert(JSON.strigify(BasicAmt));
 
     
diff --git a/application/views/importpo.php b/application/views/importpo.php
index d5b2a576..b23f8e88 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -1855,52 +1855,63 @@ var NilType = '<?php echo NILTYPE;?>';
 
 
 
+
+
+
 $('#drpSupplier').change(function() {
 
-  var supPaymentTerms='';
-     var supPaymentAT='';
-    var subPaymentDate='';
-    
- var id = $('#drpSupplier').val();
-
+  var id = $('#drpSupplier').val();
  $("#SupAddress").val('');
+
+
+
+ 
  
         if(id != '0')
         {
             var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
+            var Payment = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
+            var PaymentID='';
+            $('#PaymentTerms').empty();
 
                 
-        $.each(y, function(idx, obj) {
-            if(obj.SupplierID === id)
-            {
-               //  $("#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;
+           $.each(y, function(idx, obj) 
+           {
+              if(obj.SupplierID === id)
+               {
+               $("#SupAddress").val(obj.Address);
+        
+               PaymentID = obj.PaymentID;
+               }
+      
+           });
 
-               //  // }
-               //  // else
-               //  //   document.getElementById("Before").checked = true;
-              
-               // //var a=$("PayableAT").val();
-               
-               //  $("#PaymentTerms").append( $('<option></option>').val(obj.PaymentTerms).html(obj.PaymentTerms) );
+           
+           if(PaymentID!='PT08')
+           {
+              $('#otheroptiondiv').hide();  
+              $('#Otherpayment').val('');
+           }
 
 
-                $("#SupAddress").val(obj.Address);
-                supPaymentTerms=obj.PaymentTerms;
-                supPaymentAT=obj.PayableAT;
-                subPaymentDate=obj.PaymentDays;
+          $.each(Payment, function(pay, payobj) 
+
+          {
+              if(payobj.PaymentID == PaymentID)
+                {
+                                      
+                }
+              else
+              {
+                $("#PaymentTerms").append( $('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
+
+              }
+      
+          });
+
+          
+
 
-                
-                
-            }
-             });
          }
         else
         {
@@ -1912,6 +1923,8 @@ $('#drpSupplier').change(function() {
 
 
 
+
+
 $('#currencytype').change(function(){
   $('#ExchangeRate').val('');
 });