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

requistion issue fixed and service po changes done

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-08 11:17:53 +05:30
parent 6d07073c8a
commit 0ca7dce1ce
6 changed files with 79 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/requistion_model.php
View File

@ -428,7 +428,7 @@ class requistion_model extends CI_Model
function UpdateRequistionLineItem($Requist, $ReqNo,$MaterialCode) function UpdateRequistionLineItem($Requist, $ReqNo,$MaterialCode)
{ {
$this->db->where('ReqNo', $ReqNo); $this->db->where('ReqNo', $ReqNo);
//$this->db->where('MaterialCode', $MaterialCode); $this->db->where('MaterialCode', $MaterialCode);
$this->db->update('T_Requestion_Details',$Requist); $this->db->update('T_Requestion_Details',$Requist);
return TRUE; return TRUE;

10
application/views/EditservicePurchaseorder.php
View File

@ -2682,6 +2682,11 @@ function validateServiceTax()
{ {
return false; return false;
} }
else if($('#txtSpcialInstruction').val()==''){
alert('Please Enter the Service Description');
$('#txtSpcialInstruction').focus();
return false;
}
else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false) else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false)
{ {
$('#Rate').focus(); $('#Rate').focus();
@ -2724,6 +2729,11 @@ function validateServiceTax()
{ {
return false; return false;
} }
else if($('#EdittxtSpcialInstruction').val()==''){
alert('Please Enter the Service Description');
$('#EdittxtSpcialInstruction').focus();
return false;
}
else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false) else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false)
{ {
$('#EditRate').focus(); $('#EditRate').focus();

11
application/views/alterpurchaseorder.php
View File

@ -5898,7 +5898,11 @@ function populateValueMainFormForDeleteItem(rowid)
$('#ServiceRate').focus(); $('#ServiceRate').focus();
return false; return false;
} }
else if($('#txtSpcialInstructionSingle').val()==''){
alert('Please Enter the Service Description');
$('#txtSpcialInstructionSingle').focus();
return false;
}
else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvalBuget').val()) == false) else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvalBuget').val()) == false)
{ {
$('#ServiceRate').focus(); $('#ServiceRate').focus();
@ -6234,6 +6238,11 @@ $('#content').loader('hide');
$('#EditRate').focus(); $('#EditRate').focus();
return false; return false;
} }
else if($('#EdittxtSpcialInstructionSingle').val()==''){
alert('Please Enter the Service Description');
$('#EdittxtSpcialInstructionSingle').focus();
return false;
}
else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false) else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false)
{ {

28
application/views/capitalpurchaseorder.php
View File

@ -2958,7 +2958,13 @@ var purchaseRate = $('#purchaserate').val();
var avalbudAmt = parseFloat($('#CapitalbudAmt').val()); var avalbudAmt = parseFloat($('#CapitalbudAmt').val());
var basicAmountRate = parseFloat($('#CPTotalAmount').val()); var basicAmountRate = parseFloat($('#CPTotalAmount').val());
var totalAmount = parseFloat($('#txtTotalOrderValue').val()); var totalAmount = parseFloat($('#txtTotalOrderValue').val());
var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
if(capitalType!='Domestic'){
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
}
if(basicAmountRate > avalbudAmt) if(basicAmountRate > avalbudAmt)
{ {
alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
@ -3619,7 +3625,14 @@ $('#SpcialInstruction').val(splinstr);
$('#txtDeliveryAddress').val(deladd); $('#txtDeliveryAddress').val(deladd);
$('#txtStatus').val(stat); $('#txtStatus').val(stat);
var AvlBudAmt = '<?php echo $AvlAmount ?>'; var AvlBudAmt = '<?php echo $AvlAmount ?>';
var basicAmountRate = parseFloat($('#CapitalToatlOrder').val());
var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
if(capitalType!='Domestic'){
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
}
if(validate()) if(validate())
{ {
if(document.getElementById('serviceTax').rows.length < 2) if(document.getElementById('serviceTax').rows.length < 2)
@ -3633,7 +3646,7 @@ var AvlBudAmt = '<?php echo $AvlAmount ?>';
$('#Otherpayment').focus(); $('#Otherpayment').focus();
return false; return false;
} }
else if(parseInt(AvlBudAmt) < parseInt($('#CapitalToatlOrder').val())) { else if(parseInt(AvlBudAmt) < parseInt(basicAmountRate)) {
alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false; return false;
@ -4138,7 +4151,14 @@ function validateEditCapitalTax()
var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val()); var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val());
var basicAmountRate = parseFloat($('#EditCPTotalAmount').val()); var basicAmountRate = parseFloat($('#EditCPTotalAmount').val());
var totalAmount = parseFloat($('#EdittxtTotalOrderValue').val()); var totalAmount = parseFloat($('#EdittxtTotalOrderValue').val());
var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
if(capitalType!='Domestic'){
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
}
if(basicAmountRate > avalbudAmt) if(basicAmountRate > avalbudAmt)
{ {
alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');

27
application/views/editCapitalPo.php
View File

@ -3857,7 +3857,13 @@ var purchaseRate = $('#purchaserate').val();
var avalbudAmt = parseFloat($('#CapitalbudAmt').val()); var avalbudAmt = parseFloat($('#CapitalbudAmt').val());
var basicAmountRate = parseFloat($('#CPTotalAmount').val()); var basicAmountRate = parseFloat($('#CPTotalAmount').val());
var totalAmount = parseFloat($('#txtTotalOrderValue').val()); var totalAmount = parseFloat($('#txtTotalOrderValue').val());
var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
if(capitalType!='Domestic'){
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
}
if(basicAmountRate > avalbudAmt) if(basicAmountRate > avalbudAmt)
{ {
alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
@ -4672,7 +4678,14 @@ var PaymentMethod = $('#PaymentMethod').val();
$('#SpcialInstruction').val(splinstr); $('#SpcialInstruction').val(splinstr);
$('#txtDeliveryAddress').val(deladd); $('#txtDeliveryAddress').val(deladd);
$('#txtStatus').val(stat); $('#txtStatus').val(stat);
var basicAmountRate = parseFloat($('#CapitalToatlOrder').val());
var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
if(capitalType!='Domestic'){
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
}
if(validate()) if(validate())
{ {
@ -4689,7 +4702,7 @@ $('#txtStatus').val(stat);
$('#Otherpayment').focus(); $('#Otherpayment').focus();
return false; return false;
} }
else if(parseInt(AvlBudAmt) < parseInt($('#CapitalToatlOrder').val())) { else if(parseInt(AvlBudAmt) < parseInt(basicAmountRate)) {
alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false; return false;
@ -5199,7 +5212,13 @@ function validateEditCapitalTax()
var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val()); var avalbudAmt = parseFloat($('#EditCapitalbudAmt').val());
var basicAmountRate = parseFloat($('#EditCPTotalAmount').val()); var basicAmountRate = parseFloat($('#EditCPTotalAmount').val());
var totalAmount = parseFloat($('#EdittxtTotalOrderValue').val()); var totalAmount = parseFloat($('#EdittxtTotalOrderValue').val());
var ExchangeRate = $('#ExchangeRt').val() == '' ? '1.00' : $('#ExchangeRt').val();
if(capitalType!='Domestic'){
basicAmountRate=parseFloat(basicAmountRate*ExchangeRate);
}
else{
basicAmountRate=basicAmountRate;
}
if(basicAmountRate > avalbudAmt) if(basicAmountRate > avalbudAmt)
{ {
alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');

11
application/views/servicePurchaseorder.php
View File

@ -1921,11 +1921,17 @@ function validateServiceTax()
{ {
return false; return false;
} }
else if($('#txtSpcialInstruction').val()==''){
alert('Please Enter the Service Description');
$('#txtSpcialInstruction').focus();
return false;
}
else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false) else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false)
{ {
$('#Rate').focus(); $('#Rate').focus();
return false; return false;
} }
else else
{ {
return true; return true;
@ -1963,6 +1969,11 @@ function validateServiceTax()
{ {
return false; return false;
} }
else if($('#EdittxtSpcialInstruction').val()==''){
alert('Please Enter the Service Description');
$('#EdittxtSpcialInstruction').focus();
return false;
}
else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false) else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false)
{ {
$('#EditRate').focus(); $('#EditRate').focus();