diff --git a/base/src/org/adempiere/process/InitialClientSetup.java b/base/src/org/adempiere/process/InitialClientSetup.java
index 32f1fdb644..2d4c6d2cf2 100644
--- a/base/src/org/adempiere/process/InitialClientSetup.java
+++ b/base/src/org/adempiere/process/InitialClientSetup.java
@@ -54,6 +54,7 @@ public class InitialClientSetup extends SvrProcess
 	
 	// Process Parameters
 	private String p_ClientName = null;
+	private String p_OrgValue = null;
 	private String p_OrgName = null;
 	private String p_AdminUserName = null;
 	private String p_NormalUserName = null;
@@ -61,6 +62,13 @@ public class InitialClientSetup extends SvrProcess
 	private int p_C_Country_ID = 0;
 	private int p_C_Region_ID = 0;
 	private String p_CityName = null;
+	private String p_Postal = null;
+	private String p_Address1 = null;
+	private String p_Phone = null;
+	private String p_Phone2 = null;
+	private String p_Fax = null;
+	private String p_EMail = null;
+	private String p_TaxID = null;
 	private int p_C_City_ID = 0;
 	private boolean p_IsUseBPDimension = true;
 	private boolean p_IsUseProductDimension = true;
@@ -85,6 +93,8 @@ public class InitialClientSetup extends SvrProcess
 				;
 			else if (name.equals("ClientName"))
 				p_ClientName = (String) para[i].getParameter();
+			else if (name.equals("OrgValue"))
+				p_OrgValue = (String) para[i].getParameter();
 			else if (name.equals("OrgName"))
 				p_OrgName = (String) para[i].getParameter();
 			else if (name.equals("AdminUserName"))
@@ -101,6 +111,10 @@ public class InitialClientSetup extends SvrProcess
 				p_CityName = (String) para[i].getParameter();
 			else if (name.equals("C_City_ID"))
 				p_C_City_ID = para[i].getParameterAsInt();
+			else if (name.equals("Postal"))
+				p_Postal = (String) para[i].getParameter();
+			else if (name.equals("Address1"))
+				p_Address1 = (String) para[i].getParameter();
 			else if (name.equals("IsUseBPDimension"))
 				p_IsUseBPDimension = para[i].getParameter().equals("Y");
 			else if (name.equals("IsUseProductDimension"))
@@ -113,10 +127,20 @@ public class InitialClientSetup extends SvrProcess
 				p_IsUseSalesRegionDimension = para[i].getParameter().equals("Y");
 			else if (name.equals("CoAFile"))
 				p_CoAFile = (String) para[i].getParameter();
+			else if (name.equals("Phone"))
+				p_Phone = (String) para[i].getParameter();
+			else if (name.equals("Phone2"))
+				p_Phone2 = (String) para[i].getParameter();
+			else if (name.equals("Fax"))
+				p_Fax = (String) para[i].getParameter();
+			else if (name.equals("EMail"))
+				p_EMail = (String) para[i].getParameter();
+			else if (name.equals("TaxID"))
+				p_TaxID = (String) para[i].getParameter();
 			else
 				log.log(Level.SEVERE, "Unknown Parameter: " + name);
 		}
