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

currency symbol correction

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-09-20 17:05:49 +05:30
parent 9e4f1bdd4f
commit 4399f49349
5 changed files with 66 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/purchaseorder.php
View File

@ -234,6 +234,9 @@ class purchaseorder extends BaseController
}
else if($ReqType == IMPORT)
{
$data['staticspecialinstruction']=$this->purchaseorder_model->getConfigValue('C027');
$ViewName = 'importpo';
}
else if($ReqType == CAPITAL)

4
application/views/EditservicePurchaseorder.php
View File

@ -2771,9 +2771,9 @@ var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
$('#Otherpayment').focus();
return false;
}
else if($('#Editdescofpo').val().trim()==''){
else if($('#editdescofpo').val().trim()==''){
alert('Please Enter Description Of Service');
$('#Editdescofpo').focus();
$('#editdescofpo').focus();
return false;
}
else

9
application/views/editImportAmendPO.php
View File

@ -872,7 +872,7 @@ if(!empty($RequistionDetails))
</div>
</div>
<div class="col-md-3" style="padding-right: 0px;">
<label>Available Budget Amount</label>
<label>Available Budget Amount (<?php echo $INR?>)</label>
<div class="form-group">
<?php
// $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt',),'id'=>'EditAvlBudAmt', 'class' => 'form-control' ,'readonly' => 'true');
@ -985,8 +985,7 @@ if(!empty($RequistionDetails))
<div class="col-md-3">
<label>Exchange Rate :</label>
<?php echo "Exchange Rate ($Currencycode ($Value))"?>
<div class="form-group">
<?php
@ -1001,7 +1000,7 @@ if(!empty($RequistionDetails))
<!-- Basic value in INR : -->
<label id="labelEditBasicINR"><?php echo "Basic value in INR :";?></label>
<label id="labelEditBasicINR"><?php echo "Basic value in ($INR) :";?></label>
<div class="form-group">
<?php
@ -1348,7 +1347,7 @@ if(!empty($RequistionDetails))
</div>
<div class="col-md-12">
<div class="col-md-4">
purchase rate [Basic]/UOM
purchase rate (<?php echo $INR?>) [Basic]/UOM
</div>
<div class="col-md-4">
<div class="form-group">

31
application/views/editimportpo.php
View File

@ -144,7 +144,7 @@ if(!empty($POMaster))
// $PaymentDays=$Req->PaymentDays;
$StatusName=$Req->StatusName;
$Currency_Type=$Req->CurrencyType;
$parentPO =$Req->ParentPO;
$parentPO =$Req->ParentPO;
$DeliverySchedule=$Req->DeliverySchedule;
$Import_DispatchDetails=$Req->Import_DispatchDetails;
$Import_PlaceofOrgin=$Req->Import_PlaceofOrgin;
@ -1020,8 +1020,9 @@ if($PONOStatus == PO_RELEASED)
<!-- Exchange Rate : -->
<!-- <p id=label1><b><?php echo "Exchange Rate"?></p> -->
<label id=label1>Exchange Rate</label>
<!-- <label id=labeladdexc> </label> -->
<label id=labeladdexc><?php echo "Exchange Rate ($Currencycode ($Value))"?></label>
<div class="form-group">
<?php
@ -1035,7 +1036,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-3">
<!-- Basic value in INR : -->
<label id=labelBasicINR><?php echo "Basic value in INR";?> </label>
<label id=labelBasicINR><?php echo "Basic value in ($INR)";?> </label>
<div class="form-group">
@ -1384,7 +1385,7 @@ if($PONOStatus == PO_RELEASED)
</div>
<div class="col-md-12">
<div class="col-md-4">
<label>purchase rate [Basic]/UOM</label>
<label>purchase rate (<?php echo $INR?>) [Basic]/UOM</label>
</div>
<div class="col-md-4">
<div class="form-group">
@ -1654,8 +1655,8 @@ echo form_textarea($data);
<div class="col-md-3">
<label>Exchange Rate :</label>
<!-- <label>Exchange Rate :</label> -->
<label id=labeleditexc><?php echo "Exchange Rate ($Currencycode ($Value))"?></label>
<div class="form-group">
<?php
@ -1670,7 +1671,7 @@ echo form_textarea($data);
<!-- Basic value in INR : -->
<!-- <p id=labelEditBasicINR> --><label id=labelEditBasicINR><?php echo "Basic value in INR :";?></label><!-- </p> -->
<!-- <p id=labelEditBasicINR> --><label id=labelEditBasicINR><?php echo "Basic value in ($INR) :";?></label><!-- </p> -->
<div class="form-group">
<?php
@ -2022,7 +2023,7 @@ echo form_textarea($data);
</div>
<div class="col-md-12">
<div class="col-md-4">
<label>purchase rate [Basic]/UOM</label>
<label>purchase rate (<?php echo $INR?>) [Basic]/UOM</label>
</div>
<div class="col-md-4">
<div class="form-group">
@ -2162,7 +2163,7 @@ echo form_textarea($data);
</div>
</div>
<div class="col-md-3" style="padding-right: 0px;">
<label>Available Budget Amount</label>
<label>Available Budget Amount (<?php echo $INR?>)</label>
<div class="form-group">
<?php
$data = array('name' => 'ViewAvlBudAmt','value' => set_value('ViewAvlBudAmt'),'id'=>'ViewAvlBudAmt', 'class' => 'form-control num' ,'readonly' => 'true');
@ -2282,9 +2283,9 @@ echo form_textarea($data);
<div class="col-md-3">
Exchange Rate :
<!-- Exchange Rate : -->
<label id=labelviewexc><?php echo "Exchange Rate ($Currencycode ($Value))"?></label>
<div class="form-group">
<?php
$data = array('name' => 'ViewExchangeRt','value' => set_value('ViewExchangeRt',$ExchangeRate),'id'=>'ViewExchangeRt', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
@ -2298,7 +2299,7 @@ echo form_textarea($data);
<!-- Basic value in INR : -->
<p id=labelEditBasicINR><label><?php echo "Basic value in INR :";?></label></p>
<p id=labelEditBasicINR><label><?php echo "Basic value in ($INR) :";?></label></p>
<div class="form-group">
<?php
@ -2316,7 +2317,7 @@ echo form_textarea($data);
<div class="col-md-6" style="padding:0px;">
<div class="col-md-12">
<div class="col-md-4" >
Basic Price:
Basic Price:(<?php echo $INR?>)
</div>
<div class="col-md-4" >
<div class="form-group">
@ -2646,7 +2647,7 @@ echo form_textarea($data);
</div>
<div class="col-md-12">
<div class="col-md-4">
purchase rate [Basic]/UOM
purchase rate (<?php echo $INR?>) [Basic]/UOM
</div>
<div class="col-md-4">
<div class="form-group">
@ -3238,6 +3239,7 @@ var NilType = '<?php echo NILTYPE;?>';
$('#Insurance').change(function() {
var insuree=$('#Insurance').val();
@ -3343,6 +3345,7 @@ $('#currencytype').change(function()
document.getElementById("label2").innerHTML ='Basic Value in '+code+'('+sign+')';
document.getElementById("label3").innerHTML ='Basic Value in '+code+'('+sign+')';
document.getElementById("labelRate").innerHTML ='Rate in '+code+'('+sign+')';
document.getElementById("labelBasicpriceus").innerHTML ='Basic Value In '+code+'('+sign+')'+' per UOM';
document.getElementById("labelBasicINR").innerHTML ='Basic Price in INR:'+code+'('+sign+')';
document.getElementById("labelEditRate").innerHTML ='Rate in '+sign;

94
application/views/importpo.php
View File

@ -7,7 +7,18 @@ $Value="&#6107;";
$UOM='';
$Terms='';
date_default_timezone_set('Australia/Melbourne');
$t='';
if(!empty($staticspecialinstruction))
{
foreach($staticspecialinstruction as $text)
$t=$text->ConfigValue;
}
date_default_timezone_set('Asia/Kolkata');
$date = date('d/m/Y h:i:s a', time());
@ -85,9 +96,17 @@ $("#PaymentTerms").select2();
tinymce.init({
selector: "textarea#txtSpcialInstruction",
menubar: false,
menubar: false,
statusbar: false,
toolbar: false
toolbar: false,
setup : function(ed)
{
ed.on('init', function(evt)
{
ed.setContent('<?php echo $t;?>');
});
}
});
@ -212,48 +231,7 @@ function vaildateBeforeOpenModal()
}
else if($('#addmodeofshipment').val()=='')
{
alert('Please Enter Mode of Shipment');
$('#addmodeofshipment').focus();
return false;
}
else if($('#addsupplierreference').val()=='')
{
alert('Please Enter Supplier Reference');
$('#addsupplierreference').focus();
return false;
}
else if($('#addsupplierofferno').val()=='')
{
alert('Please Enter Supplier Offer No');
$('#addsupplierofferno').focus();
return false;
}
else if($('#addotherreference').val()=='')
{
alert('Please Enter Other Reference');
$('#addotherreference').focus();
return false;
}
else if($('#addfincap').val()=='')
{
alert('Please Enter Value In Fincap Field');
$('#addfincap').focus();
return false;
}
else if($('#Importoption').val()== "0")
@ -870,7 +848,7 @@ else if($('#addsupplierreference').val()=='')
<div class="col-md-3">
<!-- Exchange Rate : -->
<label>Exchange Rate :</label>
<label id=labeladdexc>Exchange Rate :</label>
<div class="form-group">
@ -887,7 +865,7 @@ else if($('#addsupplierreference').val()=='')
<!-- Basic value in INR : -->
<label>Basic value in INR :</label>
<label>Basic value in <?php echo $INR;?> :</label>
<div class="form-group">
<?php
@ -1234,7 +1212,7 @@ else if($('#addsupplierreference').val()=='')
</div>
<div class="col-md-12">
<div class="col-md-4">
<label>purchase rate [Basic]/UOM</label>
<label>purchase rate (<?php echo $INR?>) [Basic]/UOM</label>
<!-- <p id=labelPurchaseRate> <label><?php echo "purchase rate [Basic]/"?></label></p> -->
</div>
<div class="col-md-4">
@ -1502,7 +1480,7 @@ echo form_textarea($data);
<div class="col-md-3">
<label>Exchange Rate :</label>
<label id=labeleditexc>Exchange Rate :</label>
<div class="form-group">
@ -1515,7 +1493,7 @@ echo form_textarea($data);
</div>
<div class="col-md-3">
<!-- <p id=labelEditBasicINR> --><label id=labelEditBasicINR><?php echo "Basic value in INR";?></label><!-- </p> -->
<!-- <p id=labelEditBasicINR> --><label id=labelEditBasicINR><?php echo "Basic value in ($INR)";?></label><!-- </p> -->
<!-- Basic value in INR : -->
@ -1865,7 +1843,7 @@ echo form_textarea($data);
</div>
<div class="col-md-12">
<div class="col-md-4">
<label>purchase rate [Basic]/UOM</label>
<label>purchase rate (<?php echo $INR?>) [Basic]/UOM</label>
<!-- <p id=labelEditPurchaseRate><label><?php echo "purchase rate [Basic]/"?></label> -->
</div>
@ -2114,7 +2092,7 @@ echo form_textarea($data);
<div class="col-md-4">
<label>Total Order Value <?php echo "($INR)"?></label> <?php
<label id=labeltotal>Total Order Value </label> <?php
$data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder'),'id'=>'txtToatlOrder', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true','style'=>'text-align:right;');
echo form_input($data);
?>
@ -2483,9 +2461,17 @@ $.each(symbol,function(idx,obj)
var sign=obj.FontCode2000;
var code=obj.Currency_Code;
//console.log(code);
// alert(code);
// alert(code);labeladdexc
//alert(sign);
document.getElementById("label1").innerHTML ='Exchange Rate in '+code+'('+sign+')';
document.getElementById("labeltotal").innerHTML ='Total Order Value '+code+'('+sign+')';
document.getElementById("labeladdexc").innerHTML ='Exchange Rate '+code+'('+sign+')';
document.getElementById("labeleditexc").innerHTML ='Exchange Rate '+code+'('+sign+')';
document.getElementById("label2").innerHTML ='Basic Value in '+code+'('+sign+')';
document.getElementById("label3").innerHTML ='Basic Value in '+code+'('+sign+')';
document.getElementById("labelRate").innerHTML ='Rate in '+code+'('+sign+')';
@ -2493,7 +2479,7 @@ $.each(symbol,function(idx,obj)
//document.getElementById("labelBasicINR").innerHTML ='Basic Price INR';
document.getElementById("labelEditRate").innerHTML ='Rate in '+sign;
document.getElementById("labelEditBasicPriceUs").innerHTML ='Basic Value In '+code+'('+sign+')';
document.getElementById("labelEditBasicINR").innerHTML ='Basic Price in INR';
//document.getElementById("labelEditBasicINR").innerHTML ='Basic Price in INR';
document.getElementById("labelTotalAmount").innerHTML ='Total Amount '+code+'('+sign+')';
document.getElementById("labelEditTotalAmount").innerHTML ='Total Amount '+code+'('+sign+')';