[Compiere-cvslog] CVS: serverApps/src/main/servlet/org/compiere/wstore JSPEnv.java,1.29,1.30 RegistrationServlet.java,1.10,1.11

[Jorg J. <jj...@us...>]

Update of /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21654/src/main/servlet/org/compiere/wstore

Modified Files:
	JSPEnv.java RegistrationServlet.java 
Log Message:


Index: JSPEnv.java
===================================================================
RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/JSPEnv.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** JSPEnv.java	14 Jan 2005 07:31:10 -0000	1.29
--- JSPEnv.java	26 Feb 2005 07:37:44 -0000	1.30
***************
*** 72,76 ****
  			if (AD_Client_ID == 0)
  			{
! 				AD_Client_ID = DB.getSQLValue("SELECT AD_Client_ID FROM AD_Client WHERE AD_Client_ID > 11 AND IsActive='Y'");
  				if (AD_Client_ID < 0)
  					AD_Client_ID = 11;	//	GardenWorld
--- 72,77 ----
  			if (AD_Client_ID == 0)
  			{
! 				AD_Client_ID = DB.getSQLValue(null,
! 					"SELECT AD_Client_ID FROM AD_Client WHERE AD_Client_ID > 11 AND IsActive='Y'");
  				if (AD_Client_ID < 0)
  					AD_Client_ID = 11;	//	GardenWorld
***************
*** 132,136 ****
  			if (AD_Org_ID == 0)
  			{
! 				AD_Org_ID = DB.getSQLValue("SELECT AD_Org_ID FROM AD_Org "
  					+ "WHERE AD_Client_ID=? AND IsActive='Y' AND IsSummary='N' ORDER BY 1", AD_Client_ID);
  				if (AD_Org_ID > 0)
--- 133,138 ----
  			if (AD_Org_ID == 0)
  			{
! 				AD_Org_ID = DB.getSQLValue(null,
! 					"SELECT AD_Org_ID FROM AD_Org "
  					+ "WHERE AD_Client_ID=? AND IsActive='Y' AND IsSummary='N' ORDER BY 1", AD_Client_ID);
  				if (AD_Org_ID > 0)
***************
*** 155,159 ****
  			if (Env.getContextAsInt(newCtx, "#M_Warehouse_ID") == 0)
  			{
! 				int M_Warehouse_ID = DB.getSQLValue("SELECT M_Warehouse_ID FROM M_Warehouse "
  					+ "WHERE AD_Org_ID=? AND IsActive='Y' ORDER BY 1", AD_Org_ID);
  				if (M_Warehouse_ID > 0)
--- 157,162 ----
  			if (Env.getContextAsInt(newCtx, "#M_Warehouse_ID") == 0)
  			{
! 				int M_Warehouse_ID = DB.getSQLValue(null,
! 					"SELECT M_Warehouse_ID FROM M_Warehouse "
  					+ "WHERE AD_Org_ID=? AND IsActive='Y' ORDER BY 1", AD_Org_ID);
  				if (M_Warehouse_ID > 0)
***************
*** 171,175 ****
  			if (Env.getContextAsInt(newCtx, "#C_PaymentTerm_ID") == 0)
  			{
! 				int C_PaymentTerm_ID = DB.getSQLValue("SELECT C_PaymentTerm_ID FROM C_PaymentTerm "
  					+ "WHERE AD_Client_ID=? AND IsDefault='Y' ORDER BY NetDays", AD_Client_ID);
  				Env.setContext(newCtx, "#C_PaymentTerm_ID", C_PaymentTerm_ID);
--- 174,179 ----
  			if (Env.getContextAsInt(newCtx, "#C_PaymentTerm_ID") == 0)
  			{
! 				int C_PaymentTerm_ID = DB.getSQLValue(null,
! 					"SELECT C_PaymentTerm_ID FROM C_PaymentTerm "
  					+ "WHERE AD_Client_ID=? AND IsDefault='Y' ORDER BY NetDays", AD_Client_ID);
  				Env.setContext(newCtx, "#C_PaymentTerm_ID", C_PaymentTerm_ID);

Index: RegistrationServlet.java
===================================================================
RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/RegistrationServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RegistrationServlet.java	18 Feb 2005 13:01:03 -0000	1.10
--- RegistrationServlet.java	26 Feb 2005 07:37:44 -0000	1.11
***************
*** 14,26 ****
  package org.compiere.wstore;
  
- import javax.servlet.*;
- import javax.servlet.http.*;
  import java.io.*;
- import java.util.*;
  import java.sql.*;
! 
  import java.util.logging.*;
! import org.compiere.util.*;
  import org.compiere.model.*;
  
  /**
--- 14,25 ----
  package org.compiere.wstore;
  
  import java.io.*;
  import java.sql.*;
! import java.util.*;
  import java.util.logging.*;
! import javax.servlet.*;
! import javax.servlet.http.*;
  import org.compiere.model.*;
+ import org.compiere.util.*;
  
  /**
***************
*** 127,131 ****
  		Properties ctx = JSPEnv.getCtx(request);
  		MUser user = null;
! 		int AD_User_ID = DB.getSQLValue("SELECT AD_User_ID FROM AD_User WHERE EMail=?", userName);
  		if (AD_User_ID > 0)
  			user = MUser.get(ctx, AD_User_ID);
--- 126,131 ----
  		Properties ctx = JSPEnv.getCtx(request);
  		MUser user = null;
! 		int AD_User_ID = DB.getSQLValue(null,
! 			"SELECT AD_User_ID FROM AD_User WHERE EMail=?", userName);
  		if (AD_User_ID > 0)
  			user = MUser.get(ctx, AD_User_ID);