Skip to content

B
business-java
Commit 30267d9c authored by wansari's avatar wansari
Browse files
Options

W16EKAT001 updated js for Tax chapter validation on head 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102848 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 07511070
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 4 deletions
webitm-wms/module-resource/web/js/prodWiz_Edit.js
View file @ 30267d9c
......@@ -226,7 +226,19 @@
fieldValue = document.getElementById("Detail3."+ dbID +".phy_attrib_3").value;
flag = "A";
}
//Changed by wasim on 02-08-2016 for tax chapter pop help [END]
else if (field == "tax_chap")
{
flag = "A";
fieldValue = document.getElementById("Detail2.1.tax_chap").value;
}
else if (field == "tax_chapII")
{
flag = "A";
field = "tax_chap";
fieldValue = document.getElementById("Detail3."+ dbID +".tax_chap").value;
}
//Changed by wasim on 02-08-2016 for tax chapter pop help [END]
//var url = "/ibase/webitm/jsp/ProdWizardItemTypeList.jsp?LOGIN_ID="+loginId
// +"&FIELDS="+field+"&DBID="+dbID+"&FIELDNAME="+fieldName+"&IDNUM="+idNum+"&FIELDVALUE="+fieldValue+",";
......@@ -407,6 +419,20 @@
document.getElementById("Detail3."+idNum+".descr").value = descr;
}
// Changed by Sneha on 30/03/2016 for dispaly of color, dimension, size [End]
//CHanged by wasim on 03-08-2016 for tax chapter pop help [START]
else if (field == "tax_chap")
{
if (idNum == 0)
{
document.getElementById("Detail2.1.tax_chap").value = fieldId;
}
else if(idNum != 0)
{
document.getElementById("Detail3."+ idNum +".tax_chap").value = fieldId;
document.getElementById("tax_chap."+ idNum).innerHTML = fieldId;
}
}
//CHanged by wasim on 03-08-2016 for tax chapter pop help [END]
}
/**
......@@ -463,7 +489,7 @@
{
// Changed by Sneha on 30/03/2016, for dimension and size [Start]
//if (field == "language_desc" || field == "item_ser" || field == "item_category" || field == "supplier_code" || field == "site_codes" || field == "color_codes")
if (field == "language_desc" || field == "item_ser" || field == "item_category" || field == "supplier_code" || field == "site_codes" || field == "color_codes" || field == "dimension_desc" || field == "size_code_descr" )
if (field == "language_desc" || field == "item_ser" || field == "item_category" || field == "supplier_code" || field == "site_codes" || field == "color_codes" || field == "dimension_desc" || field == "size_code_descr" || field == "tax_chap")
{
// Changed by Sneha on 30/03/2016, for dimension and size [End]
alert("No Selection Made! \nPlease Select the Code!");
......@@ -1596,6 +1622,15 @@
return false;
}
//Changed by Sneha on 04-07-2016, validation for language, supplier, price list and pack list details [Start]
//Changed by wasim on tax chapter validation [START]
else if (document.getElementById("Detail"+formNo+"."+dbID+".tax_chap") != null
&& document.getElementById("Detail"+formNo+"."+dbID+".tax_chap").value == "")
{
alert("Please Select the Tax Chapter");
document.getElementById("Detail"+formNo+"."+dbID+".tax_chap_pophelp").focus();
return false;
}
//Changed by wasim on tax chapter validation [END]
else if (document.getElementById("Detail"+formNo+"."+dbID+".language_dtl") != null
&& document.getElementById("Detail"+formNo+"."+dbID+".language_dtl").value == "")
{
......@@ -1765,7 +1800,15 @@
alert("Please Select Brand.");
document.getElementById("Detail"+formNo+"."+domNo+".phy_attrib_24_pophelp").focus();
return false;
}
}
//Changed by wasim on 04-08-2016 for tax chapter validation [START]
else if (document.getElementById("Detail"+formNo+"."+domNo+".tax_chap") != null && document.getElementById("Detail"+formNo+"."+domNo+".tax_chap").value == "")
{
alert("Please Select Tax Chapter.");
document.getElementById("Detail"+formNo+"."+domNo+".tax_chap_pophelp").focus();
return false;
}
//Changed by wasim on 04-08-2016 for tax chapter validation [END]
//Changed by Sneha on 12-07-2016, for Item description, location code, brand validation [End]
else if (!setLanguageListDetails())
{
......@@ -1867,6 +1910,8 @@
var languageDesc = document.getElementById("Detail3."+rowId+".language_desc").value;
var loginCode = document.getElementById("Detail3."+count+".login_code").value;
var taxChap = document.getElementById("Detail3."+rowId+".tax_chap").value;//Changed by wasim on 03-08-2016 for tax chapter
//alert("itemCode---"+itemCode);
//itmparntChangeNew(itemCode, "GET_ITEM_DESCR");
//alert("valueFromServlet for GET_ITEM_DESCR --->>"+valueFromServlet);
......@@ -2032,6 +2077,25 @@
+"</div>"
+"</td>"
//Changed by wasim on 02-08-2016 to add Tax Chapter while adding new item [START]
+"<td>"
+"<input type='hidden' name='Detail3."+maxRowId+".tax_chap'"
+"id='Detail3."+maxRowId+".tax_chap' maxlength='10' value='"+taxChap+"' >"
+"<div style='float:left;width: 85%;text-align:center;' id='tax_chap."+maxRowId+"' contenteditable='false' onkeypress='return false;'"
+"onkeydown='javascript:openSearchPopup(event, '"+maxRowId+"','0','tax_chap', 'Tax&#160;Chapter', '"+maxRowId+"');'>"
+ taxChap
+"</div>"
+"<div style='float:right;position:relative; width: 8%;'>"
+"<a href=javascript:callListJSP('"+maxRowId+"','0','tax_chapII','Tax&#160;Chapter','"+maxRowId+"'); style='float: left;text-decoration: none;'"
+"id='Detail3."+maxRowId+".tax_chap_pophelp' >"
+"<img src='/ibase/webitm/images/DD/popup1.png' style='margin-left: -5px;' title='Select Tax Code' />"
+"</a>"
+"</div>"
+"</td>"
//Changed by wasim on 03-08-2016 to add Tax Chapter while adding new item [END]
// Length
+"<td>"
+"<input type='text' class='editInputClass' value='"+length+"' name='Detail3."+maxRowId+".length'"
......
webitm-wms/module-resource/web/js/prodWiz_Form_I.js
View file @ 30267d9c
......@@ -625,6 +625,14 @@
{
return false;
}
//Changed by wasim on 04-08-2016 for tax chapter null validation [START]
else if (document.getElementById("Detail1.1.tax_chap").value == "")
{
alert("Please Enter Tax Chapter");
document.getElementById("Detail1.1.tax_chap_pophelp").focus();
return false;
}
//Changed by wasim on 04-08-2016 for tax chapter null validation [END]
else if (document.getElementById("Detail1.1.tax").value == "")
{
alert("Please Enter Tax ");
......
webitm-wms/module-resource/web/js/prodWiz_Popup.js
View file @ 30267d9c
......@@ -131,6 +131,17 @@
{
fieldValue = document.getElementById("Detail1."+ dbID +".item_phy_attrib_24").value;
}
//Changed by wasim on 02-08-2016 for tax chapter pop help [END]
else if (field == "tax_chap")
{
fieldValue = document.getElementById("Detail1.1.tax_chap").value;
}
else if (field == "tax_chapII")
{
field = "tax_chap";
fieldValue = document.getElementById("Detail2.1.tax_chap").value;
}
//Changed by wasim on 02-08-2016 for tax chapter pop help [END]
/*$.ajax({
async: false,
url: url,
......@@ -440,6 +451,20 @@
}
}
// Added by Parikshit Kumbhar on date: 24/04/2015 [Added new condition] End
//CHanged by wasim on 03-08-2016 for tax chapter pop help [START]
else if (field == "tax_chap")
{
if (idNum == 0)
{
document.getElementById("Detail1.1.tax_chap").value = fieldId;
}
else if(idNum != 0)
{
document.getElementById("Detail2."+ idNum +".tax_chap").value = fieldId;
document.getElementById("tax_chap."+ idNum).innerHTML = fieldId;
}
}
//CHanged by wasim on 03-08-2016 for tax chapter pop help [END]
}
/**
......@@ -510,7 +535,7 @@
if( fieldId == "")
{
if (field == "language_desc" || field == "item_ser" || field == "item_category" || field == "supplier_code" || field == "site_codes" || field == "color_codes" || field =="item_phy_attrib_24" || field =="phy_attrib_24")
if (field == "language_desc" || field == "item_ser" || field == "item_category" || field == "supplier_code" || field == "site_codes" || field == "color_codes" || field =="item_phy_attrib_24" || field =="phy_attrib_24" || field == "tax_chap")
{
alert("No Selection Made! \nPlease Select the Code!");
return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment