commited chnages for disble tax edit window

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@178754 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJB.java

@@ -5356,11 +5356,11 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 	
 	@Override
 	//public String getList(String param, String field, String[] values)	 throws RemoteException, ITMException
-	public String getTaxData(String xmlData, String formNo, String domID, UserInfoBean userInfo,String objName) throws RemoteException,ITMException
+	public String getTaxData(String xmlData, String formNo, String domID, UserInfoBean userInfo,String objName,String editFlag) throws RemoteException,ITMException
 	{
 		System.out.println("Inside getTaxData SorderWizardEJB");
 		
-		System.out.println("In Method : [getTaxData]"+xmlData);
+		System.out.println("In Method : [getTaxData]"+xmlData+"editFlag"+editFlag);
 		System.out.println("FormNo::"+formNo+"domID::"+domID+"objName::"+objName);
 		String retString ="";
 	//	InitialContext ctx = null;
@@ -5384,7 +5384,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 					if( isValid )
 					{
 						retXMLStr = masterStateful.getCalculateTax(xmlData, formNo, domID);
-						String xslFileName = getXSLForTax(userInfo,domID,masterStateful);
+						String xslFileName = getXSLForTax(userInfo,domID,masterStateful,editFlag);
 						System.out.println("Starting XML Transformation xslFileName["+xslFileName+"]dataXML["+retXMLStr+"]");
 						ValidateXMLInput vxi = new ValidateXMLInput();
 						String outputFileName = vxi.validate(xslFileName, retXMLStr, CommonConstants.APPLICATION_CONTEXT + File.separator + "temp", "tax", ".html");
@@ -5445,7 +5445,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 	
 	//added by kaustubh on 6 Dec 2017 Start
 	
-	protected String getXSLForTax( UserInfoBean userInfo,String domID,MasterStatefulLocal masterStateful)throws ITMException
+	protected String getXSLForTax( UserInfoBean userInfo,String domID,MasterStatefulLocal masterStateful,String editFlag)throws ITMException
 	{
 		String taxRetFileName = null;
 	//	UserInfoBean userInfo = null;
@@ -5486,7 +5486,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 				propEditorInfoMap.put("EDITOR", editor);
 				//Changed by samadhan on 01/11/2017 for getting metadata from E12GenericUtility to apply enterprise propery editor end
 				//Added by Prasad on 13/12/16 [Editor option added for Property Editor] END
-				taxFileName = "Wizard_taxtran_" + userInfo.getUserLanguage() + "_" + userInfo.getUserCountry() + "_" +"A"+ ".xsl";
+				taxFileName = "Wizard_taxtran_" + userInfo.getUserLanguage() + "_" + userInfo.getUserCountry() + "_" +"v"+ ".xsl";
 				System.out.println("taxFileName"+taxFileName);
 				//defaultPath = defaultPath + "xsl" + File.separator + CommonConstants.THEME + File.separator +  taxFileName;
 				//File taxXslFile = new File(defaultPath);
@@ -5503,7 +5503,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 					//metaDataDoc = formLayout.setLocaleLabels("taxtran","1",userInfo.getUserLanguage(), userInfo.getUserCountry(), "1", editFlag, profileIdRes);
 				//	metaDataDoc = formLayout.setLocaleLabels("taxtran","1",userInfo.getUserLanguage(), userInfo.getUserCountry(), "1", dbid, propEditorInfoMap, userInfo.getTransDB() );
 			
-						metaDataDoc = formLayout.setLocaleLabels("taxtran","1",userInfo.getUserLanguage(), userInfo.getUserCountry(), "1", "A", propEditorInfoMap,userInfo.getTransDB() );
+						metaDataDoc = formLayout.setLocaleLabels("taxtran","1",userInfo.getUserLanguage(), userInfo.getUserCountry(), "1","v", propEditorInfoMap,userInfo.getTransDB() );
 
 					taxXslString =  "<?xml version='1.0' encoding='UTF-8'?>";
 					taxXslString += " \n<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">";

webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJBLocal.java

@@ -37,7 +37,7 @@ public interface SorderWizardEJBLocal extends ValidatorLocal
 	public JSONObject getDefaultValuesfromJSON(String fileName) throws RemoteException,ITMException ;
 	
     //Added By Kaustubh on 4 Dec 2017 Start
-	public String getTaxData(String xmlData, String formNo, String domID,UserInfoBean userInfo,String objName) throws RemoteException,ITMException;
+	public String getTaxData(String xmlData, String formNo, String domID,UserInfoBean userInfo,String objName,String editFlag) throws RemoteException,ITMException;
 	//Added By Kaustubh on 4 Dec 2017 End
 	
 	//Added By Kaustubh on 4 Dec 2017 Start

webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJBRemote.java

@@ -35,7 +35,7 @@ public interface SorderWizardEJBRemote extends ValidatorRemote
 	public JSONObject getDefaultValuesfromJSON(String fileName) throws RemoteException,ITMException ;
 	
 	//Added By Kaustubh on 4 Dec 2017 Start
-	public String getTaxData(String xmlData, String formNo, String domID,UserInfoBean userInfo,String objName) throws RemoteException,ITMException;
+	public String getTaxData(String xmlData, String formNo, String domID,UserInfoBean userInfo,String objName,String editFlag) throws RemoteException,ITMException;
 	//Added By Kaustubh on 4 Dec 2017 End
 	
 	//Added By Kaustubh on 13 Dec 2017 Start

webitm-wms/ibase/webitm/ejb/wms/SorderWizardPosEJB.java

@@ -88,7 +88,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
 		int lineNo = 0;
 		Document dom = null;
 		
-		String siteCodeOrd = "",orderDate = "",itemSer = "",custCode = "",custCodeDlv = "",custCodeBil = "", dlvTerm = "", userId = "",loginEmpCode="",remarks = "",
+		String siteCodeOrd = "",orderDate = "",itemSer = "",nature= "",custCode = "",custCodeDlv = "",custCodeBil = "", dlvTerm = "", userId = "",loginEmpCode="",remarks = "",
 				crTerm = "",currCode = "",stanCode = "",tranCode = "",transMode = "",currCodeFrt = "",currCodeIns = "",orderType = "",random = "",
 				sql = "",priceList = "",priceListClg = "",
 				siteCode = "",empCodeOrdDet = "",tabNo="",taxXml="";
@@ -546,38 +546,47 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
 					if(childNode != null && "item_code".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						itemCode = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+itemCode+"]");
 					}
 					else if(childNode != null && "item_descr".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						itemDescr = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+itemDescr+"]");
 					}
 					else if(childNode != null && "quantity".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						quantity = Double.parseDouble(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+quantity+"]");
 					}
 					else if(childNode != null && "rate".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						rate = Double.parseDouble(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+rate+"]");
 					}
 					else if(childNode != null && "rate__std".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						rateStd = Double.parseDouble(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+rateStd+"]");
 					}
 					else if(childNode != null && "unit__rate".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						unitRate = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+unitRate+"]");
 					}
 					else if(childNode != null && "rate__clg".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						rateClg = Double.parseDouble(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+rateClg+"]");
 					}
 					else if(childNode != null && "unit".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						unit = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+unit+"]");
 					}
 					else if(childNode != null && "tax_chap".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						taxChap = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+taxChap+"]");
 					}
 					else if(childNode != null && "tax_class".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
@@ -586,28 +595,39 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
 					else if(childNode != null && "tax_env".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						taxEnv = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+taxEnv+"]");
 					}
 					else if(childNode != null && "item_flg".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						itmFlag = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+itmFlag+"]");
 					}
 					else if(childNode != null && "dsp_date".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						dspDate = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+dspDate+"]");
 					}
 					else if(childNode != null && "line_no__contr".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						lineNoCntr = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+lineNoCntr+"]");
 					}
 					// Added by Sneha on 20-01-2017, to add discount field [Start]
 					else if(childNode != null && "discount".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						discount = Double.parseDouble(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+discount+"]");
 					}
 					// Added by Sneha on 20-01-2017, to add discount field [End]
 					else if(childNode != null && "item_ser".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
 					{
 						itemSer = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+itemSer+"]");
+					}
+					else if(childNode != null && "nature".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
+					{
+						nature = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+						System.out.println("my_nature["+nature+"]");
 					}
 			
 				}
@@ -675,6 +695,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
 				 xmlStringDet.append("<tax_chap><![CDATA[").append(taxChap).append("]]></tax_chap>");
 				 xmlStringDet.append("<tax_class><![CDATA[").append(taxClass).append("]]></tax_class>");
 				 xmlStringDet.append("<tax_env><![CDATA[").append(taxEnv).append("]]></tax_env>");
+				 xmlStringDet.append("<nature><![CDATA[").append(nature).append("]]></nature>");
 				 xmlStringDet.append("<conv__qty_stduom>").append("<![CDATA[" + 1 + "]]>").append("</conv__qty_stduom>");
 				 xmlStringDet.append("<conv__rtuom_stduom>").append("<![CDATA[" + 1 + "]]>").append("</conv__rtuom_stduom>");
 				 xmlStringDet.append("<dsp_date>").append("<![CDATA["+dspDate+"]]>").append("</dsp_date>");