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

import

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-07 12:20:35 +05:30
parent d07a318b15
commit 724bea7033
4 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/controllers/purchaseorder.php
View File

@ -418,14 +418,14 @@ class purchaseorder extends BaseController
} }
else if($ReqType == IMPORT) else if($ReqType == IMPORT)
{ {
$AvlBudget = $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$FYdt,$ReqType); $AvlBudget = $this->purchaseorder_model->GetAvailableImportBudgetAmount($CostCode,$FYdt,$ReqType);
if(count($AvlBudget)>0) if(count($AvlBudget)>0)
{ {
$data['AvlBudAmt'] = $AvlBudget[0]['BudgetAmount'] - $AvlBudget[0]['Totalvalue']; $data['AvlBudAmt'] = $AvlBudget[0]['BudgetAmount'] - $AvlBudget[0]['TotalValue'];
} }
// print_r($data); //print_r($data['AvlBudAmt']);
$data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetails($PONO); $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetails($PONO);
$data['Currency']=$this->purchaseorder_model->GetCurrencytype(); $data['Currency']=$this->purchaseorder_model->GetCurrencytype();
foreach($data['POMaster'] as $CUR) foreach($data['POMaster'] as $CUR)

2
application/views/MaterialIssueList.php
View File

@ -167,7 +167,7 @@
Sendvalues[2] = ReqNo; Sendvalues[2] = ReqNo;
Sendvalues[3] = Remarks; Sendvalues[3] = Remarks;
//alert(MaterialCode); //alert(MaterialCode);
alert(StatusCode); //alert(StatusCode);
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
data:{id:Sendvalues}, data:{id:Sendvalues},

28
application/views/editImportAmendPO.php
View File

@ -3064,6 +3064,8 @@ $('#editimportpomodel').on("shown.bs.modal", function(e) {
$('.EditImport').click(function(){ $('.EditImport').click(function(){
//alert('inside edit'); //alert('inside edit');
if(validateEditExceedLimit() && ExceedEditQuantityCheck())
{
var CostCode = $("#EditCostCenter").val(); var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val(); var AvilBudget = $('#EditAvlBudAmt').val();
@ -3171,13 +3173,37 @@ $('.EditImport').click(function(){
populateValueMainFormForEditImportTax(); populateValueMainFormForEditImportTax();
}
} ); } );
var avalbudAmte= <?php echo json_encode($AvlAmount, JSON_PRETTY_PRINT) ?>;
function validateEditExceedLimit()
{
//var avalbudAmt = parseFloat($('#EditAvlBudAmt').val());
var basicAmountRate = parseFloat($('#EdittxtBasicValue').val());
var totalAmount = parseFloat($('#EditTotalExp').val());
var exchangerate=parseFloat($('#EditExchangeRt').val());
var exp=0;
exp=basicAmountRate*exchangerate;
//console.log(exp);
if(exp > avalbudAmte || totalAmount > avalbudAmte)
{
alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
$('#EditRate').focus();
return false;
}
else
{
return true;
}
}

19
application/views/editimportpo.php
View File

@ -2633,7 +2633,7 @@ if($PONOStatus == PO_RELEASED)
<!-- <input type="text" name="txttot" id="txtPONO" value=<?php echo "$totalhidden";?>> --> <!-- <input type="text" name="txttot" id="txtPONO" value=<?php echo "$totalhidden";?>> -->
</div> </div>
<input type="hidden" name="txttot" id="txttot" value=<?php echo $totalhidden;?> <input type="text" name="txttot" id="txttot" value=<?php echo $totalhidden;?>
<div class="col-md-12"> <div class="col-md-12">
@ -4385,6 +4385,7 @@ $('#txttotalgrossduty').val((parseFloat(TotalGrossDuty) + parseFloat(Grossdutypa
$('#txttotalavlmodvat').val((parseFloat(TotalAvlmodvat) + parseFloat(AvailableModvat)).toFixed(2) ); $('#txttotalavlmodvat').val((parseFloat(TotalAvlmodvat) + parseFloat(AvailableModvat)).toFixed(2) );
$('#txttotalgrossexpense').val((parseFloat(TotalGrossExpense) + parseFloat(Grossexpenses)).toFixed(2) ); $('#txttotalgrossexpense').val((parseFloat(TotalGrossExpense) + parseFloat(Grossexpenses)).toFixed(2) );
$('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(2) ); $('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(2) );
$('#txttot').val((parseFloat(TotalOrder)+parseFloat(totalexp)).toFixed(2));
//var r=parseFloat($('#txtToatlOrder').val()); //var r=parseFloat($('#txtToatlOrder').val());
//console.log(r); //console.log(r);
//var x=parseFloat($('#txttotalcustomED').val()); //var x=parseFloat($('#txttotalcustomED').val());
@ -4399,6 +4400,22 @@ $('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(
function clearTaxField() function clearTaxField()
{ {
//$('#AfterBasicPriceTax').val(''); //$('#AfterBasicPriceTax').val('');
$('#ReqNo').val('');
$('#deptName').val('');
$('#CostCenter').val('');
$('#AvlBudAmt').val('');
$('#MaterialCode').val('');
$('#ItemName').val('');
$('#UOM').val('');
$('#Quantity').val('');
$('#Rate').val('');
$('#txtBasicValue').val('');
$('#imBasicPrice').val('');
$('#ExchangeRt').val('');
$('#INRBasicvalue').val('');
$('#BasicPriceTax').val('');
$('#AfterBasicPriceTax').val('');
$('#TotalExp').val('');
$('#AfterLandingCharge').val(''); $('#AfterLandingCharge').val('');
$('#LandingCharge').val(''); $('#LandingCharge').val('');
$('#AfterHighseas').val(''); $('#AfterHighseas').val('');