-	}	//	prepare
+	}
 
 	/**
 	 * 	Process
@@ -127,6 +151,7 @@ public class InitialClientSetup extends SvrProcess
 	{
 		log.info("InitialClientSetup"
 				+ ": ClientName=" + p_ClientName
+				+ ", OrgValue=" + p_OrgValue
 				+ ", OrgName=" + p_OrgName
 				+ ", AdminUserName=" + p_AdminUserName
 				+ ", NormalUserName=" + p_NormalUserName
@@ -158,7 +183,7 @@ public class InitialClientSetup extends SvrProcess
 
 		// Validate Uniqueness of client and users name
 		//	Unique Client Name
-		if (DB.executeUpdate("UPDATE AD_CLient SET CreatedBy=0 WHERE Name=?", new Object[] {p_ClientName}, false, null) != 0)
+		if (DB.executeUpdate("UPDATE AD_Client SET CreatedBy=0 WHERE Name=?", new Object[] {p_ClientName}, false, null) != 0)
 			throw new AdempiereException("@NotUnique@ " + p_ClientName);
 
 		//	Unique User Names
@@ -190,7 +215,8 @@ public class InitialClientSetup extends SvrProcess
 		// Process
 		MSetup ms = new MSetup(Env.getCtx(), WINDOW_THIS_PROCESS);
 
-		if (! ms.createClient(p_ClientName, p_OrgName, p_AdminUserName, p_NormalUserName)) {
+		if (! ms.createClient(p_ClientName, p_OrgValue, p_OrgName, p_AdminUserName, p_NormalUserName
+				, p_Phone, p_Phone2, p_Fax, p_EMail, p_TaxID)) {
 			ms.rollback();
 			throw new AdempiereException("Create client failed");
 		}
@@ -208,7 +234,7 @@ public class InitialClientSetup extends SvrProcess
 		}
 
 		//  Generate Entities
-		if (!ms.createEntities(p_C_Country_ID, p_CityName, p_C_Region_ID, p_C_Currency_ID)) {
+		if (!ms.createEntities(p_C_Country_ID, p_CityName, p_C_Region_ID, p_C_Currency_ID, p_Postal, p_Address1)) {
 			ms.rollback();
 			throw new AdempiereException("@AccountSetupError@");
 		}
@@ -218,6 +244,6 @@ public class InitialClientSetup extends SvrProcess
 		PrintUtil.setupPrintForm(ms.getAD_Client_ID());
 
 		return "@OK@";
-	}	//	doIt
+	}
 
-}	//	InitialClientSetup
+}
diff --git a/base/src/org/compiere/model/MInOut.java b/base/src/org/compiere/model/MInOut.java
index a07ee779a2..baa42edd35 100644
--- a/base/src/org/compiere/model/MInOut.java
+++ b/base/src/org/compiere/model/MInOut.java
@@ -1808,7 +1808,7 @@ public class MInOut extends X_M_InOut implements DocAction
 			return null;
 
 		MBPartner counterBP = new MBPartner (getCtx(), counterC_BPartner_ID, null);
-		MOrgInfo counterOrgInfo = MOrgInfo.get(getCtx(), counterAD_Org_ID);
+		MOrgInfo counterOrgInfo = MOrgInfo.get(getCtx(), counterAD_Org_ID, get_TrxName());
 		log.info("Counter BP=" + counterBP.getName());
 
 		//	Document Type
diff --git a/base/src/org/compiere/model/MOrder.java b/base/src/org/compiere/model/MOrder.java
index b383a282c7..41697df8e9 100644
--- a/base/src/org/compiere/model/MOrder.java
+++ b/base/src/org/compiere/model/MOrder.java
@@ -1909,7 +1909,7 @@ public class MOrder extends X_C_Order implements DocAction
 			return null;
 		
 		MBPartner counterBP = new MBPartner (getCtx(), counterC_BPartner_ID, null);
-		MOrgInfo counterOrgInfo = MOrgInfo.get(getCtx(), counterAD_Org_ID);
+		MOrgInfo counterOrgInfo = MOrgInfo.get(getCtx(), counterAD_Org_ID, get_TrxName());
 		log.info("Counter BP=" + counterBP.getName());
 
 		//	Document Type
diff --git a/base/src/org/compiere/model/MOrg.java b/base/src/org/compiere/model/MOrg.java
index 79ae84fd2b..b1d6dd9da3 100644
--- a/base/src/org/compiere/model/MOrg.java
+++ b/base/src/org/compiere/model/MOrg.java
@@ -111,11 +111,11 @@ public class MOrg extends X_AD_Org
 	 *	@param client client
 	 *	@param name name
 	 */
-	public MOrg (MClient client, String name)
+	public MOrg (MClient client, String value, String name)
 	{
 		this (client.getCtx(), 0, client.get_TrxName());
 		setAD_Client_ID (client.getAD_Client_ID());
-		setValue (name);
+		setValue (value);
 		setName (name);
 	}	//	MOrg
 
@@ -128,7 +128,7 @@ public class MOrg extends X_AD_Org
 	 */
 	public MOrgInfo getInfo()
 	{
-		return MOrgInfo.get(getCtx(), getAD_Org_ID());
+		return MOrgInfo.get(getCtx(), getAD_Org_ID(), get_TrxName());
 	}	//	getMOrgInfo
 
 
diff --git a/base/src/org/compiere/model/MOrgInfo.java b/base/src/org/compiere/model/MOrgInfo.java
index 88c4647c71..f96f8c81f0 100644
--- a/base/src/org/compiere/model/MOrgInfo.java
+++ b/base/src/org/compiere/model/MOrgInfo.java
@@ -44,14 +44,14 @@ public class MOrgInfo extends X_AD_OrgInfo
 	 *	@param AD_Org_ID id
 	 *	@return Org Info
 	 */
