'OtherAllowances','value' => set_value('OtherAllowances',0),'id'=>'OtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onchange'=>'Ratechange()');
+ $data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances',0),'id'=>'OtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onchange'=>'Ratechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
'EditCgst','value' => set_value('EditCgst'),'id'=>'EditCgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ $data = array('name' => 'EditCgst','value' => set_value('EditCgst'),'id'=>'EditCgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange();ChangeEditSgst();','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
'EditSgst','value' => set_value('EditSgst'),'id'=>'EditSgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ $data = array('name' => 'EditSgst','value' => set_value('EditSgst'),'id'=>'EditSgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
'EditIgst','value' => set_value('EditIgst'),'id'=>'EditIgst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ $data = array('name' => 'EditIgst','value' => set_value('EditIgst'),'id'=>'EditIgst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -2336,6 +2346,12 @@ function validateServiceTax()
alert('Please Enter the Quantity value');
$('#Quantity').focus();
return false;
+ }
+ else if($('#Quantity').val() == 0)
+ {
+ alert('Please Enter the Valid Quantity Value');
+ $('#Quantity').focus();
+ return false;
}
else if($('#Rate').val() == '')
{
@@ -2343,6 +2359,12 @@ function validateServiceTax()
$('#Rate').focus();
return false;
}
+ else if($('#Rate').val() == 0)
+ {
+ alert('Please Enter the Valid Rate of the Item');
+ $('#Rate').focus();
+ return false;
+ }
else if(ExceedQuantityCheck() == false)
{
return false;
@@ -2383,6 +2405,18 @@ function validateServiceTax()
alert('Please Enter the Quantity value');
$('#EditQuantity').focus();
return false;
+ }
+ else if($('#EditQuantity').val() == 0)
+ {
+ alert('Please Enter the Valid Quantity value');
+ $('#EditQuantity').focus();
+ return false;
+ }
+ else if($('#EditRate').val() == 0)
+ {
+ alert('Please Enter the Valid Rate of the Item');
+ $('#EditRate').focus();
+ return false;
}
else if($('#EditRate').val() == '')
{
@@ -2893,4 +2927,4 @@ $("#VIEWSERVICE").on("shown.bs.modal", function(e) {
}
});
-
+
\ No newline at end of file
diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php
index 3566967e..92ddd3b4 100755
--- a/application/views/alterpurchaseorder.php
+++ b/application/views/alterpurchaseorder.php
@@ -1648,6 +1648,7 @@ function SetExciseCalculationCancel()
calculateCST($('#isEdit').val());
}
function Editchange(){
+
var isEdit=1;
// ExceedEditQuantityCheck();
if($('#EditRevenueQuantity').val() != '' && $('#EditRevenueRate').val() != '')
@@ -1656,7 +1657,9 @@ function SetExciseCalculationCancel()
var txtUnitPrice = parseFloat($('#EditRevenueRate').val());
var Tot = txtQuantity * txtUnitPrice
$('#txtEditRevenueBasicValue').val(Tot);
+ if($("#EditDiscountType").val()!=0){
calculateDiscount(isEdit);
+ }
var discount = $('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val();
var basic = $('#txtEditRevenueBasicValue').val();
var basicValue = parseFloat(basic-discount);
@@ -1664,25 +1667,54 @@ function SetExciseCalculationCancel()
if($("#RevenueEditCgst").val()!=''){
$('#RevenueEditAfterCgst').val(calculateCgstTax(basicValue,$('#RevenueEditCgst').val()));
}
+ else{
+ $('#RevenueEditAfterCgst').val(0.00);
+ }
if($("#RevenueEditSgst").val()!=''){
$('#RevenueEditAfterSgst').val(calculateSgstTax(basicValue,$('#RevenueEditSgst').val()));
}
-
+ else{
+ $('#RevenueEditAfterSgst').val(0.00);
+ }
if($("#RevenueEditIgst").val()!=''){
$('#RevenueEditAfterIgst').val(calculateIgstTax(basicValue,$('#RevenueEditIgst').val()));
}
+ else{
+ $('#RevenueEditAfterIgst').val(0.00);
+ }
+
+
+ if ($("#EditPackagingType").val()!=0) {
+ calculatePackaging(isEdit);
+ }
+ if ($("#drpEditFreight").val()!=0) {
+ calculateFreight(isEdit);
+ }
- calculateFreight(isEdit)
-
- calculatePackaging(isEdit);
calculateEditTotalValue();
}
+}
+function RevenueChangeSgst(){
+var getTypeOfTax= $("input:radio[name='Range']:checked").val();
+if(getTypeOfTax==0){
+$('#RevenueSgst').val($('#RevenueCgst').val());
+change();
+}
+
+}
+function RevenueChangeEditSgst(){
+var getEditTypeOfTax= $("input:radio[name='Range']:checked").val();
+if(getEditTypeOfTax==0){
+$('#RevenueEditSgst').val($('#RevenueEditCgst').val());
+Editchange();
+}
}
function change(){
+
var isEdit=0;
//ExceedEditQuantityCheck();
if($('#Quantity').val() != '' && $('#Rate').val() != '')
@@ -1706,16 +1738,23 @@ function SetExciseCalculationCancel()
$('#RevenueAfterCgst').val(calculateCgstTax(basicValue,$('#RevenueCgst').val()));
}
+ else{
+ $('#RevenueAfterCgst').val(0.00);
+ }
if($("#RevenueSgst").val()!=''){
$('#RevenueAfterSgst').val(calculateSgstTax(basicValue,$('#RevenueSgst').val()));
}
-
+ else{
+ $('#RevenueAfterSgst').val(0.00);
+ }
if($("#RevenueIgst").val()!=''){
$('#RevenueAfterIgst').val(calculateIgstTax(basicValue,$('#RevenueIgst').val()));
}
-
+ else{
+ $('#RevenueAfterIgst').val(0.00);
+ }
if($("#drpFreight").val()!=0){
calculateFreight(isEdit);
@@ -2691,7 +2730,7 @@ function populateValueMainFormForDeleteItem(rowid)
'EditCgst','value' => set_value('EditCgst',0),'id'=>'EditCgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ $data = array('name' => 'EditCgst','value' => set_value('EditCgst',0),'id'=>'EditCgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange();ChangeEditSgst();','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -2719,7 +2758,7 @@ function populateValueMainFormForDeleteItem(rowid)
'EditSgst','value' => set_value('EditSgst',0),'id'=>'EditSgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ $data = array('name' => 'EditSgst','value' => set_value('EditSgst',0),'id'=>'EditSgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -2747,7 +2786,7 @@ function populateValueMainFormForDeleteItem(rowid)
'EditIgst','value' => set_value('EditIgst',0),'id'=>'EditIgst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ $data = array('name' => 'EditIgst','value' => set_value('EditIgst',0),'id'=>'EditIgst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -2773,7 +2812,7 @@ function populateValueMainFormForDeleteItem(rowid)
'EditOtherAllowances','value' => set_value('EditOtherAllowances',0),'id'=>'EditOtherAllowances', 'class' => 'form-control num','onchange'=>'EditRatechange()');
+ $data = array('name' => 'EditOtherAllowances','value' => set_value('EditOtherAllowances',0),'id'=>'EditOtherAllowances', 'class' => 'form-control num','onchange'=>'EditRatechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -2966,7 +3005,7 @@ function populateValueMainFormForDeleteItem(rowid)
'RevenueEditCgst','value' => set_value('RevenueEditCgst',0),'id'=>'RevenueEditCgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()');
+ $data = array('name' => 'RevenueEditCgst','value' => set_value('RevenueEditCgst',0),'id'=>'RevenueEditCgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange();RevenueChangeEditSgst();');
echo form_input($data);
?>
@@ -3028,7 +3067,7 @@ function populateValueMainFormForDeleteItem(rowid)
'RevenueEditSgst','value' => set_value('RevenueEditSgst',0),'id'=>'RevenueEditSgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()');
+ $data = array('name' => 'RevenueEditSgst','value' => set_value('RevenueEditSgst',0),'id'=>'RevenueEditSgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange();');
echo form_input($data);
?>
@@ -3285,7 +3324,7 @@ function populateValueMainFormForDeleteItem(rowid)
'RevenueCgst','value' => set_value('RevenueCgst',0),'id'=>'RevenueCgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()');
+ $data = array('name' => 'RevenueCgst','value' => set_value('RevenueCgst',0),'id'=>'RevenueCgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change();RevenueChangeSgst();');
echo form_input($data);
?>
@@ -3612,7 +3651,7 @@ function populateValueMainFormForDeleteItem(rowid)
'ServiceQuantity','value' => set_value('ServiceQuantity'),'id'=>'ServiceQuantity', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);');
+ $data = array('name' => 'ServiceQuantity','value' => set_value('ServiceQuantity'),'id'=>'ServiceQuantity', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
echo form_input($data);
?>
@@ -3650,7 +3689,7 @@ function populateValueMainFormForDeleteItem(rowid)
'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+ $data = array('name' => 'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'Ratechange();ChangeSgst();','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -3678,7 +3717,7 @@ function populateValueMainFormForDeleteItem(rowid)
'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+ $data = array('name' => 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'Ratechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -3707,7 +3746,7 @@ function populateValueMainFormForDeleteItem(rowid)
'Igst','value' => set_value('Igst',0),'id'=>'Igst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+ $data = array('name' => 'Igst','value' => set_value('Igst',0),'id'=>'Igst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'Ratechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -5703,6 +5742,21 @@ function populateValueMainFormForDeleteItem(rowid)
}
});
+
+ /**
+ used to update cgst % to sgst
+ */
+
+ function ChangeSgst(){
+
+ $('#Sgst').val($('#Cgst').val());
+ Ratechange();
+ }
+ function ChangeEditSgst(){
+
+ $('#EditSgst').val($('#EditCgst').val());
+ EditRatechange();
+ }
/**
* calculating taxes using quanty and rate
*/
@@ -5726,9 +5780,9 @@ function populateValueMainFormForDeleteItem(rowid)
//Service Tax calculation
- $('#AfterCgst').val(calculateCgstTax($('#ServiceBasAmt').val(),$('#Cgst').val()));
- $('#AfterSgst').val(calculateSgstTax($('#ServiceBasAmt').val(),$('#Sgst').val()));
- $('#AfterIgst').val(calculateIgstTax($('#ServiceBasAmt').val(),$('#Igst').val()));
+ $('#AfterCgst').val(calculateCgstTax($('#ServiceBasAmt').val(),$("#Cgst").val()== '' ? "0.00" : $('#Cgst').val()));
+ $('#AfterSgst').val(calculateSgstTax($('#ServiceBasAmt').val(),$("#Sgst").val()== '' ? "0.00" : $('#Sgst').val()));
+ $('#AfterIgst').val(calculateIgstTax($('#ServiceBasAmt').val(),$("#Igst").val()== '' ? "0.00" : $('#Igst').val()));
calculateTotalOrdervalue();
var res = ExceedBudget($('#TotalOrderValue').val(), $('#AvalBuget').val());
@@ -5789,7 +5843,7 @@ function populateValueMainFormForDeleteItem(rowid)
var Cgst = parseFloat($('#AfterCgst').val());
var Sgst = parseFloat($('#AfterSgst').val());
var Igst = parseFloat($('#AfterIgst').val());
- var OtherAmt = parseFloat($('#OtherAllowances').val());
+ var OtherAmt = parseFloat($("#OtherAllowances").val()== '' ? "0.00" : $('#OtherAllowances').val());
var TotAmt = basicValue + Cgst+ Sgst + Igst + OtherAmt;
$('#TotalOrderValue').val( parseFloat(TotAmt).toFixed(2));
@@ -5915,12 +5969,24 @@ function populateValueMainFormForDeleteItem(rowid)
alert('Please Enter the Quantity value');
$('#ServiceQuantity').focus();
return false;
+ }
+ else if($('#ServiceQuantity').val() == 0)
+ {
+ alert('Please Enter the Valid Quantity value');
+ $('#ServiceQuantity').focus();
+ return false;
}
else if($('#ServiceRate').val() == '')
{
alert('Please Enter the Rate of the Item');
$('#ServiceRate').focus();
return false;
+ }
+ else if($('#ServiceRate').val() == 0)
+ {
+ alert('Please Enter the Valid Rate of the Item');
+ $('#ServiceRate').focus();
+ return false;
}
else if($('#txtSpcialInstructionSingle').val()==''){
alert('Please Enter the Service Description');
@@ -6142,9 +6208,9 @@ $('#content').loader('hide');
$('#txtEditBasicValue').val(parseFloat(Tot).toFixed(2));
ExceedBudget(Tot, $('#EditAvlBudAmt').val());
- $('#EditAfterCgst').val(calculateCgstTax($('#txtEditBasicValue').val(),$('#EditCgst').val()));
- $('#EditAfterSgst').val(calculateSgstTax($('#txtEditBasicValue').val(),$('#EditSgst').val()));
- $('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val()));
+ $('#EditAfterCgst').val(calculateCgstTax($('#txtEditBasicValue').val(),$("#EditCgst").val()== '' ? "0.00" : $('#EditCgst').val()));
+ $('#EditAfterSgst').val(calculateSgstTax($('#txtEditBasicValue').val(),$("#EditSgst").val()== '' ? "0.00" : $('#EditSgst').val()));
+ $('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$("#EditIgst").val()== '' ? "0.00" : $('#EditIgst').val()));
calculateTotalEditOrdervalue();
}
@@ -6159,7 +6225,7 @@ $('#content').loader('hide');
var Cgst = parseFloat($('#EditAfterCgst').val());
var Sgst = parseFloat($('#EditAfterSgst').val());
var Igst = parseFloat($('#EditAfterIgst').val());
- var OtherAmt = parseFloat($('#EditOtherAllowances').val());
+ var OtherAmt = parseFloat($("#EditOtherAllowances").val()== '' ? "0.00" : $('#EditOtherAllowances').val());
var TotAmt = basicValue + Cgst+ Sgst + Igst + OtherAmt;
@@ -6256,11 +6322,25 @@ $('#content').loader('hide');
$('#EditQuantity').focus();
return false;
}
+
+ else if($('#EditQuantity').val() == 0)
+ {
+ alert('Please Enter the Valid Quantity value');
+ $('#EditQuantity').focus();
+ return false;
+ }
+
else if($('#EditRate').val() == '')
{
alert('Please Enter the Rate of the Item');
$('#EditRate').focus();
return false;
+ }
+ else if($('#EditRate').val() == 0)
+ {
+ alert('Please Enter the Valid Rate of the Item');
+ $('#EditRate').focus();
+ return false;
}
else if($('#EdittxtSpcialInstructionSingle').val()==''){
alert('Please Enter the Service Description');
@@ -6908,12 +6988,24 @@ $('.EditRevenue').click(function(){
$('#EditRevenueQuantity').focus();
return false;
}
+ else if($('#EditRevenueQuantity').val() == 0)
+ {
+ alert('Please Enter the Quantity value');
+ $('#EditRevenueQuantity').focus();
+ return false;
+ }
else if($('#EditRevenueRate').val() == '')
{
alert('Please Enter the Rate of the Item');
$('#EditRevenueRate').focus();
return false;
}
+ else if($('#EditRevenueRate').val() == 0)
+ {
+ alert('Please Enter the Valid Rate of the Item');
+ $('#EditRevenueRate').focus();
+ return false;
+ }
else
{
return true;
@@ -7166,4 +7258,3 @@ $("#PaymentMethod").change(function() {
}
-
diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php
index 501a829c..bea50d5c 100755
--- a/application/views/servicePurchaseorder.php
+++ b/application/views/servicePurchaseorder.php
@@ -314,9 +314,18 @@ $("#EditQuantity").val('');
});
-});
+});
+function ChangeSgst(){
+$('#Sgst').val($('#Cgst').val());
+Ratechange();
+}
+function ChangeEditSgst(){
+
+$('#EditSgst').val($('#EditCgst').val());
+EditRatechange();
+}
function Ratechange(){
if($('#ReqNo').val() == "0")
@@ -348,10 +357,11 @@ function Ratechange(){
$('#txtBasicValue').val(parseFloat(Tot).toFixed(2));
//Service Tax calculation
-
- $('#AfterCgst').val(calculateCgstTax($('#txtBasicValue').val(),$('#Cgst').val()));
- $('#AfterSgst').val(calculateSgstTax($('#txtBasicValue').val(),$('#Sgst').val()));
- $('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val()));
+
+ $('#AfterCgst').val(calculateCgstTax($('#txtBasicValue').val(),$("#Cgst").val()== '' ? "0.00" : $("#Cgst").val()));
+
+ $('#AfterSgst').val(calculateSgstTax($('#txtBasicValue').val(),$("#Sgst").val()== '' ? "0.00" : $("#Sgst").val()));
+ $('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$("#Igst").val()== '' ? "0.00" : $("#Igst").val()));
calculateTotalOrdervalue();
@@ -385,10 +395,11 @@ function EditRatechange(){
$('#txtEditBasicValue').val(parseFloat(Tot).toFixed(2));
ExceedBudget(Tot, $('#EditAvlBudAmt').val());
-
- $('#EditAfterCgst').val(calculateCgstTax($('#txtEditBasicValue').val(),$('#EditCgst').val()));
- $('#EditAfterSgst').val(calculateSgstTax($('#txtEditBasicValue').val(),$('#EditSgst').val()));
- $('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val()));
+
+ $('#EditAfterCgst').val(calculateCgstTax($('#txtEditBasicValue').val(),$("#EditCgst").val()== '' ? "0.00" : $("#EditCgst").val()));
+
+$('#EditAfterSgst').val(calculateSgstTax($('#txtEditBasicValue').val(),$("#EditSgst").val()== '' ? "0.00" : $("#EditSgst").val()));
+ $('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$("#EditIgst").val()== '' ? "0.00" : $("#EditIgst").val()));
calculateTotalEditOrdervalue();
}
@@ -447,7 +458,7 @@ function ExceedQuantityCheck()
var Cgst = parseFloat($('#AfterCgst').val());
var Sgst = parseFloat($('#AfterSgst').val());
var Igst = parseFloat($('#AfterIgst').val());
- var OtherAmt = parseFloat($('#OtherAllowances').val());
+ var OtherAmt = parseFloat($("#OtherAllowances").val()== '' ? "0.00" : $("#OtherAllowances").val());
var TotAmt = basicValue + Cgst+ Sgst + Igst + OtherAmt;
@@ -460,7 +471,7 @@ function ExceedQuantityCheck()
var Cgst = parseFloat($('#EditAfterCgst').val());
var Sgst = parseFloat($('#EditAfterSgst').val());
var Igst = parseFloat($('#EditAfterIgst').val());
- var OtherAmt = parseFloat($('#EditOtherAllowances').val());
+ var OtherAmt = parseFloat($("#EditOtherAllowances").val()== '' ? "0.00" : $("#EditOtherAllowances").val());
var TotAmt = basicValue + Cgst+ Sgst + Igst + OtherAmt;
@@ -909,7 +920,7 @@ function clearEditTaxField()
'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+ $data = array('name' => 'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'Ratechange();ChangeSgst();','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -937,7 +948,7 @@ function clearEditTaxField()
'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+ $data = array('name' => 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'Ratechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -966,7 +977,7 @@ function clearEditTaxField()
'Igst','value' => set_value('Igst',0),'id'=>'Igst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+ $data = array('name' => 'Igst','value' => set_value('Igst',0),'id'=>'Igst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'Ratechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -991,7 +1002,7 @@ function clearEditTaxField()
'OtherAllowances','value' => set_value('OtherAllowances',0),'id'=>'OtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onchange'=>'Ratechange()');
+ $data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances',0),'id'=>'OtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onchange'=>'Ratechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -1171,7 +1182,7 @@ function clearEditTaxField()
'EditCgst','value' => set_value('EditCgst'),'id'=>'EditCgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ $data = array('name' => 'EditCgst','value' => set_value('EditCgst'),'id'=>'EditCgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange();ChangeEditSgst();','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -1199,7 +1210,7 @@ function clearEditTaxField()
'EditSgst','value' => set_value('EditSgst'),'id'=>'EditSgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ $data = array('name' => 'EditSgst','value' => set_value('EditSgst'),'id'=>'EditSgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -1228,7 +1239,7 @@ function clearEditTaxField()
'EditIgst','value' => set_value('EditIgst'),'id'=>'EditIgst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+ $data = array('name' => 'EditIgst','value' => set_value('EditIgst'),'id'=>'EditIgst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -1253,7 +1264,7 @@ function clearEditTaxField()
'EditOtherAllowances','value' => set_value('EditOtherAllowances',0),'id'=>'EditOtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onchange'=>'EditRatechange()');
+ $data = array('name' => 'EditOtherAllowances','value' => set_value('EditOtherAllowances',0),'id'=>'EditOtherAllowances', 'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onchange'=>'EditRatechange()','onkeypress'=>'return isNumberKey(event);');
echo form_input($data);
?>
@@ -1911,11 +1922,23 @@ function validateServiceTax()
$('#Quantity').focus();
return false;
}
+ else if($('#Quantity').val() == 0)
+ {
+ alert('Please Enter the Valid Quantity Value');
+ $('#Quantity').focus();
+ return false;
+ }
else if($('#Rate').val() == '')
{
alert('Please Enter the Rate of the Item');
$('#Rate').focus();
return false;
+ }
+ else if($('#Rate').val() == 0)
+ {
+ alert('Please Enter the Valid Rate of the Item');
+ $('#Rate').focus();
+ return false;
}
else if(ExceedQuantityCheck() == false)
{
@@ -1959,6 +1982,18 @@ function validateServiceTax()
$('#EditQuantity').focus();
return false;
}
+ else if($('#EditQuantity').val() == 0)
+ {
+ alert('Please Enter the Valid Quantity value');
+ $('#EditQuantity').focus();
+ return false;
+ }
+ else if($('#EditRate').val() == 0)
+ {
+ alert('Please Enter the Valid Rate of the Item');
+ $('#EditRate').focus();
+ return false;
+ }
else if($('#EditRate').val() == '')
{
alert('Please Enter the Rate of the Item');
@@ -2216,4 +2251,3 @@ location.reload();
}
-
diff --git a/assets/js/CreatePOValidation.js b/assets/js/CreatePOValidation.js
index a8e586c8..a9c6c17a 100755
--- a/assets/js/CreatePOValidation.js
+++ b/assets/js/CreatePOValidation.js
@@ -100,6 +100,7 @@ function validate()
function validateRevenueTax()
{
+
if($('#ReqNo').val() == "0")
{
alert('Please select the Requisition Number');
@@ -124,12 +125,24 @@ function validateRevenueTax()
$('#Quantity').focus();
return false;
}
+ else if($('#Quantity').val() == "0")
+ {
+ alert('Please Enter the Valid Quantity value');
+ $('#Quantity').focus();
+ return false;
+ }
else if($('#Rate').val() == '')
{
alert('Please Enter the Rate of the Item');
$('#Rate').focus();
return false;
}
+ else if($('#Rate').val() == "0")
+ {
+ alert('Please Enter the Valid Rate of the Item');
+ $('#Rate').focus();
+ return false;
+ }
else
{
return true;