SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REMARKS PROBLEM AND REVENUE AMEND ISSUE FIXED

Browse Source
This commit is contained in:
velz2020 2017-08-10 15:57:07 +05:30
parent 7c3046099a
commit 2aa81eedb0
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/views/editRevenueAmendPO.php
View File

@ -1512,7 +1512,7 @@ function calculateEditTaxValue()
<td><?php echo $record->UOM ?></td> <td><?php echo $record->UOM ?></td>
<td align="right"><?php echo $record->Rate ?></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->Taxamount ?></td>
<td align="right"><?php echo $record->TotalValue ?></td> <td align="right"><?php echo $record->TotalValue ?></td>
@ -2228,6 +2228,8 @@ tinyMCE.triggerSave();
var splinstr = $('#txtSpcialInstruction').val(); var splinstr = $('#txtSpcialInstruction').val();
$('#SpcialInstruction').val(splinstr); $('#SpcialInstruction').val(splinstr);
$('#txtDeliveryAddress').val(deladd); $('#txtDeliveryAddress').val(deladd);
var budget=<?php echo $AvlAmount;?>;
var total=$('#txtTotalOrderValueSummary').val();
//alert('Before Validate IF condition'); //alert('Before Validate IF condition');
if(validate()) if(validate())
@ -2245,6 +2247,9 @@ $('#txtDeliveryAddress').val(deladd);
{ {
return false; return false;
}else if(budget < total){
alert('Total order Value is exceeding Budget Limit...!');
return false;
} }
else else
{ {

13
application/views/poapproval_view.php
View File

@ -135,16 +135,21 @@ if(empty($Status))
if((curtremarks == '<br>' || curtremarks == '') && Remark == ''){ if((curtremarks == '<br>' || curtremarks == '') && Remark == ''){
Remarks=''; 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; Remarks=Remark;
//alert("To Store current empty" + Remarks) //alert("To Store current empty:-" + Remarks)
} }
else{ else{
Remarks=Remark+"||"+curtremarks; Remarks=Remark+"||"+curtremarks;
//alert("To Store both" + Remarks) //alert("To Store both:-" + Remarks)
} }
//alert(Remarks); //alert(Remarks);
var StatusCode=''; var StatusCode='';

20
application/views/porelease_view.php
View File

@ -138,20 +138,28 @@ if(empty($Status))
var StatusCode=''; var StatusCode='';
var srtMsg=''; var srtMsg='';
if(curtremarks == '<br>' && Remark == ''){ if((curtremarks == '<br>' || curtremarks == '') && Remark == ''){
Remarks=''; 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; Remarks=Remark;
//alert("To Store current empty" + Remarks) //alert("To Store current empty:-" + Remarks)
} }
else{ else{
Remarks=Remark+"||"+curtremarks; 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'){
if(Status == '1'){ if(Status == '1'){
var strMsg='Do you want to Release this Purchase Order?' var strMsg='Do you want to Release this Purchase Order?'