RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

budget type added in po screen

Browse Source
This commit is contained in:
venbatechnologies 2018-03-23 17:38:50 +05:30
parent 4c49fe4f2e
commit 06c58fa2ee
6 changed files with 15710 additions and 15447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/purchaseorder.php
View File

@ -6,7 +6,7 @@ require APPPATH . '/third_party/mpdf/mpdf.php';
/**
* Class : purchaseorder (Purchase order - Controller)
* purchaseorder Class to control all po related operations.
* @author : Venba InfoTech
* @author : Venba InfoTech
* @version : 1.1
* @since : 18 November 2017
*/
@ -1114,8 +1114,7 @@ class purchaseorder extends BaseController
$Qualitycheck=1;
// PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$supplierreference,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'POSubType'=>$revenuetype,'InsuranceNumber'=>$insuranceno,'
IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType);
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$supplierreference,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'POSubType'=>$revenuetype,'InsuranceNumber'=>$insuranceno,'IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType);
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
$LineItemStatus = REQITEM_NEW;

68
application/views/EditservicePurchaseorder.php
View File

@ -36,6 +36,7 @@ array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1")
$InsuranceNo='';
$ServiceTypeOptions='';
$DescriptionOfPo = '';
$BudgetType = '';
if(!empty($INRSYMBOL))
@ -88,6 +89,7 @@ if(!empty($POMaster))
$InsuranceNo=$Req->InsuranceNumber;
$ServiceTypeOptions=$Req->POSubType;
$DescriptionOfPo = $Req->Description_Of_Service;
$BudgetType = $Req->BudgetType;
}
}
@ -529,15 +531,15 @@ function ExceedQuantityCheck()
var ReqAmount = parseFloat(ValuetoCheck);
var BudAmount = parseFloat(budgetAmount);
if(ReqAmount > BudAmount )
{
swal('Your exceeding the Avaiable Budget :'+ AvilBudAmt +'.Please adjust the Product to proceed further.');
return false;
}
else
{
// if(ReqAmount > BudAmount )
// {
// swal('Your exceeding the Avaiable Budget :'+ AvilBudAmt +'.Please adjust the Product to proceed further.');
// return false;
// }
// else
// {
return true;
}
//}
}
function calculateServiceTax(varBasicValue)
{
@ -1074,7 +1076,28 @@ $(document).ready(function () {
</div>
</div>
</div>
</div>
<div class="col-md-2" style="padding-right: 0px;">
<label for="BudgetType">Budget Type</label>
<select id='BudgetType' name='BudgetType'>
<?php if($BudgetType== 'CAPITAL')
{
$opt1='CAPITAL';
$opt2='REVENUE';
}
else
{
$opt1='REVENUE';
$opt2='CAPITAL';
} ?>
<option value=<?php echo $opt1;?>><?php echo $opt1;?></option>
<option value=<?php echo $opt2;?>><?php echo $opt2;?></option>
</select>
</div>
</div>
</div><!--End new fields 1 sep-->
@ -1472,12 +1495,11 @@ $(document).ready(function () {
<?php
$data = array('name' => 'EditOtheritemDescription','value' => set_value('EditOtheritemDescription'),'id'=>'EditOtheritemDescription', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
?>
</div>
</div>
</div>
</div>
<div class="col-md-3">
<div class="col-md-3">
<label>UOM</label>
<div class="form-group">
<?php
@ -2239,6 +2261,8 @@ $(document).ready(function () {
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index;?>">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED ) {
if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?>
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?>
@ -2301,6 +2325,14 @@ var userid = '';
};
$("#BudgetType").change(function(){
var aa = $("#BudgetType option:selected").text();
$('#Budget').val(aa);
});
$('#EditotherDescription').hide();
$('#otherdescription').hide();
@ -2933,11 +2965,11 @@ var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
$('#Deliverydt').focus();
return false;
}
else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
swal('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
// else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
// swal('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false;
}
// return false;
// }
else if($('#Otherpayment').val()=='' && $('#PaymentTerms').val()=='PT08'){
swal('Please Enter Other Payment Details');
$('#Otherpayment').focus();

182
application/views/alterpurchaseorder.php Executable file → Normal file
View File

@ -1,5 +1,4 @@
<?php
//r
$insuranceStatus = array(
array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1")
);
@ -1728,13 +1727,38 @@ function calculatePackaging(isEdit)
}
}
function rfilealert()
{
var file = $('#imag').val();
if (file=='')
{
swal('File not found');
SpecialPOcheck();
}
else{
SpecialPOcheck();
}
}
function sfilealert()
{
var file1 = $('#images1').val();
if (file1=='')
{
swal('File not found');
SpecialPOcheck();
}
else{
SpecialPOcheck();
}
}
function SpecialPOcheck()
{
// swal('splpo')
//$('#content').loader('show');
POcheck=$("input:radio[name='Quality']:checked").val();
@ -1757,7 +1781,7 @@ function SpecialPOcheck()
{
var images = $('#images').val();
$('#content').loader('show');
if(POcheck==0)
@ -2225,6 +2249,14 @@ Editchange();
}
else if($('#BudgetType').val()=="0")
{
swal('Please Select Budget Type');
$('#BudgetType').focus();
return false;
}
else if(input=='REVENUE' && $('#Deliverydate').val()=='' && radioValue==0){
@ -2694,7 +2726,7 @@ function populateValueMainFormForDeleteItem(rowid)
{
foreach ($ServiceOption as $SerOption):
$ServiceOptions[$SerOption->ConfigValue] = $SerOption->ConfigValue;
endforeach;
@ -2803,7 +2835,7 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="col-md-6" style="padding: 0px;">
<label id="typeOptions">Service Type Options<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5;">*</span></label>
<label id="typeOptions">Service Type Options</label>
<div class="form-group">
<?php
@ -2898,6 +2930,21 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
</div>
<div class="col-md-2" style="padding-right: 0px;">
<label for="BudgetType">Budget Type</label>
<?php
$optionsnew=array('0'=>'Select','1'=>'REVENUE','2'=>'CAPITAL');
echo form_dropdown('BudgetType', $optionsnew,set_value('BudgetType'),'id="BudgetType"' ,'required="true"' ,'class="form-control select2');
?>
</div>
</div>
</div><!--End new fields 1 sep-->
@ -3063,21 +3110,15 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="col-md-12">
<div class="col-md-5">
<input type = "file" size = "20" input accept=".docx,.pdf,.doc.JPG,.PNG" id="images" name="images"/>
<label for="images">Select Company file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
<input type = "file" size = "20" input accept=".docx,.pdf,.doc.JPG,.PNG" id="imag" name="images" onChange="filecheck();"/>
<label for="images">Select file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
</div>
</div>
<!--<div class="col-md-12 text-right" style="padding-bottom:1%;">
<div class="col-md-4" style="margin-left: 64%;">
<a class="btn btn-primary Add" onclick="addtable();"><span class="bold">Add LineItem</span></a>
</div>
</div>-->
</div>
<!-- <div class="col-md-12 text-right">
// <a class="btn btn-primary font Add" id="addtable"><span class="bold">Add table</span></a>
// </div>-->
<div class="col-md-12">
<table id="specialtable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
@ -3107,7 +3148,7 @@ function populateValueMainFormForDeleteItem(rowid)
<a class="btn btn-primary Add" onclick="addtable();"><span class="bold">Add table</span></a>
</div> -->
<div class="col-md-4 col-md-offset-8">
<a class="btn btn-primary ok" ID="ExciseOption12" onclick="SpecialPOcheck();" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-primary ok" ID="ExciseOption12" onclick="rfilealert();" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-primary" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
</div>
@ -3134,7 +3175,7 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="col-md-4">
<input type = "file" size = "20" input accept=".docx,.pdx,.doc.JPG,.PNG" id="images1" name="images1"/>
<input type = "file" size = "20" input accept=".docx,.pdx,.doc.JPG,.PNG" id="images1" name="images1" onChange="sfilecheck();"/>
<label for="images">Select Company file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
</div>
@ -3150,7 +3191,7 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="col-md-12 text-right">
<div class="col-md-4 col-md-offset-8">
<a class="btn btn-primary ok" ID="ExciseOption12" onclick="SpecialPOcheck();" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-primary ok" ID="ExciseOption12" onclick="sfilealert();" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-primary" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
</div>
@ -3297,7 +3338,7 @@ function populateValueMainFormForDeleteItem(rowid)
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1000px;">
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
<div class="modal-header" style="background-color: #3c;color:#fff;">
<center><h4>Edit Service Purchase Order Item </h4></center>
</div>
@ -3620,7 +3661,7 @@ function populateValueMainFormForDeleteItem(rowid)
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1150px;">
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
<div class="modal-header" style="background-color: #3c;color:#fff;">
<center><h4>Edit Revenue Purchase Order Line Item </h4></center>
</div>
<div align="left">
@ -4329,7 +4370,7 @@ function populateValueMainFormForDeleteItem(rowid)
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1000px;">
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
<center><h4>Add Service Purchase Order Item </h4></center>
</div>
<div align="left">
@ -4631,7 +4672,7 @@ function populateValueMainFormForDeleteItem(rowid)
<!-- Modal content-->
<form>
<div class="modal-content" style="width:900px;">
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
<center><h4>Add Import Purchase Order Item </h4></center>
</div>
@ -5132,7 +5173,7 @@ function populateValueMainFormForDeleteItem(rowid)
<!-- Modal content-->
<form>
<div class="modal-content" style="width:900px;">
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
<center><h4>Add Capital Purchase Order Item </h4></center>
</div>
@ -5726,6 +5767,8 @@ function populateValueMainFormForDeleteItem(rowid)
<input type="hidden" name="txtDeletedRow1" id="txtDeletedRow1" />
<input type="hidden" name="CheckLocalInter" id="CheckLocalInter" />
<input type="hidden" name="Budget" id="Budget" />
<input type="hidden" name="txtSpecial" id="txtSpecial" />
@ -5868,6 +5911,25 @@ function populateValueMainFormForDeleteItem(rowid)
<script>
var index = '1';
var userid = '';
$("#BudgetType").change(function(){
var aa = $("#BudgetType option:selected").text();
$('#Budget').val(aa);
});
$('.AddRevenue').click(function(){
tinyMCE.triggerSave();
@ -6096,7 +6158,7 @@ function populateValueMainFormForDeleteItem(rowid)
if(data)
{
$('#content').loader('hide');
alert(data);
swal(data);
//$('#txtRowCount').val('');
//$('#txtDeletedRow').val('');
@ -6105,7 +6167,7 @@ function populateValueMainFormForDeleteItem(rowid)
}
else
{
alert("Error");
swal("Error");
}
}
@ -6406,7 +6468,7 @@ $('#PoTypeOptions').change(function()
}
else
{
alert("Error");
swal("Error");
}
}
@ -6460,7 +6522,7 @@ $('#PoTypeOptions').change(function()
else
{
$('#content').loader('hide');
alert("Error");
swal("Error");
}
}
@ -6510,7 +6572,7 @@ $('#PoTypeOptions').change(function()
else
{
$('#content').loader('hide');
alert("Error");
swal("Error");
}
}
@ -6656,7 +6718,7 @@ $('#PoTypeOptions').change(function()
else
{
$('#content').loader('hide');
alert("Error");
swal("Error");
}
}
@ -6790,15 +6852,15 @@ $('#PoTypeOptions').change(function()
var ReqAmount = parseFloat(ValuetoCheck);
var BudAmount = parseFloat(budgetAmount);
if(ReqAmount > BudAmount )
{
swal('Your exceeding the Avaiable Budget :'+ budgetAmount +'.Please adjust the Product to proceed further.');
return false;
}
else
{
// if(ReqAmount > BudAmount )
// {
// swal('Your exceeding the Avaiable Budget :'+ budgetAmount +'.Please adjust the Product to proceed further.');
// return false;
// }
// else
// {
return true;
}
// }
}
/**
* This function is used when clicking add service button that time store the info for submit
@ -7467,11 +7529,11 @@ $('#content').loader('hide');
}
else if(parseInt($('#AvalBuget').val()) < parseInt(TextTotalOrderValueSummaryService)) {
swal('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
// else if(parseInt($('#AvalBuget').val()) < parseInt(TextTotalOrderValueSummaryService)) {
// swal('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false;
}
// return false;
// }
else if($('#Otherpayment').val()=='' && $('#PaymentMethod').val()=='PT08'){
swal('Please Enter Other Payable Terms Description');
$('#Otherpayment').focus();
@ -7563,8 +7625,8 @@ $('#content').loader('hide');
tinyMCE.triggerSave();
var splinstr = $('#txtSpcialInstruction').val();
$('#SpcialInstruction').val(splinstr);
var splinstr = $('#txtSpcialInstruction').val();
$('#SpcialInstruction').val(splinstr);
var deladd = $('#DeliveryAddr').val();
$('#txtDeliveryAddress').val(deladd);
@ -7587,11 +7649,11 @@ $('#SpcialInstruction').val(splinstr);
$('#Deliverydt').focus();
return false;
}
else if(parseInt($('#AvalBuget').val()) < parseInt(finalbasicamtrate)) {
swal('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
// else if(parseInt($('#AvalBuget').val()) < parseInt(finalbasicamtrate)) {
// swal('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false;
}
// return false;
// }
else if($('#insuranceStatus').val() == 'YES' && $('#insuranceNo').val() == '' ) {
swal('Please Enter Insurance Number..!');
@ -8624,6 +8686,30 @@ var specialservicerow=0;
}//add click function closed
function filecheck()
{
//$('#content').loader('show');
var file = $('#imag').val();
swal(file);
if(file!='')
{
swal('Your file added successfully');
}
}
function sfilecheck()
{
//$('#content').loader('show');
var file1 = $('#images1').val();
if(file1!='')
{
swal('Your file added successfully');
}
}
</script>

18331
application/views/editCapitalPo.php
View File

File diff suppressed because it is too large Load Diff

114
application/views/editRevenuepurchaseorder.php
View File

@ -73,6 +73,7 @@ foreach ($PaymentTerms as $TER)
$ServiceDescription = '';
$CapitalRange = '';
$otherPayment='';
$BudgetType = '';
if(!empty($POMaster))
{
//print_r($POMaster);
@ -106,6 +107,7 @@ if(!empty($POMaster))
$revenuesubtype = $Req->POSubType;
$insurencestatus = $Req->InsuranceStatus;
$insurenceno = $Req->InsuranceNumber;
$BudgetType = $Req->BudgetType;
// echo $insurenceno;
// echo $otherPayment;
}
@ -204,6 +206,7 @@ if(!empty($RequistionDetails))
var SchName = <?php echo json_encode($DeliverSchedule); ?>;
var DelDt = '<?php echo $Deliverydt; ?>';
var insurancestatus = '<?php echo $insurencestatus;?>';
var budgettype='<?php echo $BudgetType;?>';
var insuranceno = '<?php echo $insurenceno;?>';
var statuscheck='<?php echo $PONOStatus;?>';
@ -1928,10 +1931,16 @@ function calculatePackaging(isEdit)
$('#IGSTAddModel').attr("style","display:none;");
$('#SGSTAddModel').removeAttr("style");
$('#RevenueIgst').val(0);
$('#RevenueAfterIgst').val(0);
$('#txttaxcheck').val(0);
}
else
{
$('#EditSgst').val(0);
$('#EditAfterSgst').val(0);
$('#EditCgst').val(0);
$('#EditAfterCgst').val(0);
$('#CST').removeAttr("style");
$('#TotICST').removeAttr("style");
$('#Vat').attr("style","display:none;");
@ -1942,6 +1951,11 @@ function calculatePackaging(isEdit)
$('#SGSTViewModel').attr("style","display:none;");
$('#IGSTAddModel').removeAttr("style");
$('#SGSTAddModel').attr("style","display:none;");
$('#RevenueCgst').val(0);
$('#RevenueAfterCgst').val(0);
$('#RevenueSgst').val(0);
$('#RevenueAfterIgst').val(0);
$('#txttaxcheck').val(1);
}
}
$(document).ready(function () {
@ -2084,16 +2098,16 @@ function validateEditExceedLimit()
var basicAmountRate = parseFloat($('#txtEditBasicValue').val());
var totalAmount = parseFloat($('#txtEditTotalOrderValue').val());
if(basicAmountRate > avalbudAmt)// || totalAmount > avalbudAmt)
{
swal('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
$('#EditRate').focus();
return false;
}
else
{
// if(basicAmountRate > avalbudAmt)// || totalAmount > avalbudAmt)
// {
// swal('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
// $('#EditRate').focus();
// return false;
// }
// else
// {
return true;
}
// }
}
function calculateEditTotalValue()
@ -2518,6 +2532,29 @@ function calculateEditTaxValue()
</div>
</div>
</div>
<div class="col-md-2" style="padding-right: 0px;">
<label for="BudgetType">Budget Type</label>
<select id='BudgetType' name='BudgetType'>
<?php if($BudgetType== 'CAPITAL')
{
$opt1='CAPITAL';
$opt2='REVENUE';
}
else
{
$opt1='REVENUE';
$opt2='CAPITAL';
} ?>
<option value=<?php echo $opt1;?>><?php echo $opt1;?></option>
<option value=<?php echo $opt2;?>><?php echo $opt2;?></option>
</select>
</div>
</div>
</div>
@ -4123,6 +4160,10 @@ function calculateEditTaxValue()
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index;?>">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>"/>
<input type="hidden" name="txttaxcheck" id="txttaxcheck" value=""/>
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED ) {
if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?>
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?>
@ -4178,6 +4219,17 @@ function calculateEditTaxValue()
<script>
var index = <?php echo $index; ?>;
var userid = '';
var taxcheck=0;
$("#BudgetType").change(function(){
var aa = $("#BudgetType option:selected").text();
$('#Budget').val(aa);
});
$("#REVENUE").on("shown.bs.modal", function(e) {
@ -4186,7 +4238,7 @@ $("#REVENUE").on("shown.bs.modal", function(e) {
$('.AddRevenue').click(function(){
tinyMCE.triggerSave();
if(validateRevenueTax() && validateExceedLimit() && ExceedQuantityCheck())
if(validateRevenueTax() && ExceedQuantityCheck())
{
var temp = parseInt(index)+1;
var Reqnumber = $('#ReqNo').val();
@ -4371,9 +4423,15 @@ clearRevenueModalFields();
$('#PackVal'+userid).val(PackVal);
$('#AfterPackVal'+userid).val(AfterPackVal);
$('#RevenueCgst'+userid).val(Cgst);
var taxvaluecheck = $('#txttaxcheck').val();
if(taxvaluecheck == 1)
{
$('#RevenueAfterSgst'+userid).val(0);
$('#RevenueSgst'+userid).val(0);
}
$('#RevenueAfterCgst'+userid).val(AfterCgst);
$('#RevenueAfterSgst'+userid).val(AfterSgst);
$('#RevenueSgst'+userid).val(Sgst);
//$('#RevenueAfterSgst'+userid).val(AfterSgst);
//$('#RevenueSgst'+userid).val(Sgst);
$('#RevenueIgst'+userid).val(Igst);
$('#RevenueAfterIgst'+userid).val(AfterIgst);
$('#FreightType'+userid).val(FreightType);
@ -4717,17 +4775,17 @@ function validateBudgetExceedLimit()
{
//alert(data);
avalbudAmt = parseFloat(data);
if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt)
{
swal('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
$('#Rate').focus();
return false;
// if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt)
// {
// swal('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
// $('#Rate').focus();
// return false;
}
else
{
// }
// else
// {
return true;
}
//}
}
@ -4928,11 +4986,11 @@ var totaldiscount = $('#txtTotalDiscount').val();
//{
// return false;
//}
else if(parseInt(AvlBudAmt) < (parseInt(txtTotalbasicamount)- parseInt(totaldiscount))){
swal('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
// else if(parseInt(AvlBudAmt) < (parseInt(txtTotalbasicamount)- parseInt(totaldiscount))){
// swal('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false;
}
// return false;
// }
else if($('#Otherpayment').val()=='' && $('#PaymentTerms').val()=='PT08'){
swal('Please Enter Payable Terms Description');
@ -5254,6 +5312,10 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
$('#txtEditInsurance').val($('#Insval'+userid).val());
$('#txtEditTotalOrderValue').val($('#TotalOrderValue'+userid).val());
var x = $("input:radio[name='Range']:checked").val();
$('#EditAfterCgst').val($('#RevenueAfterCgst'+userid).val());
$('#EditAfterSgst').val($('#RevenueAfterSgst'+userid).val());
$('#EditAfterIgst').val($('#RevenueAfterIgst'+userid).val());

12457
application/views/editimportpo.php
View File

File diff suppressed because it is too large Load Diff