Taxcalc() change in parameter added form no in the end..."2"

getBlankTaxDomForAdd() change in parameter added "2" previously was blank


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

webitm-dis/ibase/webitm/ejb/dis/FrsDbtCreationPrc.java

@@ -2051,7 +2051,7 @@ private void handleTax(String tranId,int lineNo,String tranDate,double quantity,
 			taxCal.setDataNode(currRecordNode,"2",domId);
 		//	taxCal.setDataNode(currRecordNode);
 			writeLog(filePtr,"After:::(setDataNode)"+currRecordNode,true);
-			taxCal.taxCalc("S-RET", tranId,tranDate,"rate__stduom", "quantity__stduom", currCode,siteCode);
+			taxCal.taxCalc("S-RET", tranId,tranDate,"rate__stduom", "quantity__stduom", currCode,siteCode,"2");//...added form no "2" ** vishakha
 			writeLog(filePtr,"CurrentTaxNode ::"+serializeDom(currTaxNode),true);
 			writeLog(filePtr,"CurrentRecordNode ::"+serializeDom(currRecordNode),true);
 			taxAmount = GenericUtility.getInstance().getColumnValueFromNode("tax_amt",currRecordNode);
@@ -2086,7 +2086,7 @@ private void handleTax(String tranId,int lineNo,String tranDate,double quantity,
 			if(	this.blankTaxString == null)
 			{
 				MasterDataStatefulEJB masterDataStateful = new MasterDataStatefulEJB();
-				blankTaxString = masterDataStateful.getBlankTaxDomForAdd();
+				blankTaxString = masterDataStateful.getBlankTaxDomForAdd("2");//***added "2" previously it was blank **vishakha
 			}
 			NodeList dataNodeChildList = currRecordNode.getChildNodes();
 			int dataNodeChildListLen = dataNodeChildList.getLength();

webitm-dis/ibase/webitm/ejb/dis/SaleContractRelease.java

@@ -1685,7 +1685,7 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 			//String retStr = taxCal.taxCalc("S-ORD", tranId,tranDate,"rate__stduom", "quantity__stduom", currCode,siteCode);
 			tranRateCol = "rate__stduom";
 			tranQtyCol = "quantity__stduom";
-			String retStr = taxCal.taxCalc("S-ORD", tranId,tranDate,"rate__stduom", "quantity__stduom", tranRateCol, tranQtyCol, currCode, siteCode);
+			String retStr = taxCal.taxCalc("S-ORD", tranId,tranDate,"rate__stduom", "quantity__stduom", tranRateCol, tranQtyCol, currCode, siteCode,"2");//added form no. 2 ****Vishakha
 			writeLog(filePtr,"Returned from taxcalc................[" +retStr + "]" ,true);
 			//System.out.println("CurrentTaxNode ::"+serializeDom(currTaxNode));
 			//System.out.println("CurrentRecordNode ::"+serializeDom(currRecordNode));
@@ -1718,7 +1718,7 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 			if(	this.blankTaxString == null)
 			{
 				MasterDataStatefulEJB masterDataStateful = new MasterDataStatefulEJB();
-				blankTaxString = masterDataStateful.getBlankTaxDomForAdd();
+				blankTaxString = masterDataStateful.getBlankTaxDomForAdd("2");//previously it was blank now added "2" **vishakha
 			}
 			NodeList dataNodeChildList = currRecordNode.getChildNodes();
 			int dataNodeChildListLen = dataNodeChildList.getLength();

webitm-dis/ibase/webitm/ejb/dis/adv/SordAttConf.java

@@ -1553,7 +1553,7 @@ public class SordAttConf extends ActionHandlerEJB implements SordAttConfLocal, S
 			taxCal.setTaxDom(currTaxNode);
 			taxCal.setDataNode(currRecordNode);
 			//taxCal.taxCalc("S-ORD", (tranId+":"+lineNo),tranDate,"rate__stduom", "quantity__stduom", currCode,siteCode);
-			taxCal.taxCalc("S-ORD", tranId,tranDate,"rate__stduom", "quantity__stduom", currCode,siteCode);
+			taxCal.taxCalc("S-ORD", tranId,tranDate,"rate__stduom", "quantity__stduom", currCode,siteCode,"2");//added form no. 2 ** vishakha
 
 
 			System.out.println("CurrentTaxNode ::"+serializeDom(currTaxNode));
@@ -1590,7 +1590,7 @@ public class SordAttConf extends ActionHandlerEJB implements SordAttConfLocal, S
 				//MasterDataStatefulHome masterDataStatefulHome = (MasterDataStatefulHome)initialContext.lookup("MasterDataStateful");
 				 masterDataStateful = (MasterDataStatefulLocal)initialContext.lookup("ibase/MasterDataStatefulEJB/local");
 				//MasterDataStateful masterDataStateful = masterDataStatefulHome.create();
-				this.blankTaxString = masterDataStateful.getBlankTaxDomForAdd();
+				this.blankTaxString = masterDataStateful.getBlankTaxDomForAdd("2");//previous it was Blank now Passed "2"**Vishakha
 			}
 			NodeList dataNodeChildList = currRecordNode.getChildNodes();
 			int dataNodeChildListLen = dataNodeChildList.getLength();