diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index 3b9411df..932faf0e 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -3069,9 +3069,26 @@ $('#editimportpomodel').on("shown.bs.modal", function(e) {
         $('#EditQuantity').val($('#quantity'+userid).val());
         //RequistQuantity = $('#quantity'+userid).val();
         $('#EditRate').val($('#itemRate'+userid).val());
-         $('#EdittxtBasicValue').val($('#ProductPrice'+userid).val());
+
+         var q=parseFloat($('#quantity'+userid).val());
+       // console.log(q);
+
+         var r=parseFloat($('#itemRate'+userid).val());
+        //console.log(r);
+
+        var as=q*r;
+
+         $('#EdittxtBasicValue').val(parseFloat(as).toFixed(2));
        
-        $('#EditimBasicPrice').val($("#ProductPrice"+userid).val());
+        $('#EditimBasicPrice').val(parseFloat(as).toFixed(2));
+
+
+
+
+
+        //  $('#EdittxtBasicValue').val($('#ProductPrice'+userid).val());
+       
+        // $('#EditimBasicPrice').val($("#ProductPrice"+userid).val());
            var a=parseFloat($('#EdittxtBasicValue').val())
          var b=parseFloat($('#ExchangeRate').val());
          var c=a*b;
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 3570f2d5..21804b9c 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -4707,17 +4707,25 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) {
 
         //var uom=parseFloat($('#uom'+userid).val());
         //console.log(uom);
-    RequistQuantity = $('#quantity'+userid).val();
+        RequistQuantity = $('#quantity'+userid).val();
         $('#EditRate').val($('#itemRate'+userid).val());
 
-        var as=parseFloat($('#ProductPrice'+userid).val()).toFixed(2);
 
+        var q=parseFloat($('#quantity'+userid).val());
+       // console.log(q);
+
+        var r=parseFloat($('#itemRate'+userid).val());
+
+        var as=q*r;
         //console.log(as);
          // $('#EdittxtBasicValue').val($('#ProductPrice'+userid).val());
          // $('#EditimBasicPrice').val($("#ProductPrice"+userid).val());
 
-         $('#EdittxtBasicValue').val(as);
-         $('#EditimBasicPrice').val(as);
+         $('#EdittxtBasicValue').val(parseFloat(as).toFixed(2));
+         $('#EditimBasicPrice').val(parseFloat(as).toFixed(2));
+
+         // $('#EdittxtBasicValue').val(as);
+         // $('#EditimBasicPrice').val(as);
 
          var a=parseFloat($('#EdittxtBasicValue').val())
          var b=parseFloat($('#ExchangeRate').val());
diff --git a/application/views/issueStoreRequistion.php b/application/views/issueStoreRequistion.php
index 47239b0a..b082068c 100755
--- a/application/views/issueStoreRequistion.php
+++ b/application/views/issueStoreRequistion.php
@@ -165,6 +165,7 @@ span.highlight {
                         {	
                         	//print_r($record);
 							$index = $index + 1;
+							$qty=($record->QuantityRequired)-($record->QuantityIssued);
                     ?>
 							<tr  id="<?php echo $index ; ?>">
 							 <td align="left"><?php echo $index ; ?></td> 
@@ -183,12 +184,12 @@ span.highlight {
 
                   <!-- <input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" /> -->
 
-					<?php if(($record->Quantity)-($record->QuantityRequired)<=0)
+					<?php if(($record->Quantity)-$qty<0)
 					      {?>
                     <td align="right" style="color: red" ><?php echo $record->Quantity?></td>
 					      	<?
 					      	}?>
-					<?php if(($record->Quantity)-($record->QuantityRequired)>0) 
+					<?php if(($record->Quantity)-$qty>=0) 
 					        {?>    	
                     <td align="right"><?php echo $record->Quantity?></td>
                             <?
@@ -202,7 +203,7 @@ span.highlight {
 					<td align="left"><?php echo $record->Remarks  ?></td> 
 					<td align="left">
 
-					<?php if((($record->Quantity)-($record->QuantityRequired)>0)&&$record->StatusName!='ISSUED')
+					<?php if((($record->Quantity)-$qty>=0)&&$record->StatusName!='ISSUED')
 					{?> 
 
                        
@@ -220,7 +221,7 @@ span.highlight {
 					
 					<td align="left">
 
-                    <?php if((($record->Quantity)-($record->QuantityRequired)>0)&&$record->StatusName!='ISSUED')
+                    <?php if((($record->Quantity)-$qty>=0)&&$record->StatusName!='ISSUED')
 					{?> 
 
 					<input type="text" onchange="SaveRemarks(<?php echo $index ?>)" id="<?php echo 'Comments'.$index ?>"  name="<?php echo 'Comments'.$index ?>"  class="form required"  value="<?php echo $record->StoreComments; ?>" ><?}