commit alterpurchaseorder.php

This commit is contained in:
venbatechnologies@gmail.com 2017-06-26 14:04:57 +05:30
parent 6e05f847ab
commit 969b3089a5

View File

@ -1550,7 +1550,7 @@ function calculatePackaging(isEdit)
var tot = parseFloat(totvalue).toFixed(2); var tot = parseFloat(totvalue).toFixed(2);
$('#txtEditRevenueTotalOrderValue').val(tot); $('#txtEditRevenueTotalOrderValue').val(tot);
validateEditExceedLimit(); // validateEditExceedLimit();
} }
// calculate vat rate // calculate vat rate
@ -1786,11 +1786,12 @@ function populateValueMainFormForDeleteItem(rowid)
if(!empty($RequestType)) if(!empty($RequestType))
{ {
foreach ($RequestType as $RID): foreach ($RequestType as $RID):
if($RID->ConfigValue=="SERVICE" || $RID->ConfigValue=="REVENUE")
{
$options[$RID->ConfigValue] = $RID->ConfigValue; $options[$RID->ConfigValue] = $RID->ConfigValue;
}
endforeach; endforeach;
} }
@ -1803,7 +1804,7 @@ function populateValueMainFormForDeleteItem(rowid)
<label>Purchase Order Date</label> <label>Purchase Order Date</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'PODate','value' => set_value('PODate'),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true'); $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1893,7 +1894,7 @@ function populateValueMainFormForDeleteItem(rowid)
<label>Delivery Date</label> <label>Delivery Date</label>
<?php <?php
$data = array('name' => 'Deliverydt','value' => set_value('Deliverydt'),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true'); $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$CurrentDate),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
@ -4556,7 +4557,8 @@ function populateValueMainFormForDeleteItem(rowid)
var userid = ''; var userid = '';
$('.AddRevenue').click(function(){ $('.AddRevenue').click(function(){
if(validateRevenueTax() && validateExceedLimit())
if(validateRevenueTax() && ExceedBudget($('#txtTotalOrderValue').val(), $('#AvalBuget').val()))
{ {
@ -5709,7 +5711,7 @@ $('#content').loader('hide');
var TotSwachhTax = 0; var TotSwachhTax = 0;
var TotSummary = 0; var TotSummary = 0;
var TotBasicAmout = 0; var TotBasicAmout = 0;
for (i = 1; i < rows-1; i++) { for (i = 1; i < rows; i++) {
var AfterServiceTax = $('#ServiceTax'+i).val() == '' ? '0.00' : $('#ServiceTax'+i).val(); var AfterServiceTax = $('#ServiceTax'+i).val() == '' ? '0.00' : $('#ServiceTax'+i).val();
var AfterEduCess = $('#EduCess'+i).val() == '' ? '0.00' : $('#EduCess'+i).val(); var AfterEduCess = $('#EduCess'+i).val() == '' ? '0.00' : $('#EduCess'+i).val();
@ -5814,12 +5816,17 @@ $('#content').loader('hide');
if(validate()) if(validate())
{ {
if(document.getElementById('serviceTax').rows.length < 3) if(document.getElementById('serviceTax').rows.length < 2)
{ {
alert('Please Select Line item to Create PO'); alert('Please Select Line item to Create PO');
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} }
else if($('#AvalBuget').val() < TextTotalOrderValueSummaryService) {
alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false;
}
else else
{ {
$('#content').loader('show'); $('#content').loader('show');
@ -5882,12 +5889,17 @@ $('#content').loader('hide');
if(validate()) if(validate())
{ {
if(document.getElementById('serviceTax').rows.length < 3) if(document.getElementById('serviceTax').rows.length < 2)
{ {
alert('Please Select Line item to Create PO'); alert('Please Select Line item to Create PO');
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} }
else if($('#AvalBuget').val() < txtTotalOrderValueSummary) {
alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false;
}
else else
{ {
$('#content').loader('show'); $('#content').loader('show');
@ -5925,7 +5937,8 @@ $('#content').loader('hide');
*/ */
function populateValueMainFormForDeleteServiceTax(deletedRow) function populateValueMainFormForDeleteServiceTax(deletedRow)
{ {
var rows = document.getElementById('serviceTax').rows.length+1;
var rows = document.getElementById('serviceTax').rows.length;
var TotServiceTax = 0; var TotServiceTax = 0;
var TotEduCess = 0; var TotEduCess = 0;
var TotSecHighTax = 0; var TotSecHighTax = 0;
@ -5933,7 +5946,8 @@ $('#content').loader('hide');
var TotSwachhTax = 0; var TotSwachhTax = 0;
var TotSummary = 0; var TotSummary = 0;
var TotBasicAmout = 0; var TotBasicAmout = 0;
for (var i = 1; i < rows; i++) { for (var i = 1; i <= rows; i++) {
if(deletedRow==i){ if(deletedRow==i){
$('#ServiceTax'+i).val(''); $('#ServiceTax'+i).val('');
$('#EduCess'+i).val(''); $('#EduCess'+i).val('');