diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php
index b874b1cb..86cf59fc 100755
--- a/application/views/editRevenueAmendPO.php
+++ b/application/views/editRevenueAmendPO.php
@@ -1512,7 +1512,7 @@ function calculateEditTaxValue()
UOM ?> |
Rate ?> |
- BasicValue ?> |
+ BasicValue,2,'.',''); ?> |
Taxamount ?> |
TotalValue ?> |
@@ -2228,6 +2228,8 @@ tinyMCE.triggerSave();
var splinstr = $('#txtSpcialInstruction').val();
$('#SpcialInstruction').val(splinstr);
$('#txtDeliveryAddress').val(deladd);
+var budget=;
+var total=$('#txtTotalOrderValueSummary').val();
//alert('Before Validate IF condition');
if(validate())
@@ -2245,6 +2247,9 @@ $('#txtDeliveryAddress').val(deladd);
{
return false;
+ }else if(budget < total){
+ alert('Total order Value is exceeding Budget Limit...!');
+ return false;
}
else
{
diff --git a/application/views/poapproval_view.php b/application/views/poapproval_view.php
index 0ffcd989..b3f4bb98 100755
--- a/application/views/poapproval_view.php
+++ b/application/views/poapproval_view.php
@@ -135,16 +135,21 @@ if(empty($Status))
if((curtremarks == '
' || curtremarks == '') && Remark == ''){
Remarks='';
- //alert("To Store both empty" + Remarks)
+ //alert("To Store both empty:-" + Remarks)
}
- else if(curtremarks == '
')
+ else if((curtremarks != '' && Remark == ''))
+ {
+ Remarks=curtremarks;
+ //alert("To Store current empty:-" + Remarks)
+ }
+ else if((Remark != '') && (curtremarks == '' || curtremarks == '
'))
{
Remarks=Remark;
- //alert("To Store current empty" + Remarks)
+ //alert("To Store current empty:-" + Remarks)
}
else{
Remarks=Remark+"||"+curtremarks;
- //alert("To Store both" + Remarks)
+ //alert("To Store both:-" + Remarks)
}
//alert(Remarks);
var StatusCode='';
diff --git a/application/views/porelease_view.php b/application/views/porelease_view.php
index ef20de8d..698983b7 100755
--- a/application/views/porelease_view.php
+++ b/application/views/porelease_view.php
@@ -138,20 +138,28 @@ if(empty($Status))
var StatusCode='';
var srtMsg='';
- if(curtremarks == '
' && Remark == ''){
+ if((curtremarks == '
' || curtremarks == '') && Remark == ''){
Remarks='';
- //alert("To Store both empty" + Remarks)
+ //alert("To Store both empty:-" + Remarks)
}
- else if(curtremarks == '
')
+ else if((curtremarks != '' && Remark == ''))
+ {
+ Remarks=curtremarks;
+ //alert("To Store current empty:-" + Remarks)
+ }
+ else if((Remark != '') && (curtremarks == '' || curtremarks == '
'))
{
Remarks=Remark;
- //alert("To Store current empty" + Remarks)
+ //alert("To Store current empty:-" + Remarks)
}
else{
Remarks=Remark+"||"+curtremarks;
- //alert("To Store both hahve" + Remarks)
+ //alert("To Store both:-" + Remarks)
}
- //alert(PO+"-"+Status+"-"+StatusCode);
+ //alert(Remarks);
+ var StatusCode='';
+ var srtMsg='';
+ //alert(PO+"-"+Status+"-"+StatusCode+"-"+Remarks);
if(Status != '-1'){
if(Status == '1'){
var strMsg='Do you want to Release this Purchase Order?'