diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 18b7cdc4..e0312e29 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -418,14 +418,14 @@ class purchaseorder extends BaseController } else if($ReqType == IMPORT) { - $AvlBudget = $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$FYdt,$ReqType); + $AvlBudget = $this->purchaseorder_model->GetAvailableImportBudgetAmount($CostCode,$FYdt,$ReqType); if(count($AvlBudget)>0) { - $data['AvlBudAmt'] = $AvlBudget[0]['BudgetAmount'] - $AvlBudget[0]['Totalvalue']; + $data['AvlBudAmt'] = $AvlBudget[0]['BudgetAmount'] - $AvlBudget[0]['TotalValue']; } - // print_r($data); + //print_r($data['AvlBudAmt']); $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetails($PONO); $data['Currency']=$this->purchaseorder_model->GetCurrencytype(); foreach($data['POMaster'] as $CUR) diff --git a/application/views/MaterialIssueList.php b/application/views/MaterialIssueList.php index 4a26d806..f2a0a224 100755 --- a/application/views/MaterialIssueList.php +++ b/application/views/MaterialIssueList.php @@ -167,7 +167,7 @@ Sendvalues[2] = ReqNo; Sendvalues[3] = Remarks; //alert(MaterialCode); - alert(StatusCode); + //alert(StatusCode); $('#content').loader('show'); $.ajax({ data:{id:Sendvalues}, diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php index 89b3c1de..de5f1a3b 100755 --- a/application/views/editImportAmendPO.php +++ b/application/views/editImportAmendPO.php @@ -3064,6 +3064,8 @@ $('#editimportpomodel').on("shown.bs.modal", function(e) { $('.EditImport').click(function(){ //alert('inside edit'); + if(validateEditExceedLimit() && ExceedEditQuantityCheck()) +{ var CostCode = $("#EditCostCenter").val(); var AvilBudget = $('#EditAvlBudAmt').val(); @@ -3171,13 +3173,37 @@ $('.EditImport').click(function(){ populateValueMainFormForEditImportTax(); - +} } ); +var avalbudAmte= ; +function validateEditExceedLimit() + { + //var avalbudAmt = parseFloat($('#EditAvlBudAmt').val()); + var basicAmountRate = parseFloat($('#EdittxtBasicValue').val()); + var totalAmount = parseFloat($('#EditTotalExp').val()); + var exchangerate=parseFloat($('#EditExchangeRt').val()); + var exp=0; + exp=basicAmountRate*exchangerate; + //console.log(exp); + + if(exp > avalbudAmte || totalAmount > avalbudAmte) + { + alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); + $('#EditRate').focus(); + return false; + } + else + { + return true; + } + + } + diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index e8ccd257..fcf00dc9 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -2633,7 +2633,7 @@ if($PONOStatus == PO_RELEASED) - +
@@ -4385,6 +4385,7 @@ $('#txttotalgrossduty').val((parseFloat(TotalGrossDuty) + parseFloat(Grossdutypa $('#txttotalavlmodvat').val((parseFloat(TotalAvlmodvat) + parseFloat(AvailableModvat)).toFixed(2) ); $('#txttotalgrossexpense').val((parseFloat(TotalGrossExpense) + parseFloat(Grossexpenses)).toFixed(2) ); $('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(2) ); +$('#txttot').val((parseFloat(TotalOrder)+parseFloat(totalexp)).toFixed(2)); //var r=parseFloat($('#txtToatlOrder').val()); //console.log(r); //var x=parseFloat($('#txttotalcustomED').val()); @@ -4399,6 +4400,22 @@ $('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed( function clearTaxField() { //$('#AfterBasicPriceTax').val(''); + $('#ReqNo').val(''); + $('#deptName').val(''); + $('#CostCenter').val(''); + $('#AvlBudAmt').val(''); + $('#MaterialCode').val(''); + $('#ItemName').val(''); + $('#UOM').val(''); + $('#Quantity').val(''); + $('#Rate').val(''); + $('#txtBasicValue').val(''); + $('#imBasicPrice').val(''); + $('#ExchangeRt').val(''); + $('#INRBasicvalue').val(''); + $('#BasicPriceTax').val(''); + $('#AfterBasicPriceTax').val(''); + $('#TotalExp').val(''); $('#AfterLandingCharge').val(''); $('#LandingCharge').val(''); $('#AfterHighseas').val('');