diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php index e93e58f5..5fe74efa 100755 --- a/application/models/mrir_model.php +++ b/application/models/mrir_model.php @@ -322,7 +322,7 @@ TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount '); $PartialApproved = $query->num_rows; - echo 'Partialcount'.$PartialApproved; + // echo 'Partialcount'.$PartialApproved; if($ApprovedCount > 0) { diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 9d36b38f..3570f2d5 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -3048,7 +3048,7 @@ function USRate() $('#ExchangeRt').val(txtexchangerate); $('#EditAfterBasicPriceTax').val(txtINR); $('#EditimBasicPrice').val(txtbasics); - $('#EditExchangeRt').val(txtexchangerate); + $('#EditExchangeRt').val(parseFloat(txtexchangerate).toFixed(2)); $('#EditINRBasicvalue').val(txtINRvalue); @@ -3066,7 +3066,7 @@ function EditQtyZerocheck() $('#EdittxtBasicValue').val(0); $('#EditimBasicPrice').val(0); var txtexchangerate=parseFloat($('#ExchangeRate').val()); - $('#EditExchangeRt').val(txtexchangerate); + $('#EditExchangeRt').val(parseFloat(txtexchangerate).toFixed(2)); $('#EditINRBasicvalues').val(0); $('#EditAfterBasicPriceTax').val(0); $('#EditINRBasicvalue').val(0); @@ -4709,8 +4709,15 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) { //console.log(uom); RequistQuantity = $('#quantity'+userid).val(); $('#EditRate').val($('#itemRate'+userid).val()); - $('#EdittxtBasicValue').val($('#ProductPrice'+userid).val()); - $('#EditimBasicPrice').val($("#ProductPrice"+userid).val()); + + var as=parseFloat($('#ProductPrice'+userid).val()).toFixed(2); + + //console.log(as); + // $('#EdittxtBasicValue').val($('#ProductPrice'+userid).val()); + // $('#EditimBasicPrice').val($("#ProductPrice"+userid).val()); + + $('#EdittxtBasicValue').val(as); + $('#EditimBasicPrice').val(as); var a=parseFloat($('#EdittxtBasicValue').val()) var b=parseFloat($('#ExchangeRate').val()); diff --git a/application/views/importpo.php b/application/views/importpo.php index da1a7c6a..a0d2d7ec 100755 --- a/application/views/importpo.php +++ b/application/views/importpo.php @@ -3651,9 +3651,10 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) { $('#EdittxtBasicValue').val(basic); $('#EditimBasicPrice').val(basic); + var inrbasicval=parseFloat($('#BasicPriceINR'+userid).val()).toFixed(2); - - $('#EditINRBasicvalue').val($("#BasicPriceINR"+userid).val()); + // $('#EditINRBasicvalue').val($("#BasicPriceINR"+userid).val()); + $('#EditINRBasicvalue').val(inrbasicval); $('#EditLandingCharge').val($("#LandingChargee"+userid).val()); $('#EditAfterLandingCharge').val($("#AfterLandingChargee"+userid).val()); $('#EditHighseas').val($("#Highseass"+userid).val());