-	public static MOrgInfo get (Properties ctx, int AD_Org_ID)
+	public static MOrgInfo get (Properties ctx, int AD_Org_ID, String trxName)
 	{
 		MOrgInfo retValue = s_cache.get(AD_Org_ID);
 		if (retValue != null)
 		{
 			return retValue;
 		}
-		retValue = new Query(ctx, Table_Name, "AD_Org_ID=?", null)
+		retValue = new Query(ctx, Table_Name, "AD_Org_ID=?", trxName)
 						.setParameters(AD_Org_ID)
 						.firstOnly();
 		if (retValue != null)
@@ -62,7 +62,7 @@ public class MOrgInfo extends X_AD_OrgInfo
 	}	//	get
 
 	/**	Cache						*/
-	private static CCache<Integer,MOrgInfo>	s_cache	= new CCache<Integer,MOrgInfo>(Table_Name, 50);
+	private static CCache<Integer,MOrgInfo>	s_cache	= new CCache<Integer, MOrgInfo>(Table_Name, 50);
 
 	
 	/**************************************************************************
@@ -74,7 +74,7 @@ public class MOrgInfo extends X_AD_OrgInfo
 	public MOrgInfo (Properties ctx, ResultSet rs, String trxName)
 	{
 		super(ctx, rs, trxName);
-	}	//	MOrgInfo
+	}
 
 	/**
 	 * 	Organization constructor
@@ -86,6 +86,6 @@ public class MOrgInfo extends X_AD_OrgInfo
 		setClientOrg(org);
 		setDUNS ("?");
 		setTaxID ("?");
-	}	//	MOrgInfo
+	}
 	
-}	//	MOrgInfo
+}
diff --git a/base/src/org/compiere/model/MPeriod.java b/base/src/org/compiere/model/MPeriod.java
index 029d4cbdfd..28bf9fc054 100644
--- a/base/src/org/compiere/model/MPeriod.java
+++ b/base/src/org/compiere/model/MPeriod.java
@@ -744,7 +744,7 @@ public class MPeriod extends X_C_Period
         int C_Calendar_ID = 0;
         if (AD_Org_ID != 0)
         {
-            MOrgInfo info = MOrgInfo.get(ctx, AD_Org_ID);
+            MOrgInfo info = MOrgInfo.get(ctx, AD_Org_ID, null);
             C_Calendar_ID = info.getC_Calendar_ID();
         }
         
diff --git a/base/src/org/compiere/model/MSetup.java b/base/src/org/compiere/model/MSetup.java
index 04ddba9ecc..072e6f0f7b 100644
--- a/base/src/org/compiere/model/MSetup.java
+++ b/base/src/org/compiere/model/MSetup.java
@@ -101,8 +101,8 @@ public final class MSetup
 	 *  @param userOrg user id org
 	 *  @return true if created
 	 */
