From: Jorg J. <jj...@us...> - 2003-10-03 04:06:13
|
Update of /cvsroot/compiere/base/src/org/compiere/model In directory sc8-pr-cvs1:/tmp/cvs-serv9597/src/org/compiere/model Modified Files: CalloutSystem.java Log Message: . Index: CalloutSystem.java =================================================================== RCS file: /cvsroot/compiere/base/src/org/compiere/model/CalloutSystem.java,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** CalloutSystem.java 7 Sep 2003 04:47:40 -0000 1.50 --- CalloutSystem.java 3 Oct 2003 04:06:07 -0000 1.51 *************** *** 14,25 **** package org.compiere.model; ! import java.sql.*; ! import java.math.*; ! import java.util.*; import org.apache.log4j.Logger; ! ! import org.compiere.util.*; ! import org.compiere.process.*; /** --- 14,30 ---- package org.compiere.model; ! import java.math.BigDecimal; ! import java.sql.PreparedStatement; ! import java.sql.ResultSet; ! import java.sql.SQLException; ! import java.sql.Timestamp; ! import java.util.Properties; import org.apache.log4j.Logger; ! import org.compiere.process.RequestAction; ! import org.compiere.util.DB; ! import org.compiere.util.DisplayType; ! import org.compiere.util.Env; ! import org.compiere.util.Log; /** *************** *** 465,478 **** // Ship-To Location int shipTo_ID = rs.getInt("C_BPartner_Location_ID"); - /** // overwritten by InfoBP selection - works only if InfoWindow // was used otherwise creates error (uses last value, may belong to differnt BP) ! if (C_BPartner_ID.toString().equals(Env.getContext(ctx, WindowNo, Env.TAB_INFO, "C_BPartner_ID"))) { ! String loc = Env.getContext(ctx, WindowNo, Env.TAB_INFO, "C_BPartner_Location_ID"); if (loc.length() > 0) shipTo_ID = Integer.parseInt(loc); } - **/ if (shipTo_ID == 0) mTab.setValue("C_BPartner_Location_ID", null); --- 470,481 ---- // Ship-To Location int shipTo_ID = rs.getInt("C_BPartner_Location_ID"); // overwritten by InfoBP selection - works only if InfoWindow // was used otherwise creates error (uses last value, may belong to differnt BP) ! if (C_BPartner_ID.toString().equals(Env.getContext(ctx, Env.WINDOW_INFO, Env.TAB_INFO, "C_BPartner_ID"))) { ! String loc = Env.getContext(ctx, Env.WINDOW_INFO, Env.TAB_INFO, "C_BPartner_Location_ID"); if (loc.length() > 0) shipTo_ID = Integer.parseInt(loc); } if (shipTo_ID == 0) mTab.setValue("C_BPartner_Location_ID", null); *************** *** 482,491 **** // Contact - overwritten by InfoBP selection int contID = rs.getInt("AD_User_ID"); ! // if (C_BPartner_ID.toString().equals(Env.getContext(ctx, WindowNo, Env.TAB_INFO, "C_BPartner_ID"))) ! // { ! // String cont = Env.getContext(ctx, WindowNo, Env.TAB_INFO, "AD_User_ID"); ! // if (cont.length() > 0) ! // contID = Integer.parseInt(cont); ! // } if (contID == 0) mTab.setValue("AD_User_ID", null); --- 485,494 ---- // Contact - overwritten by InfoBP selection int contID = rs.getInt("AD_User_ID"); ! if (C_BPartner_ID.toString().equals(Env.getContext(ctx, Env.WINDOW_INFO, Env.TAB_INFO, "C_BPartner_ID"))) ! { ! String cont = Env.getContext(ctx, Env.WINDOW_INFO, Env.TAB_INFO, "AD_User_ID"); ! if (cont.length() > 0) ! contID = Integer.parseInt(cont); ! } if (contID == 0) mTab.setValue("AD_User_ID", null); *************** *** 702,706 **** // Check/Update Warehouse Setting ! // int M_Warehouse_ID = Env.getContextAsInt(WindowNo, "M_Warehouse_ID"); // Integer wh = (Integer)mTab.getValue("M_Warehouse_ID"); // if (wh.intValue() != M_Warehouse_ID) --- 705,709 ---- // Check/Update Warehouse Setting ! // int M_Warehouse_ID = Env.getContextAsInt(Env.WINDOW_INFO, "M_Warehouse_ID"); // Integer wh = (Integer)mTab.getValue("M_Warehouse_ID"); // if (wh.intValue() != M_Warehouse_ID) *************** *** 1132,1145 **** // Location int locID = rs.getInt("C_BPartner_Location_ID"); - /** // overwritten by InfoBP selection - works only if InfoWindow // was used otherwise creates error (uses last value, may belong to differnt BP) ! if (C_BPartner_ID.toString().equals(Env.getContext(ctx, WindowNo, Env.TAB_INFO, "C_BPartner_ID"))) { ! String loc = Env.getContext(ctx, WindowNo, Env.TAB_INFO, "C_BPartner_Location_ID"); if (loc.length() > 0) locID = Integer.parseInt(loc); } - **/ if (locID == 0) mTab.setValue("C_BPartner_Location_ID", null); --- 1135,1146 ---- // Location int locID = rs.getInt("C_BPartner_Location_ID"); // overwritten by InfoBP selection - works only if InfoWindow // was used otherwise creates error (uses last value, may belong to differnt BP) ! if (C_BPartner_ID.toString().equals(Env.getContext(ctx, Env.WINDOW_INFO, Env.TAB_INFO, "C_BPartner_ID"))) { ! String loc = Env.getContext(ctx, Env.WINDOW_INFO, Env.TAB_INFO, "C_BPartner_Location_ID"); if (loc.length() > 0) locID = Integer.parseInt(loc); } if (locID == 0) mTab.setValue("C_BPartner_Location_ID", null); *************** *** 1149,1158 **** // Contact - overwritten by InfoBP selection int contID = rs.getInt("AD_User_ID"); ! // if (C_BPartner_ID.toString().equals(Env.getContext(ctx, WindowNo, Env.TAB_INFO, "C_BPartner_ID"))) ! // { ! // String cont = Env.getContext(ctx, WindowNo, Env.TAB_INFO, "AD_User_ID"); ! // if (cont.length() > 0) ! // contID = Integer.parseInt(cont); ! // } if (contID == 0) mTab.setValue("AD_User_ID", null); --- 1150,1159 ---- // Contact - overwritten by InfoBP selection int contID = rs.getInt("AD_User_ID"); ! if (C_BPartner_ID.toString().equals(Env.getContext(ctx, Env.WINDOW_INFO, Env.TAB_INFO, "C_BPartner_ID"))) ! { ! String cont = Env.getContext(ctx, Env.WINDOW_INFO, Env.TAB_INFO, "AD_User_ID"); ! if (cont.length() > 0) ! contID = Integer.parseInt(cont); ! } if (contID == 0) mTab.setValue("AD_User_ID", null); |