tax posting not happening, bug fixing done

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

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

@@ -1028,7 +1028,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				pstmt1.close();
 				pstmt1=null;
 				
-				sql="update invoice_trace set net_amt = ( (QUANTITY__STDUOM * RATE__STDUOM) - (QUANTITY__STDUOM * RATE__STDUOM * DISCOUNT / 100 ) + TAX_AMT - DISC_SCHEM_OFFINV_AMT), chg_term = ?,chg_user=? ,chg_date=? where invoice_id = ? ";
+				sql="update invoice_trace set net_amt = ( (QUANTITY__STDUOM * RATE__STDUOM) - (QUANTITY__STDUOM * RATE__STDUOM * DISCOUNT / 100 ) + TAX_AMT - DISC_SCHEM_OFFINV_AMT ), chg_term = ?,chg_user=? ,chg_date=? where invoice_id = ? ";
 				pstmt=conn.prepareStatement(sql);
 				pstmt.setString(1,termId);
 				pstmt.setString(2,userId);

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

@@ -321,7 +321,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
 						invAcctMap.put("analysis3", "");
 						//System.out.println("@@@@@@@2 invAcctMap["+invAcctMap+"]");
 						//invAcctList.add(invAcctMap);
-						invAcctList = modifyinvAcctList(invAcctList,invAcctMap,lsAcctCodeDis,lsCctrCodeDis , lnAmountDis, checkNullSpace(hdrAnalCode) );
+						invAcctList = modifyinvAcctList(invAcctList,invAcctMap,lsAcctCodeDis,lsCctrCodeDis , -1 * lnAmountDis, checkNullSpace(hdrAnalCode) );
 
 
 					}//lnAmountDis amount not 0 END
@@ -379,7 +379,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
 					/**
 					 * Select 'taxtran'details
 					 * */
-
+					System.out.println("08-Mar-17 manohar before populating tax invAcctList ["+invAcctList+"]" );
 					lineNoTemp = "   "+InvoiceDetMap.get("line_no"); 
 					lineNoTemp = lineNoTemp.substring(lineNoTemp.length()-3, lineNoTemp.length());
 					//System.out.println("@@@@@@@ lineNoTemp["+lineNoTemp+"]");
@@ -398,19 +398,24 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
 						lnAmountTax=rs.getDouble("tax_amt");
 						lcRecoAmt=rs.getDouble("reco_amount");
 						totRecoAmt += lcRecoAmt;
+						System.out.println("08-Mar-17 manohar 1 posting tax for line ["+lineNoTemp+"] lsAcctCodeTax [" + lsAcctCodeTax + "] lsCctrCodeTax [" + lsCctrCodeTax+ "] lnAmountTax [" + lnAmountTax + "] lcRecoAmt[" + lcRecoAmt+ "] totRecoAmt [" + totRecoAmt+ "]" );
+						if( lsAcctCodeTax == null || lsAcctCodeTax.trim().length() == 0)
+						{
+							lsAcctCodeTax = lsAcctCodeSal;
+							lsCctrCodeTax = lsCctrCodeSal;
+						}
+						if( lsCctrCodeTax == null || lsCctrCodeTax.trim().length() == 0 )
+						{ 
+							lsCctrCodeTax = " ";
+						}
 						if (lcRecoAmt != 0 )
 						{
-							if( lsAcctCodeTax == null || lsAcctCodeTax.trim().length() == 0)
-							{
-								lsAcctCodeTax = lsAcctCodeSal;
-								lsCctrCodeTax = lsCctrCodeSal;
-							}
-							if( lsCctrCodeTax == null || lsCctrCodeTax.trim().length() == 0 )
-							{ 
-								lsCctrCodeTax = " ";
-							}
 							lnAmountTax=lnAmountTax-lcRecoAmt;
-
+							
+						}
+						System.out.println("08-Mar-17 manohar 2 posting tax for line ["+lineNoTemp+"] lsAcctCodeTax [" + lsAcctCodeTax + "] lsCctrCodeTax [" + lsCctrCodeTax+ "] lnAmountTax [" + lnAmountTax + "] lcRecoAmt[" + lcRecoAmt+ "] totRecoAmt [" + totRecoAmt+ "]" );
+						if (lnAmountTax != 0 )
+						{
 							invAcctMap = new HashMap<String, String>();
 
 							invAcctMap.put("invoice_id", detInvId);
@@ -433,7 +438,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
 					pstmt=null;
 					rs.close();
 					rs=null;
-
+					System.out.println("08-Mar-17 manohar after populating tax invAcctList ["+invAcctList+"]" );
 
 					/**
 					 * tax reco details
@@ -475,6 +480,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
 						lsCctrReco=checkNull(rs.getString("cctr_code__reco"));
 						lcRecoAmt=rs.getDouble("reco_amount");
 						totRecoAmt += lcRecoAmt;
+						System.out.println("08-Mar-17 manohar 1 posting reco tax for line ["+lineNoTemp+"] lsAcctReco [" + lsAcctReco + "] lsCctrReco [" + lsCctrReco+ "] lnAmountTax [" + lnAmountTax + "] lcRecoAmt[" + lcRecoAmt+ "] totRecoAmt [" + totRecoAmt+ "]" );
 						if (lcRecoAmt != 0) // 07-dec-16 manoharan
 						{
 							if( lsAcctReco == null || lsAcctReco.trim().length() == 0 )
@@ -510,6 +516,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
 					pstmt=null;
 					rs.close();
 					rs=null;
+					System.out.println("08-Mar-17 manohar after populating reco tax invAcctList ["+invAcctList+"]" );