-	public boolean createClient (String clientName, String orgName,
-		String userClient, String userOrg)
+	public boolean createClient (String clientName, String orgValue, String orgName,
+		String userClient, String userOrg, String phone, String phone2, String fax, String eMail, String taxID)
 	{
 		log.info(clientName);
 		m_trx.start();
@@ -171,7 +171,9 @@ public final class MSetup
 		name = orgName;
 		if (name == null || name.length() == 0)
 			name = "newOrg";
-		m_org = new MOrg (m_client, name);
+		if (orgValue == null || orgValue.length() == 0)
+			orgValue = name;
+		m_org = new MOrg (m_client, orgValue, name);
 		if (!m_org.save())
 		{
 			String err = "Organization NOT created";
@@ -186,7 +188,26 @@ public final class MSetup
 		m_stdValuesOrg = AD_Client_ID + "," + getAD_Org_ID() + ",'Y',SysDate,0,SysDate,0";
 		//  Info
 		m_info.append(Msg.translate(m_lang, "AD_Org_ID")).append("=").append(name).append("\n");
-
+		
+		// Set Organization Phone, Phone2, Fax, EMail
+		MOrgInfo orgInfo = MOrgInfo.get(m_ctx, getAD_Org_ID(), m_trx.getTrxName());
+		orgInfo.setPhone(phone);
+		orgInfo.setPhone2(phone2);
+		orgInfo.setFax(fax);
+		orgInfo.setEMail(eMail);
+		if (taxID != null && taxID.length() > 0) {
+			orgInfo.setTaxID(taxID);
+		}
+		if (!orgInfo.save())
+		{
+			String err = "Organization Info NOT Updated";
+			log.log(Level.SEVERE, err);
+			m_info.append(err);
+			m_trx.rollback();
+			m_trx.close();
+			return false;
+		}
+		
 		/**
 		 *  Create Roles
 		 *  - Admin
@@ -887,7 +908,7 @@ public final class MSetup
 	 *  @param C_Currency_ID currency
 	 *  @return true if created
 	 */
-	public boolean createEntities (int C_Country_ID, String City, int C_Region_ID, int C_Currency_ID)
+	public boolean createEntities (int C_Country_ID, String City, int C_Region_ID, int C_Currency_ID, String postal, String address1)
 	{
 		if (m_as == null)
 		{
@@ -1073,6 +1094,8 @@ public final class MSetup
 		 */
 		//  Location (Company)
 		MLocation loc = new MLocation(m_ctx, C_Country_ID, C_Region_ID, City, m_trx.getTrxName());
+		loc.setAddress1(address1);
+		loc.setPostal(postal);
 		loc.save();
 		sqlCmd = new StringBuffer ("UPDATE AD_OrgInfo SET C_Location_ID=");
 		sqlCmd.append(loc.getC_Location_ID()).append(" WHERE AD_Org_ID=").append(getAD_Org_ID());
diff --git a/base/src/org/compiere/process/DistributionRun.java b/base/src/org/compiere/process/DistributionRun.java
index 75a728e1db..56da7565da 100644
--- a/base/src/org/compiere/process/DistributionRun.java
+++ b/base/src/org/compiere/process/DistributionRun.java
@@ -513,7 +513,7 @@ public class DistributionRun extends SvrProcess
 						log.fine("Counter - From_BPOrg=" + bp.getAD_OrgBP_ID_Int() 
 							+ "-" + bp + ", To_BP=" + runBPartner);
 						order.setAD_Org_ID(bp.getAD_OrgBP_ID_Int());
-						MOrgInfo oi = MOrgInfo.get(getCtx(), bp.getAD_OrgBP_ID_Int());
+						MOrgInfo oi = MOrgInfo.get(getCtx(), bp.getAD_OrgBP_ID_Int(), get_TrxName());
 						if (oi.getM_Warehouse_ID() > 0)
 							order.setM_Warehouse_ID(oi.getM_Warehouse_ID());
 						order.setBPartner(runBPartner);
@@ -758,7 +758,7 @@ public class DistributionRun extends SvrProcess
 			int M_Warehouse_ID = 0;
 			if (p_M_Warehouse_ID <= 0)
 			{
-				MOrgInfo oi_source = MOrgInfo.get(getCtx(), m_run.getAD_Org_ID());
+				MOrgInfo oi_source = MOrgInfo.get(getCtx(), m_run.getAD_Org_ID(), get_TrxName());
 				MWarehouse m_source = MWarehouse.get(getCtx(), oi_source.getM_Warehouse_ID());
 				if(m_source == null)
 					throw new AdempiereException("Do not exist Defautl Warehouse Source");
@@ -850,7 +850,7 @@ public class DistributionRun extends SvrProcess
 		MLocator m_locator_to= null;
 		MWarehouse[] ws = null;
 		
-		MOrgInfo oi_source = MOrgInfo.get(getCtx(), m_run.getAD_Org_ID());
+		MOrgInfo oi_source = MOrgInfo.get(getCtx(), m_run.getAD_Org_ID(), get_TrxName());
 		m_source = MWarehouse.get(getCtx(), oi_source.getM_Warehouse_ID());
 		if(m_source == null)
 			throw new AdempiereException("Do not exist Defautl Warehouse Source");
@@ -915,7 +915,7 @@ public class DistributionRun extends SvrProcess
 			lastC_BPartner_Location_ID = detail.getC_BPartner_Location_ID();
 			
 			bp = new MBPartner (getCtx(), detail.getC_BPartner_ID(), get_TrxName());
-			MOrgInfo oi_target = MOrgInfo.get(getCtx(), bp.getAD_OrgBP_ID_Int());
+			MOrgInfo oi_target = MOrgInfo.get(getCtx(), bp.getAD_OrgBP_ID_Int(), get_TrxName());
 			m_target = MWarehouse.get(getCtx(), oi_target.getM_Warehouse_ID());
 			if(m_target==null)
 				throw new AdempiereException("Do not exist Default Warehouse Target");
diff --git a/base/src/org/compiere/process/OrderPOCreate.java b/base/src/org/compiere/process/OrderPOCreate.java
index f830900f12..5f6679d015 100644
--- a/base/src/org/compiere/process/OrderPOCreate.java
+++ b/base/src/org/compiere/process/OrderPOCreate.java
@@ -293,7 +293,7 @@ public class OrderPOCreate extends SvrProcess
 				po.setDropShip_User_ID(so.getAD_User_ID());
 			}
 			// get default drop ship warehouse
-			MOrgInfo orginfo = MOrgInfo.get(getCtx(), po.getAD_Org_ID());
+			MOrgInfo orginfo = MOrgInfo.get(getCtx(), po.getAD_Org_ID(), get_TrxName());
 			if (orginfo.getDropShip_Warehouse_ID() != 0 )
 				po.setM_Warehouse_ID(orginfo.getDropShip_Warehouse_ID());
 			else
diff --git a/base/src/org/compiere/wf/MWFActivity.java b/base/src/org/compiere/wf/MWFActivity.java
index 54575a1c2d..dcbebf51bd 100644
--- a/base/src/org/compiere/wf/MWFActivity.java
+++ b/base/src/org/compiere/wf/MWFActivity.java
@@ -1567,7 +1567,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 			}
 			else if (resp.isOrganization())
 			{
-				MOrgInfo org = MOrgInfo.get(getCtx(), m_po.getAD_Org_ID());
+				MOrgInfo org = MOrgInfo.get(getCtx(), m_po.getAD_Org_ID(), get_TrxName());
 				if (org.getSupervisor_ID() == 0)
 					log.fine("No Supervisor for AD_Org_ID=" + m_po.getAD_Org_ID());
 				else
diff --git a/base/src/org/eevolution/model/MPPProductPlanning.java b/base/src/org/eevolution/model/MPPProductPlanning.java
index 7d1c0954f9..80f83f0cf2 100644
--- a/base/src/org/eevolution/model/MPPProductPlanning.java
+++ b/base/src/org/eevolution/model/MPPProductPlanning.java
@@ -83,9 +83,9 @@ public class MPPProductPlanning extends X_PP_Product_Planning
 	 */    
 	public static MPPProductPlanning get(Properties ctx, int ad_client_id, int ad_org_id,
 											int m_product_id,
-											String trxname)               
+											String trxName)               
 	{
-		int M_Warehouse_ID = MOrgInfo.get(ctx, ad_org_id).getM_Warehouse_ID();
+		int M_Warehouse_ID = MOrgInfo.get(ctx, ad_org_id, trxName).getM_Warehouse_ID();
 		if(M_Warehouse_ID <= 0)
 		{
 			return null;
@@ -95,7 +95,7 @@ public class MPPProductPlanning extends X_PP_Product_Planning
 		if (S_Resource_ID <= 0)
 			return null;
 
-		return get(ctx, ad_client_id,ad_org_id, M_Warehouse_ID, S_Resource_ID, m_product_id, trxname);
+		return get(ctx, ad_client_id,ad_org_id, M_Warehouse_ID, S_Resource_ID, m_product_id, trxName);
 	}
 
 	/**
diff --git a/client/src/org/compiere/apps/form/VSetup.java b/client/src/org/compiere/apps/form/VSetup.java
index 7a0c3e496c..29dc141c8f 100644
--- a/client/src/org/compiere/apps/form/VSetup.java
+++ b/client/src/org/compiere/apps/form/VSetup.java
@@ -109,6 +109,7 @@ public class VSetup extends CPanel
 	private JTextField fClientName = new JTextField();
 	private JLabel lOrgName = new JLabel();
 	private JTextField fOrgName = new JTextField();
+	private JTextField fOrgValue = new JTextField();
 	private JLabel lCurrency = new JLabel();
 	private JComboBox fCurrency = new JComboBox();
 	private JLabel lUserClient = new JLabel();
@@ -472,8 +473,8 @@ public class VSetup extends CPanel
 		MSetup ms = new MSetup(Env.getCtx(), m_WindowNo);
 		m_frame.setBusyTimer(45);
 		//  Step 1
-		boolean ok = ms.createClient(fClientName.getText(), fOrgName.getText(),
-			fUserClient.getText(), fUserOrg.getText());
+		boolean ok = ms.createClient(fClientName.getText(), fOrgValue.getText(), fOrgName.getText(),
+			fUserClient.getText(), fUserOrg.getText(), null, null, null, null, null);
 		String info = ms.getInfo();
 
 		if (ok)
@@ -493,7 +494,7 @@ public class VSetup extends CPanel
 				int C_Country_ID = p.getKey();
 				p = (KeyNamePair)fRegion.getSelectedItem();
 				int C_Region_ID = p.getKey();
-				ms.createEntities(C_Country_ID, fCity.getText(), C_Region_ID, currency.getKey());
+				ms.createEntities(C_Country_ID, fCity.getText(), C_Region_ID, currency.getKey(), null, null);
 				info += ms.getInfo();
 				//	Create Print Documents
 				PrintUtil.setupPrintForm(ms.getAD_Client_ID());
diff --git a/migration/354a-trunk/oracle/721_FR2990358_InitialTenantSetup.sql b/migration/354a-trunk/oracle/721_FR2990358_InitialTenantSetup.sql
new file mode 100644
index 0000000000..feab66fbef
--- /dev/null
+++ b/migration/354a-trunk/oracle/721_FR2990358_InitialTenantSetup.sql
@@ -0,0 +1,107 @@
+-- Apr 16, 2010 1:01:06 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,0,53161,53347,10,'OrgValue',TO_DATE('2010-04-16 13:01:06','YYYY-MM-DD HH24:MI:SS'),100,'D',40,'Y','Y','N','N','Organization Key',160,TO_DATE('2010-04-16 13:01:06','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:01:06 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53347 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:02:45 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+UPDATE AD_Process_Para SET SeqNo=15,Updated=TO_DATE('2010-04-16 13:02:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53347
+;
+
+-- Apr 16, 2010 1:10:48 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,512,0,53161,53348,10,'Postal',TO_DATE('2010-04-16 13:10:47','YYYY-MM-DD HH24:MI:SS'),100,'D',10,'Y','Y','N','N','Postal Code',94,TO_DATE('2010-04-16 13:10:47','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:10:48 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53348 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:14:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,505,0,53161,53349,10,'Phone',TO_DATE('2010-04-16 13:14:16','YYYY-MM-DD HH24:MI:SS'),100,'D',40,'Y','Y','N','N','Phone',160,TO_DATE('2010-04-16 13:14:16','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:14:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53349 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:15:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,Description,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,506,0,53161,53350,10,'Phone2',TO_DATE('2010-04-16 13:15:16','YYYY-MM-DD HH24:MI:SS'),100,'Identifies an alternate telephone number.','D',40,'Y','Y','N','N','2nd Phone',170,TO_DATE('2010-04-16 13:15:16','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:15:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53350 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:19:22 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,301,0,53161,53351,10,'Fax',TO_DATE('2010-04-16 13:19:22','YYYY-MM-DD HH24:MI:SS'),100,'D',40,'Y','Y','N','N','Fax',180,TO_DATE('2010-04-16 13:19:22','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:19:22 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53351 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:20:28 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,881,0,53161,53352,10,'EMail',TO_DATE('2010-04-16 13:20:28','YYYY-MM-DD HH24:MI:SS'),100,'D',60,'Y','Y','N','N','EMail',190,TO_DATE('2010-04-16 13:20:28','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:20:28 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53352 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:23:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,156,0,53161,53353,10,'Address1',TO_DATE('2010-04-16 13:23:16','YYYY-MM-DD HH24:MI:SS'),100,'D',60,'Y','Y','N','N','Address 1',200,TO_DATE('2010-04-16 13:23:16','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:23:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53353 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:24:08 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+UPDATE AD_Process_Para SET SeqNo=96,Updated=TO_DATE('2010-04-16 13:24:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53353
+;
+
+-- Apr 21, 2010 12:13:35 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,590,0,53161,53407,10,'TaxID',TO_DATE('2010-04-21 12:13:33','YYYY-MM-DD HH24:MI:SS'),100,'D',20,'Y','Y','N','N','Tax ID',200,TO_DATE('2010-04-21 12:13:33','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 21, 2010 12:13:35 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53407 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
diff --git a/migration/354a-trunk/postgresql/721_FR2990358_InitialTenantSetup.sql b/migration/354a-trunk/postgresql/721_FR2990358_InitialTenantSetup.sql
new file mode 100644
index 0000000000..310ec349a8
--- /dev/null
+++ b/migration/354a-trunk/postgresql/721_FR2990358_InitialTenantSetup.sql
@@ -0,0 +1,108 @@
+-- Apr 16, 2010 1:01:06 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,0,53161,53347,10,'OrgValue',TO_TIMESTAMP('2010-04-16 13:01:06','YYYY-MM-DD HH24:MI:SS'),100,'D',40,'Y','Y','N','N','Organization Key',160,TO_TIMESTAMP('2010-04-16 13:01:06','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:01:06 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53347 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:02:45 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+UPDATE AD_Process_Para SET SeqNo=15,Updated=TO_TIMESTAMP('2010-04-16 13:02:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53347
+;
+
+-- Apr 16, 2010 1:10:48 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,512,0,53161,53348,10,'Postal',TO_TIMESTAMP('2010-04-16 13:10:47','YYYY-MM-DD HH24:MI:SS'),100,'D',10,'Y','Y','N','N','Postal Code',94,TO_TIMESTAMP('2010-04-16 13:10:47','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:10:48 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53348 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:14:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,505,0,53161,53349,10,'Phone',TO_TIMESTAMP('2010-04-16 13:14:16','YYYY-MM-DD HH24:MI:SS'),100,'D',40,'Y','Y','N','N','Phone',160,TO_TIMESTAMP('2010-04-16 13:14:16','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:14:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53349 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:15:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,Description,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,506,0,53161,53350,10,'Phone2',TO_TIMESTAMP('2010-04-16 13:15:16','YYYY-MM-DD HH24:MI:SS'),100,'Identifies an alternate telephone number.','D',40,'Y','Y','N','N','2nd Phone',170,TO_TIMESTAMP('2010-04-16 13:15:16','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:15:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53350 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:19:22 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,301,0,53161,53351,10,'Fax',TO_TIMESTAMP('2010-04-16 13:19:22','YYYY-MM-DD HH24:MI:SS'),100,'D',40,'Y','Y','N','N','Fax',180,TO_TIMESTAMP('2010-04-16 13:19:22','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:19:22 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53351 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:20:28 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,881,0,53161,53352,10,'EMail',TO_TIMESTAMP('2010-04-16 13:20:28','YYYY-MM-DD HH24:MI:SS'),100,'D',60,'Y','Y','N','N','EMail',190,TO_TIMESTAMP('2010-04-16 13:20:28','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:20:28 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53352 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:23:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,156,0,53161,53353,10,'Address1',TO_TIMESTAMP('2010-04-16 13:23:16','YYYY-MM-DD HH24:MI:SS'),100,'D',60,'Y','Y','N','N','Address 1',200,TO_TIMESTAMP('2010-04-16 13:23:16','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 16, 2010 1:23:16 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53353 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
+-- Apr 16, 2010 1:24:08 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+UPDATE AD_Process_Para SET SeqNo=96,Updated=TO_TIMESTAMP('2010-04-16 13:24:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53353
+;
+
+-- Apr 21, 2010 12:13:35 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para (AD_Client_ID,AD_Element_ID,AD_Org_ID,AD_Process_ID,AD_Process_Para_ID,AD_Reference_ID,ColumnName,Created,CreatedBy,EntityType,FieldLength,IsActive,IsCentrallyMaintained,IsMandatory,IsRange,Name,SeqNo,Updated,UpdatedBy) VALUES (0,590,0,53161,53407,10,'TaxID',TO_TIMESTAMP('2010-04-21 12:13:33','YYYY-MM-DD HH24:MI:SS'),100,'D',20,'Y','Y','N','N','Tax ID',200,TO_TIMESTAMP('2010-04-21 12:13:33','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Apr 21, 2010 12:13:35 PM CEST
+-- FR [2990358] - Extend Initial Tenant setup
+-- https://sourceforge.net/tracker/?func=detail&aid=2990358&group_id=176962&atid=879335
+INSERT INTO AD_Process_Para_Trl (AD_Language,AD_Process_Para_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Process_Para_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Process_Para t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Process_Para_ID=53407 AND NOT EXISTS (SELECT * FROM AD_Process_Para_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Process_Para_ID=t.AD_Process_Para_ID)
+;
+
diff --git a/posterita/posterita/src/main/org/posterita/businesslogic/ClientManager.java b/posterita/posterita/src/main/org/posterita/businesslogic/ClientManager.java
index e8a79dbd7d..443a1cade2 100644
--- a/posterita/posterita/src/main/org/posterita/businesslogic/ClientManager.java
+++ b/posterita/posterita/src/main/org/posterita/businesslogic/ClientManager.java
@@ -75,8 +75,8 @@ public class ClientManager
 		MSetup setup = new MSetup(ctx, 0);
 
 		// Step 1
-		boolean ok = setup.createClient(clientName, orgName, clientName
-				+ " Client User", clientName + " Org User");
+		boolean ok = setup.createClient(clientName, orgName, orgName, clientName
+				+ " Client User", clientName + " Org User", null, null, null, null, null);
 
 		if (ok) 
 		{
@@ -90,7 +90,7 @@ public class ClientManager
 			}
 
 			// Generate Entities
-			if (!setup.createEntities(countryId, city, 0, currency.getKey()))
+			if (!setup.createEntities(countryId, city, 0, currency.getKey(), null, null))
 			{
 				throw new OperationException(
 						"Could not create setup entities");
diff --git a/posterita/posterita/src/main/org/posterita/businesslogic/OrganisationManager.java b/posterita/posterita/src/main/org/posterita/businesslogic/OrganisationManager.java
index 3cd76ef68b..eb35e25db9 100644
--- a/posterita/posterita/src/main/org/posterita/businesslogic/OrganisationManager.java
+++ b/posterita/posterita/src/main/org/posterita/businesslogic/OrganisationManager.java
@@ -539,7 +539,7 @@ public class OrganisationManager
             return bankAccountId;
         }
         
-        MOrgInfo orgInfo = MOrgInfo.get(ctx, adOrgId);
+        MOrgInfo orgInfo = MOrgInfo.get(ctx, adOrgId, trxName);
         int bankId = orgInfo.getTransferBank_ID();
         
         if (bankId <= 0)
@@ -574,7 +574,7 @@ public class OrganisationManager
     
     public static int getCreateTransferCashBook(Properties ctx, int adOrgId, int currencyId, String trxName) throws OperationException
     {
-        MOrgInfo orgInfo = MOrgInfo.get(ctx, adOrgId);
+        MOrgInfo orgInfo = MOrgInfo.get(ctx, adOrgId, trxName);
         
         if (orgInfo.getTransferCashBook_ID() > 0)
         {
diff --git a/serverRoot/src/main/server/org/compiere/server/Scheduler.java b/serverRoot/src/main/server/org/compiere/server/Scheduler.java
index 50019624be..442416e022 100644
--- a/serverRoot/src/main/server/org/compiere/server/Scheduler.java
+++ b/serverRoot/src/main/server/org/compiere/server/Scheduler.java
@@ -94,7 +94,7 @@ public class Scheduler extends AdempiereServer
 		Env.setContext(m_schedulerctx, "#AD_Language", schedclient.getAD_Language());
 		Env.setContext(m_schedulerctx, "#AD_Org_ID", m_model.getAD_Org_ID());
 		if (m_model.getAD_Org_ID() != 0) {
-			MOrgInfo schedorg = MOrgInfo.get(getCtx(), m_model.getAD_Org_ID());
+			MOrgInfo schedorg = MOrgInfo.get(getCtx(), m_model.getAD_Org_ID(), null);
 			if (schedorg.getM_Warehouse_ID() > 0)
 				Env.setContext(m_schedulerctx, "#M_Warehouse_ID", schedorg.getM_Warehouse_ID());
 		}
diff --git a/serverRoot/src/main/server/org/compiere/server/WorkflowProcessor.java b/serverRoot/src/main/server/org/compiere/server/WorkflowProcessor.java
index 5b81921507..30db7ebc3c 100644
--- a/serverRoot/src/main/server/org/compiere/server/WorkflowProcessor.java
+++ b/serverRoot/src/main/server/org/compiere/server/WorkflowProcessor.java
@@ -446,7 +446,7 @@ public class WorkflowProcessor extends AdempiereServer
 			PO document = process.getPO();
 			if (document != null)
 			{
-				MOrgInfo org = MOrgInfo.get (getCtx(), document.getAD_Org_ID());
+				MOrgInfo org = MOrgInfo.get (getCtx(), document.getAD_Org_ID(), null);
 				if (org.getSupervisor_ID() != 0
 					&& !list.contains(new Integer(org.getSupervisor_ID())))
 				{