diff --git a/application/models/requistion_model.php b/application/models/requistion_model.php index 5bd97dd0..9abc05d4 100755 --- a/application/models/requistion_model.php +++ b/application/models/requistion_model.php @@ -428,7 +428,7 @@ class requistion_model extends CI_Model function UpdateRequistionLineItem($Requist, $ReqNo,$MaterialCode) { $this->db->where('ReqNo', $ReqNo); - //$this->db->where('MaterialCode', $MaterialCode); + $this->db->where('MaterialCode', $MaterialCode); $this->db->update('T_Requestion_Details',$Requist); return TRUE; diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php index e073f411..68fbc346 100755 --- a/application/views/EditservicePurchaseorder.php +++ b/application/views/EditservicePurchaseorder.php @@ -2682,6 +2682,11 @@ function validateServiceTax() { return false; } + else if($('#txtSpcialInstruction').val()==''){ + alert('Please Enter the Service Description'); + $('#txtSpcialInstruction').focus(); + return false; + } else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false) { $('#Rate').focus(); @@ -2724,6 +2729,11 @@ function validateServiceTax() { return false; } + else if($('#EdittxtSpcialInstruction').val()==''){ + alert('Please Enter the Service Description'); + $('#EdittxtSpcialInstruction').focus(); + return false; + } else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false) { $('#EditRate').focus(); diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php index 5641f45a..15fcbe8d 100755 --- a/application/views/alterpurchaseorder.php +++ b/application/views/alterpurchaseorder.php @@ -5898,7 +5898,11 @@ function populateValueMainFormForDeleteItem(rowid) $('#ServiceRate').focus(); return false; } - + else if($('#txtSpcialInstructionSingle').val()==''){ + alert('Please Enter the Service Description'); + $('#txtSpcialInstructionSingle').focus(); + return false; + } else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvalBuget').val()) == false) { $('#ServiceRate').focus(); @@ -6234,6 +6238,11 @@ $('#content').loader('hide'); $('#EditRate').focus(); return false; } + else if($('#EdittxtSpcialInstructionSingle').val()==''){ + alert('Please Enter the Service Description'); + $('#EdittxtSpcialInstructionSingle').focus(); + return false; + } else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false) { diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php index 8cea8432..b38a7c92 100755 --- a/application/views/capitalpurchaseorder.php +++ b/application/views/capitalpurchaseorder.php @@ -2958,7 +2958,13 @@ var purchaseRate = $('#purchaserate').val(); var avalbudAmt = parseFloat($('#CapitalbudAmt').val()); var basicAmountRate = parseFloat($('#CPTotalAmount').val()); var totalAmount = parseFloat($('#txtTotalOrderValue').val()); - + var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val(); + if(capitalType!='Domestic'){ + basicAmountRate=parseFloat(basicAmountRate*ExchangeRate); + } + else{ + basicAmountRate=basicAmountRate; + } if(basicAmountRate > avalbudAmt) { alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); @@ -3619,7 +3625,14 @@ $('#SpcialInstruction').val(splinstr); $('#txtDeliveryAddress').val(deladd); $('#txtStatus').val(stat); var AvlBudAmt = ''; - +var basicAmountRate = parseFloat($('#CapitalToatlOrder').val()); + var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val(); + if(capitalType!='Domestic'){ + basicAmountRate=parseFloat(basicAmountRate*ExchangeRate); + } + else{ + basicAmountRate=basicAmountRate; + } if(validate()) { if(document.getElementById('serviceTax').rows.length < 2) @@ -3633,7 +3646,7 @@ var AvlBudAmt = ''; $('#Otherpayment').focus(); return false; } - else if(parseInt(AvlBudAmt) < parseInt($('#CapitalToatlOrder').val())) { + else if(parseInt(AvlBudAmt) < parseInt(basicAmountRate)) { alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); return false; @@ -4138,7 +4151,14 @@ function validateEditCapitalTax() var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val()); var basicAmountRate = parseFloat($('#EditCPTotalAmount').val()); var totalAmount = parseFloat($('#EdittxtTotalOrderValue').val()); - + + var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val(); + if(capitalType!='Domestic'){ + basicAmountRate=parseFloat(basicAmountRate*ExchangeRate); + } + else{ + basicAmountRate=basicAmountRate; + } if(basicAmountRate > avalbudAmt) { alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php index b1add54b..fbbccb48 100755 --- a/application/views/editCapitalPo.php +++ b/application/views/editCapitalPo.php @@ -3857,7 +3857,13 @@ var purchaseRate = $('#purchaserate').val(); var avalbudAmt = parseFloat($('#CapitalbudAmt').val()); var basicAmountRate = parseFloat($('#CPTotalAmount').val()); var totalAmount = parseFloat($('#txtTotalOrderValue').val()); - + var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val(); + if(capitalType!='Domestic'){ + basicAmountRate=parseFloat(basicAmountRate*ExchangeRate); + } + else{ + basicAmountRate=basicAmountRate; + } if(basicAmountRate > avalbudAmt) { alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); @@ -4672,7 +4678,14 @@ var PaymentMethod = $('#PaymentMethod').val(); $('#SpcialInstruction').val(splinstr); $('#txtDeliveryAddress').val(deladd); $('#txtStatus').val(stat); - +var basicAmountRate = parseFloat($('#CapitalToatlOrder').val()); + var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val(); + if(capitalType!='Domestic'){ + basicAmountRate=parseFloat(basicAmountRate*ExchangeRate); + } + else{ + basicAmountRate=basicAmountRate; + } if(validate()) { @@ -4689,7 +4702,7 @@ $('#txtStatus').val(stat); $('#Otherpayment').focus(); return false; } - else if(parseInt(AvlBudAmt) < parseInt($('#CapitalToatlOrder').val())) { + else if(parseInt(AvlBudAmt) < parseInt(basicAmountRate)) { alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); return false; @@ -5199,7 +5212,13 @@ function validateEditCapitalTax() var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val()); var basicAmountRate = parseFloat($('#EditCPTotalAmount').val()); var totalAmount = parseFloat($('#EdittxtTotalOrderValue').val()); - + var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val(); + if(capitalType!='Domestic'){ + basicAmountRate=parseFloat(basicAmountRate*ExchangeRate); + } + else{ + basicAmountRate=basicAmountRate; + } if(basicAmountRate > avalbudAmt) { alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php index 0f32b51a..1e7e6e89 100755 --- a/application/views/servicePurchaseorder.php +++ b/application/views/servicePurchaseorder.php @@ -1921,11 +1921,17 @@ function validateServiceTax() { return false; } + else if($('#txtSpcialInstruction').val()==''){ + alert('Please Enter the Service Description'); + $('#txtSpcialInstruction').focus(); + return false; + } else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false) { $('#Rate').focus(); return false; } + else { return true; @@ -1963,6 +1969,11 @@ function validateServiceTax() { return false; } + else if($('#EdittxtSpcialInstruction').val()==''){ + alert('Please Enter the Service Description'); + $('#EdittxtSpcialInstruction').focus(); + return false; + } else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false) { $('#EditRate').focus();