From 2aa81eedb02faf5a7882ab09079f327e70838751 Mon Sep 17 00:00:00 2001
From: velz2020 <velmurugan.s@venbainfotech.com>
Date: Thu, 10 Aug 2017 15:57:07 +0530
Subject: [PATCH] REMARKS PROBLEM AND REVENUE AMEND ISSUE FIXED

---
 application/views/editRevenueAmendPO.php |  7 ++++++-
 application/views/poapproval_view.php    | 13 +++++++++----
 application/views/porelease_view.php     | 20 ++++++++++++++------
 3 files changed, 29 insertions(+), 11 deletions(-)

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()
 					<td><?php echo $record->UOM ?></td>                     
 					<td align="right"><?php echo $record->Rate ?></td>                     
 					
-					<td align="right"><?php echo $record->BasicValue ?></td>    
+					<td align="right"><?php echo number_format($record->BasicValue,2,'.',''); ?></td>    
 					  
 					<td align="right"><?php echo $record->Taxamount ?></td>
 					<td align="right"><?php echo $record->TotalValue ?></td>
@@ -2228,6 +2228,8 @@ tinyMCE.triggerSave();
 var splinstr = $('#txtSpcialInstruction').val();
 $('#SpcialInstruction').val(splinstr);
 $('#txtDeliveryAddress').val(deladd);
+var budget=<?php echo $AvlAmount;?>;
+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 == '<br>' || curtremarks == '')  && Remark == ''){
 			Remarks='';
-			//alert("To Store both empty" + Remarks)
+			//alert("To Store both empty:-" + Remarks)
 		}
-		else if(curtremarks == '<br>')
+		else if((curtremarks != '' && Remark == ''))
+		{
+		Remarks=curtremarks;
+		//alert("To Store current empty:-" + Remarks)
+		}
+		else if((Remark != '') && (curtremarks == '' || curtremarks == '<br>'))
 		{
 		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 == '<br>' && Remark == ''){
+		if((curtremarks == '<br>' || curtremarks == '')  && Remark == ''){
 			Remarks='';
-			//alert("To Store both empty" + Remarks)
+			//alert("To Store both empty:-" + Remarks)
 		}
-		else if(curtremarks == '<br>')
+		else if((curtremarks != '' && Remark == ''))
+		{
+		Remarks=curtremarks;
+		//alert("To Store current empty:-" + Remarks)
+		}
+		else if((Remark != '') && (curtremarks == '' || curtremarks == '<br>'))
 		{
 		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?'