Bug fixing, update of net_amt in invoice_trace done

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

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

@@ -1028,7 +1028,16 @@ 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 = ? ";
+				pstmt=conn.prepareStatement(sql);
+				pstmt.setString(1,termId);
+				pstmt.setString(2,userId);
+				pstmt.setTimestamp(3, sysDateTs);
+				pstmt.setString(4,tranId);
+				pstmt.executeUpdate();
+				pstmt.close();
+				pstmt=null;
+
 				/*pstmt=conn.prepareStatement("select sord_no,sord_line_no,tax_class,tax_chap,tax_env,sum(tax_amt),sum(net_amt)"
 						+ " from invoice_trace"
 						+ " where invoice_id=? "
@@ -1041,44 +1050,44 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				rs=pstmt.executeQuery();
 				while(rs.next())
 				{
-				sordNo=rs.getString(1);
-				soLineNo=rs.getString(2);
-				taxClass=rs.getString(3);
-				taxChap=rs.getString(4);
-				taxEnv=rs.getString(5);
-				taxAmt=rs.getDouble(6);
-				netAmt=rs.getDouble(7);
-				totTaxAmt+=taxAmt;
-				totNetAmt+=netAmt;
-				
-				sql="update invdet set tax_class=?,tax_chap=?,tax_env=?,tax_amt=tax_amt+?,net_amt=net_amt+?+?"
-						+ " where invoice_id=? "
-						+ " and sord_no=? "
-						//+ " and sord_line_no=?";
-						+ " and line_no=?";
-				pstmt1=conn.prepareStatement(sql);
-				pstmt1.setString(1,taxClass);
-				pstmt1.setString(2,taxChap);
-				pstmt1.setString(3,taxEnv);
-				pstmt1.setDouble(4,taxAmt);
-				pstmt1.setDouble(5,netAmt);
-				pstmt1.setDouble(6,taxAmt);
-				pstmt1.setString(7,tranId);
-				pstmt1.setString(8,sordNo);
-				pstmt1.setString(9,soLineNo);
-				pstmt1.executeUpdate();
+					sordNo=rs.getString(1);
+					soLineNo=rs.getString(2);
+					taxClass=rs.getString(3);
+					taxChap=rs.getString(4);
+					taxEnv=rs.getString(5);
+					taxAmt=rs.getDouble(6);
+					netAmt=rs.getDouble(7);
+					totTaxAmt+=taxAmt;
+					totNetAmt+=netAmt;
+					
+					sql="update invdet set tax_class=?,tax_chap=?,tax_env=?,tax_amt=tax_amt+?,net_amt=net_amt+?+?"
+							+ " where invoice_id=? "
+							+ " and sord_no=? "
+							//+ " and sord_line_no=?";
+							+ " and line_no=?";
+					pstmt1=conn.prepareStatement(sql);
+					pstmt1.setString(1,taxClass);
+					pstmt1.setString(2,taxChap);
+					pstmt1.setString(3,taxEnv);
+					pstmt1.setDouble(4,taxAmt);
+					pstmt1.setDouble(5,netAmt);
+						pstmt1.setDouble(6,taxAmt);
+					pstmt1.setString(7,tranId);
+					pstmt1.setString(8,sordNo);
+					pstmt1.setString(9,soLineNo);
+					pstmt1.executeUpdate();
 				}
 				rs.close();
 				rs=null;
 				pstmt.close();
 				pstmt=null;
 				
-				sql="update invoice set tax_amt=?,net_amt=?+? where invoice_id=? ";
+				sql="update invoice set tax_amt=?,net_amt=? where invoice_id=? ";
 				pstmt=conn.prepareStatement(sql);
 				pstmt.setDouble(1, totTaxAmt);
-				pstmt.setDouble(2, totTaxAmt);
-				pstmt.setDouble(3, totNetAmt);
-				pstmt.setString(4,tranId);
+				//pstmt.setDouble(2, totTaxAmt);
+				pstmt.setDouble(2, totNetAmt);
+				pstmt.setString(3,tranId);
 				pstmt.executeUpdate();
 				pstmt.close();
 				pstmt=null;
@@ -1096,7 +1105,10 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				{
 					sysDateTs = java.sql.Timestamp.valueOf(genericUtility.getValidDateString(sysDate, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
 				}
-				sql="update invoice_trace set 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);
@@ -1105,6 +1117,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				pstmt.executeUpdate();
 				pstmt.close();
 				pstmt=null;
+				*/
 				sql="update invdet set chg_term = ?,chg_user=? ,chg_date=? where invoice_id = ? ";
 				pstmt=conn.prepareStatement(sql);
 				pstmt.setString(1,termId);